diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-03-18 03:25:38 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-03-18 03:25:38 +0100 |
| commit | ec2b45fb836842abb89a14088ea84365a45019ae (patch) | |
| tree | 6ccceecb4b36d4871bd0056d7772ce1046f95120 /machines | |
| parent | 187c673adf3c6a9a7afd8934ee41df7941f28cbf (diff) | |
Move common{-workstation}.nix into profiles.
Both files are specific to my machines only and need to be generalized in order to be useful for anyone else. Moving these files has a few other censequences, such that we now need to automatically import the module-list.nix in callMachine. Speaking of module-list.nix, the file is now alphabetically sorted. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'machines')
| -rw-r--r-- | machines/aszlig/arilou.nix | 6 | ||||
| -rw-r--r-- | machines/aszlig/dnyarri.nix | 2 | ||||
| -rw-r--r-- | machines/aszlig/kzerza.nix | 2 | ||||
| -rw-r--r-- | machines/aszlig/mmrnmhrm.nix | 2 | ||||
| -rw-r--r-- | machines/aszlig/tishtushi.nix | 2 | ||||
| -rw-r--r-- | machines/default.nix | 2 |
6 files changed, 7 insertions, 9 deletions
diff --git a/machines/aszlig/arilou.nix b/machines/aszlig/arilou.nix index 093934b5..94efda36 100644 --- a/machines/aszlig/arilou.nix +++ b/machines/aszlig/arilou.nix @@ -7,10 +7,8 @@ let swapUUID = "4d172959-5cfd-4164-a46e-fa7be0dfd03a"; diskID = "usb-Lexar_USB_Flash_Drive_201303211246293590E4-0:0"; in { - imports = [ - ../../common-workstation.nix - <nixpkgs/nixos/modules/profiles/all-hardware.nix> - ]; + vuizvui.user.aszlig.profiles.workstation.enable = true; + imports = [ <nixpkgs/nixos/modules/profiles/all-hardware.nix> ]; boot = { kernelPackages = pkgs.linuxPackages_latest; diff --git a/machines/aszlig/dnyarri.nix b/machines/aszlig/dnyarri.nix index 57a8a92d..89753820 100644 --- a/machines/aszlig/dnyarri.nix +++ b/machines/aszlig/dnyarri.nix @@ -4,7 +4,7 @@ with pkgs.lib; with import ../../lib; { - imports = singleton ../../common-workstation.nix; + vuizvui.user.aszlig.profiles.workstation.enable = true; nix.maxJobs = 8; diff --git a/machines/aszlig/kzerza.nix b/machines/aszlig/kzerza.nix index a0ca1e5d..31ca9852 100644 --- a/machines/aszlig/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; + vuizvui.user.aszlig.profiles.base.enable = true; services.xserver.enable = mkForce false; diff --git a/machines/aszlig/mmrnmhrm.nix b/machines/aszlig/mmrnmhrm.nix index 3e3cc641..dbc6793b 100644 --- a/machines/aszlig/mmrnmhrm.nix +++ b/machines/aszlig/mmrnmhrm.nix @@ -4,7 +4,7 @@ with pkgs.lib; with import ../../lib; { - imports = singleton ../../common-workstation.nix; + vuizvui.user.aszlig.profiles.workstation.enable = true; nix.maxJobs = 2; diff --git a/machines/aszlig/tishtushi.nix b/machines/aszlig/tishtushi.nix index 305c4952..cb12ae72 100644 --- a/machines/aszlig/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; + vuizvui.user.aszlig.profiles.workstation.enable = true; boot = rec { kernelPackages = with pkgs; let diff --git a/machines/default.nix b/machines/default.nix index 10c4fdb6..baceb647 100644 --- a/machines/default.nix +++ b/machines/default.nix @@ -5,7 +5,7 @@ let config = import path; build = import <nixpkgs/nixos/lib/eval-config.nix> { inherit system; - modules = [ config ]; + modules = [ config ] ++ import ../modules/module-list.nix; }; }; |