1
1
Fork 0

Compare commits

..

No commits in common. "e709ed2a72d8fdf7e8f8415e97ad5e29a3a580f9" and "6f9f01fe842be4ba0d8c51e380452973b2fbb18a" have entirely different histories.

3 changed files with 7 additions and 42 deletions

View File

@ -113,30 +113,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1723362943,
"narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a58bc8ad779655e790115244571758e8de055e3d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"intake": "intake", "intake": "intake",
"intake-sources": "intake-sources", "intake-sources": "intake-sources",
"nixpkgs-2311": "nixpkgs-2311", "nixpkgs-2311": "nixpkgs-2311",
"nixpkgs-2405": "nixpkgs-2405", "nixpkgs-2405": "nixpkgs-2405"
"nixpkgs-unstable": "nixpkgs-unstable"
} }
} }
}, },

View File

@ -2,7 +2,6 @@
inputs = { inputs = {
nixpkgs-2311.url = "github:NixOS/nixpkgs/23.11"; nixpkgs-2311.url = "github:NixOS/nixpkgs/23.11";
nixpkgs-2405.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs-2405.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-compat = { flake-compat = {
url = "github:edolstra/flake-compat"; url = "github:edolstra/flake-compat";
flake = false; flake = false;
@ -22,25 +21,11 @@
self, self,
nixpkgs-2311, nixpkgs-2311,
nixpkgs-2405, nixpkgs-2405,
nixpkgs-unstable,
flake-compat, flake-compat,
intake, intake,
intake-sources, intake-sources,
}@inputs: { }@inputs: {
nixosModules = { nixosModules.beatific = import ./modules/beatific.nix;
beatific = import ./modules/beatific.nix;
tf2-gperftools = ({ ... }: {
environment.systemPackages = [ nixpkgs-2405.legacyPackages."i686-linux".gperftools ];
});
unstable-vscode = ({ ... }: let
pkgs = import nixpkgs-unstable { system = "x86_64-linux"; config.allowUnfree = true; };
in {
environment.systemPackages = [
pkgs.vscode
pkgs.icu
];
});
};
nixosConfigurations = { nixosConfigurations = {
backyard = nixpkgs-2405.lib.nixosSystem { backyard = nixpkgs-2405.lib.nixosSystem {
@ -77,8 +62,9 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
self.nixosModules.beatific self.nixosModules.beatific
self.nixosModules.tf2-gperftools ({ ... }: {
self.nixosModules.unstable-vscode environment.systemPackages = [ nixpkgs-2405.legacyPackages."i686-linux".gperftools ];
})
./machine/imperium ./machine/imperium
]; ];
}; };

View File

@ -56,7 +56,7 @@
}; };
users.users.tvb = { users.users.tvb = {
extraGroups = [ "networkmanager" "docker" ]; extraGroups = [ "networkmanager" ];
packages = [ packages = [
(pkgs.writeShellScriptBin "yt-dlp" ''exec $HOME/.yt-dlp/bin/yt-dlp "$@"'') (pkgs.writeShellScriptBin "yt-dlp" ''exec $HOME/.yt-dlp/bin/yt-dlp "$@"'')
]; ];
@ -71,11 +71,9 @@
beatific.extraPrograms = true; beatific.extraPrograms = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
audacity
bitwarden bitwarden
bitwarden-cli bitwarden-cli
comic-mono comic-mono
distrobox
firefox firefox
gnome.gnome-terminal gnome.gnome-terminal
gthumb gthumb
@ -83,10 +81,8 @@
mpv mpv
obsidian obsidian
unzip unzip
vscodium
]; ];
programs.nix-ld.enable = true;
virtualisation.docker.enable = true; # needed for distrobox
networking.firewall = { networking.firewall = {
enable = false; enable = false;