From 7de9f38d87c16b76ef5d7c0cd7329d49b79b6c09 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Tue, 11 May 2021 21:19:18 +0200
Subject: Update athena to new hardware

---
 host/athena.nix                    |  3 +--
 host/hardware/athena.nix           | 16 +++++++++-------
 host/software/server/wireguard.nix |  6 +-----
 3 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'host')

diff --git a/host/athena.nix b/host/athena.nix
index ee8434d..6618cd1 100644
--- a/host/athena.nix
+++ b/host/athena.nix
@@ -87,7 +87,6 @@
     enable = true;
     extraConfig = ''
      RESTORE_DEVICE_STATE_ON_STARTUP=1
-     DEVICES_TO_DISABLE_ON_STARTUP="wwan"
     '';
   };
 
@@ -99,5 +98,5 @@
     packages = [ pkgs.terminus_font ];
   };
 
-  system.stateVersion = "18.09";
+  system.stateVersion = "20.09";
 }
diff --git a/host/hardware/athena.nix b/host/hardware/athena.nix
index b0fb576..4849b6f 100644
--- a/host/hardware/athena.nix
+++ b/host/hardware/athena.nix
@@ -1,31 +1,33 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
   imports =
-    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-intel" "fuse" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/a382b969-52d6-4946-ae8a-5da3f612410c";
+    { device = "/dev/disk/by-uuid/198fbcc1-0b72-4465-891a-5959c6bfcfc6";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/CC5B-E0DA";
+    { device = "/dev/disk/by-uuid/6510-C4DF";
       fsType = "vfat";
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/96edaf95-23ce-4859-b82f-048711d2a8d2"; }
+    [ { device = "/dev/disk/by-uuid/60bd356a-c28e-4f5e-90ff-6331a3cb7252"; }
     ];
 
-  nix.maxJobs = lib.mkDefault 4;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  # high-resolution display
+  hardware.video.hidpi.enable = lib.mkDefault true;
 }
diff --git a/host/software/server/wireguard.nix b/host/software/server/wireguard.nix
index c4d8488..0398285 100644
--- a/host/software/server/wireguard.nix
+++ b/host/software/server/wireguard.nix
@@ -23,7 +23,7 @@
           allowedIPs = [ "10.100.0.3" ];
         }
         { # athena
-          publicKey = "t4SzRV/olVdzAKauJOwFau3I0fTISUvbOAaKGZd6ezU=";
+          publicKey = "byk4tOSFypOOcIQ0Za1UNilm6Bigm+dQVPxilB7NB0k=";
           allowedIPs = [ "10.100.0.4" ];
         }
         { # schreibfix
@@ -34,10 +34,6 @@
           publicKey = "jUtbAF3TZDEFXlL+YTV3g26wP0IWGbpiCFGXjxo5TXE=";
           allowedIPs = [ "10.100.0.6" ];
         }
-        { # athena new
-          publicKey = "byk4tOSFypOOcIQ0Za1UNilm6Bigm+dQVPxilB7NB0k=";
-          allowedIPs = [ "10.100.0.7" ];
-        }
       ];
     };
   };
-- 
cgit v1.2.3