HOW DID I FUCK THIS UP???????

flake.lock

@@ -37,11 +37,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1783388784,
-        "narHash": "sha256-w+YU5vatysjLZIg1wOKSzo/RL9Z66eBQuIjVnBM/1Zg=",
+        "lastModified": 1788229478,
+        "narHash": "sha256-G0F2rFORVcFkEvVdE/qWQTnYekIc77YP5/vRF9nZlxU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "63d02d1c19f1c2b47a5bc7e55c620b6af7b218a6",
+        "rev": "1dc2d1f720ab17fc7981e087346bf54b26d284b1",
         "type": "github"
       },
       "original": {
@@ -97,11 +97,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1783307699,
-        "narHash": "sha256-/nIA82c6GX01Q7HKOCr6LHLzht4daKUK05x0azNeQt0=",
+        "lastModified": 1788146779,
+        "narHash": "sha256-DPpSweCi/XNpD7r2mrL83gaN0/UsQIF6ihb2HY2G2Jc=",
         "owner": "cynicsketch",
         "repo": "nix-mineral",
-        "rev": "3393a517a85993fa843d3f28eccf81faade82a96",
+        "rev": "9e05f8a852c7ca53e797379deef275b608d47ef4",
         "type": "github"
       },
       "original": {
@@ -115,11 +115,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1783370751,
-        "narHash": "sha256-E+3MIMvKuo9k+K+qLQ9YXzsBzkgHuyVLnsEbN2DFfuc=",
+        "lastModified": 1788044418,
+        "narHash": "sha256-cmOd3iGoE140M2GidgQMQbyxHZ4dT7C0QZq2+CrXQyA=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "662bd6e312d2c8b212e32cb377abaee190749320",
+        "rev": "dc3f0cfde2050172abf6c3cdb684f735c15a57c5",
         "type": "github"
       },
       "original": {
@@ -131,11 +131,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1782948114,
-        "narHash": "sha256-AXmz9ho4Lud5CsbrZsuSVwpQZ4o5FgZ1chxBn5cJ8+0=",
+        "lastModified": 1787209939,
+        "narHash": "sha256-WvvHR4kSQLAbtouMC/ruZ5UpLwlUcY3K4FAllMN+yGk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9e92285f211dad236540fd617d7e30e0b99bc0e1",
+        "rev": "391b592eb44808b3bd0cb80bb71b63a5a118b8bb",
         "type": "github"
       },
       "original": {
@@ -207,11 +207,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1783224372,
-        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
+        "lastModified": 1788179007,
+        "narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
+        "rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9",
         "type": "github"
       },
       "original": {
@@ -223,11 +223,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1783224372,
-        "narHash": "sha256-FGQ8TfSm9WviNE/fQAWsKs+y4GkX8fU4EScewpw54Y8=",
-        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
+        "lastModified": 1787900134,
+        "narHash": "sha256-5GWj0FI2uOwKNpXkmpWrSFDe1rCaNBCUQ8d+HDtFQPI=",
+        "rev": "83199d0d373dd3ac2b9a1996b1d0263f76ab7a4c",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1027867.d407951447dc/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1063296.83199d0d373d/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
@@ -250,11 +250,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1783303713,
-        "narHash": "sha256-d6Zs6wD0kvWQXn7qPU0YsuqoqBhT7zi5+1M365FINt8=",
+        "lastModified": 1788083617,
+        "narHash": "sha256-aXMDRUxm/9se+vgKViKdDcClk1k3qA3sUwT0kAYo3Fg=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "d9d714243e2f8d10af28db5111f018ec2d77acc9",
+        "rev": "bf4ed54253a61c8324a5b461638c42db77c0b980",
         "type": "github"
       },
       "original": {

flake.nix

@@ -42,19 +42,6 @@
   in {
 
     nixosConfigurations = {
-      # repurposed for use as nas
-      #"TheBlackBox" = mkHost "x86_64-linux" [
-      #  ./modules/common.nix
-      #  ./modules/desktop-common.nix
-      #  ./hosts/desktop/configuration.nix
-      #  spicetify-nix.nixosModules.spicetify
-      #  home-manager.nixosModules.home-manager
-      #  {
-      #    home-manager.useGlobalPkgs = true;
-      #    home-manager.useUserPackages = true;
-      #    home-manager.users.k3t = ./home/desktop.nix;
-      #  }
-      #];
       "TheBlackBox" = mkHost "x86_64-linux" [
         ./modules/audio/base.nix
         ./modules/audio/zeroconf.nix
@@ -70,9 +57,11 @@
         ./modules/gui/apps/steam.nix
         ./modules/gui/fonts.nix
         ./modules/gui/services/flatpak.nix
+        ./modules/gui/services/geoclue.nix
         ./modules/gui/services/kdeconnect.nix
         ./modules/gui/services/kwallet.nix
         ./modules/gui/services/xdg.nix
+        ./modules/gui/services/waydroid.nix
         
         ./modules/net/services/avahi.nix
         ./modules/net/services/fail2ban.nix
@@ -85,18 +74,24 @@
         
         ./modules/sys/fs/btrfs.nix
         ./modules/sys/fs/mounts/efi.nix
-        ./modules/sys/fs/mounts/root-btrfs.nix
+        ./modules/sys/fs/mounts/btrfs/btrfs-with-subvols.nix
         ./modules/sys/fs/mounts/swap.nix
 
         ./modules/sys/hw/boot.nix
         ./modules/sys/hw/libinput.nix
         ./modules/sys/hw/cpu/intel.nix
-        ./modules/sys/hw/gpu/intel.nix
-        ./modules/sys/hw/gpu/vmware.nix
+        ./modules/sys/hw/gpu/nvidia.nix
+
+        ./modules/sys/hw/input/keyboard.nix
+        ./modules/sys/hw/input/tablet.nix
+        ./modules/sys/hw/input/xbox.nix
+        ./modules/sys/hw/misc/ios.nix
+
         ./modules/sys/nix.nix
         ./modules/sys/perf.nix
         ./modules/sys/pkgs.nix
         ./modules/sys/rc/openssh.nix
+        ./modules/sys/rc/sunshine.nix
 
         ./modules/sys/rgb.nix
         ./modules/sys/security.nix
@@ -106,6 +101,8 @@
         ./modules/sys/time.nix
         ./modules/sys/users/k3t.nix
 
+        ./modules/sys/vm.nix
+
         ./hosts/TheBlackBox/configuration.nix
         spicetify-nix.nixosModules.spicetify
         home-manager.nixosModules.home-manager
@@ -116,117 +113,6 @@
         }
       ];
 
-      "NixNAS" = mkHost "x86_64-linux" [
-        ./modules/net/services/avahi.nix
-        ./modules/net/services/fail2ban.nix
-        ./modules/net/services/networkmanager.nix
-        ./modules/net/services/tailscale.nix
-        
-        ./modules/sys/compat.nix
-        ./modules/sys/firewall.nix
-        
-        ./modules/sys/fs/btrfs.nix
-        ./modules/sys/fs/mounts/efi.nix
-        ./modules/sys/fs/mounts/root-btrfs.nix
-        ./modules/sys/fs/mounts/swap.nix
-
-        ./modules/sys/hw/boot.nix
-        ./modules/sys/hw/hyperv.nix
-        
-        ./modules/sys/nix.nix
-        ./modules/sys/perf.nix
-        ./modules/sys/pkgs.nix
-        ./modules/sys/rc/openssh.nix
-        ./modules/sys/security.nix
-        ./modules/sys/shell.nix
-        ./modules/sys/stateversion.nix
-        ./modules/sys/sysctl.nix
-        ./modules/sys/time.nix
-        ./modules/sys/users/k3t.nix
-
-        ./hosts/NixNAS/configuration.nix
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.k3t = ./home/server.nix;
-        }
-      ];
-
-      "NixServe" = mkHost "x86_64-linux" [
-        ./modules/net/services/avahi.nix
-        ./modules/net/services/fail2ban.nix
-        ./modules/net/services/networkmanager.nix
-        ./modules/net/services/tailscale.nix
-        
-        ./modules/sys/compat.nix
-        ./modules/sys/firewall.nix
-        
-        ./modules/sys/fs/btrfs.nix
-        ./modules/sys/fs/mounts/efi.nix
-        ./modules/sys/fs/mounts/root-btrfs.nix
-        ./modules/sys/fs/mounts/swap.nix
-
-        ./modules/sys/hw/boot.nix
-        ./modules/sys/hw/hyperv.nix
-        
-        ./modules/sys/nix.nix
-        ./modules/sys/perf.nix
-        ./modules/sys/pkgs.nix
-        ./modules/sys/rc/openssh.nix
-        ./modules/sys/security.nix
-        ./modules/sys/shell.nix
-        ./modules/sys/stateversion.nix
-        ./modules/sys/sysctl.nix
-        ./modules/sys/time.nix
-        ./modules/sys/users/k3t.nix
-
-        ./hosts/NixServe/configuration.nix
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.k3t = ./home/server.nix;
-        }
-      ];
-
-      "NixGame" = mkHost "x86_64-linux" [
-        ./modules/net/services/avahi.nix
-        ./modules/net/services/fail2ban.nix
-        ./modules/net/services/networkmanager.nix
-        ./modules/net/services/tailscale.nix
-        
-        ./modules/sys/compat.nix
-        ./modules/sys/firewall.nix
-        
-        ./modules/sys/fs/btrfs.nix
-        ./modules/sys/fs/mounts/efi.nix
-        ./modules/sys/fs/mounts/root-btrfs.nix
-        ./modules/sys/fs/mounts/swap.nix
-
-        ./modules/sys/hw/boot.nix
-        ./modules/sys/hw/hyperv.nix
-        
-        ./modules/sys/nix.nix
-        ./modules/sys/perf.nix
-        ./modules/sys/pkgs.nix
-        ./modules/sys/rc/openssh.nix
-        ./modules/sys/security.nix
-        ./modules/sys/shell.nix
-        ./modules/sys/stateversion.nix
-        ./modules/sys/sysctl.nix
-        ./modules/sys/time.nix
-        ./modules/sys/users/k3t.nix
-
-        ./hosts/NixGame/configuration.nix
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.k3t = ./home/server.nix;
-        }
-      ];
-
       "IdeaPad" = mkHost "x86_64-linux" [
         ./modules/audio/base.nix
         ./modules/audio/zeroconf.nix
@@ -238,6 +124,7 @@
         ./modules/gui/apps/firefox.nix
         ./modules/gui/fonts.nix
         ./modules/gui/services/flatpak.nix
+        ./modules/gui/services/geoclue.nix
         ./modules/gui/services/kdeconnect.nix
         ./modules/gui/services/kwallet.nix
         ./modules/gui/services/xdg.nix
@@ -274,60 +161,46 @@
         ./hosts/IdeaPad/configuration.nix
       ];
 
-      "htpc" = mkHost "x86_64-linux" [
+      "minizen" = mkHost "x86_64-linux" [
+
         ./modules/audio/base.nix
         ./modules/audio/zeroconf.nix
 
-        ./modules/bluetooth/desktop.nix
-        ./modules/de/kde.nix
-        ./modules/de/i3.nix
-        ./modules/desktop-common.nix
-        
-        ./modules/gui/services/fcast.nix
-        ./modules/gui/apps/firefox.nix
-        ./modules/gui/apps/spicetify.nix
-        ./modules/gui/apps/steam.nix
-        ./modules/gui/fonts.nix
-        ./modules/gui/services/flatpak.nix
-        ./modules/gui/services/kdeconnect.nix
-        ./modules/gui/services/kwallet.nix
-        ./modules/gui/services/xdg.nix
-        
-        ./modules/net/services/avahi.nix
         ./modules/net/services/fail2ban.nix
         ./modules/net/services/networkmanager.nix
-        ./modules/net/services/printing.nix
         ./modules/net/services/tailscale.nix
-        
         ./modules/sys/compat.nix
         ./modules/sys/firewall.nix
+
         ./modules/sys/fs/btrfs.nix
+        ./modules/sys/fs/mounts/efi.nix
+        ./modules/sys/fs/mounts/btrfs/btrfs-with-subvols.nix
+        ./modules/sys/fs/mounts/swap.nix
+
         ./modules/sys/hw/boot.nix
-        ./modules/sys/hw/cpu/amd64.nix
-        ./modules/sys/hw/gpu/amd.nix
+        ./modules/sys/hw/cpu/arm64.nix
         ./modules/sys/nix.nix
         ./modules/sys/perf.nix
         ./modules/sys/pkgs.nix
         ./modules/sys/rc/openssh.nix
-        ./modules/sys/rc/sunshine.nix
-        ./modules/sys/rgb.nix
         ./modules/sys/security.nix
         ./modules/sys/shell.nix
         ./modules/sys/stateversion.nix
         ./modules/sys/sysctl.nix
         ./modules/sys/time.nix
         ./modules/sys/users/k3t.nix
-
-        ./hosts/htpc/configuration.nix
-        spicetify-nix.nixosModules.spicetify
+        ./hosts/minizen/configuration.nix
         home-manager.nixosModules.home-manager
+
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.users.k3t = ./home/desktop.nix;
+          home-manager.users.k3t = ./home/server.nix;
         }
       ];
-      "T14" = mkHost "x86_64-linux" [
+    };
+
+      "ThinkPad" = mkHost "x86_64-linux" [
         ./modules/audio/base.nix
         ./modules/audio/zeroconf.nix
 
@@ -342,10 +215,12 @@
         ./modules/gui/apps/steam.nix
         ./modules/gui/fonts.nix
         ./modules/gui/services/flatpak.nix
+        ./modules/gui/services/geoclue.nix
         ./modules/gui/services/kdeconnect.nix
         ./modules/gui/services/kwallet.nix
         ./modules/gui/services/xdg.nix
-        
+        ./modules/gui/services/waydroid.nix
+
         ./modules/net/services/avahi.nix
         ./modules/net/services/fail2ban.nix
         ./modules/net/services/networkmanager.nix
@@ -354,14 +229,22 @@
         
         ./modules/sys/compat.nix
         ./modules/sys/firewall.nix
+
         ./modules/sys/fs/btrfs.nix
+        ./modules/sys/fs/mounts/efi.nix
+        ./modules/sys/fs/mounts/btrfs/btrfs-with-subvols.nix
+        ./modules/sys/fs/mounts/swap.nix
+
+
         ./modules/sys/hw/boot.nix
-        ./modules/sys/hw/cpu/amd64.nix
-        ./modules/sys/hw/gpu/amd.nix
+        ./modules/sys/hw/cpu/intel.nix
+        ./modules/sys/hw/gpu/intel.nix
+        ./modules/sys/hw/misc/ios.nix
         ./modules/sys/nix.nix
         ./modules/sys/perf.nix
         ./modules/sys/pkgs.nix
         ./modules/sys/rc/openssh.nix
+        ./modules/sys/rc/synergy.nix
         ./modules/sys/rc/sunshine.nix
         ./modules/sys/rgb.nix
         ./modules/sys/security.nix
@@ -463,5 +346,4 @@
     #    }
     #  ];
     #};
-  };
 }

home/cfg/arrpc.nix

@@ -0,0 +1,5 @@
+{
+  services.arrpc = {
+    enable = true;
+  };
+}

home/cfg/git.nix

@@ -7,5 +7,8 @@
         email = "k3t@k3t.dev";
       };
     };
+    lfs = {
+      enable = true;
+    };
   };
-}
+}

home/cfg/gtk.nix

@@ -1,6 +1,6 @@
 { config, pkgs, ... }: {
   gtk = {
-    enable = true;
+    enable = false;
     colorScheme = "dark";
     cursorTheme = {
       name = "WhiteSur-cursors";
@@ -20,4 +20,4 @@
       theme = config.gtk.theme;
     };
   };
-}
+}

home/cfg/lutris.nix

@@ -0,0 +1,17 @@
+{pkgs, ...}: 
+
+{
+  programs.lutris = {
+    enable = true;
+    winePackages = [ pkgs.wineWow64Packages.waylandFull pkgs.wineWow64Packages.stagingFull ];
+    protonPackages = [ pkgs.proton-ge-bin ];
+    steamPackage = pkgs.steam.override {
+      extraProfile = ''
+        # Allows Monado/WiVRn to be used
+        export PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES=1
+        # Fixes timezones on VRChat
+        unset TZ
+      '';
+    };
+  };
+}

home/desktop.nix

@@ -1,9 +1,27 @@
+{pkgs, ...}:
+
 {
   imports = [
     ./common.nix
+    ./cfg/arrpc.nix
     ./cfg/keepassxc.nix
     ./cfg/kitty.nix
-    ./cfg/gtk.nix
+    #./cfg/gtk.nix
+    # excluded since there are issues with kde
     ./cfg/qbz.nix
+    ./cfg/lutris.nix
+  ];
+
+  home.packages = with pkgs; [
+     (deadbeef-with-plugins.override {
+       plugins = [
+         deadbeefPlugins.mpris2
+         deadbeefPlugins.lyricbar
+         deadbeefPlugins.statusnotifier
+         deadbeefPlugins.waveform-seekbar
+         deadbeefPlugins.vgmstream
+         deadbeefPlugins.headerbar-gtk3
+       ];
+     })
   ];
 }

hosts/TheBlackBox/amdgpu-cap_sys_nice_begone.patch

@@ -0,0 +1,26 @@
+From fe059b4c373639fc5d69067e62de3f2a0e44a037 Mon Sep 17 00:00:00 2001
+From: Sefa Eyeoglu <contact@scrumplex.net>
+Date: Fri, 17 Mar 2023 16:50:57 +0100
+Subject: [PATCH] amdgpu: allow any ctx priority
+
+Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+index d2139ac12159..c7f1d36329c8 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+@@ -107,7 +107,7 @@ static int amdgpu_ctx_priority_permit(struct drm_file *filp,
+ 	if (drm_is_current_master(filp))
+ 		return 0;
+ 
+-	return -EACCES;
++	return 0;
+ }
+ 
+ static enum amdgpu_gfx_pipe_priority amdgpu_ctx_prio_to_gfx_pipe_prio(int32_t prio)
+-- 
+2.39.2
+

hosts/TheBlackBox/amdgpu-kernel-module.nix

@@ -0,0 +1,38 @@
+{ pkgs
+, lib
+, kernel ? pkgs.linuxPackages_latest.kernel
+}:
+
+pkgs.stdenv.mkDerivation {
+  pname = "amdgpu-kernel-module";
+  inherit (kernel) src version postPatch nativeBuildInputs;
+
+  kernel_dev = kernel.dev;
+  kernelVersion = kernel.modDirVersion;
+
+  modulePath = "drivers/gpu/drm/amd/amdgpu";
+
+  buildPhase = ''
+    BUILT_KERNEL=$kernel_dev/lib/modules/$kernelVersion/build
+
+    cp $BUILT_KERNEL/Module.symvers .
+    cp $BUILT_KERNEL/.config        .
+    cp $kernel_dev/vmlinux          .
+
+    make "-j$NIX_BUILD_CORES" modules_prepare
+    make "-j$NIX_BUILD_CORES" M=$modulePath modules
+  '';
+
+  installPhase = ''
+    make \
+      INSTALL_MOD_PATH="$out" \
+      XZ="xz -T$NIX_BUILD_CORES" \
+      M="$modulePath" \
+      modules_install
+  '';
+
+  meta = {
+    description = "AMD GPU kernel module";
+    license = lib.licenses.gpl3;
+  };
+}

hosts/TheBlackBox/configuration.nix

@@ -4,6 +4,13 @@
 
 { config, pkgs, ... }:
 
+#let
+#  amdgpu-kernel-module = pkgs.callPackage ./amdgpu-kernel-module.nix {
+    # Make sure the module targets the same kernel as your system is using.
+#    kernel = config.boot.kernelPackages.kernel;
+#  };
+#in
+
 {
   imports =
     [ # Include the results of the hardware scan.
@@ -12,9 +19,59 @@
 
   networking.hostName = "TheBlackBox";
 
+  # Linux and VR... nightmare below
+  #boot.extraModulePackages = [
+  #  (amdgpu-kernel-module.overrideAttrs (_: {
+  #    patches = [ ./amdgpu-cap_sys_nice_begone.patch ];
+  #  }))
+  #];
+
+  # Synergy
+  #services.synergy.server.enable = true;
+
+  services.wivrn = {
+    enable = true;
+    openFirewall = true;
+
+    # Run WiVRn as a systemd service on startup
+    autoStart = true;
+    steam = {
+      enable = true;
+      importOXRRuntimes = true;
+      package = pkgs.steam.override {
+        extraProfile = ''
+          # Allows Monado/WiVRn to be used
+          export PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES=1
+          # Fixes timezones on VRChat
+          unset TZ
+        '';
+      };
+    };
+  };
+
+  programs.alvr = {
+    enable = true;
+    openFirewall = true;
+  };
+
+  services.monado = {
+    enable = true;
+    defaultRuntime = true; # Register as default OpenXR runtime
+  };
+
+  systemd.user.services.monado.environment = {
+    STEAMVR_LH_ENABLE = "1";
+    XRT_COMPOSITOR_COMPUTE = "1";
+  };
+
   users.users.k3t = {
     packages = with pkgs; [
       virt-viewer
+      fuse-overlayfs
+      fuse3
+      psmisc
+      dwarfs
+      wineWow64Packages.staging
     ];
   };
 }

hosts/laptop/configuration.nix

@@ -10,7 +10,7 @@
       ./hardware-configuration.nix
     ];
 
-  networking.hostName = "T14"; # Define your hostname.
+  networking.hostName = "ThinkPad"; # Define your hostname.
 
   users.users.k3t = {
     packages = with pkgs; [

hosts/laptop/hardware-configuration.nix

@@ -8,28 +8,11 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-label/NixOS";
-      fsType = "btrfs";
-      options = [ "subvol=@" ];
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-label/NixOS";
-      fsType = "btrfs";
-      options = [ "subvol=@home" ];
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/E0C2-A3A3";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
   #swapDevices =
   #  [ { device = "/dev/disk/by-uuid/fe32f9af-3382-4505-90e3-aaf1c41bf5d4"; }
   #  ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.sensor.iio.enable = true;
 }

hosts/minizen/configuration.nix

@@ -0,0 +1,45 @@
+# Edit this configuration file to define what should be installed on
+# your system. Help is available in the configuration.nix(5) man page, on
+# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
+
+{ config, lib, pkgs, inputs, ... }:
+
+{
+  imports =
+    (lib.filesystem.listFilesRecursive ./services.d)
+    ++ [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+    
+  networking.hostName = "minizen"; # Define your hostname.
+
+  # podman
+  virtualisation.podman = {
+    enable = true;
+    autoPrune.enable = true;
+    dockerCompat = true;   # optional; lets you use `docker` CLI
+  };
+  virtualisation.oci-containers.backend = "podman";
+
+  # Enable container name DNS for all Podman networks.
+  networking.firewall.interfaces = let
+    matchAll = if !config.networking.nftables.enable then "podman+" else "podman*";
+  in {
+    "${matchAll}".allowedUDPPorts = [ 53 ];
+  };
+
+  # List packages installed in system profile.
+  # You can use https://search.nixos.org/ to find more packages (and options).
+  environment.systemPackages = with pkgs; [
+    waypipe
+  ];
+
+  # Open ports in the firewall.
+  networking.firewall.allowedTCPPorts = [ 80 443 25565 4433 9971 853 ];
+  networking.firewall.allowedUDPPorts = [ 443 24454 4433 9971 ];
+
+  # Copy the NixOS configuration file and link it from the resulting system
+  # (/run/current-system/configuration.nix). This is useful in case you
+  # accidentally delete configuration.nix.
+  # system.copySystemConfiguration = true;
+}

hosts/minizen/hardware-configuration.nix

@@ -0,0 +1,26 @@
+# 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, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_pci" "virtio_scsi" "usbhid" "sr_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  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.enp7s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}

hosts/minizen/services.d/dns.nix

@@ -0,0 +1,64 @@
+{ config, lib, pkgs, ... }:
+
+{
+    services.blocky = {
+    enable = true;
+    settings = {
+      certFile = "/etc/nixos/dns.crt";
+      keyFile =  "/etc/nixos/dns.key";
+      caching = {
+        minTime = "5m";
+        maxTime = "30m";
+        prefetching = true;
+      };
+      ports = {
+        dns = 5353;
+        tls = 853;
+        http = 4000;
+      };
+      
+      upstreams.groups.default = [
+        "https://dns.quad9.net/dns-query"
+      ];
+      # For initially solving DoH/DoT Requests when no system Resolver is available.
+      bootstrapDns = {
+        upstream = "https://dns.quad9.net/dns-query";
+        ips = [ "9.9.9.9" "1.1.1.1" ];
+      };
+
+      #Enable Blocking of certain domains.
+      blocking = {
+        loading.refreshPeriod = "1h";
+        denylists = {
+          ads = [
+            "https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts"
+            "https://v.firebog.net/hosts/AdguardDNS.txt"
+            "https://v.firebog.net/hosts/Admiral.txt"
+            "https://raw.githubusercontent.com/anudeepND/blacklist/master/adservers.txt"
+            "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts"
+          ];
+          tracking = [
+            "https://v.firebog.net/hosts/Easyprivacy.txt"
+            "https://v.firebog.net/hosts/Prigent-Ads.txt"
+            "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt"
+            "https://hostfiles.frogeye.fr/firstparty-trackers-hosts.txt"
+            "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts"
+          ];
+          sus = [
+            "https://someonewhocares.org/hosts/zero/hosts"
+            "https://raw.githubusercontent.com/RooneyMcNibNug/pihole-stuff/master/SNAFU.txt"
+            "https://raw.githubusercontent.com/matomo-org/referrer-spam-blacklist/master/spammers.txt"
+            "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Spam/hosts"
+            "https://raw.githubusercontent.com/PolishFiltersTeam/KADhosts/master/KADhosts.txt"
+            "https://raw.githubusercontent.com/matomo-org/referrer-spam-blacklist/master/spammers.txt"
+          ];
+        };
+        
+        #Configure what block categories are used
+        clientGroupsBlock = {
+          default = [ "ads" "tracking" "sus" ];
+        };
+      };
+    };
+  };
+}

hosts/minizen/services.d/gonic.nix

@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+
+{
+  services.gonic = {
+    enable = true;
+    settings = {
+      music-path = [
+        "/home/k3t/Music"
+      ];
+      playlists-path = "/home/k3t/Playlists";
+      podcast-path  = "/home/k3t/Podcasts";
+    };
+  };
+
+  services.nginx.virtualHosts."fckurspotify.lostin06.duckdns.org" = {
+    enableACME = true;
+    forceSSL = true;
+    locations."/" = {
+      proxyPass = "http://127.0.0.1:4747";
+      proxyWebsockets = true;
+      recommendedProxySettings = true;
+    };
+  };
+}

hosts/minizen/services.d/minecraft.nix

@@ -0,0 +1,20 @@
+{ config, pkgs, lib, ... }:
+
+{
+  virtualisation.oci-containers.containers."minecraft-server" = {
+    image = "ghcr.io/graalvm/graalvm-community:25";
+    volumes = [
+      "/var/lib/minecraft:/data:rw"
+    ];
+    ports = [
+      "25565:25565/tcp"
+      "24454:24454/udp"
+    ];
+    extraOptions = [
+      "--tty"
+      "--interactive"
+    ];
+    entrypoint = "/data/run.sh";
+    log-driver = "journald";
+  };
+}

hosts/minizen/services.d/nginx.nix

@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+
+{
+  services.nginx = {
+    enable = true;
+    recommendedGzipSettings = true;
+    recommendedOptimisation = true;
+    recommendedProxySettings = true;
+    recommendedTlsSettings = true;
+  };
+
+  security.acme = {
+    acceptTerms = true;
+    defaults.email = "k3t@k3t.dev";
+  };
+}

hosts/nixcloud/configuration.nix

@@ -7,12 +7,27 @@
 {
   imports =
     (lib.filesystem.listFilesRecursive ./services.d)
+    ++ (lib.filesystem.listFilesRecursive ./services.d/matrix.d)
     ++ [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
     ];
     
   networking.hostName = "nixcloud"; # Define your hostname.
 
+  # podman
+  virtualisation.podman = {
+    enable = true;
+    autoPrune.enable = true;
+    dockerCompat = true;   # optional; lets you use `docker` CLI
+  };
+  virtualisation.oci-containers.backend = "podman";
+
+  # Enable container name DNS for all Podman networks.
+  networking.firewall.interfaces = let
+    matchAll = if !config.networking.nftables.enable then "podman+" else "podman*";
+  in {
+    "${matchAll}".allowedUDPPorts = [ 53 ];
+  };
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users = {
@@ -36,9 +51,15 @@
 
   # List packages installed in system profile.
   # You can use https://search.nixos.org/ to find more packages (and options).
-  #environment.systemPackages = with pkgs; [
-  #   wget
-  #];
+  environment.systemPackages = with pkgs; [
+     waypipe
+  ];
+
+  # enable mesa
+  hardware.graphics.enable = true;
+
+  # desktop in the sky
+  services.desktopManager.plasma6.enable = true;
 
 
   # Open ports in the firewall.

hosts/nixcloud/services.d/dns.nix

@@ -12,7 +12,7 @@
         prefetching = true;
       };
       ports = {
-        dns = 53;
+        dns = 5353;
         tls = 853;
         http = 4000;
       };

hosts/nixcloud/services.d/matrix.d/gomuks.nix

@@ -0,0 +1,22 @@
+{
+  virtualisation.oci-containers.containers = {
+    "matrix-gomuks" = {
+      image = "dock.mau.dev/gomuks/gomuks";
+      volumes = [
+        "/var/lib/gomuks:/data:rw"
+      ];
+      ports = [
+        "127.0.0.1:29325:29325/tcp"
+      ];
+      log-driver = "journald";
+    };
+  };
+  services.nginx.virtualHosts."gomuks.k3t.dev" = {
+    enableACME = true;
+    forceSSL = true;
+    locations."/" = {
+      proxyPass = "http://127.0.0.1:29325";
+      proxyWebsockets = true;
+    };
+  };
+}

hosts/nixcloud/services.d/matrix.d/homeserver.nix

@@ -0,0 +1,46 @@
+{
+  services.matrix-continuwuity = {
+    enable = true;
+    settings = {
+      admin = {
+        enable = true;
+      };
+      global = {
+        address = [ "0.0.0.0" ];
+        server_name = "k3t.dev";
+        trusted_servers = [
+          "matrix.org"
+          "constellatory.net"
+          "unredacted.org"
+          "tchncs.de"
+        ];
+      };
+    };
+  };
+  services.nginx.virtualHosts = {
+    "k3t.dev".locations."/.well-known/matrix/client" = {
+      return = ''
+        200 '{"m.homeserver":{"base_url":"https://k3t.dev"},"m.identity_server":{"base_url":"https://vector.im"}}'
+      '';
+      extraConfig = ''
+        default_type application/json;
+      '';
+    };
+    "k3t.dev".locations."/.well-known/matrix/server" = {
+      return = ''
+        200 '{"m.server": "k3t.dev:443"}'
+      '';
+      extraConfig = ''
+        default_type application/json;
+      '';
+    };
+    "k3t.dev".locations."/_matrix/" = {
+      proxyPass = "http://127.0.0.1:6167";
+      proxyWebsockets = true;
+    };
+    "k3t.dev".locations."/_continuwuity/" = {
+      proxyPass = "http://127.0.0.1:6167";
+      proxyWebsockets = true;
+    };
+  };
+}

hosts/nixcloud/services.d/matrix.d/mautrix.nix

@@ -0,0 +1,104 @@
+# Auto-generated by compose2nix.
+
+{ pkgs, lib, config, ... }:
+
+{
+
+  # Containers
+  virtualisation.oci-containers.containers = {
+    "matrix-mautrix-bluesky" = {
+        image = "dock.mau.dev/mautrix/bluesky:latest";
+        volumes = [
+          "/var/lib/mautrix/bluesky:/data:rw"
+        ];
+        ports = [
+          "127.0.0.1:29340:29340/tcp"
+        ];
+        log-driver = "journald";
+      };
+      "matrix-mautrix-discord" = {
+        image = "dock.mau.dev/mautrix/discord:latest";
+        volumes = [
+          "/var/lib/mautrix/discord:/data:rw"
+        ];
+        ports = [
+          "127.0.0.1:29334:29334/tcp"
+        ];
+        log-driver = "journald";
+      };
+      "matrix-mautrix-linkedin" = {
+        image = "dock.mau.dev/mautrix/linkedin:latest";
+        volumes = [
+          "/var/lib/mautrix/linkedin:/data:rw"
+        ];
+        ports = [
+          "127.0.0.1:29341:29341/tcp"
+        ];
+        log-driver = "journald";
+      };
+      "matrix-mautrix-meta" = {
+        image = "dock.mau.dev/mautrix/meta:latest";
+        volumes = [
+          "/var/lib/mautrix/meta:/data:rw"
+        ];
+        ports = [
+          "127.0.0.1:29319:29319/tcp"
+        ];
+        log-driver = "journald";
+      };
+      "matrix-mautrix-instagram" = {
+        image = "dock.mau.dev/mautrix/meta:ig-latest";
+        volumes = [
+          "/var/lib/mautrix/instagram:/data:rw"
+        ];
+        ports = [
+          "127.0.0.1:29330:29330/tcp"
+        ];
+        log-driver = "journald";
+      };
+      "matrix-mautrix-signal" = {
+        image = "dock.mau.dev/mautrix/signal:latest";
+        volumes = [
+          "/var/lib/mautrix/signal:/data:rw"
+        ];
+        ports = [
+          "127.0.0.1:29328:29328/tcp"
+        ];
+        log-driver = "journald";
+      };
+      "matrix-mautrix-twitter" = {
+        image = "dock.mau.dev/mautrix/twitter:latest";
+        volumes = [
+          "/var/lib/mautrix/twitter:/data:rw"
+        ];
+        ports = [
+          "127.0.0.1:29327:29327/tcp"
+        ];
+        log-driver = "journald";
+      };
+      "matrix-mautrix-whatsapp" = {
+        image = "dock.mau.dev/mautrix/whatsapp:latest";
+        volumes = [
+          "/var/lib/mautrix/whatsapp:/data:rw"
+        ];
+        ports = [
+          "127.0.0.1:29318:29318/tcp"
+        ];
+        log-driver = "journald";
+      };
+  };
+  services.nginx.virtualHosts."discord-media-mxc.k3t.dev" = {
+    enableACME = true;
+    forceSSL = true;
+    locations."/" = {
+      proxyPass = "http://127.0.0.1:29334";
+      proxyWebsockets = true;
+    };
+  };
+  # Allow podman containers to access continuwuity
+  networking.firewall.interfaces = let
+    matchAll = if !config.networking.nftables.enable then "podman+" else "podman*";
+  in {
+    "${matchAll}".allowedTCPPorts = [ 6167 ];
+  };
+}

hosts/nixcloud/services.d/minecraft.nix

@@ -1,41 +1,20 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
-  virtualisation.podman = {
-    enable = true;
-    autoPrune.enable = true;
-    dockerCompat = true;   # optional; lets you use `docker` CLI
+  virtualisation.oci-containers.containers."minecraft-server" = {
+    image = "ghcr.io/graalvm/graalvm-community:25";
+    volumes = [
+      "/var/lib/minecraft:/data:rw"
+    ];
+    ports = [
+      "25565:25565/tcp"
+      "24454:24454/udp"
+    ];
+    extraOptions = [
+      "--tty"
+      "--interactive"
+    ];
+    entrypoint = "/data/run.sh";
+    log-driver = "journald";
   };
-
-  systemd.services.minecraft-container = {
-    description = "Minecraft Server Container (GraalVM JVM 21)";
-    after = [ "network-online.target" ];
-    wants = [ "network-online.target" ];
-    serviceConfig = {
-      ExecStart = ''
-        ${pkgs.podman}/bin/podman run \
-          --rm \
-          --name minecraft-server \
-          -v /var/lib/minecraft:/data \
-          -p 25565:25565 \
-          -p 24454:24454/udp \
-          ghcr.io/graalvm/graalvm-community:8 \
-          /data/run.sh
-      '';
-      ExecStop = "${pkgs.podman}/bin/podman stop minecraft-server";
-      Restart = "always";
-      RestartSec = "10s";
-    };
-
-    # Ensure the directory exists
-    preStart = ''
-      mkdir -p /var/lib/minecraft
-    '';
-    wantedBy = [ "multi-user.target" ];
-  };
-
-  # Give Podman permission to access persistent storage
-  systemd.tmpfiles.rules = [
-    "d /var/lib/minecraft 0755 root root"
-  ];
 }

modules/bluetooth/desktop.nix

@@ -11,7 +11,7 @@
         # Shows battery charge of connected devices on supported
         # Bluetooth adapters. Defaults to 'false'.
         Experimental = true;
-        KernelExperimental = true;
+        KernelExperimental = "6fbaf188-05e0-496a-9885-d6ddfdb4e03e,a6695ace-ee7f-4fb9-881a-5fac66c629af";
         # When enabled other devices can connect faster to us, however
         # the tradeoff is increased power consumption. Defaults to
         # 'false'.
@@ -28,4 +28,4 @@
     };
   };
 
-}
+}

modules/de/i3.nix

@@ -1,8 +1,6 @@
 { pkgs, lib, ... }:
 
 {
-  # gnupg to fix conflict between kde
-  programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gtk2;
   # X11
   services.xserver = {
     enable = true;

modules/de/kde.nix

@@ -5,4 +5,11 @@
     desktopManager.plasma6.enable = true;
     displayManager.plasma-login-manager.enable = true;
   };
-}
+  environment.systemPackages = with pkgs; [
+     kdePackages.qtwebsockets
+     qt5.qtwebsockets
+     qt6.qtwebsockets
+     qt6Packages.qtwebsockets
+     waypipe
+  ];
+}

modules/desktop-common.nix

@@ -17,7 +17,6 @@
       joplin-desktop
       qbittorrent
       kdePackages.kate
-      jellyfin-desktop
       flatpak
       grayjay
       vscode.fhs

modules/gui/apps/steam.nix

@@ -1,17 +1,30 @@
 { pkgs, ... }:
 
 {
+  hardware.steam-hardware.enable = true;
   programs.steam = {
     enable = true;
     gamescopeSession.enable = true;
+    extest.enable = true;
     extraCompatPackages = with pkgs; [
       proton-ge-bin
+      dwproton-bin
+      steam-play-none
     ];
+    dedicatedServer.openFirewall = true;
     localNetworkGameTransfers.openFirewall = true;
+    package = pkgs.steam.override {
+      extraProfile = ''
+        # Allows Monado/WiVRn to be used
+        export PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES=1
+        # Fixes timezones on VRChat
+        unset TZ
+      '';
+    };
   };
   programs.gamemode.enable = true;
   programs.gamescope = {
     enable = true;
     capSysNice = true;
   };
-}
+}

modules/gui/services/geoclue.nix

@@ -0,0 +1,6 @@
+{
+  services = {
+    localtimed.enable = true;
+    geoclue2.enable = true;
+  };
+}

modules/gui/services/waydroid.nix

@@ -0,0 +1,9 @@
+{pkgs, ...}:
+
+{
+  virtualisation.waydroid = {
+    enable = true;
+    package = pkgs.waydroid-nftables;
+  };
+  environment.systemPackages = [ pkgs.wl-clipboard ];
+}

modules/gui/services/xdg.nix

@@ -1,8 +1,13 @@
 { pkgs, ... }:
 
 {
-  xdg.portal = {
-    enable = true;
-    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+  xdg = {
+    mime = {
+      enable = true;
+    };
+    portal = {
+      enable = true;
+      extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+    };
   };
-}
+}

modules/sys/firewall.nix

@@ -1,13 +1,18 @@
 {
-  networking.firewall = {
-    enable = true;
-    allowedTCPPorts = [ 4713 ];
-    #allowedUDPPorts = [ 80 443 ];
-    allowedTCPPortRanges = [
-      { from = 8000; to = 9000; }
-    ];
-    allowedUDPPortRanges = [
-      { from = 8000; to = 9000; }
-    ];
+  networking = {
+    nftables = {
+      enable = false;
+    };
+    firewall = {
+      enable = true;
+      allowedTCPPorts = [ 4713 ];
+      #allowedUDPPorts = [ 80 443 ];
+      allowedTCPPortRanges = [
+        { from = 8000; to = 9000; }
+      ];
+      allowedUDPPortRanges = [
+        { from = 8000; to = 9000; }
+      ];
+    };
   };
-}
+}

modules/sys/fs/mounts/btrfs/btrfs-with-subvols.nix

@@ -0,0 +1,12 @@
+{
+  fileSystems."/" =
+    { device = "/dev/disk/by-label/NixOS";
+      fsType = "btrfs";
+      options = [ "discard" "compress" "subvol=@" ];
+    };
+  fileSystems."/home" =
+    { device = "/dev/disk/by-label/NixOS";
+      fsType = "btrfs";
+      options = [ "discard" "compress" "subvol=@home" ];
+    };
+}

modules/sys/fs/mounts/root-btrfs.nix

@@ -2,6 +2,6 @@
   fileSystems."/" =
     { device = "/dev/disk/by-label/NixOS";
       fsType = "btrfs";
-      options = [ "discard" ];
+      options = [ "discard" "compress" ];
     };
-}
+}

modules/sys/hw/cpu/amd64.nix

@@ -1,9 +1,20 @@
 { pkgs, ... }:
 
 {
-  hardware.cpu.amd.updateMicrocode = true;
-  boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
-  boot.binfmt.preferStaticEmulators = true;
-  boot.binfmt.emulatedSystems = [ "aarch64-linux" "x86_64-windows" ];
-  boot.kernelModules = [ "kvm-amd" ];
-}
+  hardware.cpu.amd = {
+    ryzen-smu.enable = true;
+    updateMicrocode = true;
+  };
+  boot = {
+    binfmt = {
+      preferStaticEmulators = true;
+      emulatedSystems = [ "aarch64-linux" "x86_64-windows" ];
+    };
+    kernelModules = [ "kvm-amd" ];
+    kernelPackages = pkgs.linuxPackages_xanmod_latest;
+  };
+  programs = {
+    ryzen-monitor-ng.enable = true;
+    corectrl.enable = true;
+  };
+}

modules/sys/hw/cpu/intel.nix

@@ -2,8 +2,16 @@
 
 {
   hardware.cpu.intel.updateMicrocode = true;
-  boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
-  boot.binfmt.preferStaticEmulators = true;
-  boot.binfmt.emulatedSystems = [ "aarch64-linux" "x86_64-windows" ];
-  boot.kernelModules = [ "kvm-intel" ];
-}
+  boot = {
+    binfmt = {
+      preferStaticEmulators = true;
+      emulatedSystems = [ "aarch64-linux" "x86_64-windows" ];
+    };
+    kernelModules = [ "kvm-intel" ];
+    kernelPackages = pkgs.linuxPackages_xanmod_latest;
+    };
+  services = {
+    thermald.enable = true;
+    throttled.enable = true;
+  };
+}

modules/sys/hw/gpu/amd.nix

@@ -1,12 +1,23 @@
 { pkgs, ... }:
 {
-  # Graphics
-  hardware.enableRedistributableFirmware = true;
-  hardware.graphics = {
-    enable = true;
-    enable32Bit = true;
-    extraPackages = with pkgs; [
-      vkbasalt
-    ];
+
+  services.lact.enable = true;
+
+  nixpkgs.config.rocmSupport = true;
+  hardware = {
+    amdgpu = {
+      overdrive.enable = true;
+      opencl.enable = true;
+      initrd.enable = true;
+      zluda.enable = true;
+    };
+    enableRedistributableFirmware = true;
+    graphics = {
+      enable = true;
+      enable32Bit = true;
+      extraPackages = with pkgs; [
+        vkbasalt
+      ];
+    };
   };
-}
+}

modules/sys/hw/gpu/intel.nix

@@ -2,20 +2,24 @@
 {
   boot.kernelParams = [ "i915.enable_guc=3" ];
   # Graphics
-  hardware.enableRedistributableFirmware = true;
-  hardware.graphics = {
-    enable = true;
-    enable32Bit = true;
-    extraPackages = with pkgs; [
-      # Required for modern Intel GPUs (Xe iGPU and ARC)
-      intel-media-driver     # VA-API (iHD) userspace
-      vpl-gpu-rt             # oneVPL (QSV) runtime
+  hardware = {
+    enableRedistributableFirmware = true;
+    intel-gpu-tools.enable = true;
+    graphics = {
+      enable = true;
+      enable32Bit = true;
+      extraPackages = with pkgs; [
+        # Required for modern Intel GPUs (Xe iGPU and ARC)
+        intel-media-driver     # VA-API (iHD) userspace
+        vpl-gpu-rt             # oneVPL (QSV) runtime
 
-      # Optional (compute / tooling):
-      intel-compute-runtime  # OpenCL (NEO) + Level Zero for Arc/Xe
-      # NOTE: 'intel-ocl' also exists as a legacy package; not recommended for Arc/Xe.
-      libvdpau-va-gl       # Only if you must run VDPAU-only apps
-      vkbasalt
-    ];
+        # Optional (compute / tooling):
+        intel-compute-runtime  # OpenCL (NEO) + Level Zero for Arc/Xe
+        # NOTE: 'intel-ocl' also exists as a legacy package; not recommended for Arc/Xe.
+        libvdpau-va-gl       # Only if you must run VDPAU-only apps
+        vkbasalt
+      ];
+    };
   };
-}
+  virtualisation.kvmgt.enable = true;
+}

modules/sys/hw/gpu/nvidia.nix

@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+{
+
+  nixpkgs.config.rocmSupport = true;
+  hardware = {
+    enableRedistributableFirmware = true;
+    graphics = {
+      enable = true;
+      enable32Bit = true;
+      extraPackages = with pkgs; [
+        vkbasalt
+        mangohud
+        lsfg-vk
+      ];
+    };
+    nvidia = {
+      open = true;
+      modesetting.enable = true;
+    };
+  };
+  services.xserver.videoDrivers = [ "nvidia" ];
+}

modules/sys/hw/input/keyboard.nix

@@ -0,0 +1,6 @@
+{
+  hardware.keyboard.qmk = {
+    enable = true;
+    keychronSupport = true;
+  };
+}

modules/sys/hw/input/tablet.nix

@@ -0,0 +1,6 @@
+{
+  hardware.opentabletdriver = {
+    enable = true;
+    daemon.enable = true;
+  };
+}

modules/sys/hw/input/xbox.nix

@@ -0,0 +1,12 @@
+{
+  hardware = {
+    xone.enable = true;
+    xpad-noone.enable = true;
+    xpadneo = {
+      enable = true;
+      settings = {
+        disable_deadzones = 1;
+      };
+    };
+  };
+}

modules/sys/hw/misc/ios.nix

@@ -0,0 +1,12 @@
+{pkgs, ...}:
+{
+  services.usbmuxd = {
+    enable = true;
+    package = pkgs.usbmuxd2;
+  };
+
+  environment.systemPackages = with pkgs; [
+    libimobiledevice
+    ifuse # optional, to mount using 'ifuse'
+  ];
+}

modules/sys/perf.nix

@@ -8,17 +8,46 @@
     };
   };
   services.fstrim.enable = true;
-  services.system76-scheduler.enable = true;
-  #services.thermald.enable = true;
+  services.system76-scheduler = {
+    enable = true;
+    settings = {
+      processScheduler = {
+        foregroundBoost = {
+          #background = {
+          #  ioClass = "idle";
+          #};
+          foreground = {
+            ioClass = "realtime";
+            class = "fifo";
+          };
+        };
+        pipewireBoost.profile = {
+          ioClass = "realtime";
+          class = "fifo";
+        };
+      };
+    };
+  };
   services.power-profiles-daemon.enable = true;
-  systemd.coredump.enable = false;
+  systemd.coredump = { # https://discourse.nixos.org/t/how-to-completely-disable-coredump/77335/11
+    enable = true;
+    settings.Coredump = {
+      Storage = "none";
+      ProcessSizeMax = "0";
+    };
+  };
   zramSwap = {
     enable = true;
     algorithm = "zstd";
     memoryPercent = 90;
   };
-  services.udev.extraRules = ''
-  ACTION=="add|change", KERNEL=="nvme[0-9]*", ATTR{queue/scheduler}="kyber"
-  ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="kyber"
-  '';
-}
+  hardware.block.scheduler = {
+    "mmcblk[0-9]*" = "bfq";
+    "nvme[0-9]*"   = "kyber";
+    "sd[a-z]"      = "kyber";
+  };
+  services.scx = {
+    enable = true;
+    scheduler = "scx_cake";
+  };
+}

modules/sys/pkgs.nix

@@ -7,7 +7,6 @@
     openssl
     topgrade
     htop
-    mosh
     btop
     python314
     wget2

modules/sys/rc/openssh.nix

@@ -1,6 +1,19 @@
+#{config, ...}:
+
 {
+  #programs.ssh = {
+  #  startAgent = true;
+  #  agentPKCS11Whitelist = "${config.security.tpm2.pkcs11.package}/lib/*,/run/current-system/sw/lib/*";
+  #};
+  programs.mosh = {
+    enable = true;
+    openFirewall = true;
+    withUtempter = true;
+  };
   services.openssh = {
     enable = true;
-    settings.PasswordAuthentication = true;
+    settings = {
+      GatewayPorts = "yes";
+    };
   };
-}
+}

modules/sys/rc/synergy.nix

@@ -0,0 +1,9 @@
+{
+  services.synergy = {
+    client = {
+      #enable = true;
+      serverAddress = "theblackbox";
+    };
+    #server.enable = true;
+  };
+}

modules/sys/rc/x2goserver.nix

@@ -0,0 +1,6 @@
+{
+  services.x2goserver = {
+    enable = true;
+    superenicer.enable = true;
+  };
+}

modules/sys/security.nix

@@ -1,8 +1,28 @@
+{pkgs, ...}:
+
 {
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+    pinentryPackage = pkgs.pinentry-qt;
+  };
+  services.pcscd.enable = true;
+  services.udev.packages = [ pkgs.yubikey-personalization ];
   security = {
     sudo.execWheelOnly = true;
     polkit.enable = true;
     protectKernelImage = true;
+    #pam.yubico = {
+    #   enable = true;
+    #   debug = true;
+    #   mode = "challenge-response";
+    #   id = [ "19694730" ];
+    #};
+    tpm2 = {
+      enable = true;
+      pkcs11.enable = true;
+      tctiEnvironment.enable = true;
+    };
   };
   system.autoUpgrade = {
     enable = true;

modules/sys/time.nix

@@ -1,3 +1,4 @@
+{lib, ...}:
 {
   # NTP configuration - NIST atomic clocks
   services.timesyncd = {
@@ -14,7 +15,7 @@
       "0.pool.ntp.org"
     ];
   };
-  time.timeZone = "America/Denver";
+  time.timeZone = lib.mkDefault "America/Denver";
   i18n.defaultLocale = "en_US.UTF-8";
   i18n.extraLocaleSettings = {
     LC_ADDRESS = "en_US.UTF-8";

modules/sys/users.nix

@@ -1,3 +0,0 @@
-{
-
-}

modules/sys/users/juliet.nix

@@ -2,8 +2,8 @@
   users.users.juliet = {
     description = "Juliet";
     isNormalUser = true;
-    extraGroups = [ "audio" "video" "bluetooth" "wheel" "input" "networkmanager" "scanner" "lp" ];
+    extraGroups = [ "audio" "video" "bluetooth" "wheel" "input" "networkmanager" "scanner" "lp" "tss" ];
     initialPassword = "password";
     linger = true;
   };
-}
+}

modules/sys/users/k3t.nix

@@ -2,11 +2,12 @@
   users.users.k3t = {
     description = "Kai Moore";
     isNormalUser = true;
-    extraGroups = [ "audio" "video" "bluetooth" "wheel" "input" "networkmanager" "scanner" "lp" ];
+    extraGroups = [ "audio" "video" "bluetooth" "wheel" "input" "networkmanager" "scanner" "lp" "tss" ];
     initialPassword = "password";
     linger = true;
     openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG6evv6KcTvFDp4EeO9mMAa2Pb7yYZ/uTNM6TrVt5nKc k3t@DESKTOP-GTFSBKP" # TBB Win10
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG6evv6KcTvFDp4EeO9mMAa2Pb7yYZ/uTNM6TrVt5nKc k3t@TheBlackBox" # TBB
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1DAk3isgJPJbo19Kto6EnZdDMIe6F6D/BLyhhQPmBd k3t@T14" # T14
     ];
   };
-}
+}