kopatz/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restructure a bit

Browse Source
This commit is contained in:
Kopatz
2024-07-23 21:35:59 +02:00
parent 8f7cbb75e1
commit 9f5c6af72d
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
flake.nix
View File

@@ -43,8 +43,9 @@
mkHost = { modules, specialArgs ? { mkHost = { modules, specialArgs ? {
pkgsVersion = nixpkgs-unstable; pkgsVersion = nixpkgs-unstable;
home-manager-version = home-manager-unstable; home-manager-version = home-manager-unstable;
}, system ? "x86_64-linux", minimal ? false }: }, system ? "x86_64-linux", minimal ? false, graphical ? true }:
specialArgs.pkgsVersion.lib.nixosSystem { let lib = specialArgs.pkgsVersion.lib;
in specialArgs.pkgsVersion.lib.nixosSystem {
inherit system; inherit system;
modules = modules ++ [ modules = modules ++ [
./modules ./modules
@@ -58,15 +59,16 @@
nur.overlay nur.overlay
]; ];
}) })
] ++ (if !minimal then [ ] ++ lib.lists.optionals (!minimal)
specialArgs.home-manager-version.nixosModules.home-manager [ specialArgs.home-manager-version.nixosModules.home-manager ]
nixos-cosmic.nixosModules.default ++ lib.lists.optionals (!minimal && graphical) [
./modules/graphical
stylix.nixosModules.stylix stylix.nixosModules.stylix
./modules/graphical/stylix.nix ./modules/graphical/stylix.nix
nixos-cosmic.nixosModules.default
./modules/graphical/cosmic.nix ./modules/graphical/cosmic.nix
({ outputs, ... }: { stylix.image = ./yuyukowallpaper.png; }) ({ outputs, ... }: { stylix.image = ./yuyukowallpaper.png; })
] else ];
[ ]);
specialArgs = specialArgs // { inherit inputs outputs; }; specialArgs = specialArgs // { inherit inputs outputs; };
}; };
in flake-utils.lib.eachDefaultSystem (system: { in flake-utils.lib.eachDefaultSystem (system: {
@@ -89,6 +91,7 @@
// import ./systems/server/userdata.nix; // import ./systems/server/userdata.nix;
pkgsVersion = nixpkgs; pkgsVersion = nixpkgs;
home-manager-version = home-manager; home-manager-version = home-manager;
graphical = false;
}; };
}; };
"kop-pc" = mkHost { "kop-pc" = mkHost {
@@ -124,6 +127,7 @@
specialArgs = { specialArgs = {
pkgsVersion = nixpkgs; pkgsVersion = nixpkgs;
home-manager-version = home-manager; home-manager-version = home-manager;
graphical = false;
}; };
modules = [ ./users/anon ./systems/mini-pc/configuration.nix ]; modules = [ ./users/anon ./systems/mini-pc/configuration.nix ];
}; };
@@ -131,6 +135,7 @@
specialArgs = { specialArgs = {
pkgsVersion = nixpkgs; pkgsVersion = nixpkgs;
home-manager-version = home-manager; home-manager-version = home-manager;
graphical = false;
}; };
modules = modules =
[ ./users/anon ./systems/mini-pc-proxmox/configuration.nix ]; [ ./users/anon ./systems/mini-pc-proxmox/configuration.nix ];
@@ -161,8 +166,10 @@
}; };
"proxmox-test-vm" = mkHost { "proxmox-test-vm" = mkHost {
minimal = true; minimal = true;
modules = modules = [
[ disko.nixosModules.disko ./systems/proxmox-test-vm/configuration.nix ]; disko.nixosModules.disko
./systems/proxmox-test-vm/configuration.nix
];
}; };
}; };
}; };

1
modules/default.nix
View File

@@ -2,7 +2,6 @@
{ {
imports = [ imports = [
./fh ./fh
./graphical
./hardware ./hardware
./misc ./misc
./nix ./nix

1
users/anon/home.nix
View File

@@ -17,7 +17,6 @@
../../home-manager/gitconfig.nix ../../home-manager/gitconfig.nix
../../home-manager/zsh ../../home-manager/zsh
../../home-manager/direnv.nix ../../home-manager/direnv.nix
inputs.nixvim.homeManagerModules.nixvim
inputs.nix-colors.homeManagerModule inputs.nix-colors.homeManagerModule
]; ];