update

flake.in.nix

@@ -86,6 +86,7 @@
             programs = {
               alejandra.enable = true;
               deadnix.enable = true;
+              jsonfmt.enable = true;
               stylua.enable = true;
               taplo.enable = true;
             };
@@ -97,11 +98,19 @@
                 alejandra
                 git
                 lua-language-server
-                #nvfetcher
+                nvfetcher
                 statix
 
-                (writeScriptBin "build" "nix fmt && ${snowfallorg.flake}/bin/flake switch")
+                (writeScriptBin "build" ''
-                (writeScriptBin "up" "nix flake update")
+                  sudo nix run \
+                    --option experimental-features "nix-command flakes" \
+                    --option extra-substituters https://numtide.cachix.org \
+                    --option extra-trusted-public-keys numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE= \
+                    github:numtide/nixos-facter -- -o systems/${system}/$(hostname)/facter.json
+                  nix fmt
+                  nh os switch
+                '')
+                (writeScriptBin "up" "nix flake update && nvfetcher")
               ];
             };
         };

flake.lock

@@ -113,11 +113,11 @@
         "nixpkgs": "nixpkgs_11"
       },
       "locked": {
-        "lastModified": 1727497393,
+        "lastModified": 1730140831,
-        "narHash": "sha256-AHL2qezvAAZtOP61cHtnB0RtqPej4LqtGkvXNOAESNw=",
+        "narHash": "sha256-tDKEnPx7mJNybQ4qb2zbCKeLSbHxomN7njr/VClcmZ8=",
         "owner": "jcdickinson",
         "repo": "codeium.nvim",
-        "rev": "17bbefff02be8fd66931f366bd4ed76a76e4a57e",
+        "rev": "dddaee0d1e9a1d0bcaea66f08a8103b3cdf26604",
         "type": "github"
       },
       "original": {
@@ -136,11 +136,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1731210504,
+        "lastModified": 1731289077,
-        "narHash": "sha256-QE5qfTcJk1XBwTxoW3nJ2PWJ/YRppy8IiwsqLwnu4A0=",
+        "narHash": "sha256-8Waya6WKqgWkYqbr1zkuyd1vNKgQb/QxfHLSMzp/LqU=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "aa9d41c105d715974b86f8cf64f84e0995d5e747",
+        "rev": "274f08b587d403940cd8d8da13a89ee094d3bc96",
         "type": "github"
       },
       "original": {
@@ -263,11 +263,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722113426,
+        "lastModified": 1728330715,
-        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
+        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
+        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
         "type": "github"
       },
       "original": {
@@ -460,11 +460,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726153070,
+        "lastModified": 1730504689,
-        "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
         "type": "github"
       },
       "original": {
@@ -722,11 +722,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727514110,
+        "lastModified": 1730814269,
-        "narHash": "sha256-0YRcOxJG12VGDFH8iS8pJ0aYQQUAgo/r3ZAL+cSh9nk=",
+        "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "85f7a7177c678de68224af3402ab8ee1bcee25c8",
+        "rev": "d70155fdc00df4628446352fc58adc640cd705c2",
         "type": "github"
       },
       "original": {
@@ -886,11 +886,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730837930,
+        "lastModified": 1731235328,
-        "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
+        "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
+        "rev": "60bb110917844d354f3c18e05450606a435d2d10",
         "type": "github"
       },
       "original": {
@@ -928,11 +928,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727383923,
+        "lastModified": 1731235328,
-        "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
+        "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ffe2d07e771580a005e675108212597e5b367d2d",
+        "rev": "60bb110917844d354f3c18e05450606a435d2d10",
         "type": "github"
       },
       "original": {
@@ -984,11 +984,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1731279191,
+        "lastModified": 1731340175,
-        "narHash": "sha256-9gJ3G8j9yUmzZdluh3fZoSN4qj/Y4XZgl2hsa8sdCwg=",
+        "narHash": "sha256-IfE7lqNFfFyzAu3pe2XTeNovU9tVzJeGLzQ2B8Segy0=",
         "ref": "refs/heads/main",
-        "rev": "c10739e6e35c30ef5f273bfe5d219d361a31e226",
+        "rev": "f5fa84554ffe55e29a397014964238be89ffa54d",
-        "revCount": 5438,
+        "revCount": 5448,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -1148,6 +1148,36 @@
         "type": "github"
       }
     },
+    "ixx": {
+      "inputs": {
+        "flake-utils": [
+          "nixvim",
+          "nixvim",
+          "nuschtosSearch",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixvim",
+          "nixvim",
+          "nuschtosSearch",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729958008,
+        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
+        "owner": "NuschtOS",
+        "repo": "ixx",
+        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "ref": "v0.0.6",
+        "repo": "ixx",
+        "type": "github"
+      }
+    },
     "jovian": {
       "inputs": {
         "nix-github-actions": "nix-github-actions",
@@ -1157,11 +1187,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730962714,
+        "lastModified": 1731227601,
-        "narHash": "sha256-Zi2NfnEqB+Xfxtnx6arIohSarXiJmwTqVa3nSpNWx30=",
+        "narHash": "sha256-aGUQ6W/Oxd9xjH9RQbnUtC61sTK2fWlKr+J7kavT/RQ=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "93b525229c99fec0016db72a174f43b9d6237714",
+        "rev": "7691d0ac1deb6ac7482c5a22fe1a14a34ca608b0",
         "type": "github"
       },
       "original": {
@@ -1233,11 +1263,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727507295,
+        "lastModified": 1731153869,
-        "narHash": "sha256-I/FrX1peu4URoj5T5odfuKR2rm4GjYJJpCGF9c0/lDA=",
+        "narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "f2e1c4aa29fc211947c3a7113cba1dd707433b70",
+        "rev": "5c74ab862c8070cbf6400128a1b56abb213656da",
         "type": "github"
       },
       "original": {
@@ -1472,11 +1502,11 @@
     },
     "nixpkgs_12": {
       "locked": {
-        "lastModified": 1727742380,
+        "lastModified": 1731287057,
-        "narHash": "sha256-5lFzlmiwrl3OHrw7QhZn/ZpZtygzx1UspKOaZqpxXSQ=",
+        "narHash": "sha256-JHTzkYQOF6756FDqN2EmMN4eysk9UAPDlnFoGoaVEBc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9dc3c339a2aecbd61ab2549248d8b64ba1c28af5",
+        "rev": "5812399690b88187502ee93b3e3f0856628ba010",
         "type": "github"
       },
       "original": {
@@ -1487,11 +1517,11 @@
     },
     "nixpkgs_13": {
       "locked": {
-        "lastModified": 1727348695,
+        "lastModified": 1731139594,
-        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
         "type": "github"
       },
       "original": {
@@ -1591,11 +1621,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1730785428,
+        "lastModified": 1731139594,
-        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
+        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
+        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
         "type": "github"
       },
       "original": {
@@ -1738,11 +1768,11 @@
         "treefmt-nix": "treefmt-nix_3"
       },
       "locked": {
-        "lastModified": 1730304915,
+        "lastModified": 1731290794,
-        "narHash": "sha256-qgxzBjrXMvfIhhqyEruh7rH5gAecpDoxKiOHGZcQeMs=",
+        "narHash": "sha256-bj8x19+LDyX5zCLWtu6XZxWOTvj76Rbks0MD1alYAWI=",
         "owner": "pupbrained",
         "repo": "nvim-config",
-        "rev": "d766bf1a0c70f3bcee2706b9dab7718fe110349a",
+        "rev": "d5a156712e38016f0738444e4d5dc838959502a5",
         "type": "github"
       },
       "original": {
@@ -1764,11 +1794,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1727645871,
+        "lastModified": 1731281996,
-        "narHash": "sha256-Os3PAThU5XliKkKa+SHsFyV/EsCHogHcYONmpzb6500=",
+        "narHash": "sha256-xdNFY/wcs8i9qluVbTAVh5JLlhI/r4JJfXb0yfEj1Ks=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "5f4a4b47597d3b9ac26c41ff4e8da28fa662f200",
+        "rev": "57068f532d5d42601fd74e2b531204fe1cd3a8f2",
         "type": "github"
       },
       "original": {
@@ -1780,6 +1810,7 @@
     "nuschtosSearch": {
       "inputs": {
         "flake-utils": "flake-utils_5",
+        "ixx": "ixx",
         "nixpkgs": [
           "nixvim",
           "nixvim",
@@ -1787,11 +1818,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727452028,
+        "lastModified": 1731060242,
-        "narHash": "sha256-ehl/A4HQFRyqj1Fk7cl+dgSf/2Fb1jLwWJtZaMU6RfU=",
+        "narHash": "sha256-43yLsOm/wxBbfYSNDWVJeVv5Ij+23X3BIjFUfsdx/6M=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "9f7426e532ef8dfc839c4a3fcc567b13a20a70d3",
+        "rev": "ef493352f9e1f051e01a55c062731503a6b36b4e",
         "type": "github"
       },
       "original": {
@@ -2132,11 +2163,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727431250,
+        "lastModified": 1730321837,
-        "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=",
+        "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754",
+        "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
         "type": "github"
       },
       "original": {
@@ -2150,11 +2181,11 @@
         "nixpkgs": "nixpkgs_14"
       },
       "locked": {
-        "lastModified": 1727431250,
+        "lastModified": 1730321837,
-        "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=",
+        "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754",
+        "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
         "type": "github"
       },
       "original": {
@@ -2285,11 +2316,11 @@
         "nixpkgs": "nixpkgs_20"
       },
       "locked": {
-        "lastModified": 1731201596,
+        "lastModified": 1731287815,
-        "narHash": "sha256-W1zTYSLFuroahnbaYInl+d3I7uc8olZ8hcjI16PMCew=",
+        "narHash": "sha256-+EDI5eFPdPnaGlFEvdDTC93R8XUfsvRn6E6DFfflkxQ=",
         "owner": "fufexan",
         "repo": "zen-browser-flake",
-        "rev": "ca4a27ef77733d50931c1ac7d4034e4dc27108d6",
+        "rev": "9217468e9995ee26e759451d71f4acbe038370bf",
         "type": "github"
       },
       "original": {

systems/x86_64-linux/navis/default.nix

@@ -9,32 +9,32 @@
 
   fileSystems = {
     "/" = {
-      device = "/dev/mapper/enc";
+      device = "/dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b";
       fsType = "btrfs";
       options = ["subvol=root"];
     };
 
     "/home" = {
-      device = "/dev/mapper/enc";
+      device = "/dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b";
       fsType = "btrfs";
       options = ["subvol=home" "compress=zstd"];
     };
 
     "/nix" = {
-      device = "/dev/mapper/enc";
+      device = "/dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b";
       fsType = "btrfs";
       options = ["subvol=nix" "compress=zstd" "noatime"];
     };
 
     "/persist" = {
-      device = "/dev/mapper/enc";
+      device = "/dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b";
       neededForBoot = true;
       fsType = "btrfs";
       options = ["subvol=persist" "compress=zstd"];
     };
 
     "/var/log" = {
-      device = "/dev/mapper/enc";
+      device = "/dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b";
       fsType = "btrfs";
       options = ["subvol=log" "compress=zstd" "noatime"];
       neededForBoot = true;
@@ -74,6 +74,12 @@
       wheelNeedsPassword = false;
       execWheelOnly = true;
     };
+
+    tpm2 = {
+      enable = true;
+      pkcs11.enable = true;
+      tctiEnvironment.enable = true;
+    };
   };
 
   fonts = {
@@ -105,7 +111,38 @@
 
   console.catppuccin.enable = true;
 
-  systemd.user.extraConfig = let
+  systemd = {
+    tpm2.enable = true;
+
+    network.networks = {
+      "10-lan1" = {
+        DHCP = "yes";
+        matchConfig.MACAddress = "04:42:1a:02:fe:f5";
+
+        dhcpV4Config.RouteMetric = 10;
+        dhcpV6Config.RouteMetric = 10;
+
+        networkConfig = {
+          IPv6PrivacyExtensions = "yes";
+          MulticastDNS = true;
+        };
+      };
+
+      "10-wlan1" = {
+        DHCP = "yes";
+        matchConfig.MACAddress = "64:49:7d:c1:01:10";
+
+        dhcpV4Config.RouteMetric = 40;
+        dhcpV6Config.RouteMetric = 40;
+
+        networkConfig = {
+          IPv6PrivacyExtensions = "yes";
+          MulticastDNS = true;
+        };
+      };
+    };
+
+    user.extraConfig = let
       path = lib.concatStringsSep ":" [
         "/run/wrappers/bin"
         "/etc/profiles/per-user/%u/bin"
@@ -115,6 +152,7 @@
     in ''
       DefaultEnvironment="PATH=${path}"
     '';
+  };
 
   age = {
     secrets.passwd.file = ../../../secrets/passwd.age;
@@ -142,14 +180,15 @@
     };
 
     systemPackages = with pkgs; [
-      inputs.agenix.packages.${system}.default
       ddccontrol-db
-      nautilus
+      inputs.agenix.packages.${system}.default
       looking-glass-client
+      nautilus
+      qemu
       snowfallorg.flake
       sound-theme-freedesktop
+      uutils-coreutils-noprefix
       virtio-win
-      qemu
       (warp-terminal.override {waylandSupport = true;})
       winetricks
       wineWowPackages.staging
@@ -160,10 +199,10 @@
     persistence."/persist" = {
       hideMounts = true;
       directories = [
-        "/etc/NetworkManager"
         "/etc/ssh"
         "/root/.ssh"
         "/var/lib/bluetooth"
+        "/var/lib/iwd"
         "/var/lib/libvirt"
         "/var/lib/nixos"
         "/var/lib/systemd/coredump"
@@ -176,14 +215,37 @@
     blacklistedKernelModules = ["nouveau" "i915"];
     kernelPackages = pkgs.linuxPackages_cachyos;
     supportedFilesystems = ["btrfs" "ntfs"];
-
-    # Encrypted device
-    initrd.luks.devices."enc".device = "/dev/disk/by-uuid/9952fcd1-46eb-4c9c-ab7d-361d31fdb9a2";
     tmp.useTmpfs = true;
 
-    initrd.postDeviceCommands = lib.mkAfter ''
+    initrd = {
+      # Encrypted device
+      luks.devices."enc".device = "/dev/disk/by-uuid/9952fcd1-46eb-4c9c-ab7d-361d31fdb9a2";
+
+      systemd = {
+        enable = true;
+        emergencyAccess = true;
+        dbus.enable = true;
+
+        network = {
+          enable = true;
+          networks = {
+            inherit (config.systemd.network.networks) "10-lan1" "10-wlan1";
+          };
+        };
+
+        initrdBin = with pkgs; [
+          iwd
+          nix
+          vim
+        ];
+
+        services.wipe-root = {
+          requires = ["dev-mapper-enc.device"];
+          after = ["dev-mapper-enc.device"];
+          wantedBy = ["initrd.target"];
+          script = lib.mkAfter ''
             mkdir /btrfs_tmp
-      mount /dev/dm-0 /btrfs_tmp
+            mount /dev/mapper/enc /btrfs_tmp
             if [[ -e /btrfs_tmp/root ]]; then
               mkdir -p /btrfs_tmp/old_roots
               timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S")
@@ -205,18 +267,16 @@
             btrfs subvolume create /btrfs_tmp/root
             umount /btrfs_tmp
           '';
-
+        };
-    plymouth = {
+      };
-      enable = true;
-      catppuccin.enable = true;
     };
 
     extraModprobeConfig =
       "options nvidia "
       + lib.concatStringsSep " " [
-        "NVreg_UsePageAttributeTable=1"
         "NVreg_EnablePCIeGen3=1"
         "NVreg_RegistryDwords=RMUseSwI2c=0x01;RMI2cSpeed=100"
+        "NVreg_UsePageAttributeTable=1"
       ];
 
     kernelParams = [
@@ -325,126 +385,6 @@
       flake = "/home/marshall/nix-config";
     };
 
-    nix-ld = {
-      enable = true;
-      libraries = with pkgs; [
-        SDL
-        SDL2
-        SDL2_image
-        SDL2_mixer
-        SDL2_ttf
-        SDL_image
-        SDL_mixer
-        SDL_ttf
-        alsa-lib
-        at-spi2-atk
-        at-spi2-core
-        atk
-        bzip2
-        cairo
-        cups
-        curlWithGnuTls
-        dbus
-        dbus-glib
-        desktop-file-utils
-        e2fsprogs
-        expat
-        flac
-        fontconfig
-        freeglut
-        freetype
-        fribidi
-        fuse
-        fuse3
-        gdk-pixbuf
-        glew110
-        glib
-        gmp
-        gst_all_1.gst-plugins-base
-        gst_all_1.gst-plugins-ugly
-        gst_all_1.gstreamer
-        gtk2
-        harfbuzz
-        icu
-        keyutils.lib
-        libgcc
-        libGL
-        libGLU
-        libappindicator-gtk2
-        libcaca
-        libcanberra
-        libcap
-        libclang.lib
-        libdbusmenu
-        libdrm
-        libgcrypt
-        libgpg-error
-        libidn
-        libjack2
-        libjpeg
-        libmikmod
-        libogg
-        libpng12
-        libpulseaudio
-        librsvg
-        libsamplerate
-        libthai
-        libtheora
-        libtiff
-        libudev0-shim
-        libusb1
-        libuuid
-        libvdpau
-        libvorbis
-        libvpx
-        libxcrypt-legacy
-        libxkbcommon
-        libxml2
-        mesa
-        nspr
-        nss
-        openssl
-        p11-kit
-        pango
-        pixman
-        python3
-        speex
-        stdenv.cc.cc
-        tbb
-        udev
-        vulkan-loader
-        wayland
-        xorg.libICE
-        xorg.libSM
-        xorg.libX11
-        xorg.libXScrnSaver
-        xorg.libXcomposite
-        xorg.libXcursor
-        xorg.libXdamage
-        xorg.libXext
-        xorg.libXfixes
-        xorg.libXft
-        xorg.libXi
-        xorg.libXinerama
-        xorg.libXmu
-        xorg.libXrandr
-        xorg.libXrender
-        xorg.libXt
-        xorg.libXtst
-        xorg.libXxf86vm
-        xorg.libpciaccess
-        xorg.libxcb
-        xorg.xcbutil
-        xorg.xcbutilimage
-        xorg.xcbutilkeysyms
-        xorg.xcbutilrenderutil
-        xorg.xcbutilwm
-        xorg.xkeyboardconfig
-        xz
-        zlib
-      ];
-    };
-
     obs-studio = {
       enable = true;
       enableVirtualCamera = true;
@@ -452,12 +392,13 @@
   };
 
   networking = {
-    useDHCP = lib.mkDefault true;
-    hostName = "navis";
     firewall.enable = false;
+    networkmanager.enable = false;
+    hostName = "navis";
     nameservers = ["1.1.1.1" "1.0.0.1"];
-    networkmanager.dns = "none";
+    useDHCP = lib.mkForce true;
-    networkmanager.enable = true;
+    useNetworkd = true;
+    wireless.iwd.enable = true;
   };
 
   time = {
@@ -505,9 +446,12 @@
 
     pipewire = {
       enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
       pulse.enable = true;
+
+      alsa = {
+        enable = true;
+        support32Bit = true;
+      };
     };
   };
 
@@ -515,10 +459,18 @@
     mutableUsers = false;
 
     users.marshall = {
-      isNormalUser = true;
-      extraGroups = ["wheel" "gamemode" "libvirtd" "qemu-libvirtd" "disk" "networkmanager"];
-      shell = pkgs.fish;
       hashedPasswordFile = config.age.secrets.passwd.path;
+      isNormalUser = true;
+      shell = pkgs.fish;
+
+      extraGroups = [
+        "disk"
+        "gamemode"
+        "libvirtd"
+        "qemu-libvirtd"
+        "tss"
+        "wheel"
+      ];
     };
   };
 
@@ -554,19 +506,17 @@
 
   xdg.portal = {
     enable = true;
-    config = {
+    xdgOpenUsePortal = true;
-      common = {
+
-        default = [
+    config.common.default = [
       "cosmic"
       "gtk"
     ];
-      };
+
-    };
     extraPortals = [
       pkgs.xdg-desktop-portal-cosmic
       pkgs.xdg-desktop-portal-gtk
     ];
-    xdgOpenUsePortal = true;
   };
 
   system.stateVersion = "24.05";