roots/tempest: updating roots file with bugfixes

1 files changed, 43 insertions, 26 deletions

diff --git a/roots/tempest.nix b/roots/tempest.nix
index 5dcfd0699ad..04c4629406b 100644
--- a/roots/tempest.nix
+++ b/roots/tempest.nix
@@ -1,6 +1,6 @@
 /* TOP LEVEL DEVICE CONFIGURATION FOR
  * 
- *    tempst (AMD workstation)
+ *    tempest (AMD workstation)
  *
  * This file only contains settings that are specific to this one
  * device (hardware and things outside of nix, like partitions).
@@ -15,29 +15,34 @@
   nixpkgs.config.allowUnfree = true;
 
   imports = [
-    <home-manager/nixos>
     ../modules/nix
+    ../modules/nix/home-manager.nix
+    
     ../modules/base
+    ../modules/docker
+    ../modules/workstation
+    ../modules/workstation/hardware/yubikey
+    ../modules/workstation/hardware/xkblayout
   ];
   
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-  hardware.enableRedistributableFirmware = true;
-  
+  # Use the GRUB 2 boot loader.
   boot.loader.grub = {
-    copyKernels = true;
+    enable = true;
     device = "/dev/disk/by-id/ata-Samsung_SSD_850_EVO_500GB_S2RBNB0J340787H";
-    zfsSupport = true;
     enableCryptodisk = true;
+    zfsSupport = true;
+    version = 2;
   };
 
-  boot.extraModprobeConfig = "options kvm_item nested=1";
-  boot.cleanTmpDir = true;
-  boot.tmpOnTmpfs = true;
-  boot.supportedFilesystems = [ "zfs" "exfat" ];
+  hardware.cpu.amd.updateMicrocode = true;
+  hardware.enableRedistributableFirmware = true;
 
+  boot.initrd.availableKernelModules =
+    [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [];
+  
   fileSystems."/" = {
     device = "zroot";
     fsType = "zfs";
@@ -45,26 +50,38 @@
     encrypted = {
       enable = true;
       label = "lvm";
-      blkDev = "/dev/disk/by-uuid/7444569c-3f9c-4870-89c2-efa2632f533d";
+      blkDev = "/dev/disk/by-uuid/e01e1473-ea51-4ec7-a5a9-44d673396644";
     };
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/a5140cc3-08b9-4b5f-9854-aa97c47027b8";
+    device = "/dev/disk/by-uuid/0583b1a0-88c1-4e1c-855e-2df948272cbf";
     fsType = "ext4";
   };
 
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/3ff907d0-5e9d-419e-bc98-41653b615725"; }
-  ];
-
+  swapDevices = [];
   nix.maxJobs = 16;
-  i18n.consoleFont = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
-
-  # The protagonist's ship in Mass Effect: Andromeda
+  
+  ## From Mass Effect: Andromeda
   networking.hostName = "tempest";
-  networking.hostId = "ef9611bf";
+  networking.hostId = "01fd342c";
 
-  system.stateVersion = "19.03";
-  users.users.spacekookie.hashedPassword = "$6$rounds=1000000$SJCdQsnp.nL8r$ilM9bdZhxmHPT6mns0Z2sNtIxe4xBDi1.qLybNrDKZeeL8ctNHsF95F4QCvc0kQm4A1EMtwun5YStr4sSz8Yi/";
+  networking.useDHCP = false;
+  networking.interfaces.enp7s0.useDHCP = true;
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_GB.UTF-8";
+
+  # Set your time zone.
+  time.timeZone = "Europe/Berlin";
+
+  programs.sway.enable = true;
+  programs.mtr.enable = true;
+  programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
+  services.openssh.enable = true;
+
+  # users.users.spacekookie.hashedPassword = "$6$rounds=1000000$22ypycQ2AlCCv8iC$RrzyAbCX3D518nCgfR3MTqZhfK.GAclme7EQlKTlqH4oV1YvGd/aHdTfe59iMpf/J18tqEO2aSXsevTVQz2yW.";
+  users.users.spacekookie.hashedPassword = "$6$rounds=1000000$IncTbazL/YhUV5$brzwb3Xa0cmmazpxJGPPo93wfs6jAomL1NYJ7Amw3WSyTjXGXGbedIMmm06nkeCnJfJzoZ.Jd47q88ot3USZi/";
+  system.stateVersion = "19.09";
 }
+