refactor everything holy fuck

flake.nix

@@ -28,11 +28,61 @@
       ] ++ modules;
     }).config.system.build.sdImage;
   in {
+
     nixosConfigurations = {
-      "TheBlackBox" = mkHost "x86_64-linux" [
+      # repurposed for use as nas
-        ./modules/common.nix
+      #"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;
+      #  }
+      #];
+      "board" = mkHost "x86_64-linux" [
+        ./modules/audio/base.nix
+        ./modules/audio/zeroconf.nix
+
+        ./modules/bluetooth/desktop.nix
+        ./modules/de/kde.nix
         ./modules/desktop-common.nix
-        ./hosts/desktop/configuration.nix
+        
+        ./modules/gui/apps/firefox.nix
+        ./modules/gui/apps/spicetify.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/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/hw/boot.nix
+        ./modules/sys/hw/cpu/amd64.nix
+        ./modules/sys/hw/gpu/amd.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/tz.nix
+        ./modules/sys/users.nix
+
+        ./hosts/board/configuration.nix
         spicetify-nix.nixosModules.spicetify
         home-manager.nixosModules.home-manager
         {
@@ -41,21 +91,45 @@
           home-manager.users.k3t = ./home/desktop.nix;
         }
       ];
-      "pi-htpc" = mkHost "aarch64-linux" [
-        nixos-hardware.nixosModules.raspberry-pi-4
-        ./modules/common.nix
-        ./modules/pi-common.nix
-        ./hosts/pi-htpc/configuration.nix
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.k3t = ./home/htpc.nix;
-        }
-      ];
       "T14" = mkHost "x86_64-linux" [
-        ./modules/common.nix
+        ./modules/audio/base.nix
+        ./modules/audio/zeroconf.nix
+
+        ./modules/bluetooth/desktop.nix
+        ./modules/de/kde.nix
         ./modules/desktop-common.nix
+        
+        ./modules/gui/apps/firefox.nix
+        ./modules/gui/apps/spicetify.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/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/hw/boot.nix
+        ./modules/sys/hw/cpu/amd64.nix
+        ./modules/sys/hw/gpu/amd.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/tz.nix
+        ./modules/sys/users.nix
+
         ./hosts/laptop/configuration.nix
         spicetify-nix.nixosModules.spicetify
         home-manager.nixosModules.home-manager
@@ -65,8 +139,49 @@
           home-manager.users.k3t = ./home/desktop.nix;
         }
       ];
+      #"pi-htpc" = mkHost "aarch64-linux" [
+      #  nixos-hardware.nixosModules.raspberry-pi-4
+      #  ./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/hw/boot.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/tz.nix
+      #  ./modules/sys/users.nix
+      #  ./modules/pi-common.nix
+      #  ./hosts/pi-htpc-old/configuration.nix
+      #  home-manager.nixosModules.home-manager
+      #  {
+      #    home-manager.useGlobalPkgs = true;
+      #    home-manager.useUserPackages = true;
+      #    home-manager.users.k3t = ./home/htpc.nix;
+      #  }
+      #];
       "nixcloud" = mkHost "x86_64-linux" [
-        ./modules/common.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/hw/boot.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/security.nix
+        ./modules/sys/shell.nix
+        ./modules/sys/stateversion.nix
+        ./modules/sys/tz.nix
+        ./modules/sys/users.nix
         ./modules/vps-aarch64-common.nix
         ./hosts/nixcloud/configuration.nix
         home-manager.nixosModules.home-manager
@@ -79,17 +194,31 @@
     };
 
     # SD card images
-    images = {
+    #images = {
-      pi-htpc = mkPiImage [
+    #  pi-htpc-old = mkPiImage [
-        ./modules/common.nix
+    #    ./modules/net/services/networkmanager.nix
-        ./modules/pi-common.nix
+    #    ./modules/net/services/tailscale.nix
-        ./hosts/pi-htpc/configuration.nix
+    #    ./modules/sys/compat.nix
-        {
+    #    ./modules/sys/firewall.nix
-          home-manager.useGlobalPkgs = true;
+    #    ./modules/sys/fs/btrfs.nix
-          home-manager.useUserPackages = true;
+    #    ./modules/sys/hw/boot.nix
-          home-manager.users.k3t = ./home/desktop.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/tz.nix
+    #    ./modules/sys/users.nix
+    #    ./modules/pi-common.nix
+    #    ./hosts/pi-htpc-old/configuration.nix
+    #    {
+    #      home-manager.useGlobalPkgs = true;
+    #      home-manager.useUserPackages = true;
+    #      home-manager.users.k3t = ./home/desktop.nix;
+    #    }
+    #  ];
+    #};
   };
 }

home/htpc.nix

@@ -1,3 +1,4 @@
+{ pkgs, ... }:
 
 let
   kodi-with-addons = pkgs.kodi-wayland.withPackages (kodiPkgs: with kodiPkgs; [

hosts/board/configuration.nix

@@ -0,0 +1,31 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+  services.beesd.filesystems = {
+    root = {
+      spec = "LABEL=NixOS";
+      hashTableSizeMB = 128;
+      verbosity = "crit";
+      extraOptions = [ "--loadavg-target" "1.5" ];
+    };
+  };
+
+  networking.hostName = "T14"; # Define your hostname.
+  services.openssh.enable = true;
+
+  users.users.k3t = {
+    packages = with pkgs; [
+      anydesk
+      virt-viewer
+    ];
+  };
+}

hosts/board/hardware-configuration.nix

@@ -0,0 +1,35 @@
+# 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 + "/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;
+}

modules/audio/base.nix

@@ -0,0 +1,26 @@
+{ pkgs, lib, ... }:
+
+{
+  # Enable sound with pipewire.
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
+    wireplumber.extraConfig.bluetoothEnhancements = {
+      "monitor.bluez.properties" = {
+          "bluez5.enable-sbc-xq" = true;
+          "bluez5.enable-msbc" = true;
+          "bluez5.enable-hw-volume" = true;
+          "bluez5.roles" = [ "hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag" "a2dp_sink" "a2dp_source" "bap_sink" "bap_source" ];
+      };
+    };
+  };
+}

modules/audio/zeroconf.nix

@@ -0,0 +1,23 @@
+{
+  services.pipewire.extraConfig.pipewire-pulse = {
+      "10-zeroconf" = {
+        "pulse.cmd" = [
+          {
+            cmd = "load-module";
+            args = "module-zeroconf-discover";
+            flags = [];
+          }
+          {
+            cmd = "load-module";
+            args = "module-zeroconf-publish";
+            flags = [];
+          }
+          {
+            cmd = "load-module";
+            args = "module-native-protocol-tcp";
+            flags = ["auth-anonymous"];
+          }
+        ];
+      };
+  };
+}

modules/bluetooth/desktop.nix

@@ -0,0 +1,31 @@
+{ pkgs, lib, ... }:
+
+{
+
+  # desktop oriented bluetooth settings
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;
+    settings = {
+      General = {
+        # Shows battery charge of connected devices on supported
+        # Bluetooth adapters. Defaults to 'false'.
+        Experimental = true;
+        KernelExperimental = true;
+        # When enabled other devices can connect faster to us, however
+        # the tradeoff is increased power consumption. Defaults to
+        # 'false'.
+        FastConnectable = true;
+        ControllerMode = "both";
+        Testing = true;
+      };
+      Policy = {
+        # Enable all controllers when they are found. This includes
+        # adapters present on start as well as adapters that are plugged
+        # in later on. Defaults to 'true'.
+        AutoEnable = true;
+      };
+    };
+  };
+
+}

modules/bluetooth/sbc.nix

@@ -0,0 +1,31 @@
+{ pkgs, lib, ... }:
+
+{
+
+  # desktop oriented bluetooth settings
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;
+    settings = {
+      General = {
+        # Shows battery charge of connected devices on supported
+        # Bluetooth adapters. Defaults to 'false'.
+        Experimental = true;
+        KernelExperimental = true;
+        # When enabled other devices can connect faster to us, however
+        # the tradeoff is increased power consumption. Defaults to
+        # 'false'.
+        FastConnectable = false;
+        ControllerMode = "both";
+        Testing = true;
+      };
+      Policy = {
+        # Enable all controllers when they are found. This includes
+        # adapters present on start as well as adapters that are plugged
+        # in later on. Defaults to 'true'.
+        AutoEnable = true;
+      };
+    };
+  };
+
+}

modules/common.nix

@@ -1,88 +0,0 @@
-{ pkgs, ... }: {
-  nix = {
-    settings = {
-      experimental-features = [ "nix-command" "flakes" ];
-      substituters = [
-        "https://nix-community.cachix.org"
-        "https://cache.nixos.org/"
-      ];
-      trusted-public-keys = [
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      ];
-    };
-    optimise.automatic = true;
-    gc = {
-      automatic = true;
-      dates = "daily";
-      options = "--delete-older-than 2d";
-    };
-  };
-  nixpkgs.config.allowUnfree = true;
-
-  # auto upgrade from your public repo
-  system.autoUpgrade = {
-    #enable = true;
-    flake = "github:notquitek3t/nixconf";
-  };
-
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-  };
-
-  # networking
-  networking.networkmanager.enable = true;
-  services.tailscale.enable = true;
-
-  # environment
-  programs.zsh.enable = true;
-  users.defaultUserShell = pkgs.zsh;
-  environment.pathsToLink = [ "/share/zsh" ];
-  environment.systemPackages = with pkgs; [
-    git
-    neovim
-    caligula
-    openssl
-    topgrade
-    htop
-    mosh
-    btop
-    wget2
-    python314
-  ];
-
-  # disable core dumps
-  systemd.coredump.enable = false;
-
-  # zram swap
-  zramSwap.enable = true;
-  zramSwap.memoryPercent = 80;
-
-  # security
-  security.polkit.enable = true;
-
-  users.users.k3t = {
-    description = "Kai Moore";
-    isNormalUser = true;
-    extraGroups = [ "audio" "video" "bluetooth" "wheel" "input" "networkmanager" ];
-    initialPassword = "password";
-    linger = true;
-  };
-
-  # locale / time — adjust as needed
-  time.timeZone = "America/Denver";
-  i18n.defaultLocale = "en_US.UTF-8";
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "en_US.UTF-8";
-    LC_IDENTIFICATION = "en_US.UTF-8";
-    LC_MEASUREMENT = "en_US.UTF-8";
-    LC_MONETARY = "en_US.UTF-8";
-    LC_NAME = "en_US.UTF-8";
-    LC_NUMERIC = "en_US.UTF-8";
-    LC_PAPER = "en_US.UTF-8";
-    LC_TELEPHONE = "en_US.UTF-8";
-    LC_TIME = "en_US.UTF-8";
-  };
-
-  system.stateVersion = "25.11";
-}

modules/de/i3.nix

@@ -0,0 +1,55 @@
+{ pkgs, lib, ... }:
+
+{
+  # X11
+  services.xserver = {
+    videoDrivers = [ "modesetting" "amdgpu" ];
+    enable = true;   
+    xkb = {
+      layout = "us";
+      variant = "";
+    };
+    desktopManager = {
+      xterm.enable = false;
+      xfce = {
+        enable = true;
+        noDesktop = true;
+        enableXfwm = false;
+      };
+    };
+    libinput.enable = true;
+    windowManager.i3 = {
+      enable = true;
+      extraPackages = with pkgs; [
+        dmenu
+        i3status
+	i3lock
+	i3blocks
+      ];
+    };
+  };
+  services.displayManager.defaultSession = "xfce+i3";
+
+  services.picom = {
+    enable = true;
+    fade = true;
+    #vSync = true;
+    shadow = true;
+    fadeDelta = 4 ;
+    inactiveOpacity = 1;
+    activeOpacity = 1;
+    #backend = "glx";
+    settings = {
+      blur = {
+        #method = "dual_kawase";
+        #background = true;
+        strength = 5;
+      };
+    };
+  };
+
+  # useful services
+  services.gvfs.enable = true;
+  services.tumbler.enable = true;
+  programs.dconf.enable = true;
+}

modules/de/kde.nix

@@ -0,0 +1,9 @@
+{ pkgs, lib, ... }:
+
+{
+  services = {
+    desktopManager.plasma6.enable = true;
+    displayManager.plasma-login-manager.enable = true;
+    xserver.enable = true;
+  };
+}

modules/desktop-common.nix

@@ -1,262 +1,13 @@
 { pkgs, lib, spicetify-nix, ... }:
 
-let
-  spicePkgs = spicetify-nix.legacyPackages.${pkgs.stdenv.system};
-in
-
 {
 
-  # Bootloader
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
-  boot.kernelParams = [ "i915.enable_guc=3" ];
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  # Avahi
-  services.avahi = {
-    enable = true;
-    nssmdns4 = true;
-    openFirewall = true;
-    publish = {
-      addresses = true;
-      domain = true;
-      enable = true;
-      hinfo = true;
-      userServices = true;
-      workstation = true;
-    };
-  };
-
-  # Self Maintenance
-  services.btrfs.autoScrub = {
-    enable = true;
-    interval = "weekly";
-    fileSystems = [ "/" ];
-  };
-
-  # Performance
-  services.system76-scheduler.enable = true;
-  #hardware.system76.power-daemon.enable = true;
-  services.thermald.enable = true;
-  services.power-profiles-daemon.enable = true;
-
-  # Support
-  fonts.packages = with pkgs; [ nerd-fonts.fira-code noto-fonts noto-fonts-cjk-sans liberation_ttf fira-code fira-code-symbols ];
-  services.gvfs.enable = true;
-  services.tumbler.enable = true;
-  programs.dconf.enable = true;
-  services.flatpak.enable = true;
-  boot.binfmt.preferStaticEmulators = true;
-  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
-  programs.nix-ld.enable = true;
-  programs.appimage.enable = true;
-  programs.appimage.binfmt = true;
-
-  # Printing
-  services.printing.enable = true;
-
-  # 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
-
-      # 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
-    ];
-  };
-
-  #environment.sessionVariables = {
-  #  LIBVA_DRIVER_NAME = "iHD";     # Prefer the modern iHD backend
-  #  # VDPAU_DRIVER = "va_gl";      # Only if using libvdpau-va-gl
-  #};
-
-
-
-  # X11
-  services.xserver = {
-    videoDrivers = [ "modesetting" "amdgpu" ];
-    enable = true;   
-    xkb = {
-      layout = "us";
-      variant = "";
-    };
-    desktopManager = {
-      xterm.enable = false;
-      xfce = {
-        enable = true;
-        noDesktop = true;
-        enableXfwm = false;
-      };
-    };
-    libinput.enable = true;
-    #windowManager.i3.enable = true;
-    windowManager.i3 = {
-      #package = pkgs.i3-gaps;
-      enable = true;
-      extraPackages = with pkgs; [
-        dmenu
-        i3status
-	i3lock
-	i3blocks
-      ];
-    };
-  };
-  services.displayManager.defaultSession = "xfce+i3";
-
-  services.picom = {
-    enable = true;
-    fade = true;
-    #vSync = true;
-    shadow = true;
-    fadeDelta = 4 ;
-    inactiveOpacity = 1;
-    activeOpacity = 1;
-    #backend = "glx";
-    settings = {
-      blur = {
-        #method = "dual_kawase";
-        #background = true;
-        strength = 5;
-      };
-    };
-  };
-
-  # desktop oriented bluetooth settings
-  hardware.bluetooth = {
-    settings = {
-      General = {
-        # Shows battery charge of connected devices on supported
-        # Bluetooth adapters. Defaults to 'false'.
-        Experimental = true;
-        KernelExperimental = true;
-        # When enabled other devices can connect faster to us, however
-        # the tradeoff is increased power consumption. Defaults to
-        # 'false'.
-        FastConnectable = true;
-        ControllerMode = "both";
-      };
-      Policy = {
-        # Enable all controllers when they are found. This includes
-        # adapters present on start as well as adapters that are plugged
-        # in later on. Defaults to 'true'.
-        AutoEnable = true;
-      };
-    };
-  };
-
-  # Sunshine (remote desktop)
-  services.sunshine = {
-    enable = true;
-    autoStart = true;
-    capSysAdmin = true;
-    openFirewall = true;
-  };
-
-  # Enable sound with pipewire.
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-    wireplumber.extraConfig.bluetoothEnhancements = {
-      "monitor.bluez.properties" = {
-          "bluez5.enable-sbc-xq" = true;
-          "bluez5.enable-msbc" = true;
-          "bluez5.enable-hw-volume" = true;
-          "bluez5.roles" = [ "hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag" "a2dp_sink" "a2dp_source" "bap_sink" "bap_source" ];
-      };
-    };
-  };
-
   programs.mtr.enable = true;
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
   };
-  programs.kdeconnect.enable = true;
 
-  environment.etc."firefox/policies/policies.json".target = "librewolf/policies/policies.json";
-  programs.firefox = {
-    enable = true;
-    package = pkgs.librewolf;
-    policies = {
-      DisableTelemetry = true;
-      DisableFirefoxStudies = true;
-      Preferences = {
-        "cookiebanners.service.mode.privateBrowsing" = 2; # Block cookie banners in private browsing
-        "cookiebanners.service.mode" = 2; # Block cookie banners
-        "privacy.donottrackheader.enabled" = true;
-        "privacy.fingerprintingProtection" = true;
-        "privacy.resistFingerprinting" = true;
-        "privacy.trackingprotection.emailtracking.enabled" = true;
-        "privacy.trackingprotection.enabled" = true;
-        "privacy.trackingprotection.fingerprinting.enabled" = true;
-        "privacy.trackingprotection.socialtracking.enabled" = true;
-      };
-      ExtensionSettings = {
-        "jid1-ZAdIEUB7XOzOJw@jetpack" = {
-          install_url = "https://addons.mozilla.org/firefox/downloads/latest/duckduckgo-for-firefox/latest.xpi";
-          installation_mode = "force_installed";
-        };
-        "uBlock0@raymondhill.net" = {
-          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
-          installation_mode = "force_installed";
-        };
-      };
-    };
-  };
-
-  networking.firewall = {
-    enable = false;
-    allowedTCPPortRanges = [
-      { from = 8000; to = 9000; }
-    ];
-    allowedUDPPortRanges = [
-      { from = 8000; to = 9000; }
-    ];
-  };
-
-  programs.spicetify = {
-    enable = true;
-
-    enabledExtensions = with spicePkgs.extensions; [
-      adblock
-      hidePodcasts
-      shuffle # shuffle+ (special characters are sanitized out of extension names)
-    ];
-    enabledCustomApps = with spicePkgs.apps; [
-      newReleases
-      ncsVisualizer
-    ];
-    enabledSnippets = with spicePkgs.snippets; [
-      rotatingCoverart
-      pointer
-    ];
-
-    theme = spicePkgs.themes.catppuccin;
-    colorScheme = "mocha";
-  };
-
-  security.pam.services.k3t.kwallet.enable = true;
-  security.pam.services.k3t.kwallet.forceRun = true;
   users.users.k3t = {
     packages = with pkgs; [
       moonlight-qt

modules/gui/apps/firefox.nix

@@ -0,0 +1,34 @@
+{ pkgs, lib, ... }:
+
+{
+  environment.etc."firefox/policies/policies.json".target = "librewolf/policies/policies.json";
+  programs.firefox = {
+    enable = true;
+    package = pkgs.librewolf;
+    policies = {
+      DisableTelemetry = true;
+      DisableFirefoxStudies = true;
+      Preferences = {
+        "cookiebanners.service.mode.privateBrowsing" = 2; # Block cookie banners in private browsing
+        "cookiebanners.service.mode" = 2; # Block cookie banners
+        "privacy.donottrackheader.enabled" = true;
+        "privacy.fingerprintingProtection" = true;
+        "privacy.resistFingerprinting" = true;
+        "privacy.trackingprotection.emailtracking.enabled" = true;
+        "privacy.trackingprotection.enabled" = true;
+        "privacy.trackingprotection.fingerprinting.enabled" = true;
+        "privacy.trackingprotection.socialtracking.enabled" = true;
+      };
+      ExtensionSettings = {
+        "jid1-ZAdIEUB7XOzOJw@jetpack" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/duckduckgo-for-firefox/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        "uBlock0@raymondhill.net" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+          installation_mode = "force_installed";
+        };
+      };
+    };
+  };
+}

modules/gui/apps/spicetify.nix

@@ -0,0 +1,28 @@
+{ pkgs, lib, spicetify-nix, ... }:
+
+let
+  spicePkgs = spicetify-nix.legacyPackages.${pkgs.stdenv.system};
+in
+
+{
+  programs.spicetify = {
+    enable = true;
+
+    enabledExtensions = with spicePkgs.extensions; [
+      adblock
+      hidePodcasts
+      shuffle # shuffle+ (special characters are sanitized out of extension names)
+    ];
+    enabledCustomApps = with spicePkgs.apps; [
+      newReleases
+      ncsVisualizer
+    ];
+    enabledSnippets = with spicePkgs.snippets; [
+      rotatingCoverart
+      pointer
+    ];
+
+    theme = spicePkgs.themes.catppuccin;
+    colorScheme = "mocha";
+  };
+}

modules/gui/fonts.nix

@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  fonts.packages = with pkgs; [ nerd-fonts.fira-code noto-fonts noto-fonts-cjk-sans liberation_ttf fira-code fira-code-symbols ];
+}

modules/gui/services/flatpak.nix

@@ -0,0 +1,3 @@
+{
+  services.flatpak.enable = true;
+}

modules/gui/services/kdeconnect.nix

@@ -0,0 +1,3 @@
+{
+  programs.kdeconnect.enable = true;
+}

modules/gui/services/kwallet.nix

@@ -0,0 +1,4 @@
+{
+  security.pam.services.k3t.kwallet.enable = true;
+  security.pam.services.k3t.kwallet.forceRun = true;
+}

modules/gui/services/xdg.nix

@@ -0,0 +1,3 @@
+{
+  xdg.portal.enable = true;
+}

modules/net/services/avahi.nix

@@ -0,0 +1,16 @@
+{
+  # Avahi
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    openFirewall = true;
+    publish = {
+      addresses = true;
+      domain = true;
+      enable = true;
+      hinfo = true;
+      userServices = true;
+      workstation = true;
+    };
+  };
+}

modules/net/services/networkmanager.nix

@@ -0,0 +1,6 @@
+{
+  networking.networkmanager = {
+    enable = true;
+    wifi.powersave = true;
+  };
+}

modules/net/services/printing.nix

@@ -0,0 +1,3 @@
+{
+  services.printing.enable = true;
+}

modules/net/services/tailscale.nix

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

modules/pi-common.nix

@@ -26,16 +26,4 @@
     raspberrypi-eeprom
   ];
 
-  # ssh so you can manage them remotely
-  services.openssh = {
-    enable = true;
-    settings.PasswordAuthentication = true;
-  };
-
-  # auto upgrade on pis can reboot unattended
-  system.autoUpgrade = {
-    #operation = "boot";
-    allowReboot = true;
-    rebootWindow = { lower = "02:00"; upper = "05:00"; };
-  };
 }

modules/sys/compat.nix

@@ -0,0 +1,6 @@
+{
+  programs.nix-ld.enable = true;
+  programs.appimage.enable = true;
+  programs.appimage.binfmt = true;
+  services.dbus.implementation = "broker";
+}

modules/sys/firewall.nix

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

modules/sys/fs/btrfs.nix

@@ -0,0 +1,7 @@
+{
+  services.btrfs.autoScrub = {
+    enable = true;
+    interval = "weekly";
+    fileSystems = [ "/" ];
+  };
+}

modules/sys/hw/boot.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  boot.loader.limine.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
+  boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
+}

modules/sys/hw/cpu/amd64.nix

@@ -0,0 +1,5 @@
+{
+  boot.binfmt.preferStaticEmulators = true;
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" "x86_64-windows" ];
+  boot.kernelModules = [ "kvm-amd" ];
+}

modules/sys/hw/cpu/arm64.nix

@@ -0,0 +1,4 @@
+{
+  boot.binfmt.preferStaticEmulators = true;
+  boot.binfmt.emulatedSystems = [ "x86_64-linux" "i386-linux" ];
+}

modules/sys/hw/cpu/intel.nix

@@ -0,0 +1,5 @@
+{
+  boot.binfmt.preferStaticEmulators = true;
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" "x86_64-windows" ];
+  boot.kernelModules = [ "kvm-intel" ];
+}

modules/sys/hw/gpu/amd.nix

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

modules/sys/hw/gpu/intel.nix

@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+{
+  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
+
+      # 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
+    ];
+  };
+}

modules/sys/nix.nix

@@ -0,0 +1,21 @@
+{
+  nix = {
+    settings = {
+      experimental-features = [ "nix-command" "flakes" ];
+      substituters = [
+        "https://nix-community.cachix.org"
+        "https://cache.nixos.org/"
+      ];
+      trusted-public-keys = [
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      ];
+    };
+    optimise.automatic = true;
+    gc = {
+      automatic = true;
+      dates = "daily";
+      options = "--delete-older-than 2d";
+    };
+  };
+  nixpkgs.config.allowUnfree = true;
+}

modules/sys/perf.nix

@@ -0,0 +1,8 @@
+{
+  services.system76-scheduler.enable = true;
+  #services.thermald.enable = true;
+  services.power-profiles-daemon.enable = true;
+  systemd.coredump.enable = false;
+  zramSwap.enable = true;
+  zramSwap.memoryPercent = 80;
+}

modules/sys/pkgs.nix

@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    git
+    neovim
+    caligula
+    openssl
+    topgrade
+    htop
+    mosh
+    btop
+    wget2
+    python314
+  ];
+}

modules/sys/rc/openssh.nix

@@ -0,0 +1,6 @@
+{
+  services.openssh = {
+    enable = true;
+    settings.PasswordAuthentication = true;
+  };
+}

modules/sys/rc/sunshine.nix

@@ -0,0 +1,8 @@
+{
+  services.sunshine = {
+    enable = true;
+    autoStart = true;
+    capSysAdmin = true;
+    openFirewall = true;
+  };
+}

modules/sys/rgb.nix

@@ -0,0 +1,13 @@
+{ pkgs, lib, ... }:
+
+{
+  # OpenRGB
+  services.hardware.openrgb = { 
+    enable = true; 
+    package = pkgs.openrgb-with-all-plugins; 
+    motherboard = "amd"; 
+    server = { 
+      port = 6742;
+    }; 
+  };
+}

modules/sys/security.nix

@@ -0,0 +1,10 @@
+{
+  security.polkit.enable = true;
+  system.autoUpgrade = {
+    enable = true;
+    flake = "git+https://k3t.dev/git/nixconf.git?branch=main";
+    operation = "boot";
+    allowReboot = true;
+    rebootWindow = { lower = "10:00"; upper = "14:00"; };
+  };
+}

modules/sys/shell.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  programs.zsh.enable = true;
+  users.defaultUserShell = pkgs.zsh;
+  environment.pathsToLink = [ "/share/zsh" ];
+}

modules/sys/stateversion.nix

@@ -0,0 +1,3 @@
+{
+  system.stateVersion = "25.11";
+}

modules/sys/tz.nix

@@ -0,0 +1,15 @@
+{
+  time.timeZone = "America/Denver";
+  i18n.defaultLocale = "en_US.UTF-8";
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_US.UTF-8";
+    LC_IDENTIFICATION = "en_US.UTF-8";
+    LC_MEASUREMENT = "en_US.UTF-8";
+    LC_MONETARY = "en_US.UTF-8";
+    LC_NAME = "en_US.UTF-8";
+    LC_NUMERIC = "en_US.UTF-8";
+    LC_PAPER = "en_US.UTF-8";
+    LC_TELEPHONE = "en_US.UTF-8";
+    LC_TIME = "en_US.UTF-8";
+  };
+}

modules/sys/users.nix

@@ -0,0 +1,9 @@
+{
+  users.users.k3t = {
+    description = "Kai Moore";
+    isNormalUser = true;
+    extraGroups = [ "audio" "video" "bluetooth" "wheel" "input" "networkmanager" ];
+    initialPassword = "password";
+    linger = true;
+  };
+}

modules/vps-aarch64-common.nix

@@ -1,9 +1,5 @@
 { pkgs, ... }: {
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.binfmt.emulatedSystems = ["x86_64-linux" "i386-linux"]; 
-
   #environment.systemPackages = with pkgs; [
   #];
 
@@ -13,9 +9,4 @@
     settings.PasswordAuthentication = true;
   };
 
-  system.autoUpgrade = {
-    operation = "boot";
-    allowReboot = true;
-    rebootWindow = { lower = "02:00"; upper = "05:00"; };
-  };
 }