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
   ];
 

hosts/desktop/pkgs.nix

@@ -10,21 +10,14 @@
 
   # BEGIN PER-HOST PACKAGES
   home.packages = with pkgs; [
-    adw-gtk3
     android-studio
     genymotion
     fred
     hexchat
     krita
-    kdePackages.qt6ct
-    libsForQt5.qt5ct
     paper-icon-theme
-    # papirus-icon-theme
     shotcut
-    tela-icon-theme
-    tela-circle-icon-theme
     nvtopPackages.nvidia
-    prismlauncher
   ];
 
   # BEGIN PER-HOST PROGRAMS

hosts/graphical/configuration.nix

@@ -90,12 +90,12 @@
       noto-fonts-cjk-sans
       noto-fonts-cjk-serif
       noto-fonts-color-emoji
-      liberation_ttf
-      fira-code-symbols
+      # liberation_ttf
+      # fira-code-symbols
       mplus-outline-fonts.githubRelease
-      dina-font
-      nerd-fonts.fira-code
-      nerd-fonts.droid-sans-mono
+      # dina-font
+      # nerd-fonts.fira-code
+      # nerd-fonts.droid-sans-mono
     ];
 
     fontconfig = {
@@ -160,7 +160,14 @@
 
     # hyprlock.enable = true;
     dconf.enable = true;
-    nix-ld.enable = true;
+    nix-ld = {
+      enable = true;
+      libraries = with pkgs; [
+        fontconfig
+        libxkbcommon
+        vulkan-loader
+      ];
+    };
     mtr.enable = true;
   };
 

hosts/graphical/pkgs.nix

@@ -6,65 +6,49 @@
 {
   # BEGIN PACKAGES
   home.packages = with pkgs; [
+    adw-gtk3
     arc-icon-theme
     audacity
-    # android-studio
     bibata-cursors
     brave
-    # brightnessctl
     btop
-    # comma
     emacs-all-the-icons-fonts
     emacs-gtk
     emacsPackages.pdf-tools
     exfatprogs
     fastfetch
     ffmpeg
-    # filezilla
     floorp-bin
     focus
     fuzzel
     fzf
-    # genymotion
     gimp
-    # grim
     gtk4
     gvfs
     grimblast
-    # htop
     hyprpicker
     hyprpwcenter
     imagemagick
-    # hyprsysteminfo
-    # kdePackages.kdenlive
-    # kdePackages.polkit-kde-agent-1
+    kdePackages.kdenlive
+    kdePackages.qt6ct
     keepassxc
-    # libreoffice
+    libsForQt5.qt5ct
     localsend
     materia-theme
     mpv
     mupdf
-    # networkmanagerapplet
     nwg-displays
     nwg-look
     openvpn
-    # pamixer
-    # pavucontrol
-    # powertop
-    # prismlauncher
-    # protonvpn-gui
-    # qbittorrent
+    prismlauncher
     signal-desktop
-    # slurp
-    # teams-for-linux
+    tela-icon-theme
+    tela-circle-icon-theme
     texliveFull
     thunar
     thunar-volman
     tree
-    # waybar
     wev
-    # wlr-randr
-    # wlsunset
     zoom-us
   ];