diff options
Diffstat (limited to 'machines')
-rw-r--r-- | machines/aszlig/arilou.nix (renamed from machines/arilou.nix) | 2 | ||||
-rw-r--r-- | machines/aszlig/dnyarri-kconf.nix (renamed from machines/dnyarri-kconf.nix) | 0 | ||||
-rw-r--r-- | machines/aszlig/dnyarri.nix (renamed from machines/dnyarri.nix) | 4 | ||||
-rw-r--r-- | machines/aszlig/kzerza.nix (renamed from machines/kzerza.nix) | 2 | ||||
-rw-r--r-- | machines/aszlig/mmrnmhrm-kconf.nix (renamed from machines/mmrnmhrm-kconf.nix) | 0 | ||||
-rw-r--r-- | machines/aszlig/mmrnmhrm.nix (renamed from machines/mmrnmhrm.nix) | 4 | ||||
-rw-r--r-- | machines/aszlig/tishtushi.nix (renamed from machines/tishtushi.nix) | 2 | ||||
-rw-r--r-- | machines/default.nix | 20 |
8 files changed, 27 insertions, 7 deletions
diff --git a/machines/arilou.nix b/machines/aszlig/arilou.nix index 08f3e370..093934b5 100644 --- a/machines/arilou.nix +++ b/machines/aszlig/arilou.nix @@ -8,7 +8,7 @@ let diskID = "usb-Lexar_USB_Flash_Drive_201303211246293590E4-0:0"; in { imports = [ - ../common-workstation.nix + ../../common-workstation.nix <nixpkgs/nixos/modules/profiles/all-hardware.nix> ]; diff --git a/machines/dnyarri-kconf.nix b/machines/aszlig/dnyarri-kconf.nix index 368c155f..368c155f 100644 --- a/machines/dnyarri-kconf.nix +++ b/machines/aszlig/dnyarri-kconf.nix diff --git a/machines/dnyarri.nix b/machines/aszlig/dnyarri.nix index aca4d383..0547059e 100644 --- a/machines/dnyarri.nix +++ b/machines/aszlig/dnyarri.nix @@ -1,10 +1,10 @@ { pkgs, ... }: with pkgs.lib; -with import ../lib; +with import ../../lib; { - imports = singleton ../common-workstation.nix; + imports = singleton ../../common-workstation.nix; nix.maxJobs = 8; diff --git a/machines/kzerza.nix b/machines/aszlig/kzerza.nix index c7f09526..a0ca1e5d 100644 --- a/machines/kzerza.nix +++ b/machines/aszlig/kzerza.nix @@ -6,7 +6,7 @@ let rootUUID = "ad41f848-d14a-4a89-9d04-3e48bd73dc5c"; diskID = "usb-0000_Removable_Drive_23372707080836980013-0:0"; in { - imports = singleton ../common.nix; + imports = singleton ../../common.nix; services.xserver.enable = mkForce false; diff --git a/machines/mmrnmhrm-kconf.nix b/machines/aszlig/mmrnmhrm-kconf.nix index ac37de64..ac37de64 100644 --- a/machines/mmrnmhrm-kconf.nix +++ b/machines/aszlig/mmrnmhrm-kconf.nix diff --git a/machines/mmrnmhrm.nix b/machines/aszlig/mmrnmhrm.nix index 7f966c02..c14c203f 100644 --- a/machines/mmrnmhrm.nix +++ b/machines/aszlig/mmrnmhrm.nix @@ -1,10 +1,10 @@ { pkgs, ... }: with pkgs.lib; -with import ../lib; +with import ../../lib; { - imports = singleton ../common-workstation.nix; + imports = singleton ../../common-workstation.nix; nix.maxJobs = 2; diff --git a/machines/tishtushi.nix b/machines/aszlig/tishtushi.nix index 3e067ca9..305c4952 100644 --- a/machines/tishtushi.nix +++ b/machines/aszlig/tishtushi.nix @@ -8,7 +8,7 @@ let storeUUID = "ce1db87b-d717-450d-a212-3685a224f626"; diskID = "ata-Hitachi_HTS543232A7A384_E2P31243FGB6PJ"; in { - imports = singleton ../common-workstation.nix; + imports = singleton ../../common-workstation.nix; boot = rec { kernelPackages = with pkgs; let diff --git a/machines/default.nix b/machines/default.nix new file mode 100644 index 00000000..10c4fdb6 --- /dev/null +++ b/machines/default.nix @@ -0,0 +1,20 @@ +{ system ? builtins.currentSystem, ... }: + +let + callMachine = path: rec { + config = import path; + build = import <nixpkgs/nixos/lib/eval-config.nix> { + inherit system; + modules = [ config ]; + }; + }; + +in { + aszlig = { + dnyarri = callMachine ./aszlig/dnyarri.nix; + mmrnmhrm = callMachine ./aszlig/mmrnmhrm.nix; + arilou = callMachine ./aszlig/arilou.nix; + kzerza = callMachine ./aszlig/kzerza.nix; + tishtushi = callMachine ./aszlig/tishtushi.nix; + }; +} |