dadada/nix-config
dadada/nix-config
1
0
Fork 0
Code Issues 2 Pull requests 5 Projects Releases Packages Wiki Activity Actions

fix nixosModules

Browse source
This commit is contained in:
Tim Schubert 2021-07-11 18:52:46 +02:00
parent 2c0ea20ad5
commit d63c116b9f
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
3 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nixos/configurations.nix
View file

@ -5,7 +5,6 @@
, nixos-hardware , nixos-hardware
}: }:
let adapterModule = { let adapterModule = {
imports = [ ./modules ];
nix.nixPath = [ nix.nixPath = [
"home-manager=${home-manager}" "home-manager=${home-manager}"
"nixpkgs=${nixpkgs}" "nixpkgs=${nixpkgs}"
@ -28,7 +27,7 @@ in
{ {
gorgon = nixosSystem { gorgon = nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [
adapterModule adapterModule
nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1 nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1
#home-manager.nixosModules.home-manager #home-manager.nixosModules.home-manager
@ -43,7 +42,7 @@ in
}; };
ifrit = nixosSystem { ifrit = nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [
adapterModule adapterModule
./modules/profiles/server.nix ./modules/profiles/server.nix
./ifrit/configuration.nix ./ifrit/configuration.nix
@ -52,7 +51,7 @@ in
surgat = nixosSystem { surgat = nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [
adapterModule adapterModule
./modules/profiles/server.nix ./modules/profiles/server.nix
./surgat/configuration.nix ./surgat/configuration.nix
@ -60,7 +59,7 @@ in
}; };
pruflas = nixosSystem { pruflas = nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [
adapterModule adapterModule
./modules/profiles/server.nix ./modules/profiles/server.nix
./pruflas/configuration.nix ./pruflas/configuration.nix

31
nixos/modules/default.nix
View file

@ -1,19 +1,16 @@
{ ... }:
{ {
imports = [ admin = import ./admin.nix;
./admin.nix backup = import ./backup.nix;
./backup.nix element = import ./element.nix;
./element.nix fido2 = import ./fido2.nix;
./fido2.nix fileShare = import ./fileShare.nix;
./fileShare.nix gitea = import ./gitea.nix;
./gitea.nix headphones = import ./headphones.nix;
./headphones.nix homepage = import ./homepage.nix;
./homepage.nix networking = import ./networking.nix;
./networking.nix share = import ./share.nix;
./share.nix steam = import ./steam.nix;
./steam.nix update = import ./update.nix;
./update.nix vpnServer = import ./vpnServer.nix;
./vpnServer.nix weechat = import ./weechat.nix;
./weechat.nix
];
} }

2
outputs.nix
View file

@ -62,7 +62,7 @@
nixosSystem = nixpkgs.lib.nixosSystem; nixosSystem = nixpkgs.lib.nixosSystem;
inherit self nixpkgs home-manager nixos-hardware; inherit self nixpkgs home-manager nixos-hardware;
}; };
nixosModule = import ./nixos/modules; nixosModules = import ./nixos/modules;
overlays = import ./overlays; overlays = import ./overlays;
pythonPackages = import ./pkgs/python-pkgs; pythonPackages = import ./pkgs/python-pkgs;