updates, new laptop install

hosts/darp8/configuration.nix

@@ -23,22 +23,8 @@
     };
     system76.enableAll = true;
   };
-
-  swapDevices = [ {
-    device = "/var/swapfile";
-    size = 24 * 1024;
-  } ];
-
   boot = {
-    resumeDevice = "/dev/disk/by-uuid/c7704142-d0b9-4a85-af1c-ce776b895c0f";
-    kernelParams = [
-      "resume_offset=13629440"
-      "mem_sleep_default=s2idle"
-    ];
     kernelPackages = pkgs.linuxPackages_latest;
-    initrd.postMountCommands = lib.mkAfter ''
-      swapon /mnt-root/var/swapfile
-    '';
   };
 
   services = {
@@ -64,10 +50,10 @@
       };
     };
 
-    sleep.extraConfig = ''
-      HibernateDelaySec=15m
-      SuspendState=mem
-      '';
+    sleep.settings.Sleep = {
+      HibernateDelaySec="15m";
+      SuspendState="mem";
+    };
   };
 
   home-manager = {
@@ -78,7 +64,7 @@
     };
     backupFileExtension = ".bak";
   };
- 
+
   # This option defines the first version of NixOS you have installed on this particular machine
   # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
   # and migrated your data accordingly.

hosts/darp8/hardware-configuration.nix

@@ -14,31 +14,20 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/c7704142-d0b9-4a85-af1c-ce776b895c0f";
-      fsType = "ext4";
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/bf7180c8-72f0-483a-8306-821276eda3e5";
+    { device = "/dev/disk/by-uuid/95c6d153-b238-430d-9755-58a38f6f7409";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/E27A-231B";
+    { device = "/dev/disk/by-uuid/3161-399E";
       fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
     };
 
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp46s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/a3a8cbf0-066f-46f6-a5cd-e427428617e2"; }
+    ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }

hosts/darp8/pkgs.nix

@@ -13,7 +13,6 @@
     android-studio
     genymotion
     praat
-    prismlauncher
     mcpelauncher-ui-qt
   ];