update

_sources/generated.json

@@ -20,21 +20,6 @@
     },
     "version": "ec991b80ba7d4dda7a962167b036efc5c2d79419"
   },
-  "fix-window-role": {
-    "cargoLocks": null,
-    "date": null,
-    "extract": null,
-    "name": "fix-window-role",
-    "passthru": null,
-    "pinned": false,
-    "src": {
-      "name": null,
-      "sha256": "sha256-H4Qj6n5uZsmsbdjjexGZctqhJk3gAXKiSnmnEO/LgTA=",
-      "type": "url",
-      "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch"
-    },
-    "version": "latest"
-  },
   "git-abbr": {
     "cargoLocks": null,
     "date": "2023-06-19",
@@ -119,57 +104,6 @@
     },
     "version": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c"
   },
-  "round-undecorated-frame": {
-    "cargoLocks": null,
-    "date": null,
-    "extract": null,
-    "name": "round-undecorated-frame",
-    "passthru": null,
-    "pinned": false,
-    "src": {
-      "name": null,
-      "sha256": "sha256-dFH4D1WYQOVOagUuVdEQB3irxV+Y8dDAOKJOJXc/KHQ=",
-      "type": "url",
-      "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/round-undecorated-frame.patch"
-    },
-    "version": "latest"
-  },
-  "sddm-theme-minesddm": {
-    "cargoLocks": null,
-    "date": "2025-03-08",
-    "extract": null,
-    "name": "sddm-theme-minesddm",
-    "passthru": null,
-    "pinned": false,
-    "src": {
-      "deepClone": false,
-      "fetchSubmodules": false,
-      "leaveDotGit": false,
-      "name": null,
-      "owner": "Davi-S",
-      "repo": "sddm-theme-minesddm",
-      "rev": "56be28834dfdb05d678156ebd1d00c83dadfa3f4",
-      "sha256": "sha256-X64m9fs+a6M0cgJKCNsk2kQU43DEcwEvD/1nQ755BGE=",
-      "sparseCheckout": [],
-      "type": "github"
-    },
-    "version": "56be28834dfdb05d678156ebd1d00c83dadfa3f4"
-  },
-  "system-appearance": {
-    "cargoLocks": null,
-    "date": null,
-    "extract": null,
-    "name": "system-appearance",
-    "passthru": null,
-    "pinned": false,
-    "src": {
-      "name": null,
-      "sha256": "sha256-nrPOgGQAJb/5brrrWJNDARY2jWNJ9OsMtO+LPVhHfbY=",
-      "type": "url",
-      "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/system-appearance.patch"
-    },
-    "version": "latest"
-  },
   "wttr": {
     "cargoLocks": null,
     "date": "2016-05-23",

_sources/generated.nix

@@ -1,6 +1,5 @@
 # This file was generated by nvfetcher, please do not modify it manually.
 {
-  fetchurl,
   fetchFromGitHub,
 }: {
   bang-bang = {
@@ -15,14 +14,6 @@
     };
     date = "2023-07-23";
   };
-  fix-window-role = {
-    pname = "fix-window-role";
-    version = "latest";
-    src = fetchurl {
-      url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch";
-      sha256 = "sha256-H4Qj6n5uZsmsbdjjexGZctqhJk3gAXKiSnmnEO/LgTA=";
-    };
-  };
   git-abbr = {
     pname = "git-abbr";
     version = "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e";
@@ -71,34 +62,6 @@
     };
     date = "2024-07-01";
   };
-  round-undecorated-frame = {
-    pname = "round-undecorated-frame";
-    version = "latest";
-    src = fetchurl {
-      url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/round-undecorated-frame.patch";
-      sha256 = "sha256-dFH4D1WYQOVOagUuVdEQB3irxV+Y8dDAOKJOJXc/KHQ=";
-    };
-  };
-  sddm-theme-minesddm = {
-    pname = "sddm-theme-minesddm";
-    version = "56be28834dfdb05d678156ebd1d00c83dadfa3f4";
-    src = fetchFromGitHub {
-      owner = "Davi-S";
-      repo = "sddm-theme-minesddm";
-      rev = "56be28834dfdb05d678156ebd1d00c83dadfa3f4";
-      fetchSubmodules = false;
-      sha256 = "sha256-X64m9fs+a6M0cgJKCNsk2kQU43DEcwEvD/1nQ755BGE=";
-    };
-    date = "2025-03-08";
-  };
-  system-appearance = {
-    pname = "system-appearance";
-    version = "latest";
-    src = fetchurl {
-      url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/system-appearance.patch";
-      sha256 = "sha256-nrPOgGQAJb/5brrrWJNDARY2jWNJ9OsMtO+LPVhHfbY=";
-    };
-  };
   wttr = {
     pname = "wttr";
     version = "7500e382e6b29a463edc57598217ce0cfaf8c90c";

flake.in.nix

@@ -1,6 +1,5 @@
 {
   inputs = let
-    mkCustomUrl = url: {inherit url;};
 
     mkInput = url: {url = "github:${url}";};
 
@@ -23,9 +22,6 @@
     agenix = mkInput "ryantm/agenix";
     catppuccin = mkInput "catppuccin/nix";
     chaotic = mkInput "chaotic-cx/nyx/nyxpkgs-unstable";
-    emacs = mkCustomUrl "git+https://git.pupbrained.xyz/pupbrained/nixmacs.git";
-    ghostty = mkInput "ghostty-org/ghostty";
-    hypr-dynamic-cursors = mkFollowing "VirtCode/hypr-dynamic-cursors" "hyprland";
     hyprland = mkWithSubmodules "https://github.com/hyprwm/Hyprland";
     hyprland-plugins = mkFollowing "hyprwm/hyprland-plugins" "hyprland";
     hyprpanel = mkInput "ThomasCarey4/HyprPanel-NixFix";
@@ -33,19 +29,15 @@
     hyprswitch = mkInput "h3rmt/hyprswitch/release";
     impermanence = mkInput "nix-community/impermanence";
     jovian = mkInput "Jovian-Experiments/Jovian-NixOS";
-    kirsch = mkCustomUrl "https://flakehub.com/f/molarmanful/kirsch/0.3.0";
     nix-colors = mkInput "Misterio77/nix-colors";
     nixos-apple-silicon = mkInput "tpwrules/nixos-apple-silicon";
     nixos-facter-modules = mkInput "numtide/nixos-facter-modules";
     nixpkgs = mkInput "NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-jdk16 = mkInput "NixOS/nixpkgs/0e713aed46a8a43f6b6cc31c98c017a10dcf8810"; # last version to have temurin 16
     nixvim = mkInput "pupbrained/nvim-config";
     treefmt-nix = mkInput "numtide/treefmt-nix";
     wezterm = mkInput "wez/wezterm?dir=nix";
-    xmonad-contrib = mkInput "xmonad/xmonad-contrib";
+    zen-browser = mkInput "0xc000022070/zen-browser-flake";
-    zen-browser = mkInput "youwen5/zen-browser-flake";
 
-    cosmic = mkFollowingNixpkgs "lilyinstarlight/nixos-cosmic";
     darwin = mkFollowingNixpkgs "LnL7/nix-darwin/master";
     home-manager = mkFollowingNixpkgs "nix-community/home-manager";
     niri = mkFollowingNixpkgs "sodiboo/niri-flake";
@@ -72,17 +64,14 @@
           cudaSupport = true;
         };
 
-        systems.modules.nixos =
+        systems.modules.nixos = [
-          [
+          agenix.nixosModules.default
-            agenix.nixosModules.default
+          catppuccin.nixosModules.catppuccin
-            catppuccin.nixosModules.catppuccin
+          chaotic.nixosModules.default
-            chaotic.nixosModules.default
+          impermanence.nixosModules.impermanence
-            cosmic.nixosModules.default
+          nixos-facter-modules.nixosModules.facter
-            impermanence.nixosModules.impermanence
+          jovian.nixosModules.default
-            nixos-facter-modules.nixosModules.facter
+        ];
-            jovian.nixosModules.default
-          ]
-          ++ xmonad-contrib.nixosModules;
 
         systems.modules.darwin = [
           "${home-manager}/nix-darwin"

flake.nix

@@ -4,25 +4,15 @@
     agenix.url = "github:ryantm/agenix";
     catppuccin.url = "github:catppuccin/nix";
     chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
-    cosmic = {
-      inputs.nixpkgs.follows = "nixpkgs";
-      url = "github:lilyinstarlight/nixos-cosmic";
-    };
     darwin = {
       inputs.nixpkgs.follows = "nixpkgs";
       url = "github:LnL7/nix-darwin/master";
     };
-    emacs.url = "git+https://git.pupbrained.xyz/pupbrained/nixmacs.git";
     flakegen.url = "github:jorsn/flakegen";
-    ghostty.url = "github:ghostty-org/ghostty";
     home-manager = {
       inputs.nixpkgs.follows = "nixpkgs";
       url = "github:nix-community/home-manager";
     };
-    hypr-dynamic-cursors = {
-      inputs.hyprland.follows = "hyprland";
-      url = "github:VirtCode/hypr-dynamic-cursors";
-    };
     hyprland = {
       submodules = true;
       type = "git";
@@ -40,7 +30,6 @@
     hyprswitch.url = "github:h3rmt/hyprswitch/release";
     impermanence.url = "github:nix-community/impermanence";
     jovian.url = "github:Jovian-Experiments/Jovian-NixOS";
-    kirsch.url = "https://flakehub.com/f/molarmanful/kirsch/0.3.0";
     niri = {
       inputs.nixpkgs.follows = "nixpkgs";
       url = "github:sodiboo/niri-flake";
@@ -53,7 +42,6 @@
     nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon";
     nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-jdk16.url = "github:NixOS/nixpkgs/0e713aed46a8a43f6b6cc31c98c017a10dcf8810";
     nixvim.url = "github:pupbrained/nvim-config";
     snowfall-flake = {
       inputs.nixpkgs.follows = "nixpkgs";
@@ -65,8 +53,7 @@
     };
     treefmt-nix.url = "github:numtide/treefmt-nix";
     wezterm.url = "github:wez/wezterm?dir=nix";
-    xmonad-contrib.url = "github:xmonad/xmonad-contrib";
+    zen-browser.url = "github:0xc000022070/zen-browser-flake";
-    zen-browser.url = "github:youwen5/zen-browser-flake";
   };
   outputs = inputs: inputs.flakegen ./flake.in.nix inputs;
 }

homes/x86_64-linux/marshall@navis/default.nix

@@ -1,24 +1,12 @@
 {
-  lib,
   pkgs,
   inputs,
   ...
 }: let
-  nixpkgs-jdk16 = import inputs.nixpkgs-jdk16 {
-    inherit (pkgs) system;
-
-    config = {
-      permittedInsecurePackages = [
-        "temurin-bin-16.0.2"
-      ];
-    };
-  };
-
   additionalJDKs = with pkgs; [
     temurin-bin-23
     temurin-bin-21
     temurin-bin-17
-    nixpkgs-jdk16.temurin-bin-16
     temurin-bin-8
   ];
 in {
@@ -28,6 +16,7 @@ in {
     hyprland.homeManagerModules.default
     nix-colors.homeManagerModules.default
     nix-index-database.hmModules.nix-index
+    zen-browser.homeModules.twilight
 
     ./hyprland
   ];
@@ -55,43 +44,20 @@ in {
 
     packages = with pkgs;
       [
-        alacritty
-        fuzzel
         alejandra
-        beeper
         bitwarden-desktop
-        (discord.override {withVencord = true;})
         duf
-        eternal-terminal
-        ((pkgs.emacsPackagesFor pkgs.emacs30-pgtk).emacsWithPackages (epkgs:
-          builtins.attrValues {
-            inherit (epkgs.treesit-grammars) with-all-grammars;
-          }))
-        emacs-lsp-booster
         equibop
-        firefox
         glow
         grc
         killall
         libnotify
         lm_sensors
         loupe
-        #mullvad-vpn
         nodejs
         playerctl
         prismlauncher
         ryujinx-greemdev
-        (python312.withPackages
-          (p:
-            with p; [
-              epc
-              orjson
-              sexpdata
-              six
-              setuptools
-              paramiko
-              rapidfuzz
-            ]))
         telegram-desktop
       ]
       ++ (with jetbrains; [
@@ -101,9 +67,7 @@ in {
       ++ (with inputs; [
         chaotic.packages.${pkgs.system}.distrobox_git
         chaotic.packages.${pkgs.system}.zed-editor_git
-        ghostty.packages.${pkgs.system}.default
         nixvim.packages.${pkgs.system}.default
-        zen-browser.packages.${pkgs.system}.default
       ]);
 
     stateVersion = "24.05";
@@ -120,9 +84,18 @@ in {
 
   catppuccin = {
     enable = true;
-    pointerCursor.enable = true;
     flavor = "mocha";
     accent = "green";
+
+    bat.enable = true;
+    btop.enable = true;
+    cursors.enable = true;
+    fzf.enable = true;
+    kvantum.enable = true;
+    mpv.enable = true;
+    rio.enable = true;
+    rofi.enable = true;
+    starship.enable = true;
   };
 
   gtk = let
@@ -171,15 +144,9 @@ in {
     enable = true;
     platformTheme.name = "kvantum";
     style.name = "kvantum";
-    style.catppuccin.enable = true;
   };
 
   programs = {
-    rio = {
-      enable = true;
-
-      catppuccin.enable = true;
-    };
     xmobar.enable = true;
 
     wezterm.extraConfig = builtins.readFile ./wezterm.lua;
@@ -197,54 +164,16 @@ in {
     mpv = {
       enable = true;
       scripts = [pkgs.mpvScripts.uosc];
-      catppuccin.enable = true;
-    };
-  };
-
-  services = {
-    picom = {
-      enable = false;
-      backend = "glx";
-      fadeDelta = 5;
-      fade = true;
-      shadow = true;
-      vSync = true;
-
-      shadowExclude = [
-        "class_g = 'firefox' && argb"
-        "class_g *?= 'slop'"
-      ];
-
-      settings = {
-        corner-radius = 10;
-
-        blur-background-exclude = [
-          "class_g = 'slop'"
-        ];
-
-        rounded-corners-exclude = [
-          "window_type = 'dock'"
-          "window_type = 'desktop'"
-        ];
-
-        blur = {
-          method = "gaussian";
-          size = 10;
-          deviation = 5.0;
-        };
-      };
     };
 
-    dunst = {
+    zen-browser = {
-      enable = false;
+      enable = true;
-      settings.global = {
+      nativeMessagingHosts = [pkgs.firefoxpwa];
-        corner_radius = 10;
+
-        offset = "18x53";
+      policies = {
-        frame_width = 2;
+        DisableAppUpdate = true;
-        font = "SN Pro 12";
+        DisableTelemetry = true;
-        frame_color = lib.mkForce "#a6e3a1";
       };
-      catppuccin.enable = true;
     };
   };
 

homes/x86_64-linux/marshall@navis/hyprland/rofi.nix

@@ -1,7 +1,6 @@
 {pkgs, ...}: {
   programs.rofi = {
     enable = true;
-    catppuccin.enable = true;
     package = pkgs.rofi-wayland;
 
     extraConfig = {

modules/home/shell/default.nix

@@ -7,6 +7,8 @@
   ];
 
   programs = {
+    bat.enable = true;
+    btop.enable = true;
     fd.enable = true;
     git-cliff.enable = true;
     jq.enable = true;
@@ -23,16 +25,6 @@
       };
     };
 
-    bat = {
-      enable = true;
-      catppuccin.enable = true;
-    };
-
-    btop = {
-      enable = true;
-      catppuccin.enable = true;
-    };
-
     direnv = {
       enable = true;
       nix-direnv.enable = true;
@@ -46,7 +38,6 @@
 
     fzf = {
       enable = true;
-      catppuccin.enable = true;
       colors = with lib; {
         bg = mkForce "-1";
         "bg+" = mkForce "-1";

modules/home/shell/fish.nix

@@ -1,13 +1,15 @@
 {pkgs, ...}:
 with pkgs; {
   programs = {
+    starship.enable = true;
+
     fish = let
       mkFishPlugin = sources: {
         inherit (sources) src;
         name = sources.pname;
       };
 
-      sources = import ../../../_sources/generated.nix {inherit (pkgs) fetchurl fetchFromGitHub;};
+      sources = import ../../../_sources/generated.nix {inherit (pkgs) fetchFromGitHub;};
 
       extraPlugins = lib.attrsets.mapAttrsToList (_: value: mkFishPlugin value) sources;
 
@@ -41,10 +43,5 @@ with pkgs; {
         fish_add_path /Users/marshall/.nix-profile/bin
       '';
     };
-
-    starship = {
-      enable = true;
-      catppuccin.enable = true;
-    };
   };
 }

modules/home/vscode/default.nix

@@ -6,53 +6,54 @@
       then pkgs.vscode
       else pkgs.vscode.fhsWithPackages (ps: with ps; [rustup zlib openssl.dev pkg-config]);
 
-    extensions = with pkgs.vscode-extensions; [
+    profiles.default = {
-      bbenoist.nix
+      extensions = with pkgs.vscode-extensions; [
-      llvm-vs-code-extensions.vscode-clangd
+        bbenoist.nix
-      kamadorueda.alejandra
+        llvm-vs-code-extensions.vscode-clangd
-      mkhl.direnv
+        kamadorueda.alejandra
-      usernamehw.errorlens
+        mkhl.direnv
-      #vadimcn.vscode-lldb
+        usernamehw.errorlens
-      vscodevim.vim
+        vscodevim.vim
-    ];
-
-    userSettings = {
-      "files.autoSave" = "afterDelay";
-
-      "editor.fontFamily" = "Maple Mono NF";
-      "editor.fontLigatures" = true;
-      "editor.fontSize" = 14;
-      "editor.formatOnSave" = true;
-      "editor.minimap.enabled" = false;
-
-      "git.autofetch" = true;
-      "git.confirmSync" = false;
-      "git.enableSmartCommit" = true;
-
-      "vim.camelCaseMotion.enable" = true;
-      "vim.smartRelativeLine" = false;
-      "vim.sneak" = true;
-      "vim.useSystemClipboard" = true;
-      "vim.normalModeKeyBindingsNonRecursive" = [
-        {
-          before = ["K"];
-          commands = ["editor.action.showHover"];
-          silent = true;
-        }
       ];
 
-      "mesonbuild.downloadLanguageServer" = true;
+      userSettings = {
+        "files.autoSave" = "afterDelay";
 
-      "terminal.integrated.fontSize" =
+        "editor.fontFamily" = "Maple Mono NF";
-        if pkgs.hostPlatform.isDarwin
+        "editor.fontLigatures" = true;
-        then 14
+        "editor.fontSize" = 14;
-        else 16;
+        "editor.formatOnSave" = true;
+        "editor.minimap.enabled" = false;
 
-      "workbench.colorTheme" = "Catppuccin Mocha";
+        "git.autofetch" = true;
-      "workbench.iconTheme" = "catppuccin-mocha";
+        "git.confirmSync" = false;
+        "git.enableSmartCommit" = true;
 
-      "window.menuBarVisibility" = "toggle";
+        "vim.camelCaseMotion.enable" = true;
-      "window.titleBarStyle" = "custom";
+        "vim.smartRelativeLine" = false;
+        "vim.sneak" = true;
+        "vim.useSystemClipboard" = true;
+        "vim.normalModeKeyBindingsNonRecursive" = [
+          {
+            before = ["K"];
+            commands = ["editor.action.showHover"];
+            silent = true;
+          }
+        ];
+
+        "mesonbuild.downloadLanguageServer" = true;
+
+        "terminal.integrated.fontSize" =
+          if pkgs.hostPlatform.isDarwin
+          then 14
+          else 16;
+
+        "workbench.colorTheme" = "Catppuccin Mocha";
+        "workbench.iconTheme" = "catppuccin-mocha";
+
+        "window.menuBarVisibility" = "toggle";
+        "window.titleBarStyle" = "custom";
+      };
     };
   };
 }

nvfetcher.toml

@@ -21,19 +21,3 @@ fetch.github = "oh-my-fish/plugin-gityaw"
 [bang-bang]
 src.git = "https://github.com/oh-my-fish/plugin-bang-bang"
 fetch.github = "oh-my-fish/plugin-bang-bang"
-
-[fix-window-role]
-src.manual = "latest"
-fetch.url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch"
-
-[round-undecorated-frame]
-src.manual = "latest"
-fetch.url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/round-undecorated-frame.patch"
-
-[system-appearance]
-src.manual = "latest"
-fetch.url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/system-appearance.patch"
-
-[sddm-theme-minesddm]
-src.git = "https://github.com/Davi-S/sddm-theme-minesddm"
-fetch.github = "Davi-S/sddm-theme-minesddm"

systems/aarch64-darwin/canis/default.nix

@@ -4,7 +4,7 @@
   lib,
   ...
 }: {
-  environment.variables.FLAKE = "/Users/marshall/nix-config";
+  environment.variables.NH_FLAKE = "/Users/marshall/nix-config";
 
   fonts.packages = with pkgs; ([
       font-awesome

systems/x86_64-linux/navis/default.nix

@@ -5,6 +5,8 @@
   lib,
   ...
 }: {
+  catppuccin.tty.enable = true;
+
   facter.reportPath = ./facter.json;
 
   fileSystems = {
@@ -119,116 +121,29 @@
 
   fonts = {
     packages = with pkgs;
-      [
+      [maple-mono.NF]
-        ibm-plex
-        inputs.kirsch.packages.${system}.kirsch-nerd
-        recursive
-      ]
       ++ (with nerd-fonts; [
-        _0xproto
-        _3270
-        agave
-        anonymice
-        arimo
-        aurulent-sans-mono
-        bigblue-terminal
-        bitstream-vera-sans-mono
-        blex-mono
-        caskaydia-cove
-        caskaydia-mono
-        code-new-roman
         comic-shanns-mono
-        commit-mono
-        cousine
-        d2coding
-        daddy-time-mono
-        dejavu-sans-mono
-        departure-mono
-        droid-sans-mono
-        envy-code-r
-        fantasque-sans-mono
         fira-code
-        fira-mono
-        geist-mono
-        go-mono
-        gohufont
-        hack
-        hasklug
-        heavy-data
-        hurmit
-        im-writing
-        inconsolata
-        inconsolata-go
-        inconsolata-lgc
-        intone-mono
         iosevka
-        iosevka-term
-        iosevka-term-slab
         jetbrains-mono
-        lekton
-        liberation
-        lilex
-        martian-mono
-        meslo-lg
-        monaspace
-        monofur
-        monoid
-        mononoki
-        mplus
-        noto
-        open-dyslexic
-        overpass
-        profont
-        proggy-clean-tt
         recursive-mono
-        roboto-mono
-        sauce-code-pro
-        shure-tech-mono
-        space-mono
         symbols-only
-        terminess-ttf
-        tinos
-        ubuntu
         ubuntu-mono
-        ubuntu-sans
-        victor-mono
         zed-mono
-      ])
-      ++ (with iosevka-comfy; [
-        comfy
-        comfy-duo
-        comfy-fixed
-        comfy-motion
-        comfy-motion-duo
-        comfy-motion-fixed
-        comfy-wide
-        comfy-wide-duo
-        comfy-wide-fixed
-        comfy-wide-motion
-        comfy-wide-motion-duo
-        comfy-wide-motion-fixed
       ]);
-
-    fontconfig = {
-      hinting.enable = true;
-      subpixel.lcdfilter = "none";
-    };
   };
 
-  console.catppuccin.enable = true;
-
   systemd = {
     tpm2.enable = true;
 
-    user.extraConfig = let
+    user.extraConfig = ''
-      path = lib.concatStringsSep ":" [
+      DefaultEnvironment="PATH=${lib.concatStringsSep ":" [
         "/run/wrappers/bin"
         "/etc/profiles/per-user/%u/bin"
         "/nix/var/nix/profiles/default/bin"
         "/run/current-system/sw/bin"
-      ];
+      ]}"
-    in ''
-      DefaultEnvironment="PATH=${path}"
     '';
   };
 
@@ -239,7 +154,6 @@
 
   virtualisation = {
     spiceUSBRedirection.enable = true;
-    waydroid.enable = true;
 
     podman = {
       enable = true;
@@ -250,33 +164,25 @@
 
   environment = {
     sessionVariables = {
-      COSMIC_DATA_CONTROL_ENABLED = 1;
       BROWSER = "zen";
+      COSMIC_DATA_CONTROL_ENABLED = 1;
       DIRENV_WARN_TIMEOUT = "100s";
       EDITOR = "nvim";
+      NH_FLAKE = "/home/marshall/nix-config";
       NIXOS_OZONE_WL = 1;
       TERMINAL = "wezterm";
     };
 
     systemPackages = with pkgs; [
+      config.boot.kernelPackages.perf
       ddccontrol-db
       inputs.agenix.packages.${system}.default
-      looking-glass-client
-      nautilus
-      qemu
-      snowfallorg.flake
-      sound-theme-freedesktop
-      uutils-coreutils-noprefix
-      tpm2-tss
-      virtio-win
-      (warp-terminal.override {waylandSupport = true;})
-      winetricks
-      wineWowPackages.staging
-      xclip
-      yt-dlp
       inputs.hyprswitch.packages.${system}.hyprswitch
-
+      nautilus
-      (callPackage ./pkgs/sddm-theme-minesddm.nix {})
+      sound-theme-freedesktop
+      tpm2-tss
+      uutils-coreutils-noprefix
+      xclip
     ];
 
     persistence."/persist" = {
@@ -296,21 +202,22 @@
   };
 
   boot = {
+    kernelPackages = pkgs.linuxPackages_cachyos;
+    tmp.useTmpfs = true;
+
     blacklistedKernelModules = [
       "nouveau"
       "i915"
     ];
-    kernelPackages = pkgs.linuxPackages_cachyos;
+
     supportedFilesystems = [
       "btrfs"
       "ntfs"
     ];
-    tmp.useTmpfs = true;
 
     initrd = {
       availableKernelModules = ["tpm_tis"];
 
-      # Encrypted device
       luks.devices."enc" = {
         device = "/dev/disk/by-uuid/9952fcd1-46eb-4c9c-ab7d-361d31fdb9a2";
         crypttabExtraOpts = ["tpm2-device=auto" "tpm2-measure-pcr=yes"];
@@ -319,12 +226,12 @@
       systemd = {
         enable = true;
         emergencyAccess = true;
-        enableTpm2 = true;
+        tpm2.enable = true;
 
         services.wipe-root = {
           description = "Rollback BTRFS root subvolume to a pristine state";
           wantedBy = ["initrd.target"];
-          after = ["dev-mapper-enc.device"]; # LUKS process
+          after = ["dev-mapper-enc.device"];
           requires = ["dev-mapper-enc.device"];
           before = ["sysroot.mount"];
           unitConfig.DefaultDependencies = "no";
@@ -408,8 +315,14 @@
       keep-going = true;
       log-lines = 30;
       max-jobs = "auto";
+      max-free = "${toString (10 * 1024 * 1024 * 1024)}";
+      min-free = "${toString (5 * 1024 * 1024 * 1024)}";
       sandbox-fallback = false;
       sandbox = true;
+      use-cgroups = true;
+      use-xdg-base-directories = true;
+      warn-dirty = false;
+
       system-features = [
         "nixos-test"
         "kvm"
@@ -417,24 +330,19 @@
         "big-parallel"
         "gccarch-x86-64-v4"
       ];
-      use-cgroups = true;
-      use-xdg-base-directories = true;
-      warn-dirty = false;
 
       allowed-users = [
         "root"
         "@wheel"
         "nix-builder"
       ];
+
       trusted-users = [
         "root"
         "@wheel"
         "nix-builder"
       ];
 
-      min-free = "${toString (5 * 1024 * 1024 * 1024)}";
-      max-free = "${toString (10 * 1024 * 1024 * 1024)}";
-
       extra-experimental-features = [
         "flakes" # flakes
         "nix-command" # experimental nix commands
@@ -446,16 +354,12 @@
 
       substituters = [
         "https://cache.nixos.org?priority=100"
-        #"https://cosmic.cachix.org/"
-        #"https://cuda-maintainers.cachix.org"
         "https://hyprland.cachix.org"
         "https://nix-community.cachix.org"
       ];
 
       trusted-public-keys = [
         "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-        #"cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
-        # "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
@@ -485,9 +389,7 @@
 
     nix-ld = {
       enable = true;
-      libraries = with pkgs; [
+      libraries = [pkgs.libGL];
-        libGL
-      ];
     };
 
     obs-studio = {
@@ -497,9 +399,7 @@
 
     steam = {
       enable = true;
-      extraCompatPackages = with inputs; [
+      extraCompatPackages = [inputs.chaotic.packages.${pkgs.system}.proton-ge-custom];
-        chaotic.packages.${pkgs.system}.proton-ge-custom
-      ];
     };
   };
 
@@ -524,7 +424,6 @@
     flatpak.enable = true;
     getty.autologinUser = "marshall";
     gnome.gnome-keyring.enable = true;
-    #mullvad-vpn.enable = true;
     openssh.enable = true;
     spice-vdagentd.enable = true;
     udisks2.enable = true;
@@ -534,16 +433,6 @@
       fileSystems = ["/dev/mapper/enc"];
     };
 
-    displayManager.sddm = {
-      enable = false;
-      wayland.enable = true;
-      wayland.compositor = "kwin";
-      theme = "minesddm";
-    };
-
-    displayManager.cosmic-greeter.enable = false;
-    desktopManager.cosmic.enable = false;
-
     libinput = {
       enable = true;
       touchpad.naturalScrolling = true;
@@ -552,16 +441,6 @@
     xserver = {
       enable = true;
       videoDrivers = ["nvidia"];
-
-      windowManager.xmonad = {
-        enable = false;
-        enableContribAndExtras = true;
-        enableConfiguredRecompile = true;
-        flake = {
-          enable = true;
-          compiler = "ghc982";
-        };
-      };
     };
 
     pipewire = {
@@ -601,6 +480,7 @@
   hardware = {
     bluetooth.enable = true;
     i2c.enable = true;
+    nvidia-container-toolkit.enable = true;
 
     graphics = {
       enable = true;
@@ -611,8 +491,6 @@
       ];
     };
 
-    nvidia-container-toolkit.enable = true;
-
     nvidia = {
       package = config.boot.kernelPackages.nvidiaPackages.beta;
       modesetting.enable = true;
@@ -624,7 +502,6 @@
   xdg.portal = {
     enable = true;
     xdgOpenUsePortal = true;
-
     config.common.default = "*";
 
     extraPortals = [

systems/x86_64-linux/navis/pkgs/sddm-theme-minesddm.nix

@@ -1,11 +0,0 @@
-{pkgs, ...}: let
-  sources = import ../../../../_sources/generated.nix {inherit (pkgs) fetchurl fetchFromGitHub;};
-in
-  pkgs.stdenv.mkDerivation {
-    inherit (sources.sddm-theme-minesddm) src pname version;
-    dontBuild = true;
-    installPhase = ''
-      mkdir -p $out/share/sddm/themes
-      cp -aR $src/minesddm $out/share/sddm/themes
-    '';
-  }

systems/x86_64-linux/polaris-nix/default.nix

@@ -72,7 +72,7 @@
   environment = {
     localBinInPath = true;
 
-    sessionVariables.FLAKE = "/home/marshall/nix-config";
+    sessionVariables.NH_FLAKE = "/home/marshall/nix-config";
 
     systemPackages = [
       pkgs.miniupnpc