diff options
author | aszlig <aszlig@redmoonstudios.org> | 2014-10-13 03:25:09 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2014-10-13 03:28:38 +0200 |
commit | da03760eeb325a48e2fd743af3e7e89cfd204390 (patch) | |
tree | 7da8d422546e6020f49f5735bc7a2691b749df94 | |
parent | 0e8cf712a4bef500762bef8d3277d9a199256997 (diff) |
machines: Add new configuration for 'tishtushi'.
At the moment, this configuration is only preliminary and we still need to refine hardware configuration and of course the kernel configuration. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-rw-r--r-- | machines/tishtushi.nix | 46 | ||||
-rw-r--r-- | network.nix | 1 |
2 files changed, 47 insertions, 0 deletions
diff --git a/machines/tishtushi.nix b/machines/tishtushi.nix new file mode 100644 index 00000000..0d1c2e5e --- /dev/null +++ b/machines/tishtushi.nix @@ -0,0 +1,46 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +let + rootUUID = "e33a3dda-a87d-473b-b113-37783aa35667"; + swapUUID = "e9f59283-143c-4c36-978c-c730c6ca27c7"; + storeUUID = "ce1db87b-d717-450d-a212-3685a224f626"; + diskID = "ata-Hitachi_HTS543232A7A384_E2P31243FGB6PJ"; +in { + imports = singleton ../common-workstation.nix; + + boot = { + kernelPackages = pkgs.linuxPackages_latest; + initrd.kernelModules = [ "fbcon" "usb_storage" ]; + loader.grub.device = "/dev/disk/by-id/${diskID}"; + loader.grub.timeout = 0; + }; + + networking.hostName = "tishtushi"; + networking.wireless.enable = true; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/${rootUUID}"; + fsType = "btrfs"; + options = concatStringsSep "," [ + "space_cache" "compress=zlib" "noatime" + ]; + }; + + fileSystems."/nix/store" = { + device = "/dev/disk/by-uuid/${storeUUID}"; + fsType = "btrfs"; + options = concatStringsSep "," [ + "ssd" "compress-force=zlib" "noatime" + ]; + }; + + swapDevices = singleton { + device = "/dev/disk/by-uuid/${swapUUID}"; + }; + + services.xserver.videoDrivers = [ "intel" ]; + + nix.maxJobs = 4; +} diff --git a/network.nix b/network.nix index 709c2c18..038f9e73 100644 --- a/network.nix +++ b/network.nix @@ -3,4 +3,5 @@ mmrnmhrm = import ./machines/mmrnmhrm.nix; arilou = import ./machines/arilou.nix; kzerza = import ./machines/kzerza.nix; + tishtushi = import ./machines/tishtushi.nix; } |