diff --git a/.sops.yaml b/.sops.yaml
index a6e6f4f..b8b0adf 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -13,7 +13,3 @@ creation_rules:
     key_groups:
       - age:
         - *leyla
-  - path_regex: secrets/application-keys.yaml$
-    key_groups:
-      - age:
-        - *leyla
\ No newline at end of file
diff --git a/README.md b/README.md
index 339a8e8..bc31eca 100644
--- a/README.md
+++ b/README.md
@@ -41,30 +41,30 @@ nix multi user, multi system, configuration with `sops` secret management, `home
 
 ## Research topics
 - Look into this for auto rotating sops keys `https://technotim.live/posts/rotate-sops-encryption-keys/`
-- Look into this for npins https://jade.fyi/blog/pinning-nixos-with-npins/
+- Look into this for flake templates https://nix.dev/manual/nix/2.22/command-ref/new-cli/nix3-flake-init
 - https://nixos-and-flakes.thiscute.world/
-- nix config mcp https://github.com/utensils/mcp-nixos
 
 # Tasks:
 
 ## Tech Debt
 - monitor configuration in `~/.config/monitors.xml` should be sym linked to `/run/gdm/.config/monitors.xml` (https://www.reddit.com/r/NixOS/comments/u09cz9/home_manager_create_my_own_symlinks_automatically/)
+- syncthing folder passwords
 - nfs export should be backed by the same values for server and client
 ## New Features
-- crab-hole
-- figure out why syncthing and jellyfins permissions don't propagate downwards
-- figure out steam vr things?
-- auto turn off on power loss - nut
-- zfs email after scrubbing # TODO: test this
-- SMART test with email results
-- samba mounts
 - offline access for nfs mounts (overlay with rsync might be a good option here? https://www.spinics.net/lists/linux-unionfs/msg07105.html note about nfs4 and overlay fs)
-- Create Tor guard/relay server
-- migrate away from flakes and move to npins
-- whisper
+- samba mounts
+- figure out steam vr things?
+- Open GL?
+- rotate sops encryption keys periodically (and somehow sync between devices?)
+- zfs email after scrubbing # TODO: test this
+- wake on LAN for updates
+- ISO target that contains authorized keys for nixos-anywhere https://github.com/diegofariasm/yggdrasil/blob/4acc43ebc7bcbf2e41376d14268e382007e94d78/hosts/bootstrap/default.nix
 - zfs encryption FIDO2 2fa (look into shavee)
 - Secure Boot - https://github.com/nix-community/lanzaboote
-- rotate sops encryption keys periodically (and somehow sync between devices?)
-- wake on LAN for updates
+- SMART test with email results
+- Create Tor guard/relay server
 - remote distributed builds - https://nix.dev/tutorials/nixos/distributed-builds-setup.html
-- ISO target that contains authorized keys for nixos-anywhere https://github.com/diegofariasm/yggdrasil/blob/4acc43ebc7bcbf2e41376d14268e382007e94d78/hosts/bootstrap/default.nix
\ No newline at end of file
+- migrate away from flakes and move to npins
+- fix nfs
+- fix home assistant
+- create adguard server
\ No newline at end of file
diff --git a/configurations/home-manager/eve/default.nix b/configurations/home-manager/eve/default.nix
index 192c980..4e1d6fd 100644
--- a/configurations/home-manager/eve/default.nix
+++ b/configurations/home-manager/eve/default.nix
@@ -1,10 +1,15 @@
-{osConfig, ...}: let
+{
+  pkgs,
+  lib,
+  config,
+  osConfig,
+  ...
+}: let
   userConfig = osConfig.host.users.eve;
 in {
-  imports = [
-    ./packages.nix
-    ./gnomeconf.nix
-  ];
+  nixpkgs.config = {
+    allowUnfree = true;
+  };
 
   home = {
     username = userConfig.name;
@@ -52,5 +57,37 @@ in {
     sessionVariables = {
       # EDITOR = "emacs";
     };
+
+    packages = lib.lists.optionals userConfig.isDesktopUser (
+      with pkgs; [
+        firefox
+        bitwarden
+        discord
+        makemkv
+        signal-desktop-bin
+        ungoogled-chromium
+      ]
+    );
+  };
+
+  programs = {
+    # Let Home Manager install and manage itself.
+    home-manager.enable = true;
+
+    git = {
+      enable = true;
+      userName = "Eve Halfmann";
+      userEmail = "evesnrobins@gmail.com";
+      extraConfig.init.defaultBranch = "main";
+    };
+
+    openssh = {
+      hostKeys = [
+        {
+          type = "ed25519";
+          path = "${config.home.username}_${osConfig.networking.hostName}_ed25519";
+        }
+      ];
+    };
   };
 }
diff --git a/configurations/home-manager/eve/gnomeconf.nix b/configurations/home-manager/eve/gnomeconf.nix
deleted file mode 100644
index fbad391..0000000
--- a/configurations/home-manager/eve/gnomeconf.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{pkgs, ...}: {
-  config = {
-    dconf = {
-      enable = true;
-      settings = {
-        "org/gnome/shell".enabled-extensions = [
-          pkgs.gnomeExtensions.dash-to-panel.extensionUuid
-        ];
-      };
-    };
-  };
-}
diff --git a/configurations/home-manager/eve/packages.nix b/configurations/home-manager/eve/packages.nix
deleted file mode 100644
index f738fe2..0000000
--- a/configurations/home-manager/eve/packages.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: let
-  userConfig = osConfig.host.users.eve;
-  hardware = osConfig.host.hardware;
-in {
-  config = {
-    nixpkgs.config = {
-      allowUnfree = true;
-    };
-
-    # Packages that can be installed without any extra configuration
-    # See https://search.nixos.org/packages for all options
-    home.packages = lib.lists.optionals userConfig.isDesktopUser (
-      with pkgs; [
-        gnomeExtensions.dash-to-panel
-      ]
-    );
-
-    # Packages that need to be installed with some extra configuration
-    # See https://home-manager-options.extranix.com/ for all options
-    programs = lib.mkMerge [
-      {
-        # Let Home Manager install and manage itself.
-        home-manager.enable = true;
-      }
-      (lib.mkIf (config.user.isDesktopUser || config.user.isTerminalUser) {
-        git = {
-          enable = true;
-          userName = "Eve";
-          userEmail = "evesnrobins@gmail.com";
-          extraConfig.init.defaultBranch = "main";
-        };
-
-        openssh = {
-          enable = true;
-          hostKeys = [
-            {
-              type = "ed25519";
-              path = "${config.home.username}_${osConfig.networking.hostName}_ed25519";
-            }
-          ];
-        };
-      })
-      (lib.mkIf config.user.isDesktopUser {
-        vscode = {
-          enable = true;
-          package = pkgs.vscodium;
-        };
-
-        firefox.enable = true;
-        bitwarden.enable = true;
-        discord.enable = true;
-        makemkv.enable = true;
-        signal-desktop-bin.enable = true;
-        steam.enable = true;
-        piper.enable = hardware.piperMouse.enable;
-        krita.enable = true;
-        ungoogled-chromium.enable = true;
-      })
-    ];
-  };
-}
diff --git a/configurations/home-manager/leyla/dconf.nix b/configurations/home-manager/leyla/dconf.nix
index ef75db6..5818641 100644
--- a/configurations/home-manager/leyla/dconf.nix
+++ b/configurations/home-manager/leyla/dconf.nix
@@ -1,23 +1,26 @@
 {pkgs, ...}: {
   config = {
-    gnome = {
-      extraWindowControls = true;
-      colorScheme = "prefer-dark";
-      clockFormat = "24h";
-      extensions = [
-        pkgs.gnomeExtensions.dash-to-dock
-      ];
-      hotkeys = {
-        "Open Terminal" = {
-          binding = "<Super>t";
-          command = "kgx";
-        };
-      };
-    };
-
     dconf = {
       enable = true;
       settings = {
+        "org/gnome/desktop/interface".color-scheme = "prefer-dark";
+
+        "org/gnome/desktop/wm/preferences".button-layout = ":minimize,maximize,close";
+
+        "org/gnome/shell" = {
+          disable-user-extensions = false; # enables user extensions
+          enabled-extensions = [
+            # Put UUIDs of extensions that you want to enable here.
+            # If the extension you want to enable is packaged in nixpkgs,
+            # you can easily get its UUID by accessing its extensionUuid
+            # field (look at the following example).
+            pkgs.gnomeExtensions.dash-to-dock.extensionUuid
+
+            # Alternatively, you can manually pass UUID as a string.
+            # "dash-to-dock@micxgx.gmail.com"
+          ];
+        };
+
         "org/gnome/shell/extensions/dash-to-dock" = {
           "dock-position" = "LEFT";
           "intellihide-mode" = "ALL_WINDOWS";
@@ -26,6 +29,18 @@
           "show-mounts" = false;
         };
 
+        "org/gnome/settings-daemon/plugins/media-keys" = {
+          custom-keybindings = [
+            "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
+          ];
+        };
+
+        "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
+          binding = "<Super>t";
+          command = "kgx";
+          name = "Open Terminal";
+        };
+
         "org/gnome/shell" = {
           favorite-apps = ["org.gnome.Nautilus.desktop" "firefox.desktop" "codium.desktop" "steam.desktop" "org.gnome.Console.desktop"];
           # app-picker-layout =
diff --git a/configurations/home-manager/leyla/default.nix b/configurations/home-manager/leyla/default.nix
index 6d759c5..0c90ab1 100644
--- a/configurations/home-manager/leyla/default.nix
+++ b/configurations/home-manager/leyla/default.nix
@@ -1,12 +1,11 @@
 {
-  pkgs,
-  config,
   osConfig,
+  config,
   ...
 }: {
   imports = [
-    ./packages
     ./i18n.nix
+    ./packages.nix
     ./impermanence.nix
     ./dconf.nix
   ];
@@ -40,7 +39,7 @@
         #   org.gradle.console=verbose
         #   org.gradle.daemon.idletimeout=3600000
         # '';
-        "${config.xdg.configHome}/user-dirs.dirs" = {
+        ".config/user-dirs.dirs" = {
           force = true;
           text = ''
             # This file is written by xdg-user-dirs-update
@@ -84,11 +83,69 @@
       };
     };
 
-    # TODO: move this into a fonts module
-    home.packages = with pkgs; [
-      aileron
-      nerd-fonts.open-dyslexic
-    ];
-    fonts.fontconfig.enable = true;
+    user = {
+      continue = {
+        enable = true;
+        docs = {
+          "Continue Docs" = {
+            startUrl = "https://docs.continue.dev";
+          };
+          "Nixpkgs" = {
+            startUrl = "https://ryantm.github.io/nixpkgs/#preface";
+          };
+          "Nix Manual" = {
+            startUrl = "https://nixos.org/manual/nixos/stable/";
+          };
+          "Home manager Manual" = {
+            startUrl = "https://nix-community.github.io/home-manager/";
+          };
+          "Nix Docs" = {
+            startUrl = "https://nix.dev/index.html";
+          };
+          "Linux Man Page" = {
+            startUrl = "https://linux.die.net/man/";
+          };
+        };
+      };
+    };
+
+    programs = {
+      # Let Home Manager install and manage itself.
+      home-manager.enable = true;
+
+      # set up git defaults
+      git = {
+        enable = true;
+        userName = "Leyla Becker";
+        userEmail = "git@jan-leila.com";
+        extraConfig.init.defaultBranch = "main";
+      };
+
+      # add direnv to auto load flakes for development
+      direnv = {
+        enable = true;
+        enableBashIntegration = true;
+        nix-direnv.enable = true;
+        config = {
+          global.hide_env_diff = true;
+          whitelist.exact = ["/home/leyla/documents/code/nix-config"];
+        };
+      };
+      bash.enable = true;
+
+      openssh = {
+        authorizedKeys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJHeItmt8TRW43uNcOC+eIurYC7Eunc0V3LGocQqLaYj leyla@horizon"
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIILimFIW2exEH/Xo7LtXkqgE04qusvnPNpPWSCeNrFkP leyla@defiant"
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKBiZkg1c2aaNHiieBX4cEziqvJVj9pcDfzUrKU/mO0I leyla@twilight"
+        ];
+        hostKeys = [
+          {
+            type = "ed25519";
+            path = "${config.home.username}_${osConfig.networking.hostName}_ed25519";
+          }
+        ];
+      };
+    };
   };
 }
diff --git a/configurations/home-manager/leyla/firefox.nix b/configurations/home-manager/leyla/firefox.nix
new file mode 100644
index 0000000..4f8c624
--- /dev/null
+++ b/configurations/home-manager/leyla/firefox.nix
@@ -0,0 +1,342 @@
+{
+  lib,
+  pkgs,
+  inputs,
+  ...
+}: {
+  programs.firefox = {
+    enable = true;
+    profiles.leyla = {
+      settings = {
+        "browser.search.defaultenginename" = "Searx";
+        "browser.search.order.1" = "Searx";
+      };
+
+      search = {
+        force = true;
+        default = "Searx";
+        engines = {
+          "Nix Packages" = {
+            urls = [
+              {
+                template = "https://search.nixos.org/packages";
+                params = [
+                  {
+                    name = "type";
+                    value = "packages";
+                  }
+                  {
+                    name = "query";
+                    value = "{searchTerms}";
+                  }
+                ];
+              }
+            ];
+            icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+            definedAliases = ["@np"];
+          };
+          "NixOS Wiki" = {
+            urls = [{template = "https://nixos.wiki/index.php?search={searchTerms}";}];
+            icon = "https://nixos.wiki/favicon.png";
+            updateInterval = 24 * 60 * 60 * 1000; # every day
+            definedAliases = ["@nw"];
+          };
+          "Searx" = {
+            urls = [{template = "https://search.jan-leila.com/?q={searchTerms}";}];
+            icon = "https://nixos.wiki/favicon.png";
+            updateInterval = 24 * 60 * 60 * 1000; # every day
+            definedAliases = ["@searx"];
+          };
+        };
+      };
+
+      extensions.packages = with inputs.firefox-addons.packages.${pkgs.system}; [
+        bitwarden
+        terms-of-service-didnt-read
+        multi-account-containers
+        shinigami-eyes
+
+        ublock-origin
+        sponsorblock
+        dearrow
+        df-youtube
+        return-youtube-dislikes
+
+        privacy-badger
+        decentraleyes
+        clearurls
+        localcdn
+
+        snowflake
+
+        deutsch-de-language-pack
+        dictionary-german
+
+        # (
+        #   buildFirefoxXpiAddon rec {
+        #     pname = "italiano-it-language-pack";
+        #     version = "132.0.20241110.231641";
+        #     addonId = "langpack-it@firefox.mozilla.org";
+        #     url = "https://addons.mozilla.org/firefox/downloads/file/4392453/italiano_it_language_pack-${version}.xpi";
+        #     sha256 = "";
+        #     meta = with lib;
+        #     {
+        #       description = "Firefox Language Pack for Italiano (it) – Italian";
+        #       license = licenses.mpl20;
+        #       mozPermissions = [];
+        #       platforms = platforms.all;
+        #     };
+        #   }
+        # )
+        # (
+        #   buildFirefoxXpiAddon rec {
+        #     pname = "dizionario-italiano";
+        #     version = "5.1";
+        #     addonId = "it-IT@dictionaries.addons.mozilla.org";
+        #     url = "https://addons.mozilla.org/firefox/downloads/file/1163874/dizionario_italiano-${version}.xpi";
+        #     sha256 = "";
+        #     meta = with lib;
+        #     {
+        #       description = "Add support for Italian to spellchecking";
+        #       license = licenses.gpl3;
+        #       mozPermissions = [];
+        #       platforms = platforms.all;
+        #     };
+        #   }
+        # )
+      ];
+
+      settings = {
+        # Disable irritating first-run stuff
+        "browser.disableResetPrompt" = true;
+        "browser.download.panel.shown" = true;
+        "browser.feeds.showFirstRunUI" = false;
+        "browser.messaging-system.whatsNewPanel.enabled" = false;
+        "browser.rights.3.shown" = true;
+        "browser.shell.checkDefaultBrowser" = false;
+        "browser.shell.defaultBrowserCheckCount" = 1;
+        "browser.startup.homepage_override.mstone" = "ignore";
+        "browser.uitour.enabled" = false;
+        "startup.homepage_override_url" = "";
+        "trailhead.firstrun.didSeeAboutWelcome" = true;
+        "browser.bookmarks.restore_default_bookmarks" = false;
+        "browser.bookmarks.addedImportButton" = true;
+        "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
+
+        # Usage Experience
+        "browser.startup.homepage" = "about:home";
+        "browser.download.useDownloadDir" = false;
+        "browser.uiCustomization.state" = builtins.toJSON {
+          "currentVersion" = 20;
+          "newElementCount" = 6;
+          "dirtyAreaCache" = [
+            "nav-bar"
+            "PersonalToolbar"
+            "toolbar-menubar"
+            "TabsToolbar"
+            "unified-extensions-area"
+            "vertical-tabs"
+          ];
+          "placements" = {
+            "widget-overflow-fixed-list" = [];
+            "unified-extensions-area" = [
+              "privacy_privacy_com-browser-action"
+              # bitwarden
+              "_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action"
+              "ublock0_raymondhill_net-browser-action"
+              "sponsorblocker_ajay_app-browser-action"
+              "dearrow_ajay_app-browser-action"
+              "jid1-mnnxcxisbpnsxq_jetpack-browser-action"
+              "_testpilot-containers-browser-action"
+              "addon_simplelogin-browser-action"
+              "_74145f27-f039-47ce-a470-a662b129930a_-browser-action"
+              "jid1-bofifl9vbdl2zq_jetpack-browser-action"
+              "dfyoutube_example_com-browser-action"
+              "_b86e4813-687a-43e6-ab65-0bde4ab75758_-browser-action"
+              "_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action"
+              "_b11bea1f-a888-4332-8d8a-cec2be7d24b9_-browse-action"
+              "jid0-3guet1r69sqnsrca5p8kx9ezc3u_jetpack-browser-action"
+            ];
+            "nav-bar" = [
+              "back-button"
+              "forward-button"
+              "stop-reload-button"
+              "urlbar-container"
+              "downloads-button"
+              "unified-extensions-button"
+              "reset-pbm-toolbar-button"
+            ];
+            "toolbar-menubar" = [
+              "menubar-items"
+            ];
+            "TabsToolbar" = [
+              "firefox-view-button"
+              "tabbrowser-tabs"
+              "new-tab-button"
+              "alltabs-button"
+            ];
+            "vertical-tabs" = [];
+            "PersonalToolbar" = [
+              "import-button"
+              "personal-bookmarks"
+            ];
+          };
+          "seen" = [
+            "save-to-pocket-button"
+            "developer-button"
+            "privacy_privacy_com-browser-action"
+            "sponsorblocker_ajay_app-browser-action"
+            "ublock0_raymondhill_net-browser-action"
+            "addon_simplelogin-browser-action"
+            "dearrow_ajay_app-browser-action"
+            "_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action"
+            "_74145f27-f039-47ce-a470-a662b129930a_-browser-action"
+            "jid1-bofifl9vbdl2zq_jetpack-browser-action"
+            "dfyoutube_example_com-browser-action"
+            "_testpilot-containers-browser-action"
+            "_b86e4813-687a-43e6-ab65-0bde4ab75758_-browser-action"
+            "jid1-mnnxcxisbpnsxq_jetpack-browser-action"
+            "_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action"
+            "_b11bea1f-a888-4332-8d8a-cec2be7d24b9_-browser-action"
+            "jid0-3guet1r69sqnsrca5p8kx9ezc3u_jetpack-browser-action"
+          ];
+        };
+        "browser.newtabpage.activity-stream.feeds.topsites" = false;
+        "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
+        "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts" = false;
+        "browser.newtabpage.blocked" = lib.genAttrs [
+          # Facebook
+          "4gPpjkxgZzXPVtuEoAL9Ig=="
+          # Reddit
+          "gLv0ja2RYVgxKdp0I5qwvA=="
+          # Amazon
+          "K00ILysCaEq8+bEqV/3nuw=="
+          # Twitter
+          "T9nJot5PurhJSy8n038xGA=="
+        ] (_: 1);
+        "identity.fxaccounts.enabled" = false;
+
+        # Security
+        "privacy.trackingprotection.enabled" = true;
+        "dom.security.https_only_mode" = true;
+
+        "extensions.formautofill.addresses.enabled" = false;
+        "extensions.formautofill.creditCards.enabled" = false;
+        "signon.rememberSignons" = false;
+        "privacy.sanitize.sanitizeOnShutdown" = true;
+        "privacy.clearOnShutdown_v2.cache" = true;
+        "privacy.clearOnShutdown_v2.cookiesAndStorage" = true;
+        "privacy.clearOnShutdown_v2.historyFormDataAndDownloads" = true;
+        "urlclassifier.trackingSkipURLs" = "";
+        "urlclassifier.features.socialtracking.skipURLs" = "";
+        "dom.security.https_only_mode_pbm" = true;
+        "dom.security.https_only_mode_error_page_user_suggestions" = true;
+
+        # Disable telemetry
+        "app.shield.optoutstudies.enabled" = false;
+        "browser.discovery.enabled" = false;
+        "browser.newtabpage.activity-stream.feeds.telemetry" = false;
+        "browser.newtabpage.activity-stream.telemetry" = false;
+        "browser.ping-centre.telemetry" = false;
+        "datareporting.healthreport.service.enabled" = false;
+        "datareporting.healthreport.uploadEnabled" = false;
+        "datareporting.policy.dataSubmissionEnabled" = false;
+        "datareporting.sessions.current.clean" = true;
+        "devtools.onboarding.telemetry.logged" = false;
+        "toolkit.telemetry.archive.enabled" = false;
+        "toolkit.telemetry.bhrPing.enabled" = false;
+        "toolkit.telemetry.enabled" = false;
+        "toolkit.telemetry.firstShutdownPing.enabled" = false;
+        "toolkit.telemetry.hybridContent.enabled" = false;
+        "toolkit.telemetry.newProfilePing.enabled" = false;
+        "toolkit.telemetry.prompted" = 2;
+        "toolkit.telemetry.rejected" = true;
+        "toolkit.telemetry.reportingpolicy.firstRun" = false;
+        "toolkit.telemetry.server" = "";
+        "toolkit.telemetry.shutdownPingSender.enabled" = false;
+        "toolkit.telemetry.unified" = false;
+        "toolkit.telemetry.unifiedIsOptIn" = false;
+        "toolkit.telemetry.updatePing.enabled" = false;
+      };
+
+      bookmarks = {
+        force = true;
+        settings = [
+          {
+            name = "Media";
+            url = "https://media.jan-leila.com/";
+            keyword = "";
+            tags = [""];
+          }
+          {
+            name = "Photos";
+            url = "https://photos.jan-leila.com";
+            keyword = "";
+            tags = [""];
+          }
+          {
+            name = "Git";
+            url = "https://git.jan-leila.com/";
+            keyword = "";
+            tags = [""];
+          }
+          {
+            name = "Home Automation";
+            url = "https://home.jan-leila.com/";
+            keyword = "";
+            tags = [""];
+          }
+          {
+            name = "Mail";
+            url = "https://mail.protonmail.com";
+            keyword = "";
+            tags = [""];
+          }
+          {
+            name = "Open Street Map";
+            url = "https://www.openstreetmap.org/";
+            keyword = "";
+            tags = [""];
+          }
+          {
+            name = "Password Manager";
+            url = "https://vault.bitwarden.com/";
+            keyword = "";
+            tags = [""];
+          }
+          {
+            name = "Mastodon";
+            url = "https://mspsocial.net";
+            keyword = "";
+            tags = [""];
+          }
+          {
+            name = "Linked In";
+            url = "https://www.linkedin.com/";
+            keyword = "";
+            tags = [""];
+          }
+          {
+            name = "Job Search";
+            url = "https://www.jobsinnetwork.com/?state=cleaned_history&language%5B%5D=en&query=react&locations.countryCode%5B%5D=IT&locations.countryCode%5B%5D=DE&locations.countryCode%5B%5D=NL&experience%5B%5D=medior&experience%5B%5D=junior&page=1";
+            keyword = "";
+            tags = [""];
+          }
+          {
+            name = "React Docs";
+            url = "https://react.dev/";
+            keyword = "";
+            tags = [""];
+          }
+          # Template
+          # {
+          #   name = "";
+          #   url = "";
+          #   keyword = "";
+          #   tags = [""];
+          # }
+        ];
+      };
+    };
+  };
+}
diff --git a/configurations/home-manager/leyla/impermanence.nix b/configurations/home-manager/leyla/impermanence.nix
index 041bff8..29936b5 100644
--- a/configurations/home-manager/leyla/impermanence.nix
+++ b/configurations/home-manager/leyla/impermanence.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  config,
   osConfig,
   ...
 }: {
@@ -10,10 +9,14 @@
         "desktop"
         "downloads"
         "documents"
+        {
+          directory = ".local/share/Steam";
+          method = "symlink";
+        }
       ];
       files = [
         ".bash_history" # keep shell history around
-        "${config.xdg.dataHome}/recently-used.xbel" # gnome recently viewed files
+        ".local/share/recently-used.xbel" # gnome recently viewed files
       ];
       allowOther = true;
     };
diff --git a/configurations/home-manager/leyla/packages.nix b/configurations/home-manager/leyla/packages.nix
new file mode 100644
index 0000000..13263ea
--- /dev/null
+++ b/configurations/home-manager/leyla/packages.nix
@@ -0,0 +1,95 @@
+{
+  lib,
+  osConfig,
+  pkgs,
+  ...
+}: let
+  userConfig = osConfig.host.users.leyla;
+  hardware = osConfig.host.hardware;
+in {
+  imports = [
+    ./vscode/default.nix
+    ./firefox.nix
+  ];
+
+  nixpkgs.config = {
+    allowUnfree = true;
+  };
+
+  home = {
+    packages =
+      lib.lists.optionals userConfig.isTerminalUser (
+        with pkgs; [
+          # command line tools
+          sox
+          yt-dlp
+          ffmpeg
+          imagemagick
+        ]
+      )
+      ++ (
+        lib.lists.optionals userConfig.isDesktopUser (
+          (with pkgs; [
+            # helvetica font
+            aileron
+
+            gnomeExtensions.dash-to-dock
+
+            # development tools
+            dbeaver-bin
+            bruno
+            proxmark3
+          ])
+          ++ (
+            lib.lists.optionals hardware.directAccess.enable (with pkgs; [
+              #foss platforms
+              signal-desktop-bin
+              bitwarden
+              ungoogled-chromium
+              libreoffice
+              inkscape
+              gimp
+              krita
+              freecad
+              # cura
+              # kicad-small
+              makemkv
+              onionshare
+              # rhythmbox
+              (lib.mkIf hardware.graphicsAcceleration.enable obs-studio)
+              # wireshark
+              # rpi-imager
+              # fritzing
+              mfoc
+              tor-browser
+              anki
+              pdfarranger
+              calibre
+              qbittorrent
+              picard
+
+              # proprietary platforms
+              discord
+              obsidian
+              (lib.mkIf hardware.graphicsAcceleration.enable davinci-resolve)
+
+              # development tools
+              # androidStudioPackages.canary
+              jetbrains.idea-community
+              qFlipper
+
+              # system tools
+              protonvpn-gui
+              openvpn
+              noisetorch
+
+              # hardware management tools
+              (lib.mkIf hardware.piperMouse.enable piper)
+              (lib.mkIf hardware.openRGB.enable openrgb)
+              (lib.mkIf hardware.viaKeyboard.enable via)
+            ])
+          )
+        )
+      );
+  };
+}
diff --git a/configurations/home-manager/leyla/packages/default.nix b/configurations/home-manager/leyla/packages/default.nix
deleted file mode 100644
index 6377ed2..0000000
--- a/configurations/home-manager/leyla/packages/default.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: let
-  hardware = osConfig.host.hardware;
-in {
-  imports = [
-    ./vscode
-    ./firefox.nix
-    ./direnv.nix
-    ./openssh.nix
-    ./git.nix
-    ./makemkv.nix
-  ];
-
-  config = lib.mkMerge [
-    {
-      programs = lib.mkMerge [
-        {
-          # Let Home Manager install and manage itself.
-          home-manager.enable = true;
-        }
-        (lib.mkIf (config.user.isTerminalUser || config.user.isDesktopUser) {
-          bash.enable = true;
-          git.enable = true;
-          openssh.enable = true;
-        })
-        (lib.mkIf config.user.isDesktopUser {
-          bitwarden.enable = true;
-          obs-studio.enable = hardware.graphicsAcceleration.enable;
-          qbittorrent.enable = true;
-          prostudiomasters.enable = true;
-          protonvpn-gui.enable = true;
-          dbeaver-bin.enable = true;
-          bruno.enable = true;
-          piper.enable = hardware.piperMouse.enable;
-          proxmark3.enable = true;
-          openrgb.enable = hardware.openRGB.enable;
-          via.enable = hardware.viaKeyboard.enable;
-          claude-code.enable = osConfig.host.ai.enable;
-          davinci-resolve.enable = hardware.graphicsAcceleration.enable;
-          mfoc.enable = true;
-        })
-        (lib.mkIf (hardware.directAccess.enable && config.user.isDesktopUser) {
-          anki.enable = true;
-          makemkv.enable = true;
-          discord.enable = true;
-          signal-desktop-bin.enable = true;
-          calibre.enable = true;
-          obsidian.enable = true;
-          jetbrains.idea-community.enable = true;
-          vscode.enable = true;
-          firefox.enable = true;
-          steam.enable = true;
-          krita.enable = true;
-          ungoogled-chromium.enable = true;
-          libreoffice.enable = true;
-          mapillary-uploader.enable = true;
-          inkscape.enable = true;
-          gimp.enable = true;
-          freecad.enable = true;
-          onionshare.enable = true;
-          pdfarranger.enable = true;
-          picard.enable = true;
-          qflipper.enable = true;
-          openvpn.enable = true;
-          noisetorch.enable = true;
-          tor-browser.enable = true;
-          gdx-liftoff.enable = true;
-        })
-      ];
-    }
-    (lib.mkIf config.user.isTerminalUser {
-      home.packages = with pkgs; [
-        # command line tools
-        sox
-        yt-dlp
-        ffmpeg
-        imagemagick
-      ];
-    })
-    (lib.mkIf config.user.isDesktopUser {
-      nixpkgs.config = {
-        allowUnfree = true;
-      };
-    })
-  ];
-}
diff --git a/configurations/home-manager/leyla/packages/direnv.nix b/configurations/home-manager/leyla/packages/direnv.nix
deleted file mode 100644
index 038c149..0000000
--- a/configurations/home-manager/leyla/packages/direnv.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  lib,
-  config,
-  osConfig,
-  ...
-}: let
-  userConfig = osConfig.host.users.leyla;
-in {
-  config = lib.mkIf userConfig.isDesktopUser {
-    programs = {
-      direnv = {
-        enable = true;
-        enableBashIntegration = true;
-        nix-direnv.enable = true;
-        config = {
-          global.hide_env_diff = true;
-          whitelist.exact = ["${config.home.homeDirectory}/documents/code/nix-config"];
-        };
-      };
-    };
-  };
-}
diff --git a/configurations/home-manager/leyla/packages/firefox.nix b/configurations/home-manager/leyla/packages/firefox.nix
deleted file mode 100644
index d166eb4..0000000
--- a/configurations/home-manager/leyla/packages/firefox.nix
+++ /dev/null
@@ -1,344 +0,0 @@
-{
-  lib,
-  pkgs,
-  inputs,
-  ...
-}: {
-  config = {
-    programs.firefox = {
-      profiles.leyla = {
-        settings = {
-          "browser.search.defaultenginename" = "Searx";
-          "browser.search.order.1" = "Searx";
-        };
-
-        search = {
-          force = true;
-          default = "Searx";
-          engines = {
-            "Nix Packages" = {
-              urls = [
-                {
-                  template = "https://search.nixos.org/packages";
-                  params = [
-                    {
-                      name = "type";
-                      value = "packages";
-                    }
-                    {
-                      name = "query";
-                      value = "{searchTerms}";
-                    }
-                  ];
-                }
-              ];
-              icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-              definedAliases = ["@np"];
-            };
-            "NixOS Wiki" = {
-              urls = [{template = "https://nixos.wiki/index.php?search={searchTerms}";}];
-              icon = "https://nixos.wiki/favicon.png";
-              updateInterval = 24 * 60 * 60 * 1000; # every day
-              definedAliases = ["@nw"];
-            };
-            "Searx" = {
-              urls = [{template = "https://search.jan-leila.com/?q={searchTerms}";}];
-              icon = "https://nixos.wiki/favicon.png";
-              updateInterval = 24 * 60 * 60 * 1000; # every day
-              definedAliases = ["@searx"];
-            };
-          };
-        };
-
-        extensions.packages = with inputs.firefox-addons.packages.${pkgs.system}; [
-          bitwarden
-          terms-of-service-didnt-read
-          multi-account-containers
-          shinigami-eyes
-
-          ublock-origin
-          sponsorblock
-          dearrow
-          df-youtube
-          return-youtube-dislikes
-
-          privacy-badger
-          decentraleyes
-          clearurls
-          localcdn
-
-          snowflake
-
-          deutsch-de-language-pack
-          dictionary-german
-
-          tab-session-manager
-
-          # (
-          #   buildFirefoxXpiAddon rec {
-          #     pname = "italiano-it-language-pack";
-          #     version = "132.0.20241110.231641";
-          #     addonId = "langpack-it@firefox.mozilla.org";
-          #     url = "https://addons.mozilla.org/firefox/downloads/file/4392453/italiano_it_language_pack-${version}.xpi";
-          #     sha256 = "";
-          #     meta = with lib;
-          #     {
-          #       description = "Firefox Language Pack for Italiano (it) – Italian";
-          #       license = licenses.mpl20;
-          #       mozPermissions = [];
-          #       platforms = platforms.all;
-          #     };
-          #   }
-          # )
-          # (
-          #   buildFirefoxXpiAddon rec {
-          #     pname = "dizionario-italiano";
-          #     version = "5.1";
-          #     addonId = "it-IT@dictionaries.addons.mozilla.org";
-          #     url = "https://addons.mozilla.org/firefox/downloads/file/1163874/dizionario_italiano-${version}.xpi";
-          #     sha256 = "";
-          #     meta = with lib;
-          #     {
-          #       description = "Add support for Italian to spellchecking";
-          #       license = licenses.gpl3;
-          #       mozPermissions = [];
-          #       platforms = platforms.all;
-          #     };
-          #   }
-          # )
-        ];
-
-        settings = {
-          # Disable irritating first-run stuff
-          "browser.disableResetPrompt" = true;
-          "browser.download.panel.shown" = true;
-          "browser.feeds.showFirstRunUI" = false;
-          "browser.messaging-system.whatsNewPanel.enabled" = false;
-          "browser.rights.3.shown" = true;
-          "browser.shell.checkDefaultBrowser" = false;
-          "browser.shell.defaultBrowserCheckCount" = 1;
-          "browser.startup.homepage_override.mstone" = "ignore";
-          "browser.uitour.enabled" = false;
-          "startup.homepage_override_url" = "";
-          "trailhead.firstrun.didSeeAboutWelcome" = true;
-          "browser.bookmarks.restore_default_bookmarks" = false;
-          "browser.bookmarks.addedImportButton" = true;
-          "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
-
-          # Usage Experience
-          "browser.startup.homepage" = "about:home";
-          "browser.download.useDownloadDir" = false;
-          "browser.uiCustomization.state" = builtins.toJSON {
-            "currentVersion" = 20;
-            "newElementCount" = 6;
-            "dirtyAreaCache" = [
-              "nav-bar"
-              "PersonalToolbar"
-              "toolbar-menubar"
-              "TabsToolbar"
-              "unified-extensions-area"
-              "vertical-tabs"
-            ];
-            "placements" = {
-              "widget-overflow-fixed-list" = [];
-              "unified-extensions-area" = [
-                # bitwarden
-                "_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action"
-                "ublock0_raymondhill_net-browser-action"
-                "sponsorblocker_ajay_app-browser-action"
-                "dearrow_ajay_app-browser-action"
-                "jid1-mnnxcxisbpnsxq_jetpack-browser-action"
-                "_testpilot-containers-browser-action"
-                "addon_simplelogin-browser-action"
-                "_74145f27-f039-47ce-a470-a662b129930a_-browser-action"
-                "jid1-bofifl9vbdl2zq_jetpack-browser-action"
-                "dfyoutube_example_com-browser-action"
-                "_b86e4813-687a-43e6-ab65-0bde4ab75758_-browser-action"
-                "_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action"
-                "_b11bea1f-a888-4332-8d8a-cec2be7d24b9_-browse-action"
-                "jid0-3guet1r69sqnsrca5p8kx9ezc3u_jetpack-browser-action"
-              ];
-              "nav-bar" = [
-                "back-button"
-                "forward-button"
-                "stop-reload-button"
-                "urlbar-container"
-                "downloads-button"
-                "unified-extensions-button"
-                "reset-pbm-toolbar-button"
-              ];
-              "toolbar-menubar" = [
-                "menubar-items"
-              ];
-              "TabsToolbar" = [
-                "firefox-view-button"
-                "tabbrowser-tabs"
-                "new-tab-button"
-                "alltabs-button"
-              ];
-              "vertical-tabs" = [];
-              "PersonalToolbar" = [
-                "import-button"
-                "personal-bookmarks"
-              ];
-            };
-            "seen" = [
-              "save-to-pocket-button"
-              "developer-button"
-              "privacy_privacy_com-browser-action"
-              "sponsorblocker_ajay_app-browser-action"
-              "ublock0_raymondhill_net-browser-action"
-              "addon_simplelogin-browser-action"
-              "dearrow_ajay_app-browser-action"
-              "_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action"
-              "_74145f27-f039-47ce-a470-a662b129930a_-browser-action"
-              "jid1-bofifl9vbdl2zq_jetpack-browser-action"
-              "dfyoutube_example_com-browser-action"
-              "_testpilot-containers-browser-action"
-              "_b86e4813-687a-43e6-ab65-0bde4ab75758_-browser-action"
-              "jid1-mnnxcxisbpnsxq_jetpack-browser-action"
-              "_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action"
-              "_b11bea1f-a888-4332-8d8a-cec2be7d24b9_-browser-action"
-              "jid0-3guet1r69sqnsrca5p8kx9ezc3u_jetpack-browser-action"
-            ];
-          };
-          "browser.newtabpage.activity-stream.feeds.topsites" = false;
-          "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
-          "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts" = false;
-          "browser.newtabpage.blocked" = lib.genAttrs [
-            # Facebook
-            "4gPpjkxgZzXPVtuEoAL9Ig=="
-            # Reddit
-            "gLv0ja2RYVgxKdp0I5qwvA=="
-            # Amazon
-            "K00ILysCaEq8+bEqV/3nuw=="
-            # Twitter
-            "T9nJot5PurhJSy8n038xGA=="
-          ] (_: 1);
-          "identity.fxaccounts.enabled" = false;
-
-          # Security
-          "privacy.trackingprotection.enabled" = true;
-          "dom.security.https_only_mode" = true;
-
-          "extensions.formautofill.addresses.enabled" = false;
-          "extensions.formautofill.creditCards.enabled" = false;
-          "signon.rememberSignons" = false;
-          "privacy.sanitize.sanitizeOnShutdown" = true;
-          "privacy.clearOnShutdown_v2.cache" = true;
-          "privacy.clearOnShutdown_v2.cookiesAndStorage" = true;
-          "privacy.clearOnShutdown_v2.historyFormDataAndDownloads" = true;
-          "urlclassifier.trackingSkipURLs" = "";
-          "urlclassifier.features.socialtracking.skipURLs" = "";
-          "dom.security.https_only_mode_pbm" = true;
-          "dom.security.https_only_mode_error_page_user_suggestions" = true;
-
-          # Disable telemetry
-          "app.shield.optoutstudies.enabled" = false;
-          "browser.discovery.enabled" = false;
-          "browser.newtabpage.activity-stream.feeds.telemetry" = false;
-          "browser.newtabpage.activity-stream.telemetry" = false;
-          "browser.ping-centre.telemetry" = false;
-          "datareporting.healthreport.service.enabled" = false;
-          "datareporting.healthreport.uploadEnabled" = false;
-          "datareporting.policy.dataSubmissionEnabled" = false;
-          "datareporting.sessions.current.clean" = true;
-          "devtools.onboarding.telemetry.logged" = false;
-          "toolkit.telemetry.archive.enabled" = false;
-          "toolkit.telemetry.bhrPing.enabled" = false;
-          "toolkit.telemetry.enabled" = false;
-          "toolkit.telemetry.firstShutdownPing.enabled" = false;
-          "toolkit.telemetry.hybridContent.enabled" = false;
-          "toolkit.telemetry.newProfilePing.enabled" = false;
-          "toolkit.telemetry.prompted" = 2;
-          "toolkit.telemetry.rejected" = true;
-          "toolkit.telemetry.reportingpolicy.firstRun" = false;
-          "toolkit.telemetry.server" = "";
-          "toolkit.telemetry.shutdownPingSender.enabled" = false;
-          "toolkit.telemetry.unified" = false;
-          "toolkit.telemetry.unifiedIsOptIn" = false;
-          "toolkit.telemetry.updatePing.enabled" = false;
-        };
-
-        bookmarks = {
-          force = true;
-          settings = [
-            {
-              name = "Media";
-              url = "https://media.jan-leila.com/";
-              keyword = "";
-              tags = [""];
-            }
-            {
-              name = "Photos";
-              url = "https://photos.jan-leila.com";
-              keyword = "";
-              tags = [""];
-            }
-            {
-              name = "Git";
-              url = "https://git.jan-leila.com/";
-              keyword = "";
-              tags = [""];
-            }
-            {
-              name = "Home Automation";
-              url = "https://home.jan-leila.com/";
-              keyword = "";
-              tags = [""];
-            }
-            {
-              name = "Mail";
-              url = "https://mail.protonmail.com";
-              keyword = "";
-              tags = [""];
-            }
-            {
-              name = "Open Street Map";
-              url = "https://www.openstreetmap.org/";
-              keyword = "";
-              tags = [""];
-            }
-            {
-              name = "Password Manager";
-              url = "https://vault.bitwarden.com/";
-              keyword = "";
-              tags = [""];
-            }
-            {
-              name = "Mastodon";
-              url = "https://mspsocial.net";
-              keyword = "";
-              tags = [""];
-            }
-            {
-              name = "Linked In";
-              url = "https://www.linkedin.com/";
-              keyword = "";
-              tags = [""];
-            }
-            {
-              name = "Job Search";
-              url = "https://www.jobsinnetwork.com/?state=cleaned_history&language%5B%5D=en&query=react&locations.countryCode%5B%5D=IT&locations.countryCode%5B%5D=DE&locations.countryCode%5B%5D=NL&experience%5B%5D=medior&experience%5B%5D=junior&page=1";
-              keyword = "";
-              tags = [""];
-            }
-            {
-              name = "React Docs";
-              url = "https://react.dev/";
-              keyword = "";
-              tags = [""];
-            }
-            # Template
-            # {
-            #   name = "";
-            #   url = "";
-            #   keyword = "";
-            #   tags = [""];
-            # }
-          ];
-        };
-      };
-    };
-  };
-}
diff --git a/configurations/home-manager/leyla/packages/git.nix b/configurations/home-manager/leyla/packages/git.nix
deleted file mode 100644
index 568cd7a..0000000
--- a/configurations/home-manager/leyla/packages/git.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{...}: {
-  config = {
-    programs = {
-      git = {
-        userName = "Leyla Becker";
-        userEmail = "git@jan-leila.com";
-        extraConfig.init.defaultBranch = "main";
-      };
-    };
-  };
-}
diff --git a/configurations/home-manager/leyla/packages/makemkv.nix b/configurations/home-manager/leyla/packages/makemkv.nix
deleted file mode 100644
index ee71955..0000000
--- a/configurations/home-manager/leyla/packages/makemkv.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  config,
-  inputs,
-  ...
-}: {
-  config = {
-    sops.secrets = {
-      "application-keys/makemkv" = {
-        sopsFile = "${inputs.secrets}/application-keys.yaml";
-      };
-    };
-    programs.makemkv = {
-      appKeyFile = config.sops.placeholder."application-keys/makemkv";
-      destinationDir = "/home/leyla/downloads/makemkv";
-    };
-  };
-}
diff --git a/configurations/home-manager/leyla/packages/openssh.nix b/configurations/home-manager/leyla/packages/openssh.nix
deleted file mode 100644
index 91aec11..0000000
--- a/configurations/home-manager/leyla/packages/openssh.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  config,
-  osConfig,
-  ...
-}: {
-  config = {
-    programs = {
-      openssh = {
-        authorizedKeys = [
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJHeItmt8TRW43uNcOC+eIurYC7Eunc0V3LGocQqLaYj leyla@horizon"
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIILimFIW2exEH/Xo7LtXkqgE04qusvnPNpPWSCeNrFkP leyla@defiant"
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKBiZkg1c2aaNHiieBX4cEziqvJVj9pcDfzUrKU/mO0I leyla@twilight"
-        ];
-        hostKeys = [
-          {
-            type = "ed25519";
-            path = "${config.home.username}_${osConfig.networking.hostName}_ed25519";
-          }
-        ];
-      };
-    };
-  };
-}
diff --git a/configurations/home-manager/leyla/packages/vscode/default.nix b/configurations/home-manager/leyla/packages/vscode/default.nix
deleted file mode 100644
index 583f440..0000000
--- a/configurations/home-manager/leyla/packages/vscode/default.nix
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: let
-  nix-development-enabled = osConfig.host.nix-development.enable;
-  ai-tooling-enabled = osConfig.host.ai.enable;
-in {
-  imports = [
-    ./user-words.nix
-  ];
-
-  config = lib.mkIf config.user.isDesktopUser {
-    programs = {
-      bash.shellAliases = {
-        code = "codium";
-      };
-
-      vscode = {
-        package = pkgs.vscodium;
-
-        mutableExtensionsDir = false;
-
-        profiles.default = {
-          enableUpdateCheck = false;
-          enableExtensionUpdateCheck = false;
-
-          userSettings = lib.mkMerge [
-            {
-              "javascript.updateImportsOnFileMove.enabled" = "always";
-              "editor.tabSize" = 2;
-              "editor.insertSpaces" = false;
-            }
-          ];
-
-          extraExtensions = {
-            # vs code feel
-            oneDark.enable = true;
-            atomKeybindings.enable = true;
-            openRemoteSsh.enable = true;
-
-            # html development
-            autoRenameTag.enable = true;
-            liveServer.enable = true;
-
-            # js development
-            es7ReactJsSnippets.enable = true;
-            tauriVscode.enable = true;
-            vscodeEslint.enable = true;
-            vscodeJest.enable = true;
-            vitest.enable = true;
-            vscodeStandard.enable = true;
-            vscodeStylelint.enable = true;
-
-            nearley.enable = true;
-
-            # astro development
-            vscodeMdx.enable = true;
-            astroVscode.enable = true;
-
-            # nix development
-            alejandra.enable = nix-development-enabled;
-            nixIde.enable = nix-development-enabled;
-
-            # go development
-            go.enable = true;
-
-            # claude development
-            claudeDev = lib.mkIf ai-tooling-enabled {
-              enable = true;
-              mcp = {
-                nixos.enable = true;
-                eslint = {
-                  enable = true;
-                  autoApprove = {
-                    lint-files = true;
-                  };
-                };
-                vitest = {
-                  enable = true;
-                  autoApprove = {
-                    list_tests = true;
-                    run_tests = true;
-                    analyze_coverage = true;
-                  };
-                };
-                sleep = {
-                  enable = true;
-                  timeout = 18000; # 5 hours to match claude codes timeout
-                  autoApprove = {
-                    sleep = true;
-                  };
-                };
-              };
-            };
-
-            # misc extensions
-            evenBetterToml.enable = true;
-            direnv.enable = config.programs.direnv.enable;
-            conventionalCommits.enable = true;
-          };
-
-          extensions = let
-            extension-pkgs = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-          in (
-            with extension-pkgs.open-vsx; [
-              # vs code feel extensions
-              streetsidesoftware.code-spell-checker
-              streetsidesoftware.code-spell-checker-german
-              streetsidesoftware.code-spell-checker-italian
-            ]
-          );
-        };
-      };
-    };
-  };
-}
diff --git a/configurations/home-manager/leyla/packages/vscode/user-words.nix b/configurations/home-manager/leyla/packages/vscode/user-words.nix
deleted file mode 100644
index bb99bbc..0000000
--- a/configurations/home-manager/leyla/packages/vscode/user-words.nix
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  config.programs.vscode.profiles.default.userSettings = {
-    "cSpell.userWords" = [
-      "leyla"
-    ];
-
-    "cSpell.languageSettings" = [
-      {
-        "languageId" = "nix";
-        "locale" = "*";
-        "dictionaries" = [
-          "applications"
-          "ai-words"
-          "nix-words"
-
-          # We need to include all other dictionaries in the nix language settings because they exist in this file
-          # TODO: see if there is a way to make this only apply for this file
-          "js-words"
-        ];
-      }
-      {
-        "languageId" = "javascript,typescript,js,ts";
-        "locale" = "*";
-        "dictionaries" = [
-          "js-words"
-        ];
-      }
-    ];
-
-    "cSpell.customDictionaries" = {
-      applications = {
-        name = "applications";
-        description = "application names";
-        path = pkgs.writeText "applications.txt" (lib.strings.concatLines [
-          "ollama"
-          "syncthing"
-          "immich"
-          "sonos"
-          "makemkv"
-          "hass"
-          "qbittorent"
-          "prostudiomasters"
-          "protonmail"
-          "pulseaudio"
-        ]);
-      };
-
-      ai-words = {
-        name = "ai-words";
-        description = "common words used for ai development";
-        path = pkgs.writeText "ai-words.txt" (lib.strings.concatLines [
-          "ollama"
-          "deepseek"
-          "qwen"
-        ]);
-      };
-
-      nix-words = {
-        name = "nix-words";
-        description = "words used in nix configurations";
-        path = pkgs.writeText "nix-words.txt" (lib.strings.concatLines [
-          "pname"
-          "direnv"
-          "tmpfiles"
-          "Networkd"
-          "networkmanager"
-          "dialout"
-          "adbusers"
-          "authkey"
-          "netdevs"
-          "atomix"
-          "geary"
-          "gedit"
-          "hitori"
-          "iagno"
-          "alsa"
-          "timezoned"
-          "pipewire"
-          "rtkit"
-          "disko"
-          "ashift"
-          "autotrim"
-          "canmount"
-          "mountpoint"
-          "xattr"
-          "acltype"
-          "relatime"
-          "keyformat"
-          "keylocation"
-          "vdevs"
-
-          # codium extensions
-          "akamud"
-          "onedark"
-          "jeanp"
-          "dsznajder"
-          "dbaeumer"
-          "orta"
-          "tauri"
-          "unifiedjs"
-          "tamasfe"
-          "pinage"
-          "jnoortheen"
-          "kamadorueda"
-          "karyfoundation"
-          "nearley"
-
-          # nix.optimise is spelled wrong
-          "optimise"
-        ]);
-      };
-
-      js-words = {
-        name = "js-words";
-        description = "words used in js development";
-        path = pkgs.writeText "js-words.txt" (lib.strings.concatLines [
-          "webdav"
-        ]);
-      };
-    };
-  };
-}
diff --git a/configurations/home-manager/leyla/vscode/default.nix b/configurations/home-manager/leyla/vscode/default.nix
new file mode 100644
index 0000000..2f3c455
--- /dev/null
+++ b/configurations/home-manager/leyla/vscode/default.nix
@@ -0,0 +1,118 @@
+{
+  lib,
+  pkgs,
+  inputs,
+  config,
+  osConfig,
+  ...
+}: let
+  nix-development-enabled = osConfig.host.nix-development.enable;
+  ai-tooling-enabled = config.user.continue.enable && osConfig.host.ai.enable;
+in {
+  nixpkgs = {
+    overlays = [
+      inputs.nix-vscode-extensions.overlays.default
+    ];
+  };
+
+  programs = {
+    bash.shellAliases = {
+      code = "codium";
+    };
+
+    vscode = let
+      extensions = inputs.nix-vscode-extensions.extensions.${pkgs.system};
+      open-vsx = extensions.open-vsx;
+      vscode-marketplace = extensions.vscode-marketplace;
+    in {
+      enable = true;
+
+      package = pkgs.vscodium;
+
+      mutableExtensionsDir = false;
+
+      profiles.default = {
+        enableUpdateCheck = false;
+        enableExtensionUpdateCheck = false;
+
+        userSettings = lib.mkMerge [
+          {
+            "workbench.colorTheme" = "Atom One Dark";
+            "cSpell.userWords" = import ./user-words.nix;
+            "javascript.updateImportsOnFileMove.enabled" = "always";
+            "editor.tabSize" = 2;
+            "editor.insertSpaces" = false;
+          }
+          (lib.mkIf nix-development-enabled {
+            "nix.enableLanguageServer" = true;
+            "nix.serverPath" = "nil";
+            "[nix]" = {
+              "editor.defaultFormatter" = "kamadorueda.alejandra";
+              "editor.formatOnPaste" = true;
+              "editor.formatOnSave" = true;
+              "editor.formatOnType" = true;
+            };
+            "alejandra.program" = "alejandra";
+            "nixpkgs" = {
+              "expr" = "import <nixpkgs> {}";
+            };
+          })
+          (lib.mkIf ai-tooling-enabled {
+            "continue.telemetryEnabled" = false;
+          })
+        ];
+
+        extensions = (
+          with open-vsx;
+            [
+              # vs code feel extensions
+              ms-vscode.atom-keybindings
+              akamud.vscode-theme-onedark
+              streetsidesoftware.code-spell-checker
+              streetsidesoftware.code-spell-checker-german
+              streetsidesoftware.code-spell-checker-italian
+              jeanp413.open-remote-ssh
+
+              # html extensions
+              formulahendry.auto-rename-tag
+              ms-vscode.live-server
+
+              # js extensions
+              dsznajder.es7-react-js-snippets
+              dbaeumer.vscode-eslint
+              standard.vscode-standard
+              firsttris.vscode-jest-runner
+              stylelint.vscode-stylelint
+              tauri-apps.tauri-vscode
+
+              # go extensions
+              golang.go
+
+              # astro blog extensions
+              astro-build.astro-vscode
+              unifiedjs.vscode-mdx
+
+              # misc extensions
+              tamasfe.even-better-toml
+            ]
+            ++ (lib.lists.optionals nix-development-enabled [
+              # nix extensions
+              pinage404.nix-extension-pack
+              jnoortheen.nix-ide
+              kamadorueda.alejandra
+            ])
+            ++ (
+              with vscode-marketplace;
+                [
+                  # js extensions
+                  karyfoundation.nearley
+                ]
+                ++ (lib.lists.optionals ai-tooling-enabled [
+                  continue.continue
+                ])
+            )
+        );
+      };
+    };
+  };
+}
diff --git a/configurations/home-manager/leyla/vscode/user-words.nix b/configurations/home-manager/leyla/vscode/user-words.nix
new file mode 100644
index 0000000..b581118
--- /dev/null
+++ b/configurations/home-manager/leyla/vscode/user-words.nix
@@ -0,0 +1,6 @@
+[
+  "leyla"
+  "webdav"
+  "ollama"
+  "optimise"
+]
diff --git a/configurations/nixos/defiant/configuration.nix b/configurations/nixos/defiant/configuration.nix
index e109d45..fef7a56 100644
--- a/configurations/nixos/defiant/configuration.nix
+++ b/configurations/nixos/defiant/configuration.nix
@@ -17,12 +17,6 @@
     "services/zfs_smtp_token" = {
       sopsFile = "${inputs.secrets}/defiant-services.yaml";
     };
-    "services/paperless_password" = {
-      sopsFile = "${inputs.secrets}/defiant-services.yaml";
-      mode = "0700";
-      owner = "paperless";
-      group = "paperless";
-    };
   };
 
   host = {
@@ -42,12 +36,10 @@
         host = "smtp.protonmail.ch";
         port = 587;
         to = "leyla@jan-leila.com";
-        user = "noreply@jan-leila.com";
+        user = "leyla@jan-leila.com";
         tokenFile = config.sops.secrets."services/zfs_smtp_token".path;
       };
       pool = {
-        # We are having to boot off of the nvm cache drive because I cant figure out how to boot via the HBA
-        bootDrives = ["nvme-Samsung_SSD_990_PRO_4TB_S7KGNU0X907881F"];
         vdevs = [
           [
             "ata-ST18000NE000-3G6101_ZVTCXVEB"
@@ -115,11 +107,24 @@
         };
       };
     };
+    # home-assistant = {
+    #   enable = false;
+    #   subdomain = "home";
+    # };
+    adguardhome = {
+      enable = false;
+    };
   };
 
   systemd.network = {
     enable = true;
 
+    # config = {
+    #   routeTables = {
+    #     p2p = 1;
+    #   };
+    # };
+
     netdevs = {
       "10-bond0" = {
         netdevConfig = {
@@ -132,20 +137,23 @@
         };
       };
 
-      # "20-wg0" = {
+      # "15-p2p0" = {
       #   netdevConfig = {
       #     Kind = "wireguard";
-      #     Name = "wg0";
+      #     Name = "p2p0";
+      #     MTUBytes = "1280";
       #   };
       #   wireguardConfig = {
       #     PrivateKeyFile = config.sops.secrets."vpn-keys/proton-wireguard/defiant-p2p".path;
       #     ListenPort = 51820;
+      #     # RouteTable = "p2p";
       #   };
       #   wireguardPeers = [
       #     {
       #       PublicKey = "rRO6yJim++Ezz6scCLMaizI+taDjU1pzR2nfW6qKbW0=";
       #       Endpoint = "185.230.126.146:51820";
       #       AllowedIPs = ["0.0.0.0/0"];
+      #       RouteTable = "off";
       #     }
       #   ];
       # };
@@ -167,55 +175,46 @@
         dns = ["192.168.1.1"];
       };
 
-      # For some reason this isn't working. It looks like traffic goes out and comes back but doesn't get correctly routed back to the wg interface on the return trip
-      # debugging steps:
-      # try sending data on the interface `ping -I wg0 8.8.8.8`
-      # view all traffic on the interface `sudo tshark -i wg0`
-      # see what applications are listening to port 14666 (thats what we currently have qbittorent set up to use) `ss -tuln | grep 14666`
-      # "50-wg0" = {
-      #   matchConfig.Name = "wg0";
-      #   networkConfig = {
-      #     DHCP = "no";
-      #   };
+      # "45-p2p0" = {
+      #   matchConfig.Name = "p2p0";
       #   address = [
       #     "10.2.0.2/32"
       #   ];
-      #   # routes = [
-      #   #   {
-      #   #     Destination = "10.2.0.2/32";
-      #   #     Gateway = "10.2.0.1";
-      #   #   }
-      #   # ];
+      #   routes = [
+      #     {
+      #       Destination = "0.0.0.0/0";
+      #     }
+      #   ];
+      #   linkConfig.RequiredForOnline = false;
       # };
     };
   };
 
-  # limit arc usage to 50gb because ollama doesn't play nice with zfs using up all of the memory
-  boot.kernelParams = ["zfs.zfs_arc_max=53687091200"];
-
   services = {
-    # temp enable desktop environment for setup
-    # Enable the X11 windowing system.
-    xserver.enable = true;
-
-    # Enable the GNOME Desktop Environment.
-    displayManager = {
-      gdm.enable = true;
+    # TODO: move zfs scrubbing into module
+    zfs = {
+      autoScrub.enable = true;
+      autoSnapshot.enable = true;
     };
-    desktopManager = {
-      gnome.enable = true;
+
+    # temp enable desktop enviroment for setup
+    # Enable the X11 windowing system.
+    xserver = {
+      enable = true;
+
+      # Enable the GNOME Desktop Environment.
+      displayManager = {
+        gdm.enable = true;
+      };
+      desktopManager = {
+        gnome.enable = true;
+      };
     };
 
     ollama = {
       enable = true;
       exposePort = true;
 
-      acceleration = false;
-
-      environmentVariables = {
-        OLLAMA_KEEP_ALIVE = "24h";
-      };
-
       loadModels = [
         # conversation models
         "llama3.1:8b"
@@ -232,10 +231,6 @@
         # agent models
         "qwen3:8b"
         "qwen3:32b"
-        "qwen3:235b-a22b"
-
-        "qwen3-coder:30b"
-        "qwen3-coder:30b-a3b-fp16"
 
         # embedding models
         "nomic-embed-text:latest"
@@ -282,35 +277,17 @@
       subdomain = "search";
     };
 
-    actual = {
+    virt-home-assistant = {
       enable = false;
-      subdomain = "budget";
-    };
-
-    home-assistant = {
-      enable = true;
-      subdomain = "home";
-      openFirewall = true;
-      database = "postgres";
-
-      extensions = {
-        sonos.enable = true;
-        jellyfin.enable = true;
-        wyoming.enable = false; # Temporarily disabled due to dependency conflict in wyoming-piper
-      };
-    };
-
-    paperless = {
-      enable = true;
-      subdomain = "documents";
-      passwordFile = config.sops.secrets."services/paperless_password".path;
+      networkBridge = "bond0";
+      hostDevice = "0x10c4:0xea60";
     };
 
     qbittorrent = {
       enable = true;
       mediaDir = "/srv/qbittorent";
       openFirewall = true;
-      webuiPort = 8084;
+      webPort = 8084;
     };
   };
 
@@ -321,7 +298,7 @@
     hibernate.enable = false;
     hybrid-sleep.enable = false;
   };
-  services.displayManager.gdm.autoSuspend = false;
+  services.xserver.displayManager.gdm.autoSuspend = false;
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
diff --git a/configurations/nixos/emergent/configuration.nix b/configurations/nixos/emergent/configuration.nix
index 90aecab..a880ef5 100644
--- a/configurations/nixos/emergent/configuration.nix
+++ b/configurations/nixos/emergent/configuration.nix
@@ -2,12 +2,12 @@
 # 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,
   ...
 }: {
   imports = [
-    ./nvidia-drivers.nix
   ];
 
   # Use the systemd-boot EFI boot loader.
@@ -36,15 +36,10 @@
 
   # Enable the X11 windowing system.
   services.xserver.enable = true;
-  # Enable wacom touchscreen device
-  services.xserver.wacom.enable = true;
-
-  # installed opentabletdriver
-  hardware.opentabletdriver.enable = true;
 
   # Enable the GNOME Desktop Environment.
-  services.displayManager.gdm.enable = true;
-  services.desktopManager.gnome.enable = true;
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
 
   host = {
     users = {
@@ -54,17 +49,6 @@
         isPrincipleUser = true;
       };
     };
-    hardware = {
-      piperMouse.enable = true;
-    };
-
-    storage = {
-      enable = true;
-      pool = {
-        mode = "";
-        drives = ["wwn-0x5000039fd0cf05eb"];
-      };
-    };
   };
 
   # Configure keymap in X11
@@ -96,17 +80,12 @@
 
   # programs.firefox.enable = true;
 
-  nixpkgs.config.allowUnfree = true;
-
-  # Packages that can be installed without any extra configuration
-  # See https://search.nixos.org/packages for all options
-  environment.systemPackages = with pkgs; [
-    wget
-  ];
-
-  # Packages that need to be installed with some extra configuration
-  # See https://search.nixos.org/options for all options
-  programs = {};
+  # List packages installed in system profile.
+  # You can use https://search.nixos.org/ to find more packages (and options).
+  # environment.systemPackages = with pkgs; [
+  #   vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+  #   wget
+  # ];
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
diff --git a/configurations/nixos/emergent/default.nix b/configurations/nixos/emergent/default.nix
index 452334a..3455825 100644
--- a/configurations/nixos/emergent/default.nix
+++ b/configurations/nixos/emergent/default.nix
@@ -3,5 +3,6 @@
   imports = [
     ./configuration.nix
     ./hardware-configuration.nix
+    ./disco-configuration.nix
   ];
 }
diff --git a/configurations/nixos/emergent/disco-configuration.nix b/configurations/nixos/emergent/disco-configuration.nix
new file mode 100644
index 0000000..ec002b2
--- /dev/null
+++ b/configurations/nixos/emergent/disco-configuration.nix
@@ -0,0 +1,57 @@
+{...}: {
+  disko.devices = {
+    disk = {
+      disk1 = {
+        type = "disk";
+        device = "/dev/disk/by-id/wwn-0x5000039fd0cf05eb";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "64M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = ["umask=0077"];
+              };
+            };
+            zfs = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "zroot";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      zroot = {
+        type = "zpool";
+        mode = "";
+        options.cachefile = "none";
+        rootFsOptions = {
+          compression = "zstd";
+          "com.sun:auto-snapshot" = "true";
+        };
+        mountpoint = "/";
+        postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot@blank$' || zfs snapshot zroot@blank";
+
+        datasets = {
+          "system/nix" = {
+            type = "zfs_fs";
+            mountpoint = "/nix";
+            options = {
+              atime = "off";
+              relatime = "off";
+              canmount = "on";
+            };
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/configurations/nixos/emergent/nvidia-drivers.nix b/configurations/nixos/emergent/nvidia-drivers.nix
deleted file mode 100644
index b532446..0000000
--- a/configurations/nixos/emergent/nvidia-drivers.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
-  # Enable OpenGL
-  hardware.graphics = {
-    enable = true;
-  };
-
-  # Load nvidia driver for Xorg and Wayland
-  services = {
-    xserver = {
-      # Load nvidia driver for Xorg and Wayland
-      videoDrivers = ["nvidia"];
-    };
-    # Use X instead of wayland
-    displayManager.gdm.wayland = false;
-  };
-
-  hardware.nvidia = {
-    # Modesetting is required.
-    modesetting.enable = true;
-
-    # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
-    # Enable this if you have graphical corruption issues or application crashes after waking
-    # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
-    # of just the bare essentials.
-    powerManagement.enable = true;
-
-    # Fine-grained power management. Turns off GPU when not in use.
-    # Experimental and only works on modern Nvidia GPUs (Turing or newer).
-    powerManagement.finegrained = false;
-
-    # Use the NVidia open source kernel module (not to be confused with the
-    # independent third-party "nouveau" open source driver).
-    # Support is limited to the Turing and later architectures. Full list of
-    # supported GPUs is at:
-    # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
-    # Only available from driver 515.43.04+
-    open = true;
-
-    # Enable the Nvidia settings menu,
-    # accessible via `nvidia-settings`.
-    nvidiaSettings = true;
-
-    # Optionally, you may need to select the appropriate driver version for your specific GPU.
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
-  };
-}
diff --git a/configurations/nixos/horizon/configuration.nix b/configurations/nixos/horizon/configuration.nix
index 731c6b0..7e2ab8a 100644
--- a/configurations/nixos/horizon/configuration.nix
+++ b/configurations/nixos/horizon/configuration.nix
@@ -1,8 +1,7 @@
 {
-  lib,
-  pkgs,
   config,
   inputs,
+  pkgs,
   ...
 }: {
   imports = [
@@ -11,19 +10,6 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  boot = {
-    initrd = {
-      availableKernelModules = ["usb_storage" "sd_mod"];
-    };
-    kernelModules = ["sg"];
-
-    # Bootloader.
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-  };
-
   host = {
     users = {
       leyla = {
@@ -42,66 +28,38 @@
       enable = true;
       models = {
         "Llama 3.1 8B" = {
-          model = "llama3.1:8b";
+          model = "lamma3.1:8b";
           roles = ["chat" "edit" "apply"];
-          apiBase = "http://defiant:11434";
-        };
-        "Deepseek Coder:6.7B" = {
-          model = "deepseek-coder:6.7b";
-          roles = ["chat" "edit" "apply"];
-          apiBase = "http://defiant:11434";
-        };
-        "Deepseek Coder:33B" = {
-          model = "deepseek-coder:33b";
-          roles = ["chat" "edit" "apply"];
-          apiBase = "http://defiant:11434";
-        };
-
-        "Deepseek r1:8B" = {
-          model = "deepseek-r1:8b";
-          roles = ["chat"];
-          apiBase = "http://defiant:11434";
-        };
-
-        "Deepseek r1:32B" = {
-          model = "deepseek-r1:32b";
-          roles = ["chat"];
-          apiBase = "http://defiant:11434";
+          apiBase = "http://twilight:11434";
         };
 
         "qwen2.5-coder:1.5b-base" = {
           model = "qwen2.5-coder:1.5b-base";
           roles = ["autocomplete"];
-          apiBase = "http://defiant:11434";
+          apiBase = "http://twilight:11434";
         };
 
         "nomic-embed-text:latest" = {
           model = "nomic-embed-text:latest";
           roles = ["embed"];
-          apiBase = "http://defiant:11434";
+          apiBase = "http://twilight:11434";
         };
       };
     };
   };
 
   environment.systemPackages = with pkgs; [
-    cachefilesd
     webtoon-dl
+    prostudiomasters
   ];
-  services.cachefilesd.enable = true;
 
   programs = {
     adb.enable = true;
-  };
-
-  networking = {
-    networkmanager.enable = true;
-    hostName = "horizon"; # Define your hostname.
-  };
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-
-  hardware = {
-    graphics.enable = true;
+    steam = {
+      enable = true;
+      remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
+      dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+    };
   };
 
   sops.secrets = {
@@ -115,10 +73,6 @@
     fprintd = {
       enable = true;
     };
-    # firmware update tool
-    fwupd = {
-      enable = true;
-    };
     tailscale = {
       enable = true;
       authKeyFile = config.sops.secrets."vpn-keys/tailscale-authkey/horizon".path;
@@ -126,18 +80,8 @@
     };
 
     syncthing.enable = true;
-
-    ollama = {
-      enable = true;
-      loadModels = [
-        "llama3.1:8b"
-      ];
-    };
   };
 
-  # Enable network-online.target for better network dependency handling
-  systemd.services.NetworkManager-wait-online.enable = true;
-
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
 
diff --git a/configurations/nixos/horizon/default.nix b/configurations/nixos/horizon/default.nix
index b916d82..1263215 100644
--- a/configurations/nixos/horizon/default.nix
+++ b/configurations/nixos/horizon/default.nix
@@ -3,6 +3,5 @@
   imports = [
     ./configuration.nix
     ./hardware-configuration.nix
-    # ./network-mount.nix
   ];
 }
diff --git a/configurations/nixos/horizon/hardware-configuration.nix b/configurations/nixos/horizon/hardware-configuration.nix
index cec4914..e88d8dc 100644
--- a/configurations/nixos/horizon/hardware-configuration.nix
+++ b/configurations/nixos/horizon/hardware-configuration.nix
@@ -4,6 +4,7 @@
 {
   config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }: {
@@ -11,10 +12,22 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [];
+  boot = {
+    initrd = {
+      availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
+      kernelModules = [];
+    };
+    kernelModules = ["kvm-intel" "sg"];
+    extraModulePackages = [];
+
+    # Bootloader.
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+
+    supportedFilesystems = ["nfs"];
+  };
 
   fileSystems = {
     "/" = {
@@ -26,20 +39,98 @@
       device = "/dev/disk/by-uuid/E138-65B5";
       fsType = "vfat";
     };
+
+    "/mnt/leyla_documents" = {
+      device = "defiant:/export/leyla_documents";
+      fsType = "nfs";
+      options = [
+        "vers=4"
+        "x-systemd.automount"
+        "noauto"
+        "user"
+        "noatime"
+        "nofail"
+        "x-systemd.idle-timeout=600"
+        "fsc"
+        "timeo=600"
+        "retrans=2"
+      ];
+    };
+
+    "/mnt/eve_documents" = {
+      device = "defiant:/export/eve_documents";
+      fsType = "nfs";
+      options = [
+        "vers=4"
+        "x-systemd.automount"
+        "noauto"
+        "user"
+        "nofail"
+        "x-systemd.idle-timeout=600"
+        "fsc"
+        "timeo=600"
+        "retrans=2"
+      ];
+    };
+
+    "/mnt/users_documents" = {
+      device = "defiant:/export/users_documents";
+      fsType = "nfs";
+      options = [
+        "vers=4"
+        "x-systemd.automount"
+        "noauto"
+        "user"
+        "nofail"
+        "x-systemd.idle-timeout=600"
+        "fsc"
+        "timeo=600"
+        "retrans=2"
+      ];
+    };
+
+    "/mnt/media" = {
+      device = "defiant:/export/media";
+      fsType = "nfs";
+      options = [
+        "vers=4"
+        "x-systemd.automount"
+        "noauto"
+        "user"
+        "noatime"
+        "nofail"
+        "x-systemd.idle-timeout=600"
+        "noatime"
+        "nodiratime"
+        "relatime"
+        "fsc"
+        "timeo=600"
+        "retrans=2"
+      ];
+    };
   };
 
+  environment.systemPackages = with pkgs; [
+    cachefilesd
+  ];
+
+  services.cachefilesd.enable = true;
+
   swapDevices = [
     {device = "/dev/disk/by-uuid/be98e952-a072-4c3a-8c12-69500b5a2fff";}
   ];
 
-  # 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.tailscale0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp170s0.useDHCP = lib.mkDefault true;
+  networking = {
+    networkmanager.enable = true;
+    useDHCP = lib.mkDefault true;
+    hostName = "horizon"; # Define your hostname.
+  };
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+
+  hardware = {
+    graphics.enable = true;
+    cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  };
 }
diff --git a/configurations/nixos/horizon/network-mount.nix b/configurations/nixos/horizon/network-mount.nix
deleted file mode 100644
index fde16f5..0000000
--- a/configurations/nixos/horizon/network-mount.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{...}: {
-  boot.supportedFilesystems = ["nfs"];
-
-  fileSystems = {
-    "/mnt/leyla_documents" = {
-      device = "defiant:/exports/leyla_documents";
-      fsType = "nfs";
-      options = [
-        "x-systemd.automount"
-        "noauto"
-        "noatime"
-        "nofail"
-        "soft"
-        "intr" # Allow interruption of NFS calls
-        "timeo=30" # 3 second timeout (30 deciseconds)
-        "retrans=2" # Only 2 retries before giving up
-        "x-systemd.idle-timeout=300" # 5 minute idle timeout for mobile
-        "x-systemd.device-timeout=15" # 15 second device timeout
-        "bg" # Background mount - don't block boot
-        "fsc" # Enable caching
-        "_netdev" # Network device - wait for network
-        "x-systemd.requires=network-online.target" # Require network to be online
-        "x-systemd.after=network-online.target" # Start after network is online
-        "x-systemd.mount-timeout=30" # 30 second mount timeout
-      ];
-    };
-
-    "/mnt/users_documents" = {
-      device = "defiant:/exports/users_documents";
-      fsType = "nfs";
-      options = [
-        "x-systemd.automount"
-        "noauto"
-        "nofail"
-        "soft"
-        "intr"
-        "timeo=30"
-        "retrans=2"
-        "x-systemd.idle-timeout=300"
-        "x-systemd.device-timeout=15"
-        "bg"
-        "fsc"
-        "_netdev"
-        "x-systemd.requires=network-online.target"
-        "x-systemd.after=network-online.target"
-        "x-systemd.mount-timeout=30"
-      ];
-    };
-
-    "/mnt/media" = {
-      device = "defiant:/exports/media";
-      fsType = "nfs";
-      options = [
-        "x-systemd.automount"
-        "noauto"
-        "noatime"
-        "nofail"
-        "soft"
-        "intr"
-        "timeo=30"
-        "retrans=2"
-        "x-systemd.idle-timeout=300"
-        "x-systemd.device-timeout=15"
-        "bg"
-        # Mobile-optimized read settings
-        "rsize=8192" # Smaller read size for mobile
-        "wsize=8192" # Smaller write size for mobile
-        "fsc"
-        "_netdev"
-        "x-systemd.requires=network-online.target"
-        "x-systemd.after=network-online.target"
-        "x-systemd.mount-timeout=30"
-      ];
-    };
-  };
-}
diff --git a/configurations/nixos/twilight/configuration.nix b/configurations/nixos/twilight/configuration.nix
index 477c517..e9032d8 100644
--- a/configurations/nixos/twilight/configuration.nix
+++ b/configurations/nixos/twilight/configuration.nix
@@ -1,7 +1,6 @@
 {
   inputs,
   config,
-  pkgs,
   ...
 }: {
   imports = [
@@ -10,14 +9,6 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  boot.initrd.availableKernelModules = ["usb_storage"];
-  boot.kernelModules = ["sg"];
-
-  boot.loader = {
-    systemd-boot.enable = true;
-    efi.canTouchEfiVariables = true;
-  };
-
   sops.secrets = {
     "vpn-keys/tailscale-authkey/twilight" = {
       sopsFile = "${inputs.secrets}/vpn-keys.yaml";
@@ -130,19 +121,12 @@
 
     syncthing.enable = true;
   };
-
-  # Enable network-online.target for better network dependency handling
-  systemd.services.NetworkManager-wait-online.enable = true;
-
-  environment.systemPackages = with pkgs; [
-    cachefilesd
-  ];
-  hardware.steam-hardware.enable = true; # Provides udev rules for controller, HTC vive, and Valve Index
-
-  networking = {
-    networkmanager.enable = true;
-    hostName = "twilight"; # Define your hostname.
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
+    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
   };
+  hardware.steam-hardware.enable = true; # Provides udev rules for controller, HTC vive, and Valve Index
 
   # enabled virtualisation for docker
   # virtualisation.docker.enable = true;
diff --git a/configurations/nixos/twilight/default.nix b/configurations/nixos/twilight/default.nix
index aa841f8..edfb3f6 100644
--- a/configurations/nixos/twilight/default.nix
+++ b/configurations/nixos/twilight/default.nix
@@ -3,7 +3,5 @@
   imports = [
     ./configuration.nix
     ./hardware-configuration.nix
-    ./nvidia-drivers.nix
-    # ./network-mount.nix
   ];
 }
diff --git a/configurations/nixos/twilight/hardware-configuration.nix b/configurations/nixos/twilight/hardware-configuration.nix
index 1389caf..1cba7de 100644
--- a/configurations/nixos/twilight/hardware-configuration.nix
+++ b/configurations/nixos/twilight/hardware-configuration.nix
@@ -4,6 +4,7 @@
 {
   config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }: {
@@ -11,10 +12,30 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "sd_mod"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = [];
+  boot = {
+    initrd = {
+      availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
+      kernelModules = [];
+    };
+    kernelModules = ["kvm-amd" "sg"];
+    extraModulePackages = [];
+
+    # Bootloader.
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+
+    supportedFilesystems = ["nfs"];
+  };
+
+  services.xserver = {
+    # Load nvidia driver for Xorg and Wayland
+    videoDrivers = ["nvidia"];
+
+    # Use X instead of wayland for gaming reasons
+    displayManager.gdm.wayland = false;
+  };
 
   fileSystems = {
     "/" = {
@@ -27,16 +48,111 @@
       fsType = "vfat";
       options = ["fmask=0022" "dmask=0022"];
     };
+
+    "/mnt/leyla_documents" = {
+      device = "defiant:/exports/leyla_documents";
+      fsType = "nfs";
+      options = [
+        "x-systemd.automount"
+        "noauto"
+        "user"
+        "noatime"
+        "nofail"
+        "soft"
+        "x-systemd.idle-timeout=600"
+        "fsc"
+      ];
+    };
+
+    "/mnt/users_documents" = {
+      device = "defiant:/exports/users_documents";
+      fsType = "nfs";
+      options = [
+        "x-systemd.automount"
+        "noauto"
+        "user"
+        "nofail"
+        "soft"
+        "x-systemd.idle-timeout=600"
+        "fsc"
+      ];
+    };
+
+    "/mnt/media" = {
+      device = "defiant:/exports/media";
+      fsType = "nfs";
+      options = [
+        "x-systemd.automount"
+        "noauto"
+        "user"
+        "noatime"
+        "nofail"
+        "soft"
+        "x-systemd.idle-timeout=600"
+        "noatime"
+        "nodiratime"
+        "relatime"
+        "rsize=32768"
+        "wsize=32768"
+        "fsc"
+      ];
+    };
   };
 
+  environment.systemPackages = with pkgs; [
+    cachefilesd
+  ];
+
   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 = {
+    networkmanager.enable = true;
+    # 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`.
+    useDHCP = lib.mkDefault true;
+    hostName = "twilight"; # Define your hostname.
+  };
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  hardware = {
+    # Enable OpenGL
+    graphics.enable = true;
+
+    # install graphics drivers
+    nvidia = {
+      # Modesetting is required.
+      modesetting.enable = true;
+
+      # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
+      # Enable this if you have graphical corruption issues or application crashes after waking
+      # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
+      # of just the bare essentials.
+      powerManagement.enable = false;
+
+      # Fine-grained power management. Turns off GPU when not in use.
+      # Experimental and only works on modern Nvidia GPUs (Turing or newer).
+      powerManagement.finegrained = false;
+
+      # Use the NVidia open source kernel module (not to be confused with the
+      # independent third-party "nouveau" open source driver).
+      # Support is limited to the Turing and later architectures. Full list of
+      # supported GPUs is at:
+      # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
+      # Only available from driver 515.43.04+
+      # Currently alpha-quality/buggy, so false is currently the recommended setting.
+      open = false;
+
+      # Enable the Nvidia settings menu,
+      # accessible via `nvidia-settings`.
+      nvidiaSettings = true;
+
+      # Optionally, you may need to select the appropriate driver version for your specific GPU.
+      package = config.boot.kernelPackages.nvidiaPackages.production;
+    };
+
+    cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  };
 }
diff --git a/configurations/nixos/twilight/network-mount.nix b/configurations/nixos/twilight/network-mount.nix
deleted file mode 100644
index 9f84b04..0000000
--- a/configurations/nixos/twilight/network-mount.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{...}: {
-  boot.supportedFilesystems = ["nfs"];
-
-  fileSystems = {
-    "/mnt/leyla_documents" = {
-      device = "defiant:/exports/leyla_documents";
-      fsType = "nfs";
-      options = [
-        "x-systemd.automount"
-        "noauto"
-        "noatime"
-        "nofail"
-        "soft"
-        "intr" # Allow interruption of NFS calls
-        "timeo=50" # 5 second timeout (50 deciseconds) - longer than mobile
-        "retrans=3" # 3 retries for desktop
-        "x-systemd.idle-timeout=600" # 10 minute idle timeout for desktop
-        "x-systemd.device-timeout=30" # 30 second device timeout
-        "bg" # Background mount - don't block boot
-        "fsc" # Enable caching
-        "_netdev" # Network device - wait for network
-        "x-systemd.requires=network-online.target" # Require network to be online
-        "x-systemd.after=network-online.target" # Start after network is online
-      ];
-    };
-
-    "/mnt/users_documents" = {
-      device = "defiant:/exports/users_documents";
-      fsType = "nfs";
-      options = [
-        "x-systemd.automount"
-        "noauto"
-        "nofail"
-        "soft"
-        "intr"
-        "timeo=50"
-        "retrans=3"
-        "x-systemd.idle-timeout=600"
-        "bg"
-        "fsc"
-        "_netdev"
-        "x-systemd.requires=network-online.target"
-        "x-systemd.after=network-online.target"
-      ];
-    };
-
-    "/mnt/media" = {
-      device = "defiant:/exports/media";
-      fsType = "nfs";
-      options = [
-        "x-systemd.automount"
-        "noauto"
-        "noatime"
-        "nofail"
-        "soft"
-        "intr"
-        "timeo=50"
-        "retrans=3"
-        "x-systemd.idle-timeout=600"
-        "x-systemd.device-timeout=30"
-        "bg"
-        # Desktop-optimized read settings
-        "rsize=32768" # Larger read size for desktop
-        "wsize=32768" # Larger write size for desktop
-        "fsc"
-        "_netdev"
-        "x-systemd.requires=network-online.target"
-        "x-systemd.after=network-online.target"
-      ];
-    };
-  };
-}
diff --git a/configurations/nixos/twilight/nvidia-drivers.nix b/configurations/nixos/twilight/nvidia-drivers.nix
deleted file mode 100644
index d875e37..0000000
--- a/configurations/nixos/twilight/nvidia-drivers.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{config, ...}: {
-  services = {
-    xserver = {
-      # Load nvidia driver for Xorg and Wayland
-      videoDrivers = ["nvidia"];
-    };
-    # Use X instead of wayland for gaming reasons
-    displayManager.gdm.wayland = false;
-  };
-
-  hardware = {
-    # Enable OpenGL
-    graphics.enable = true;
-
-    # install graphics drivers
-    nvidia = {
-      # Modesetting is required.
-      modesetting.enable = true;
-
-      # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
-      # Enable this if you have graphical corruption issues or application crashes after waking
-      # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
-      # of just the bare essentials.
-      powerManagement.enable = true;
-
-      # Fine-grained power management. Turns off GPU when not in use.
-      # Experimental and only works on modern Nvidia GPUs (Turing or newer).
-      powerManagement.finegrained = false;
-
-      # Use the NVidia open source kernel module (not to be confused with the
-      # independent third-party "nouveau" open source driver).
-      # Support is limited to the Turing and later architectures. Full list of
-      # supported GPUs is at:
-      # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
-      # Only available from driver 515.43.04+
-      # Currently alpha-quality/buggy, so false is currently the recommended setting.
-      open = true;
-
-      # Enable the Nvidia settings menu,
-      # accessible via `nvidia-settings`.
-      nvidiaSettings = true;
-
-      # Optionally, you may need to select the appropriate driver version for your specific GPU.
-      package = config.boot.kernelPackages.nvidiaPackages.production;
-    };
-  };
-}
diff --git a/flake.lock b/flake.lock
index 6ea6f9b..fa3ad83 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,23 +1,5 @@
 {
   "nodes": {
-    "devshell": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1741473158,
-        "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -25,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757255839,
-        "narHash": "sha256-XH33B1X888Xc/xEXhF1RPq/kzKElM0D5C9N6YdvOvIc=",
+        "lastModified": 1748225455,
+        "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "c8a0e78d86b12ea67be6ed0f7cae7f9bfabae75a",
+        "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba",
         "type": "github"
       },
       "original": {
@@ -46,11 +28,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1757304222,
-        "narHash": "sha256-s070stByAXxeCLgftTXxFxZ2ynJhghne4Y6cTuqGAaw=",
+        "lastModified": 1748405006,
+        "narHash": "sha256-pmt0SFjACJJAI8g8QU5arg2c9BXNZG9/okVwRSDJkG8=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "fa312c0175ffb82bc67da095439b9cb683ac52bd",
+        "rev": "f9801a86d6603260940890c36650275090d1dceb",
         "type": "gitlab"
       },
       "original": {
@@ -93,24 +75,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -118,11 +82,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757256385,
-        "narHash": "sha256-WK7tOhWwr15mipcckhDg2no/eSpM1nIh4C9le8HgHhk=",
+        "lastModified": 1748455938,
+        "narHash": "sha256-mQ/iNzPra2WtDQ+x2r5IadcWNr0m3uHvLMzJkXKAG/8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f35703b412c67b48e97beb6e27a6ab96a084cd37",
+        "rev": "02077149e2921014511dac2729ae6dadb4ec50e2",
         "type": "github"
       },
       "original": {
@@ -146,28 +110,6 @@
         "type": "github"
       }
     },
-    "mcp-nixos": {
-      "inputs": {
-        "devshell": "devshell",
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1755372538,
-        "narHash": "sha256-iWhsf1Myk6RyQ7IuNf4bWI3Sqq9pgmhKvEisCXtkxyw=",
-        "owner": "utensils",
-        "repo": "mcp-nixos",
-        "rev": "46b4d4d3d6421bfbadc415532ef74433871e1cda",
-        "type": "github"
-      },
-      "original": {
-        "owner": "utensils",
-        "repo": "mcp-nixos",
-        "type": "github"
-      }
-    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -175,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757130842,
-        "narHash": "sha256-4i7KKuXesSZGUv0cLPLfxbmF1S72Gf/3aSypgvVkwuA=",
+        "lastModified": 1748352827,
+        "narHash": "sha256-sNUUP6qxGkK9hXgJ+p362dtWLgnIWwOCmiq72LAWtYo=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "15f067638e2887c58c4b6ba1bdb65a0b61dc58c5",
+        "rev": "44a7d0e687a87b73facfe94fba78d323a6686a90",
         "type": "github"
       },
       "original": {
@@ -211,17 +153,17 @@
     },
     "nix-vscode-extensions": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1757296711,
-        "narHash": "sha256-7u9/tXUdmTj8x7ofet8aELLBlCHSoA+QOhYKheRdacM=",
+        "lastModified": 1748397853,
+        "narHash": "sha256-tudGoP5caIJ5TzkV6wnsmUk7Spx21oWMKpkmPbjRNZc=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "ab9374ac8c162dacffcd4400e668fd7f9b6f173a",
+        "rev": "ac4fc8eb9a1ee5eeb3c0a30f57652e4c5428d3a5",
         "type": "github"
       },
       "original": {
@@ -232,11 +174,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1757103352,
-        "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=",
+        "lastModified": 1747900541,
+        "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "11b2a10c7be726321bb854403fdeec391e798bf0",
+        "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06",
         "type": "github"
       },
       "original": {
@@ -248,27 +190,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1722073938,
-        "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1757068644,
-        "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=",
+        "lastModified": 1748370509,
+        "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9",
+        "rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
         "type": "github"
       },
       "original": {
@@ -285,25 +211,23 @@
         "flake-compat": "flake-compat",
         "home-manager": "home-manager",
         "impermanence": "impermanence",
-        "mcp-nixos": "mcp-nixos",
         "nix-darwin": "nix-darwin",
         "nix-syncthing": "nix-syncthing",
         "nix-vscode-extensions": "nix-vscode-extensions",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "secrets": "secrets",
-        "sops-nix": "sops-nix",
-        "steam-fetcher": "steam-fetcher"
+        "sops-nix": "sops-nix"
       }
     },
     "secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1752531440,
-        "narHash": "sha256-04tQ3EUrtmZ7g6fVUkZC4AbAG+Z7lng79qU3jsiqWJY=",
+        "lastModified": 1743538790,
+        "narHash": "sha256-QXmvyxfAhpifxAWcYTvuGfzv9I+9gHw0bq4WYtGEB9A=",
         "ref": "refs/heads/main",
-        "rev": "f016767c13aa36dde91503f7a9f01bdd02468045",
-        "revCount": 20,
+        "rev": "3d63dff77f8eda1667e3586169642cf256c4aa34",
+        "revCount": 17,
         "type": "git",
         "url": "ssh://git@git.jan-leila.com/jan-leila/nix-config-secrets.git"
       },
@@ -319,11 +243,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754988908,
-        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
+        "lastModified": 1747603214,
+        "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
+        "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd",
         "type": "github"
       },
       "original": {
@@ -332,26 +256,6 @@
         "type": "github"
       }
     },
-    "steam-fetcher": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1714795926,
-        "narHash": "sha256-PkgC9jqoN6cJ8XYzTA2PlrWs7aPJkM3BGiTxNqax0cA=",
-        "owner": "nix-community",
-        "repo": "steam-fetcher",
-        "rev": "12f66eafb7862d91b3e30c14035f96a21941bd9c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "steam-fetcher",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -366,21 +270,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 7980012..496456a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
     # lix-module = {
-    #   url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-1.tar.gz";
+    #   url = "https://git.lix.systems/lix-project/nixos-module/archive/stable.tar.gz";
     #   inputs.nixpkgs.follows = "nixpkgs";
     # };
 
@@ -71,17 +71,6 @@
     flake-compat = {
       url = "github:edolstra/flake-compat";
     };
-
-    steam-fetcher = {
-      url = "github:nix-community/steam-fetcher";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    # MCP NixOS server for Claude Dev
-    mcp-nixos = {
-      url = "github:utensils/mcp-nixos";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs = {
@@ -142,11 +131,11 @@
       systemsHomes
       // homeSystems;
   in {
-    formatter = forEachPkgs (system: pkgs: pkgs.alejandra);
+    formatter = forEachPkgs (pkgs: pkgs.alejandra);
 
     # templates = import ./templates;
 
-    devShells = forEachPkgs (system: pkgs: {
+    devShells = forEachPkgs (pkgs: {
       default = pkgs.mkShell {
         packages = with pkgs; [
           # for version controlling this repo
@@ -161,10 +150,6 @@
           nixos-anywhere
           # for updating disko configurations
           disko
-          # for viewing dconf entries
-          dconf-editor
-          # for MCP NixOS server support in development
-          inputs.mcp-nixos.packages.${system}.default
         ];
 
         SOPS_AGE_KEY_DIRECTORY = import ./const/sops_age_key_directory.nix;
diff --git a/modules/common-modules/overlays/default.nix b/modules/common-modules/overlays/default.nix
index 465e83f..08085f5 100644
--- a/modules/common-modules/overlays/default.nix
+++ b/modules/common-modules/overlays/default.nix
@@ -1,7 +1,3 @@
 # this folder is for derivation overlays
-{inputs, ...}: {
-  nixpkgs.overlays = [
-    inputs.steam-fetcher.overlays.default
-    inputs.nix-vscode-extensions.overlays.default
-  ];
+{...}: {
 }
diff --git a/modules/common-modules/pkgs/codium-extensions/ai-code.nix b/modules/common-modules/pkgs/codium-extensions/ai-code.nix
deleted file mode 100644
index 9c9efe3..0000000
--- a/modules/common-modules/pkgs/codium-extensions/ai-code.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  buildNpmPackage,
-  vscode-utils,
-  pkgs,
-  ...
-}: let
-  version = "0.0.1";
-  pname = "ai-code";
-  publisher = "jan-leila";
-  vsix = buildNpmPackage {
-    inherit version pname;
-
-    src = builtins.fetchGit {
-      url = "ssh://git@git.jan-leila.com/jan-leila/ai-code.git";
-      rev = "d48e01713021dbb30de0ebbee2cfaf99e4e9b5a6";
-    };
-
-    npmDepsHash = "sha256-kjMyEnT3dz0yH5Ydh+aGoFDocKpBYGRmfnwbEdvvgpY=";
-
-    nativeBuildInputs = with pkgs; [
-      vsce
-    ];
-
-    buildPhase = ''
-      ${pkgs.vsce}/bin/vsce package -o ${pname}.zip
-    '';
-
-    installPhase = ''
-      mkdir -p $out
-      mv ${pname}.zip $out/${pname}.zip
-    '';
-  };
-in
-  vscode-utils.buildVscodeExtension {
-    inherit pname version;
-
-    src = "${vsix}/${pname}.zip";
-
-    vscodeExtUniqueId = "${publisher}.${pname}";
-    vscodeExtPublisher = publisher;
-    vscodeExtName = pname;
-  }
diff --git a/modules/common-modules/pkgs/codium-extensions/default.nix b/modules/common-modules/pkgs/codium-extensions/default.nix
deleted file mode 100644
index a60e8a0..0000000
--- a/modules/common-modules/pkgs/codium-extensions/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  ai-code = pkgs.callPackage ./ai-code.nix {};
-}
diff --git a/modules/common-modules/pkgs/default.nix b/modules/common-modules/pkgs/default.nix
index 669533b..3e4456b 100644
--- a/modules/common-modules/pkgs/default.nix
+++ b/modules/common-modules/pkgs/default.nix
@@ -1,29 +1,4 @@
-{pkgs, ...}: {
-  nixpkgs.overlays = [
-    (final: prev: {
-      webtoon-dl =
-        pkgs.callPackage
-        ./webtoon-dl.nix
-        {};
-    })
-    # TODO: this package always needs to be called with the --in-process-gpu flag for some reason, can we automate that?
-    (final: prev: {
-      prostudiomasters =
-        pkgs.callPackage
-        ./prostudiomasters.nix
-        {};
-    })
-    (final: prev: {
-      noita_entangled_worlds = pkgs.callPackage ./noita-entangled-worlds.nix {};
-    })
-    (final: prev: {
-      gdx-liftoff = pkgs.callPackage ./gdx-liftoff.nix {};
-    })
-    (final: prev: {
-      codium-extensions = pkgs.callPackage ./codium-extensions {};
-    })
-    (final: prev: {
-      mapillary-uploader = pkgs.callPackage ./mapillary-uploader.nix {};
-    })
-  ];
+# this folder is for custom derivations
+{...}: {
+  # package = pkgs.callPackage ./package.nix {};
 }
diff --git a/modules/common-modules/pkgs/gdx-liftoff.nix b/modules/common-modules/pkgs/gdx-liftoff.nix
deleted file mode 100644
index d2e9424..0000000
--- a/modules/common-modules/pkgs/gdx-liftoff.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  stdenv,
-  fetchurl,
-  makeWrapper,
-  jdk,
-  lib,
-  xorg,
-  libGL,
-  ...
-}:
-stdenv.mkDerivation rec {
-  pname = "gdx-liftoff";
-  version = "1.13.5.1";
-
-  src = fetchurl {
-    url = "https://github.com/libgdx/gdx-liftoff/releases/download/v${version}/gdx-liftoff-${version}.jar";
-    hash = "sha256-9vCXGNGwI/P4VmcdIzTv2GPAX8bZb7nkfopaRAf6yMA=";
-  };
-
-  dontUnpack = true;
-
-  nativeBuildInputs = [makeWrapper];
-
-  runtimeDependencies = lib.makeLibraryPath [
-    # glfw
-    libGL
-    xorg.libX11
-    xorg.libXcursor
-    xorg.libXext
-    xorg.libXrandr
-    xorg.libXxf86vm
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm644 $src $out/lib/gdx-liftoff-${version}.jar
-
-    makeWrapper ${lib.getExe jdk} $out/bin/gdx-liftoff-${version} \
-      --append-flags "-jar $out/lib/gdx-liftoff-${version}.jar"\
-      ${lib.optionalString stdenv.hostPlatform.isLinux "--prefix LD_LIBRARY_PATH : ${runtimeDependencies}"}
-    runHook postInstall
-  '';
-}
diff --git a/modules/common-modules/pkgs/mapillary-uploader.nix b/modules/common-modules/pkgs/mapillary-uploader.nix
deleted file mode 100644
index 3ab38f8..0000000
--- a/modules/common-modules/pkgs/mapillary-uploader.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  fetchurl,
-  appimageTools,
-}: let
-  pname = "mapillary-uploader";
-  version = "4.7.2"; # Based on the application output
-
-  src = fetchurl {
-    url = "https://tools.mapillary.com/uploader/download/linux";
-    name = "mapillary-uploader.AppImage";
-    sha256 = "sha256-Oyx7AIdA/2mwBaq7UzXOoyq/z2SU2sViMN40sY2RCQw=";
-  };
-
-  appimageContents = appimageTools.extractType2 {
-    inherit pname version src;
-  };
-in
-  appimageTools.wrapType2 {
-    inherit pname version src;
-
-    extraInstallCommands = ''
-      # Install desktop file
-      install -Dm644 ${appimageContents}/mapillary-desktop-uploader.desktop $out/share/applications/mapillary-uploader.desktop
-
-      # Install icon
-      install -Dm644 ${appimageContents}/usr/share/icons/hicolor/0x0/apps/mapillary-desktop-uploader.png $out/share/pixmaps/mapillary-uploader.png
-
-      # Fix desktop file paths
-      substituteInPlace $out/share/applications/mapillary-uploader.desktop \
-        --replace 'Exec=AppRun' 'Exec=${pname}'
-    '';
-
-    meta = with lib; {
-      description = "Mapillary Desktop Uploader - Upload street-level imagery to Mapillary";
-      homepage = "https://www.mapillary.com/";
-      license = licenses.unfree; # Mapillary's license terms
-      maintainers = [];
-      platforms = ["x86_64-linux"];
-      sourceProvenance = with sourceTypes; [binaryNativeCode];
-    };
-  }
diff --git a/modules/common-modules/pkgs/noita-entangled-worlds.nix b/modules/common-modules/pkgs/noita-entangled-worlds.nix
deleted file mode 100644
index 322ce41..0000000
--- a/modules/common-modules/pkgs/noita-entangled-worlds.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-# not working yet
-{
-  pkgs,
-  rustPlatform,
-  fetchFromGitHub,
-  ...
-}: let
-  version = "1.5.3";
-  repo = fetchFromGitHub {
-    owner = "IntQuant";
-    repo = "noita_entangled_worlds";
-    rev = "v${version}";
-    hash = "sha256-frrpD0aWTeDbZYtp15R+quUUAZf7OvHlbSLtGJJtAqk=";
-  };
-in
-  rustPlatform.buildRustPackage {
-    name = "noita-proxy-${version}";
-    src = repo + "/noita-proxy";
-    prePatch = ''
-      substituteInPlace Cargo.toml \
-          --replace "path = \"../shared\"" "path = \"${repo + "/shared"}\""
-    '';
-    nativeBuildInputs = with pkgs; [
-      pkg-config
-      python3
-      cmake
-    ];
-    buildInputs = with pkgs; [
-      openssl
-      openssl.dev
-      libpulseaudio
-      libjack2
-      alsa-lib
-      xorg.libxcb
-      xorg.libxcb.dev
-      libopus
-    ];
-    propagatedBuildInputs = with pkgs; [
-      steamworks-sdk-redist
-    ];
-    runtimeDependencies = with pkgs; [
-      steamworks-sdk-redist
-    ];
-    doCheck = false;
-    cargoHash = "sha256-TzUS6d6PopgGf2i1yVaXaXdzNrvfSz+Gv67BAtxYmb4=";
-  }
diff --git a/modules/home-manager-modules/continue.nix b/modules/home-manager-modules/continue.nix
new file mode 100644
index 0000000..327ee44
--- /dev/null
+++ b/modules/home-manager-modules/continue.nix
@@ -0,0 +1,75 @@
+{
+  lib,
+  pkgs,
+  config,
+  osConfig,
+  ...
+}: let
+  ai-tooling-enabled = config.user.continue.enable && osConfig.host.ai.enable;
+in {
+  options = {
+    user.continue = {
+      enable = lib.mkEnableOption "should continue be enabled on this machine";
+      docs = lib.mkOption {
+        type = lib.types.attrsOf (lib.types.submodule ({name, ...}: {
+          options = {
+            name = lib.mkOption {
+              type = lib.types.str;
+              default = name;
+            };
+            startUrl = lib.mkOption {
+              type = lib.types.str;
+            };
+          };
+        }));
+      };
+      context = lib.mkOption {
+        type = lib.types.attrsOf (lib.types.submodule ({name, ...}: {
+          options = {
+            provider = lib.mkOption {
+              type = lib.types.str;
+              default = name;
+            };
+          };
+        }));
+        default = {
+          "code" = {};
+          "docs" = {};
+          "diff" = {};
+          "terminal" = {};
+          "problems" = {};
+          "folder" = {};
+          "codebase" = {};
+        };
+      };
+    };
+  };
+
+  config =
+    lib.mkIf ai-tooling-enabled
+    (lib.mkMerge [
+      {
+        home = {
+          file = {
+            ".continue/config.yaml".source = (pkgs.formats.yaml {}).generate "continue-config" {
+              name = "Assistant";
+              version = "1.0.0";
+              schema = "v1";
+              models = lib.attrsets.attrValues osConfig.host.ai.models;
+              context = lib.attrsets.attrValues config.user.continue.context;
+              docs = lib.attrsets.attrValues config.user.continue.docs;
+            };
+          };
+        };
+      }
+      (lib.mkIf osConfig.host.impermanence.enable {
+        home.persistence."/persist${config.home.homeDirectory}" = {
+          directories = [
+            ".continue/index"
+            ".continue/sessions"
+          ];
+          allowOther = true;
+        };
+      })
+    ]);
+}
diff --git a/modules/home-manager-modules/default.nix b/modules/home-manager-modules/default.nix
index 4c085a5..ee47fb5 100644
--- a/modules/home-manager-modules/default.nix
+++ b/modules/home-manager-modules/default.nix
@@ -1,12 +1,9 @@
 # this folder container modules that are for home manager only
 {...}: {
   imports = [
-    ./sops.nix
-    ./user.nix
     ./flipperzero.nix
     ./i18n.nix
     ./openssh.nix
-    ./gnome.nix
-    ./programs
+    ./continue.nix
   ];
 }
diff --git a/modules/home-manager-modules/gnome.nix b/modules/home-manager-modules/gnome.nix
deleted file mode 100644
index 8c70cf6..0000000
--- a/modules/home-manager-modules/gnome.nix
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: {
-  options.gnome = {
-    extraWindowControls = lib.mkEnableOption "Should we add back in the minimize and maximize window controls?";
-    clockFormat = lib.mkOption {
-      type = lib.types.enum [
-        "12h"
-        "24h"
-      ];
-      default = "24h";
-    };
-    colorScheme = lib.mkOption {
-      type = lib.types.enum [
-        "default"
-        "prefer-dark"
-        "prefer-light"
-      ];
-      default = "default";
-    };
-    accentColor = lib.mkOption {
-      type = lib.types.enum [
-        "blue"
-        "teal"
-        "green"
-        "yellow"
-        "orange"
-        "red"
-        "pink"
-        "purple"
-        "slate"
-      ];
-      default = "blue";
-    };
-    extensions = lib.mkOption {
-      type = lib.types.listOf lib.types.package;
-      default = [];
-      description = "The set of extensions to install and enable in the user environment.";
-    };
-    hotkeys = lib.mkOption {
-      type = lib.types.attrsOf (lib.types.submodule ({name, ...}: {
-        options = {
-          key = lib.mkOption {
-            type = lib.types.strMatching "[a-zA-Z0-9-]+";
-            default = builtins.replaceStrings [" " "/" "_"] ["-" "-" "-"] name;
-          };
-          name = lib.mkOption {
-            type = lib.types.str;
-            default = name;
-          };
-          binding = lib.mkOption {
-            type = lib.types.str;
-          };
-          command = lib.mkOption {
-            type = lib.types.str;
-          };
-        };
-      }));
-      default = {};
-    };
-  };
-
-  config = {
-    home.packages = config.gnome.extensions;
-    dconf = {
-      settings = lib.mkMerge [
-        {
-          "org/gnome/shell" = {
-            disable-user-extensions = false; # enables user extensions
-            enabled-extensions = builtins.map (extension: extension.extensionUuid) config.gnome.extensions;
-          };
-
-          "org/gnome/desktop/wm/preferences".button-layout = lib.mkIf config.gnome.extraWindowControls ":minimize,maximize,close";
-
-          "org/gnome/desktop/interface".color-scheme = config.gnome.colorScheme;
-          "org/gnome/desktop/interface".accent-color = config.gnome.accentColor;
-          "org/gnome/desktop/interface".clock-format = config.gnome.clockFormat;
-        }
-        (
-          lib.mkMerge (
-            builtins.map (value: let
-              entry = "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/${value.key}";
-            in {
-              ${entry} = {
-                binding = value.binding;
-                command = value.command;
-                name = value.name;
-              };
-
-              "org/gnome/settings-daemon/plugins/media-keys" = {
-                custom-keybindings = [
-                  "/${entry}/"
-                ];
-              };
-            })
-            (
-              lib.attrsets.mapAttrsToList (_: value: value) config.gnome.hotkeys
-            )
-          )
-        )
-      ];
-    };
-  };
-}
diff --git a/modules/home-manager-modules/openssh.nix b/modules/home-manager-modules/openssh.nix
index 9d77d10..7b646b8 100644
--- a/modules/home-manager-modules/openssh.nix
+++ b/modules/home-manager-modules/openssh.nix
@@ -6,7 +6,6 @@
   ...
 }: {
   options.programs.openssh = {
-    enable = lib.mkEnableOption "should we enable openssh";
     authorizedKeys = lib.mkOption {
       type = lib.types.listOf lib.types.str;
       default = [];
@@ -38,70 +37,63 @@
     };
   };
 
-  config = lib.mkIf config.programs.openssh.enable (
-    lib.mkMerge [
-      (
-        lib.mkIf ((builtins.length config.programs.openssh.hostKeys) != 0) {
-          services.ssh-agent.enable = true;
-          programs.ssh = {
-            enable = true;
-            enableDefaultConfig = false;
-            matchBlocks = {
-              "*" = {
-                compression = true;
-                addKeysToAgent = "confirm";
-              };
-            };
-            extraConfig = lib.strings.concatLines (
-              builtins.map (hostKey: "IdentityFile ~/.ssh/${hostKey.path}") config.programs.openssh.hostKeys
-            );
-          };
-
-          systemd.user.services = builtins.listToAttrs (
-            builtins.map (hostKey:
-              lib.attrsets.nameValuePair "ssh-gen-keys-${hostKey.path}" {
-                Install = {
-                  WantedBy = ["default.target"];
-                };
-                Service = let
-                  path = "${config.home.homeDirectory}/.ssh/${hostKey.path}";
-                in {
-                  Restart = "always";
-                  Type = "simple";
-                  ExecStart = "${
-                    pkgs.writeShellScript "ssh-gen-keys" ''
-                      if ! [ -s "${path}" ]; then
-                          if ! [ -h "${path}" ]; then
-                              rm -f "${path}"
-                          fi
-                          mkdir -p "$(dirname '${path}')"
-                          chmod 0755 "$(dirname '${path}')"
-                          ${pkgs.openssh}/bin/ssh-keygen \
-                            -t "${hostKey.type}" \
-                            ${lib.optionalString (hostKey ? bits) "-b ${toString hostKey.bits}"} \
-                            ${lib.optionalString (hostKey ? rounds) "-a ${toString hostKey.rounds}"} \
-                            ${lib.optionalString (hostKey ? comment) "-C '${hostKey.comment}'"} \
-                            ${lib.optionalString (hostKey ? openSSHFormat && hostKey.openSSHFormat) "-o"} \
-                            -f "${path}" \
-                            -N ""
-                          chown ${config.home.username} ${path}*
-                          chgrp ${config.home.username} ${path}*
-                      fi
-                    ''
-                  }";
-                };
-              })
-            config.programs.openssh.hostKeys
-          );
-        }
-      )
-      (lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          files = lib.lists.flatten (
-            builtins.map (hostKey: [".ssh/${hostKey.path}" ".ssh/${hostKey.path}.pub"]) config.programs.openssh.hostKeys
+  config = lib.mkMerge [
+    (
+      lib.mkIf ((builtins.length config.programs.openssh.hostKeys) != 0) {
+        services.ssh-agent.enable = true;
+        programs.ssh = {
+          enable = true;
+          compression = true;
+          addKeysToAgent = "confirm";
+          extraConfig = lib.strings.concatLines (
+            builtins.map (hostKey: "IdentityFile ~/.ssh/${hostKey.path}") config.programs.openssh.hostKeys
           );
         };
-      })
-    ]
-  );
+
+        systemd.user.services = builtins.listToAttrs (
+          builtins.map (hostKey:
+            lib.attrsets.nameValuePair "ssh-gen-keys-${hostKey.path}" {
+              Install = {
+                WantedBy = ["default.target"];
+              };
+              Service = let
+                path = "${config.home.homeDirectory}/.ssh/${hostKey.path}";
+              in {
+                Restart = "always";
+                Type = "simple";
+                ExecStart = "${
+                  pkgs.writeShellScript "ssh-gen-keys" ''
+                    if ! [ -s "${path}" ]; then
+                        if ! [ -h "${path}" ]; then
+                            rm -f "${path}"
+                        fi
+                        mkdir -p "$(dirname '${path}')"
+                        chmod 0755 "$(dirname '${path}')"
+                        ${pkgs.openssh}/bin/ssh-keygen \
+                          -t "${hostKey.type}" \
+                          ${lib.optionalString (hostKey ? bits) "-b ${toString hostKey.bits}"} \
+                          ${lib.optionalString (hostKey ? rounds) "-a ${toString hostKey.rounds}"} \
+                          ${lib.optionalString (hostKey ? comment) "-C '${hostKey.comment}'"} \
+                          ${lib.optionalString (hostKey ? openSSHFormat && hostKey.openSSHFormat) "-o"} \
+                          -f "${path}" \
+                          -N ""
+                        chown ${config.home.username} ${path}*
+                        chgrp ${config.home.username} ${path}*
+                    fi
+                  ''
+                }";
+              };
+            })
+          config.programs.openssh.hostKeys
+        );
+      }
+    )
+    (lib.mkIf osConfig.host.impermanence.enable {
+      home.persistence."/persist${config.home.homeDirectory}" = {
+        files = lib.lists.flatten (
+          builtins.map (hostKey: [".ssh/${hostKey.path}" ".ssh/${hostKey.path}.pub"]) config.programs.openssh.hostKeys
+        );
+      };
+    })
+  ];
 }
diff --git a/modules/home-manager-modules/programs/anki.nix b/modules/home-manager-modules/programs/anki.nix
deleted file mode 100644
index c2f93ea..0000000
--- a/modules/home-manager-modules/programs/anki.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  lib,
-  config,
-  osConfig,
-  ...
-}: {
-  config = lib.mkIf (config.programs.anki.enable && osConfig.host.impermanence.enable) {
-    home.persistence."/persist${config.home.homeDirectory}" = {
-      directories = [
-        "${config.xdg.dataHome}/Anki2/"
-      ];
-      allowOther = true;
-    };
-  };
-}
diff --git a/modules/home-manager-modules/programs/bitwarden.nix b/modules/home-manager-modules/programs/bitwarden.nix
deleted file mode 100644
index b9b91c4..0000000
--- a/modules/home-manager-modules/programs/bitwarden.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.bitwarden = {
-    enable = lib.mkEnableOption "enable bitwarden";
-  };
-
-  config = lib.mkIf config.programs.bitwarden.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        bitwarden
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.configHome}/Bitwarden"
-          ];
-          allowOther = true;
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/bruno.nix b/modules/home-manager-modules/programs/bruno.nix
deleted file mode 100644
index 00b248f..0000000
--- a/modules/home-manager-modules/programs/bruno.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.bruno = {
-    enable = lib.mkEnableOption "enable bruno";
-  };
-
-  config = lib.mkIf config.programs.bruno.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        bruno
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.configHome}/bruno/"
-          ];
-          allowOther = true;
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/calibre.nix b/modules/home-manager-modules/programs/calibre.nix
deleted file mode 100644
index 9e5f34e..0000000
--- a/modules/home-manager-modules/programs/calibre.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.calibre = {
-    enable = lib.mkEnableOption "enable calibre";
-  };
-
-  config = lib.mkIf config.programs.calibre.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        calibre
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.configHome}/calibre"
-          ];
-          allowOther = true;
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/davinci-resolve.nix b/modules/home-manager-modules/programs/davinci-resolve.nix
deleted file mode 100644
index 00ba525..0000000
--- a/modules/home-manager-modules/programs/davinci-resolve.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.davinci-resolve = {
-    enable = lib.mkEnableOption "enable davinci-resolve";
-  };
-
-  config = lib.mkIf config.programs.davinci-resolve.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        davinci-resolve
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.dataHome}/DaVinciResolve"
-            "${config.xdg.configHome}/blackmagic"
-          ];
-          allowOther = true;
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/dbeaver.nix b/modules/home-manager-modules/programs/dbeaver.nix
deleted file mode 100644
index a962459..0000000
--- a/modules/home-manager-modules/programs/dbeaver.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.dbeaver-bin = {
-    enable = lib.mkEnableOption "enable dbeaver";
-  };
-
-  config = lib.mkIf config.programs.dbeaver-bin.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        dbeaver-bin
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.dataHome}/DBeaverData/"
-          ];
-          allowOther = true;
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/default.nix b/modules/home-manager-modules/programs/default.nix
deleted file mode 100644
index 79f3351..0000000
--- a/modules/home-manager-modules/programs/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{...}: {
-  imports = [
-    ./firefox.nix
-    ./signal.nix
-    ./bitwarden.nix
-    ./makemkv.nix
-    ./obs.nix
-    ./anki.nix
-    ./piper.nix
-    ./qbittorrent.nix
-    ./discord.nix
-    ./obsidian.nix
-    ./prostudiomasters.nix
-    ./idea.nix
-    ./krita.nix
-    ./protonvpn.nix
-    ./calibre.nix
-    ./bruno.nix
-    ./dbeaver.nix
-    ./steam.nix
-    ./vscode
-    ./ungoogled-chromium.nix
-    ./libreoffice.nix
-    ./mapillary-uploader.nix
-    ./inkscape.nix
-    ./gimp.nix
-    ./proxmark3.nix
-    ./freecad.nix
-    ./onionshare.nix
-    ./mfoc.nix
-    ./pdfarranger.nix
-    ./picard.nix
-    ./qflipper.nix
-    ./openvpn.nix
-    ./noisetorch.nix
-    ./openrgb.nix
-    ./via.nix
-    ./davinci-resolve.nix
-    ./gdx-liftoff.nix
-    ./tor-browser.nix
-  ];
-}
diff --git a/modules/home-manager-modules/programs/discord.nix b/modules/home-manager-modules/programs/discord.nix
deleted file mode 100644
index e8605a5..0000000
--- a/modules/home-manager-modules/programs/discord.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.discord = {
-    enable = lib.mkEnableOption "enable discord";
-  };
-
-  config = lib.mkIf config.programs.discord.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        discord
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.configHome}/discord/"
-          ];
-          allowOther = true;
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/firefox.nix b/modules/home-manager-modules/programs/firefox.nix
deleted file mode 100644
index 907b619..0000000
--- a/modules/home-manager-modules/programs/firefox.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  config,
-  osConfig,
-  ...
-}: let
-  buildProfilePersistence = profile: {
-    directories = [
-      ".mozilla/firefox/${profile}/extensions"
-    ];
-    files = [
-      ".mozilla/firefox/${profile}/cookies.sqlite"
-      ".mozilla/firefox/${profile}/favicons.sqlite"
-      # Permissions and ${profileName} levels for each site
-      ".mozilla/firefox/${profile}/permissions.sqlite"
-      ".mozilla/firefox/${profile}/content-prefs.sqlite"
-      # Browser history and bookmarks
-      ".mozilla/firefox/${profile}/places.sqlite"
-      # I guess this is useful?
-      # https://bugzilla.mozilla.org/show_bug.cgi?id=1511384
-      # https://developer.mozilla.org/en-US/docs/Web/API/Storage_API/Storage_quotas_and_eviction_criteria
-      ".mozilla/firefox/${profile}/storage.sqlite"
-      # Extension configuration
-      ".mozilla/firefox/${profile}/extension-settings.json"
-    ];
-    allowOther = true;
-  };
-in {
-  config = lib.mkIf (config.programs.firefox.enable && osConfig.host.impermanence.enable) {
-    home.persistence."/persist${config.home.homeDirectory}" = lib.mkMerge (
-      (
-        lib.attrsets.mapAttrsToList
-        (profile: _: buildProfilePersistence profile)
-        config.programs.firefox.profiles
-      )
-      ++ (
-        lib.lists.optional
-        ((builtins.length (lib.attrsets.mapAttrsToList (key: value: value) config.programs.firefox.profiles)) == 0)
-        (buildProfilePersistence "default")
-      )
-    );
-  };
-}
diff --git a/modules/home-manager-modules/programs/freecad.nix b/modules/home-manager-modules/programs/freecad.nix
deleted file mode 100644
index ec17205..0000000
--- a/modules/home-manager-modules/programs/freecad.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.freecad = {
-    enable = lib.mkEnableOption "enable freecad";
-  };
-
-  config = lib.mkIf config.programs.freecad.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        freecad
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.configHome}/FreeCAD"
-          ];
-          allowOther = true;
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/gdx-liftoff.nix b/modules/home-manager-modules/programs/gdx-liftoff.nix
deleted file mode 100644
index b29230d..0000000
--- a/modules/home-manager-modules/programs/gdx-liftoff.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.gdx-liftoff = {
-    enable = lib.mkEnableOption "enable gdx-liftoff";
-  };
-
-  config = lib.mkIf config.programs.gdx-liftoff.enable {
-    home.packages = with pkgs; [
-      gdx-liftoff
-    ];
-  };
-}
diff --git a/modules/home-manager-modules/programs/gimp.nix b/modules/home-manager-modules/programs/gimp.nix
deleted file mode 100644
index 428068e..0000000
--- a/modules/home-manager-modules/programs/gimp.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.gimp = {
-    enable = lib.mkEnableOption "enable gimp";
-  };
-
-  config = lib.mkIf config.programs.gimp.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        gimp
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.configHome}/GIMP"
-          ];
-          allowOther = true;
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/idea.nix b/modules/home-manager-modules/programs/idea.nix
deleted file mode 100644
index f0a928c..0000000
--- a/modules/home-manager-modules/programs/idea.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.jetbrains.idea-community = {
-    enable = lib.mkEnableOption "enable idea-community";
-  };
-
-  config = lib.mkIf config.programs.jetbrains.idea-community.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        jetbrains.idea-community
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            # configuration
-            "${config.xdg.configHome}/JetBrains/"
-            # plugins
-            "${config.xdg.dataHome}/JetBrains/"
-            # System and Logs
-            "${config.xdg.cacheHome}/JetBrains/"
-          ];
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/inkscape.nix b/modules/home-manager-modules/programs/inkscape.nix
deleted file mode 100644
index facb08f..0000000
--- a/modules/home-manager-modules/programs/inkscape.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.inkscape = {
-    enable = lib.mkEnableOption "enable inkscape";
-  };
-
-  config = lib.mkIf config.programs.inkscape.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        inkscape
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.configHome}/inkscape"
-          ];
-          allowOther = true;
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/krita.nix b/modules/home-manager-modules/programs/krita.nix
deleted file mode 100644
index d662251..0000000
--- a/modules/home-manager-modules/programs/krita.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.krita = {
-    enable = lib.mkEnableOption "enable krita";
-  };
-
-  config = lib.mkIf config.programs.krita.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        krita
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.configHome}/kritarc"
-            "${config.xdg.dataHome}/krita"
-          ];
-          allowOther = true;
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/libreoffice.nix b/modules/home-manager-modules/programs/libreoffice.nix
deleted file mode 100644
index b61ea58..0000000
--- a/modules/home-manager-modules/programs/libreoffice.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.libreoffice = {
-    enable = lib.mkEnableOption "enable libreoffice";
-  };
-
-  config = lib.mkIf config.programs.libreoffice.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        libreoffice
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.configHome}/libreoffice"
-          ];
-          allowOther = true;
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/makemkv.nix b/modules/home-manager-modules/programs/makemkv.nix
deleted file mode 100644
index eca059d..0000000
--- a/modules/home-manager-modules/programs/makemkv.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.makemkv = {
-    enable = lib.mkEnableOption "enable makemkv";
-    appKeyFile = lib.mkOption {
-      type = lib.types.str;
-    };
-    destinationDir = lib.mkOption {
-      type = lib.types.str;
-    };
-  };
-
-  config = lib.mkIf config.programs.makemkv.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        makemkv
-      ];
-
-      sops.templates."MakeMKV.settings.conf".content = ''
-        app_DestinationDir = "${config.programs.makemkv.destinationDir}"
-        app_DestinationType = "2"
-        app_Key = "${config.programs.makemkv.appKeyFile}"
-      '';
-
-      home.file.".MakeMKV/settings.conf".source = config.lib.file.mkOutOfStoreSymlink config.sops.templates."MakeMKV.settings.conf".path;
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            ".MakeMKV"
-          ];
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/mapillary-uploader.nix b/modules/home-manager-modules/programs/mapillary-uploader.nix
deleted file mode 100644
index 38c1144..0000000
--- a/modules/home-manager-modules/programs/mapillary-uploader.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.programs.mapillary-uploader;
-in {
-  options.programs.mapillary-uploader = {
-    enable = mkEnableOption "Mapillary Desktop Uploader";
-  };
-
-  config = mkIf cfg.enable {
-    home.packages = [pkgs.mapillary-uploader];
-  };
-}
diff --git a/modules/home-manager-modules/programs/mfoc.nix b/modules/home-manager-modules/programs/mfoc.nix
deleted file mode 100644
index 7b92007..0000000
--- a/modules/home-manager-modules/programs/mfoc.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.mfoc = {
-    enable = lib.mkEnableOption "enable mfoc";
-  };
-
-  config = lib.mkIf config.programs.mfoc.enable {
-    home.packages = with pkgs; [
-      mfoc
-    ];
-  };
-}
diff --git a/modules/home-manager-modules/programs/noisetorch.nix b/modules/home-manager-modules/programs/noisetorch.nix
deleted file mode 100644
index c53e3a9..0000000
--- a/modules/home-manager-modules/programs/noisetorch.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.noisetorch = {
-    enable = lib.mkEnableOption "enable noisetorch";
-  };
-
-  config = lib.mkIf config.programs.noisetorch.enable {
-    home.packages = with pkgs; [
-      noisetorch
-    ];
-  };
-}
diff --git a/modules/home-manager-modules/programs/obs.nix b/modules/home-manager-modules/programs/obs.nix
deleted file mode 100644
index 98c4fea..0000000
--- a/modules/home-manager-modules/programs/obs.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  lib,
-  config,
-  osConfig,
-  ...
-}: {
-  config = lib.mkIf config.programs.obs-studio.enable (lib.mkMerge [
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        # TODO: map impermanence for obs
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/obsidian.nix b/modules/home-manager-modules/programs/obsidian.nix
deleted file mode 100644
index 4d28b3e..0000000
--- a/modules/home-manager-modules/programs/obsidian.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  lib,
-  config,
-  osConfig,
-  ...
-}: {
-  config = lib.mkIf config.programs.obsidian.enable (lib.mkMerge [
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.configHome}/obsidian"
-          ];
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/onionshare.nix b/modules/home-manager-modules/programs/onionshare.nix
deleted file mode 100644
index ed1903d..0000000
--- a/modules/home-manager-modules/programs/onionshare.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.onionshare = {
-    enable = lib.mkEnableOption "enable onionshare";
-  };
-
-  config = lib.mkIf config.programs.onionshare.enable {
-    home.packages = with pkgs; [
-      onionshare
-    ];
-  };
-}
diff --git a/modules/home-manager-modules/programs/openrgb.nix b/modules/home-manager-modules/programs/openrgb.nix
deleted file mode 100644
index 0260c91..0000000
--- a/modules/home-manager-modules/programs/openrgb.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.openrgb = {
-    enable = lib.mkEnableOption "enable openrgb";
-  };
-
-  config = lib.mkIf config.programs.openrgb.enable {
-    home.packages = with pkgs; [
-      openrgb
-    ];
-  };
-}
diff --git a/modules/home-manager-modules/programs/openvpn.nix b/modules/home-manager-modules/programs/openvpn.nix
deleted file mode 100644
index 814c16d..0000000
--- a/modules/home-manager-modules/programs/openvpn.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.openvpn = {
-    enable = lib.mkEnableOption "enable openvpn";
-  };
-
-  config = lib.mkIf config.programs.openvpn.enable {
-    home.packages = with pkgs; [
-      openvpn
-    ];
-  };
-}
diff --git a/modules/home-manager-modules/programs/pdfarranger.nix b/modules/home-manager-modules/programs/pdfarranger.nix
deleted file mode 100644
index d4e33b5..0000000
--- a/modules/home-manager-modules/programs/pdfarranger.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.pdfarranger = {
-    enable = lib.mkEnableOption "enable pdfarranger";
-  };
-
-  config = lib.mkIf config.programs.pdfarranger.enable {
-    home.packages = with pkgs; [
-      pdfarranger
-    ];
-  };
-}
diff --git a/modules/home-manager-modules/programs/picard.nix b/modules/home-manager-modules/programs/picard.nix
deleted file mode 100644
index d2c1fe2..0000000
--- a/modules/home-manager-modules/programs/picard.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.picard = {
-    enable = lib.mkEnableOption "enable picard";
-  };
-
-  config = lib.mkIf config.programs.picard.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        picard
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.configHome}/MusicBrainz"
-          ];
-          allowOther = true;
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/piper.nix b/modules/home-manager-modules/programs/piper.nix
deleted file mode 100644
index ec0d887..0000000
--- a/modules/home-manager-modules/programs/piper.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.piper = {
-    enable = lib.mkEnableOption "enable piper";
-  };
-
-  config = lib.mkIf config.programs.piper.enable {
-    home.packages = with pkgs; [
-      piper
-    ];
-  };
-}
diff --git a/modules/home-manager-modules/programs/prostudiomasters.nix b/modules/home-manager-modules/programs/prostudiomasters.nix
deleted file mode 100644
index 9e6088f..0000000
--- a/modules/home-manager-modules/programs/prostudiomasters.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.prostudiomasters = {
-    enable = lib.mkEnableOption "enable prostudiomasters";
-  };
-
-  config = lib.mkIf config.programs.prostudiomasters.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        prostudiomasters
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.configHome}/ProStudioMasters"
-          ];
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/protonvpn.nix b/modules/home-manager-modules/programs/protonvpn.nix
deleted file mode 100644
index dd11aae..0000000
--- a/modules/home-manager-modules/programs/protonvpn.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.protonvpn-gui = {
-    enable = lib.mkEnableOption "enable protonvpn";
-  };
-
-  config = lib.mkIf config.programs.protonvpn-gui.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        protonvpn-gui
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.configHome}/protonvpn"
-            "${config.xdg.configHome}/Proton"
-          ];
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/proxmark3.nix b/modules/home-manager-modules/programs/proxmark3.nix
deleted file mode 100644
index ad1e298..0000000
--- a/modules/home-manager-modules/programs/proxmark3.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.proxmark3 = {
-    enable = lib.mkEnableOption "enable proxmark3";
-  };
-
-  config = lib.mkIf config.programs.proxmark3.enable {
-    home.packages = with pkgs; [
-      proxmark3
-    ];
-  };
-}
diff --git a/modules/home-manager-modules/programs/qbittorrent.nix b/modules/home-manager-modules/programs/qbittorrent.nix
deleted file mode 100644
index 02e23df..0000000
--- a/modules/home-manager-modules/programs/qbittorrent.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.qbittorrent = {
-    enable = lib.mkEnableOption "enable qbittorrent";
-  };
-
-  config = lib.mkIf config.programs.qbittorrent.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        qbittorrent
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.configHome}/qBittorrent"
-          ];
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/qflipper.nix b/modules/home-manager-modules/programs/qflipper.nix
deleted file mode 100644
index abc2442..0000000
--- a/modules/home-manager-modules/programs/qflipper.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.qflipper = {
-    enable = lib.mkEnableOption "enable qflipper";
-  };
-
-  config = lib.mkIf config.programs.qflipper.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        qFlipper
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.configHome}/qFlipper"
-          ];
-          allowOther = true;
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/signal.nix b/modules/home-manager-modules/programs/signal.nix
deleted file mode 100644
index fdf0af9..0000000
--- a/modules/home-manager-modules/programs/signal.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.signal-desktop-bin = {
-    enable = lib.mkEnableOption "enable signal";
-  };
-
-  config = lib.mkIf config.programs.signal-desktop-bin.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        signal-desktop-bin
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.configHome}/Signal"
-          ];
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/steam.nix b/modules/home-manager-modules/programs/steam.nix
deleted file mode 100644
index 4661151..0000000
--- a/modules/home-manager-modules/programs/steam.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.steam = {
-    enable = lib.mkEnableOption "enable steam";
-  };
-
-  config = lib.mkIf config.programs.steam.enable (
-    lib.mkMerge [
-      {
-        home.packages = with pkgs; [
-          steam
-          steam.run
-        ];
-      }
-      (
-        lib.mkIf osConfig.host.impermanence.enable {
-          home.persistence."/persist${config.home.homeDirectory}" = {
-            directories = [
-              {
-                directory = "${config.xdg.dataHome}/Steam";
-                method = "symlink";
-              }
-            ];
-            allowOther = true;
-          };
-        }
-      )
-    ]
-  );
-
-  # TODO: bind impermanence config
-}
diff --git a/modules/home-manager-modules/programs/tor-browser.nix b/modules/home-manager-modules/programs/tor-browser.nix
deleted file mode 100644
index 2c58578..0000000
--- a/modules/home-manager-modules/programs/tor-browser.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.tor-browser = {
-    enable = lib.mkEnableOption "enable tor-browser";
-  };
-
-  config = lib.mkIf config.programs.tor-browser.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        tor-browser
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.dataHome}/torbrowser"
-          ];
-          allowOther = true;
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/ungoogled-chromium.nix b/modules/home-manager-modules/programs/ungoogled-chromium.nix
deleted file mode 100644
index 5b52cd6..0000000
--- a/modules/home-manager-modules/programs/ungoogled-chromium.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.ungoogled-chromium = {
-    enable = lib.mkEnableOption "enable ungoogled-chromium";
-  };
-
-  config = lib.mkIf config.programs.ungoogled-chromium.enable (lib.mkMerge [
-    {
-      home.packages = with pkgs; [
-        ungoogled-chromium
-      ];
-    }
-    (
-      lib.mkIf osConfig.host.impermanence.enable {
-        home.persistence."/persist${config.home.homeDirectory}" = {
-          directories = [
-            "${config.xdg.configHome}/chromium"
-          ];
-          allowOther = true;
-        };
-      }
-    )
-  ]);
-}
diff --git a/modules/home-manager-modules/programs/via.nix b/modules/home-manager-modules/programs/via.nix
deleted file mode 100644
index 0b79452..0000000
--- a/modules/home-manager-modules/programs/via.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  osConfig,
-  ...
-}: {
-  options.programs.via = {
-    enable = lib.mkEnableOption "enable via";
-  };
-
-  config = lib.mkIf config.programs.via.enable {
-    home.packages = with pkgs; [
-      via
-    ];
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/aiCode.nix b/modules/home-manager-modules/programs/vscode/aiCode.nix
deleted file mode 100644
index 838a439..0000000
--- a/modules/home-manager-modules/programs/vscode/aiCode.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}: let
-  pkgsRepository = pkgs.codium-extensions;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.aiCode = {
-          enable = lib.mkEnableOption "should the ai code extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "ai-code" {};
-          ollamaHost = lib.mkOption {
-            type = lib.types.nullOr lib.types.str;
-            description = "what host should be used for ollama";
-            default = null;
-          };
-          inlineCompletion = {
-            enable = lib.mkOption {
-              type = lib.types.bool;
-              description = "should inline completion be enabled";
-              default = true;
-            };
-            model = lib.mkOption {
-              type = lib.types.nullOr lib.types.str;
-              description = "what model should be used for ollama";
-              default = null;
-            };
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.aiCode.enable {
-        extensions = [
-          config.extraExtensions.aiCode.extension
-        ];
-        userSettings = {
-          "aiCode.ollamaHost" = lib.mkIf (config.extraExtensions.aiCode.ollamaHost != null) config.extraExtensions.aiCode.ollamaHost;
-          "aiCode.inlineCompletion.enable" = config.extraExtensions.aiCode.inlineCompletion.enable;
-          "aiCode.inlineCompletion.model" = lib.mkIf (config.extraExtensions.aiCode.inlineCompletion.model != null) config.extraExtensions.aiCode.inlineCompletion.model;
-        };
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/alejandra.nix b/modules/home-manager-modules/programs/vscode/alejandra.nix
deleted file mode 100644
index ffeaf96..0000000
--- a/modules/home-manager-modules/programs/vscode/alejandra.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.alejandra = {
-          enable = lib.mkEnableOption "Enable Alejandra extension for Nix formatting";
-          extension = lib.mkPackageOption pkgsRepository "alejandra" {
-            default = ["kamadorueda" "alejandra"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.alejandra.enable {
-        extensions = [config.extraExtensions.alejandra.extension];
-        userSettings = {
-          "[nix]" = {
-            "editor.defaultFormatter" = "kamadorueda.alejandra";
-            "editor.formatOnPaste" = true;
-            "editor.formatOnSave" = true;
-            "editor.formatOnType" = true;
-          };
-          "alejandra.program" = "alejandra";
-        };
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/astroVscode.nix b/modules/home-manager-modules/programs/vscode/astroVscode.nix
deleted file mode 100644
index 4bae34a..0000000
--- a/modules/home-manager-modules/programs/vscode/astroVscode.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.astroVscode = {
-          enable = lib.mkEnableOption "should the astro-vscode extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "astro-vscode" {
-            default = ["astro-build" "astro-vscode"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.astroVscode.enable {
-        extensions = [
-          config.extraExtensions.astroVscode.extension
-        ];
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/atomKeybindings.nix b/modules/home-manager-modules/programs/vscode/atomKeybindings.nix
deleted file mode 100644
index 95cd928..0000000
--- a/modules/home-manager-modules/programs/vscode/atomKeybindings.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.atomKeybindings = {
-          enable = lib.mkEnableOption "should the atom keybindings extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "atom-keybindings" {
-            default = ["ms-vscode" "atom-keybindings"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.atomKeybindings.enable {
-        extensions = [
-          config.extraExtensions.atomKeybindings.extension
-        ];
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/autoRenameTag.nix b/modules/home-manager-modules/programs/vscode/autoRenameTag.nix
deleted file mode 100644
index 5f24a32..0000000
--- a/modules/home-manager-modules/programs/vscode/autoRenameTag.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.autoRenameTag = {
-          enable = lib.mkEnableOption "should the auto-rename-tag extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "auto-rename-tag" {
-            default = ["formulahendry" "auto-rename-tag"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.autoRenameTag.enable {
-        extensions = [
-          config.extraExtensions.autoRenameTag.extension
-        ];
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/claudeDev.nix b/modules/home-manager-modules/programs/vscode/claudeDev.nix
deleted file mode 100644
index 0e34f97..0000000
--- a/modules/home-manager-modules/programs/vscode/claudeDev.nix
+++ /dev/null
@@ -1,197 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  inputs,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-
-  mcp-nixos = inputs.mcp-nixos.packages.${pkgs.stdenv.hostPlatform.system}.default;
-
-  anyProfileHasMcpNixos = lib.any (
-    profile:
-      profile.extraExtensions.claudeDev.enable
-      && profile.extraExtensions.claudeDev.mcp.nixos.enable
-  ) (lib.attrValues config.programs.vscode.profiles);
-
-  anyProfileHasMcpEslint = lib.any (
-    profile:
-      profile.extraExtensions.claudeDev.enable
-      && profile.extraExtensions.claudeDev.mcp.eslint.enable
-  ) (lib.attrValues config.programs.vscode.profiles);
-
-  anyProfileHasMcpVitest = lib.any (
-    profile:
-      profile.extraExtensions.claudeDev.enable
-      && profile.extraExtensions.claudeDev.mcp.vitest.enable
-  ) (lib.attrValues config.programs.vscode.profiles);
-
-  anyProfileHasMcpSleep = lib.any (
-    profile:
-      profile.extraExtensions.claudeDev.enable
-      && profile.extraExtensions.claudeDev.mcp.sleep.enable
-  ) (lib.attrValues config.programs.vscode.profiles);
-
-  anyProfileHasMcp = anyProfileHasMcpNixos || anyProfileHasMcpEslint || anyProfileHasMcpVitest || anyProfileHasMcpSleep;
-
-  getMcpTimeout = serverName:
-    lib.findFirst (timeout: timeout != null) null (map (
-      profile:
-        if profile.extraExtensions.claudeDev.enable && profile.extraExtensions.claudeDev.mcp.${serverName}.enable
-        then profile.extraExtensions.claudeDev.mcp.${serverName}.timeout
-        else null
-    ) (lib.attrValues config.programs.vscode.profiles));
-
-  getMcpAutoApprove = serverName:
-    lib.foldl' (
-      acc: profile:
-        if profile.extraExtensions.claudeDev.enable && profile.extraExtensions.claudeDev.mcp.${serverName}.enable
-        then acc // profile.extraExtensions.claudeDev.mcp.${serverName}.autoApprove
-        else acc
-    ) {} (lib.attrValues config.programs.vscode.profiles);
-
-  getMcpPackage = serverName:
-    lib.findFirst (package: package != null) null (map (
-      profile:
-        if profile.extraExtensions.claudeDev.enable && profile.extraExtensions.claudeDev.mcp.${serverName}.enable
-        then profile.extraExtensions.claudeDev.mcp.${serverName}.package
-        else null
-    ) (lib.attrValues config.programs.vscode.profiles));
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.claudeDev = {
-          enable = lib.mkEnableOption "should the claude-dev extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "claude-dev" {
-            default = ["saoudrizwan" "claude-dev"];
-          };
-
-          mcp = {
-            nixos = {
-              enable = lib.mkEnableOption "enable NixOS MCP server for Claude Dev";
-            };
-            eslint = {
-              enable = lib.mkEnableOption "enable ESLint MCP server for Claude Dev";
-              package = lib.mkOption {
-                type = lib.types.str;
-                default = "@eslint/mcp@latest";
-                description = "NPM package to use for ESLint MCP server";
-              };
-              timeout = lib.mkOption {
-                type = lib.types.nullOr lib.types.int;
-                default = null;
-                description = "Timeout in seconds for ESLint MCP server operations";
-              };
-              autoApprove = {
-                lint-files = lib.mkEnableOption "Should the lint-files tool be auto approved for ESLint MCP server";
-              };
-            };
-            vitest = {
-              enable = lib.mkEnableOption "enable Vitest MCP server for Claude Dev";
-              package = lib.mkOption {
-                type = lib.types.str;
-                default = "@djankies/vitest-mcp";
-                description = "NPM package to use for Vitest MCP server";
-              };
-              timeout = lib.mkOption {
-                type = lib.types.nullOr lib.types.int;
-                default = null;
-                description = "Timeout in seconds for Vitest MCP server operations";
-              };
-              autoApprove = {
-                list_tests = lib.mkEnableOption "Should the list_tests tool be auto approved for Vitest MCP server";
-                run_tests = lib.mkEnableOption "Should the run_tests tool be auto approved for Vitest MCP server";
-                analyze_coverage = lib.mkEnableOption "Should the analyze_coverage tool be auto approved for Vitest MCP server";
-              };
-            };
-            sleep = {
-              enable = lib.mkEnableOption "enable Sleep MCP server for Claude Dev";
-              package = lib.mkOption {
-                type = lib.types.str;
-                default = "sleep-mcp";
-                description = "NPM package to use for Sleep MCP server";
-              };
-              timeout = lib.mkOption {
-                type = lib.types.nullOr lib.types.int;
-                default = null;
-                description = "Timeout in seconds for Sleep MCP server operations";
-              };
-              autoApprove = {
-                sleep = lib.mkEnableOption "Should the sleep tool be auto approved for Sleep MCP server";
-              };
-            };
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.claudeDev.enable {
-        extensions = [
-          config.extraExtensions.claudeDev.extension
-        ];
-      };
-    }));
-  };
-
-  config = lib.mkMerge [
-    (lib.mkIf anyProfileHasMcpNixos {
-      home.packages = [
-        mcp-nixos
-      ];
-    })
-
-    (lib.mkIf anyProfileHasMcp {
-      home.file."${config.xdg.configHome}/VSCodium/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json" = {
-        text = builtins.toJSON {
-          mcpServers =
-            (lib.optionalAttrs anyProfileHasMcpNixos {
-              nixos = {
-                command = "${mcp-nixos}/bin/mcp-nixos";
-              };
-            })
-            // (lib.optionalAttrs anyProfileHasMcpEslint {
-              eslint =
-                {
-                  command = "${pkgs.nodejs}/bin/npx";
-                  args = ["-y" (getMcpPackage "eslint")];
-                }
-                // (lib.optionalAttrs ((getMcpTimeout "eslint") != null) {
-                  timeout = getMcpTimeout "eslint";
-                })
-                // (lib.optionalAttrs ((getMcpAutoApprove "eslint") != {}) {
-                  autoApprove = builtins.attrNames (lib.filterAttrs (_: v: v) (getMcpAutoApprove "eslint"));
-                });
-            })
-            // (lib.optionalAttrs anyProfileHasMcpVitest {
-              vitest =
-                {
-                  command = "${pkgs.nodejs}/bin/npx";
-                  args = ["-y" (getMcpPackage "vitest")];
-                }
-                // (lib.optionalAttrs ((getMcpTimeout "vitest") != null) {
-                  timeout = getMcpTimeout "vitest";
-                })
-                // (lib.optionalAttrs ((getMcpAutoApprove "vitest") != {}) {
-                  autoApprove = builtins.attrNames (lib.filterAttrs (_: v: v) (getMcpAutoApprove "vitest"));
-                });
-            })
-            // (lib.optionalAttrs anyProfileHasMcpSleep {
-              sleep-mcp =
-                {
-                  command = "${pkgs.nodejs}/bin/npx";
-                  args = ["-y" (getMcpPackage "sleep")];
-                }
-                // (lib.optionalAttrs ((getMcpTimeout "sleep") != null) {
-                  timeout = getMcpTimeout "sleep";
-                })
-                // (lib.optionalAttrs ((getMcpAutoApprove "sleep") != {}) {
-                  autoApprove = builtins.attrNames (lib.filterAttrs (_: v: v) (getMcpAutoApprove "sleep"));
-                });
-            });
-        };
-        force = true;
-      };
-    })
-  ];
-}
diff --git a/modules/home-manager-modules/programs/vscode/conventionalCommits.nix b/modules/home-manager-modules/programs/vscode/conventionalCommits.nix
deleted file mode 100644
index 5bc8124..0000000
--- a/modules/home-manager-modules/programs/vscode/conventionalCommits.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.vscode-marketplace;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.conventionalCommits = {
-          enable = lib.mkEnableOption "Enable VSCode Conventional Commits extension";
-          extension = lib.mkPackageOption pkgsRepository "conventional-commits" {
-            default = ["vivaxy" "vscode-conventional-commits"];
-          };
-
-          gitmoji = lib.mkEnableOption "should emoji be prompted for as a part of the commit message./";
-
-          promptScopes = lib.mkEnableOption "prompting for scopes in conventional commits";
-        };
-      };
-      config = lib.mkIf config.extraExtensions.conventionalCommits.enable {
-        extensions = [config.extraExtensions.conventionalCommits.extension];
-
-        userSettings = {
-          "conventionalCommits.gitmoji" = config.extraExtensions.conventionalCommits.gitmoji;
-          "conventionalCommits.promptScopes" = config.extraExtensions.conventionalCommits.promptScopes;
-        };
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/default.nix b/modules/home-manager-modules/programs/vscode/default.nix
deleted file mode 100644
index 85f4a62..0000000
--- a/modules/home-manager-modules/programs/vscode/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{...}: {
-  imports = [
-    ./oneDark.nix
-    ./atomKeybindings.nix
-    ./aiCode.nix
-    ./alejandra.nix
-    ./nixIde.nix
-    ./autoRenameTag.nix
-    ./es7ReactJsSnippets.nix
-    ./liveServer.nix
-    ./tauriVscode.nix
-    ./vscodeEslint.nix
-    ./vscodeJest.nix
-    ./vscodeStandard.nix
-    ./vscodeStylelint.nix
-    ./go.nix
-    ./evenBetterToml.nix
-    ./openRemoteSsh.nix
-    ./astroVscode.nix
-    ./vscodeMdx.nix
-    ./claudeDev.nix
-    ./nearley.nix
-    ./vitest.nix
-    ./direnv.nix
-    ./conventionalCommits.nix
-  ];
-}
diff --git a/modules/home-manager-modules/programs/vscode/direnv.nix b/modules/home-manager-modules/programs/vscode/direnv.nix
deleted file mode 100644
index 231ea17..0000000
--- a/modules/home-manager-modules/programs/vscode/direnv.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.vscode-marketplace;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.direnv = {
-          enable = lib.mkEnableOption "Enable direnv extension";
-          extension = lib.mkPackageOption pkgsRepository "direnv" {
-            default = ["mkhl" "direnv"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.direnv.enable {
-        extensions = [config.extraExtensions.direnv.extension];
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/es7ReactJsSnippets.nix b/modules/home-manager-modules/programs/vscode/es7ReactJsSnippets.nix
deleted file mode 100644
index 09e6da3..0000000
--- a/modules/home-manager-modules/programs/vscode/es7ReactJsSnippets.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.es7ReactJsSnippets = {
-          enable = lib.mkEnableOption "should the es7-react-js-snippets extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "es7-react-js-snippets" {
-            default = ["dsznajder" "es7-react-js-snippets"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.es7ReactJsSnippets.enable {
-        extensions = [
-          config.extraExtensions.es7ReactJsSnippets.extension
-        ];
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/evenBetterToml.nix b/modules/home-manager-modules/programs/vscode/evenBetterToml.nix
deleted file mode 100644
index 9813ee1..0000000
--- a/modules/home-manager-modules/programs/vscode/evenBetterToml.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.evenBetterToml = {
-          enable = lib.mkEnableOption "should the even-better-toml extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "even-better-toml" {
-            default = ["tamasfe" "even-better-toml"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.evenBetterToml.enable {
-        extensions = [
-          config.extraExtensions.evenBetterToml.extension
-        ];
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/go.nix b/modules/home-manager-modules/programs/vscode/go.nix
deleted file mode 100644
index 02ffe5d..0000000
--- a/modules/home-manager-modules/programs/vscode/go.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.go = {
-          enable = lib.mkEnableOption "should the go extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "go" {
-            default = ["golang" "go"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.go.enable {
-        extensions = [
-          config.extraExtensions.go.extension
-        ];
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/liveServer.nix b/modules/home-manager-modules/programs/vscode/liveServer.nix
deleted file mode 100644
index 3f53ca3..0000000
--- a/modules/home-manager-modules/programs/vscode/liveServer.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.liveServer = {
-          enable = lib.mkEnableOption "should the live-server extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "live-server" {
-            default = ["ms-vscode" "live-server"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.liveServer.enable {
-        extensions = [
-          config.extraExtensions.liveServer.extension
-        ];
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/nearley.nix b/modules/home-manager-modules/programs/vscode/nearley.nix
deleted file mode 100644
index 3020a9e..0000000
--- a/modules/home-manager-modules/programs/vscode/nearley.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.vscode-marketplace;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.nearley = {
-          enable = lib.mkEnableOption "should the nearley extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "nearley" {
-            default = ["karyfoundation" "nearley"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.nearley.enable {
-        extensions = [
-          config.extraExtensions.nearley.extension
-        ];
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/nixIde.nix b/modules/home-manager-modules/programs/vscode/nixIde.nix
deleted file mode 100644
index bc79b69..0000000
--- a/modules/home-manager-modules/programs/vscode/nixIde.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.nixIde = {
-          enable = lib.mkEnableOption "Enable Nix IDE extension";
-          extension = lib.mkPackageOption pkgsRepository "nix-ide" {
-            default = ["jnoortheen" "nix-ide"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.nixIde.enable {
-        extensions = [config.extraExtensions.nixIde.extension];
-        userSettings = {
-          "nix.enableLanguageServer" = true;
-          "nix.serverPath" = "nil";
-        };
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/oneDark.nix b/modules/home-manager-modules/programs/vscode/oneDark.nix
deleted file mode 100644
index 5ed43f4..0000000
--- a/modules/home-manager-modules/programs/vscode/oneDark.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.oneDark = {
-          enable = lib.mkEnableOption "should the one dark theme for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "onedark" {
-            default = ["akamud" "vscode-theme-onedark"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.oneDark.enable {
-        extensions = [
-          config.extraExtensions.oneDark.extension
-        ];
-        userSettings = {
-          "workbench.colorTheme" = "Atom One Dark";
-        };
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/openRemoteSsh.nix b/modules/home-manager-modules/programs/vscode/openRemoteSsh.nix
deleted file mode 100644
index c1b6daa..0000000
--- a/modules/home-manager-modules/programs/vscode/openRemoteSsh.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.openRemoteSsh = {
-          enable = lib.mkEnableOption "should the open-remote-ssh extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "open-remote-ssh" {
-            default = ["jeanp413" "open-remote-ssh"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.openRemoteSsh.enable {
-        extensions = [
-          config.extraExtensions.openRemoteSsh.extension
-        ];
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/tauriVscode.nix b/modules/home-manager-modules/programs/vscode/tauriVscode.nix
deleted file mode 100644
index 9185fb3..0000000
--- a/modules/home-manager-modules/programs/vscode/tauriVscode.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.tauriVscode = {
-          enable = lib.mkEnableOption "should the tauri-vscode extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "tauri-vscode" {
-            default = ["tauri-apps" "tauri-vscode"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.tauriVscode.enable {
-        extensions = [
-          config.extraExtensions.tauriVscode.extension
-        ];
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/vitest.nix b/modules/home-manager-modules/programs/vscode/vitest.nix
deleted file mode 100644
index 446d25b..0000000
--- a/modules/home-manager-modules/programs/vscode/vitest.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.vitest = {
-          enable = lib.mkEnableOption "should the vitest extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "vitest" {
-            default = ["vitest" "explorer"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.vitest.enable {
-        extensions = [
-          config.extraExtensions.vitest.extension
-        ];
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/vscodeEslint.nix b/modules/home-manager-modules/programs/vscode/vscodeEslint.nix
deleted file mode 100644
index 64d979f..0000000
--- a/modules/home-manager-modules/programs/vscode/vscodeEslint.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.vscodeEslint = {
-          enable = lib.mkEnableOption "should the vscode-eslint extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "vscode-eslint" {
-            default = ["dbaeumer" "vscode-eslint"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.vscodeEslint.enable {
-        extensions = [
-          config.extraExtensions.vscodeEslint.extension
-        ];
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/vscodeJest.nix b/modules/home-manager-modules/programs/vscode/vscodeJest.nix
deleted file mode 100644
index 7c24f2a..0000000
--- a/modules/home-manager-modules/programs/vscode/vscodeJest.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.vscodeJest = {
-          enable = lib.mkEnableOption "should the vscode-jest extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "vscode-jest" {
-            default = ["orta" "vscode-jest"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.vscodeJest.enable {
-        extensions = [
-          config.extraExtensions.vscodeJest.extension
-        ];
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/vscodeMdx.nix b/modules/home-manager-modules/programs/vscode/vscodeMdx.nix
deleted file mode 100644
index c49fe51..0000000
--- a/modules/home-manager-modules/programs/vscode/vscodeMdx.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.vscodeMdx = {
-          enable = lib.mkEnableOption "should the vscode-mdx extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "vscode-mdx" {
-            default = ["unifiedjs" "vscode-mdx"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.vscodeMdx.enable {
-        extensions = [
-          config.extraExtensions.vscodeMdx.extension
-        ];
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/vscodeStandard.nix b/modules/home-manager-modules/programs/vscode/vscodeStandard.nix
deleted file mode 100644
index 31c8ad0..0000000
--- a/modules/home-manager-modules/programs/vscode/vscodeStandard.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.vscodeStandard = {
-          enable = lib.mkEnableOption "should the vscode-standard extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "vscode-standard" {
-            default = ["standard" "vscode-standard"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.vscodeStandard.enable {
-        extensions = [
-          config.extraExtensions.vscodeStandard.extension
-        ];
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/programs/vscode/vscodeStylelint.nix b/modules/home-manager-modules/programs/vscode/vscodeStylelint.nix
deleted file mode 100644
index 0d43b29..0000000
--- a/modules/home-manager-modules/programs/vscode/vscodeStylelint.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.vscodeStylelint = {
-          enable = lib.mkEnableOption "should the vscode-stylelint extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "vscode-stylelint" {
-            default = ["stylelint" "vscode-stylelint"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.vscodeStylelint.enable {
-        extensions = [
-          config.extraExtensions.vscodeStylelint.extension
-        ];
-      };
-    }));
-  };
-}
diff --git a/modules/home-manager-modules/sops.nix b/modules/home-manager-modules/sops.nix
deleted file mode 100644
index 910fbb6..0000000
--- a/modules/home-manager-modules/sops.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{...}: {
-  config = {
-    sops = {
-      age.keyFile = "/var/lib/sops-nix/key.txt";
-    };
-  };
-}
diff --git a/modules/home-manager-modules/user.nix b/modules/home-manager-modules/user.nix
deleted file mode 100644
index efce22d..0000000
--- a/modules/home-manager-modules/user.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  lib,
-  config,
-  osConfig,
-  ...
-}: {
-  options.user = {
-    isDesktopUser = lib.mkOption {
-      type = lib.types.bool;
-      default = osConfig.host.users.${config.home.username}.isDesktopUser;
-    };
-    isTerminalUser = lib.mkOption {
-      type = lib.types.bool;
-      default = osConfig.host.users.${config.home.username}.isTerminalUser;
-    };
-  };
-}
diff --git a/modules/nixos-modules/default.nix b/modules/nixos-modules/default.nix
index 2ba1a58..d668a74 100644
--- a/modules/nixos-modules/default.nix
+++ b/modules/nixos-modules/default.nix
@@ -14,8 +14,8 @@
     ./ollama.nix
     ./ai.nix
     ./tailscale.nix
-    ./steam.nix
     ./server
+    ./packages
   ];
 
   nixpkgs.config.permittedInsecurePackages = [
diff --git a/modules/nixos-modules/desktop.nix b/modules/nixos-modules/desktop.nix
index 6686ee3..cf59cd9 100644
--- a/modules/nixos-modules/desktop.nix
+++ b/modules/nixos-modules/desktop.nix
@@ -11,48 +11,42 @@
       host.desktop.enable = lib.mkDefault true;
     }
     (lib.mkIf config.host.desktop.enable {
-      environment.gnome.excludePackages = with pkgs; [
-        xterm # default terminal
-        atomix # puzzle game
-        cheese # webcam tool
-        epiphany # web browser
-        geary # email reader
-        gedit # text editor
-        decibels # audio player
-        gnome-characters # character set viewer
-        gnome-music # music player
-        gnome-photos # photo viewer
-        gnome-logs # log viewer
-        gnome-maps # map viewer
-        gnome-tour # welcome tour
-        hitori # sudoku game
-        iagno # go game
-        tali # poker game
-        yelp # help viewer
-      ];
       services = {
         # Enable CUPS to print documents.
-        printing = {
-          enable = true;
-          drivers = [
-            pkgs.hplip
-            pkgs.gutenprint
-            pkgs.gutenprintBin
-          ];
-        };
+        printing.enable = true;
 
         xserver = {
           # Enable the X11 windowing system.
           enable = true;
 
+          # Enable the GNOME Desktop Environment.
+          displayManager.gdm.enable = true;
+          desktopManager = {
+            gnome.enable = true;
+          };
+
           # Get rid of xTerm
           desktopManager.xterm.enable = false;
+          excludePackages = with pkgs; [
+            xterm
+            atomix # puzzle game
+            cheese # webcam tool
+            epiphany # web browser
+            geary # email reader
+            gedit # text editor
+            gnome-characters
+            gnome-music
+            gnome-photos
+            gnome-tour
+            gnome-logs
+            gnome-maps
+            hitori # sudoku game
+            iagno # go game
+            tali # poker game
+            yelp # help viewer
+          ];
         };
 
-        # Enable the GNOME Desktop Environment.
-        displayManager.gdm.enable = true;
-        desktopManager.gnome.enable = true;
-
         pipewire = {
           enable = true;
           alsa.enable = true;
@@ -76,6 +70,8 @@
 
       # enable RealtimeKit for pulse audio
       security.rtkit.enable = true;
+      # disable welcome tour
+      environment.gnome.excludePackages = [pkgs.gnome-tour];
     })
   ];
 }
diff --git a/modules/nixos-modules/disko.nix b/modules/nixos-modules/disko.nix
index a962689..13ddb8f 100644
--- a/modules/nixos-modules/disko.nix
+++ b/modules/nixos-modules/disko.nix
@@ -20,8 +20,6 @@
       disk: lib.attrsets.nameValuePair (hashDisk disk) disk
     )
     config.host.storage.pool.cache;
-
-  datasets = config.host.storage.pool.datasets // config.host.storage.pool.extraDatasets;
 in {
   options.host.storage = {
     enable = lib.mkEnableOption "are we going create zfs disks with disko on this device";
@@ -50,68 +48,21 @@ in {
       };
     };
     pool = {
-      mode = lib.mkOption {
-        type = lib.types.str;
-        default = "raidz2";
-        description = "what level of redundancy should this pool have";
-      };
-      # list of drives in pool that will have a boot partition put onto them
-      bootDrives = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
-        description = "list of disks that are going to have a boot partition installed on them";
-        default = lib.lists.flatten config.host.storage.pool.vdevs;
-      };
-      # shorthand for vdevs if you only have 1 vdev
-      drives = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
-        description = "list of drives that are going to be in the vdev";
-        default = [];
-      };
-      # list of all drives in each vdev
       vdevs = lib.mkOption {
         type = lib.types.listOf (lib.types.listOf lib.types.str);
         description = "list of disks that are going to be in";
         default = [config.host.storage.pool.drives];
       };
-      # list of cache drives for pool
+      drives = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
+        description = "list of drives that are going to be in the vdev";
+        default = [];
+      };
       cache = lib.mkOption {
         type = lib.types.listOf lib.types.str;
         description = "list of drives that are going to be used as cache";
         default = [];
       };
-      # Default datasets that are needed to make a functioning system
-      datasets = lib.mkOption {
-        type = lib.types.attrsOf (inputs.disko.lib.subType {
-          types = {inherit (inputs.disko.lib.types) zfs_fs zfs_volume;};
-        });
-        default = {
-          "local" = {
-            type = "zfs_fs";
-            options.canmount = "off";
-          };
-          # nix directory needs to be available pre persist and doesn't need to be snapshotted or backed up
-          "local/system/nix" = {
-            type = "zfs_fs";
-            mountpoint = "/nix";
-            options = {
-              atime = "off";
-              relatime = "off";
-              canmount = "on";
-            };
-          };
-          # dataset for root that gets rolled back on every boot
-          "local/system/root" = {
-            type = "zfs_fs";
-            mountpoint = "/";
-            options = {
-              canmount = "on";
-            };
-            postCreateHook = ''
-              zfs snapshot rpool/local/system/root@blank
-            '';
-          };
-        };
-      };
       extraDatasets = lib.mkOption {
         type = lib.types.attrsOf (inputs.disko.lib.subType {
           types = {inherit (inputs.disko.lib.types) zfs_fs zfs_volume;};
@@ -136,8 +87,6 @@ in {
       };
       accounts = {
         zfs_notifications = {
-          auth = true;
-          tls = true;
           host = config.host.storage.notifications.host;
           passwordeval = "cat ${config.host.storage.notifications.tokenFile}";
           user = config.host.storage.notifications.user;
@@ -151,13 +100,14 @@ in {
       autoSnapshot.enable = true;
 
       zed = lib.mkIf config.host.storage.notifications.enable {
-        enableMail = true;
+        # this option is broken we are just going to disable it
+        enableMail = false;
 
         settings = {
           ZED_DEBUG_LOG = "/tmp/zed.debug.log";
           ZED_EMAIL_ADDR = [config.host.storage.notifications.to];
           ZED_EMAIL_PROG = "${pkgs.msmtp}/bin/msmtp";
-          ZED_EMAIL_OPTS = "-a zfs_notifications @ADDRESS@";
+          ZED_EMAIL_OPTS = "@ADDRESS@";
 
           ZED_NOTIFY_INTERVAL_SECS = 3600;
           ZED_NOTIFY_VERBOSE = true;
@@ -171,37 +121,59 @@ in {
     disko.devices = {
       disk = (
         builtins.listToAttrs (
-          builtins.map
-          (drive:
-            lib.attrsets.nameValuePair (drive.name) {
-              type = "disk";
-              device = "/dev/disk/by-id/${drive.value}";
-              content = {
-                type = "gpt";
-                partitions = {
-                  ESP = lib.mkIf (builtins.elem drive.value config.host.storage.pool.bootDrives) {
-                    # The 2GB here for the boot partition might be a bit overkill we probably only need like 1/4th of that but storage is cheap
-                    size = "2G";
-                    type = "EF00";
-                    content = {
-                      type = "filesystem";
-                      format = "vfat";
-                      mountpoint = "/boot";
-                      mountOptions = ["umask=0077"];
-                    };
-                  };
-                  zfs = {
-                    size = "100%";
-                    content = {
-                      type = "zfs";
-                      pool = "rpool";
+          (
+            builtins.map
+            (drive:
+              lib.attrsets.nameValuePair (drive.name) {
+                type = "disk";
+                device = "/dev/disk/by-id/${drive.value}";
+                content = {
+                  type = "gpt";
+                  partitions = {
+                    zfs = {
+                      size = "100%";
+                      content = {
+                        type = "zfs";
+                        pool = "rpool";
+                      };
                     };
                   };
                 };
-              };
-            })
-          (
-            (lib.lists.flatten vdevs) ++ cache
+              })
+            (lib.lists.flatten vdevs)
+          )
+          ++ (
+            builtins.map
+            (drive:
+              lib.attrsets.nameValuePair (drive.name) {
+                type = "disk";
+                device = "/dev/disk/by-id/${drive.value}";
+                content = {
+                  type = "gpt";
+                  partitions = {
+                    # We are having to boot off of the nvm cache drive because I cant figure out how to boot via the HBA
+                    ESP = {
+                      # 2G here because its not much relative to how much storage we have for caching
+                      size = "2G";
+                      type = "EF00";
+                      content = {
+                        type = "filesystem";
+                        format = "vfat";
+                        mountpoint = "/boot";
+                        mountOptions = ["umask=0077"];
+                      };
+                    };
+                    zfs = {
+                      size = "100%";
+                      content = {
+                        type = "zfs";
+                        pool = "rpool";
+                      };
+                    };
+                  };
+                };
+              })
+            cache
           )
         )
       );
@@ -213,7 +185,7 @@ in {
               type = "topology";
               vdev = (
                 builtins.map (disks: {
-                  mode = config.host.storage.pool.mode;
+                  mode = "raidz2";
                   members =
                     builtins.map (disk: disk.name) disks;
                 })
@@ -250,15 +222,13 @@ in {
             );
 
           datasets = lib.mkMerge [
-            (
-              lib.attrsets.mapAttrs (name: value: {
+            (lib.attrsets.mapAttrs (name: value: {
                 type = value.type;
                 options = value.options;
                 mountpoint = value.mountpoint;
                 postCreateHook = value.postCreateHook;
               })
-              datasets
-            )
+              config.host.storage.pool.extraDatasets)
           ];
         };
       };
diff --git a/modules/nixos-modules/home-manager/default.nix b/modules/nixos-modules/home-manager/default.nix
index 10f86c7..cab004b 100644
--- a/modules/nixos-modules/home-manager/default.nix
+++ b/modules/nixos-modules/home-manager/default.nix
@@ -4,6 +4,5 @@
     ./flipperzero.nix
     ./i18n.nix
     ./openssh.nix
-    ./steam.nix
   ];
 }
diff --git a/modules/nixos-modules/home-manager/steam.nix b/modules/nixos-modules/home-manager/steam.nix
deleted file mode 100644
index d151bca..0000000
--- a/modules/nixos-modules/home-manager/steam.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  setupSteam =
-    lib.lists.any
-    (value: value)
-    (lib.attrsets.mapAttrsToList (name: value: value.programs.steam.enable) config.home-manager.users);
-in {
-  config = lib.mkIf setupSteam {
-    programs.steam = {
-      enable = true;
-      # TODO: figure out how to not install steam here
-      # package = lib.mkDefault pkgs.emptyFile;
-    };
-  };
-}
diff --git a/modules/nixos-modules/impermanence.nix b/modules/nixos-modules/impermanence.nix
index 7735e97..e969e20 100644
--- a/modules/nixos-modules/impermanence.nix
+++ b/modules/nixos-modules/impermanence.nix
@@ -25,18 +25,6 @@
           }
         ];
 
-        # fixes issues with /var/lib/private not having the correct permissions https://github.com/nix-community/impermanence/issues/254
-        system.activationScripts."createPersistentStorageDirs".deps = ["var-lib-private-permissions" "users" "groups"];
-        system.activationScripts = {
-          "var-lib-private-permissions" = {
-            deps = ["specialfs"];
-            text = ''
-              mkdir -p /persist/system/root/var/lib/private
-              chmod 0700 /persist/system/root/var/lib/private
-            '';
-          };
-        };
-
         programs.fuse.userAllowOther = true;
 
         boot.initrd.postResumeCommands = lib.mkAfter ''
@@ -50,6 +38,33 @@
         };
 
         host.storage.pool.extraDatasets = {
+          # local datasets are for data that should be considered ephemeral
+          "local" = {
+            type = "zfs_fs";
+            options.canmount = "off";
+          };
+          # nix directory needs to be available pre persist and doesn't need to be snapshotted or backed up
+          "local/system/nix" = {
+            type = "zfs_fs";
+            mountpoint = "/nix";
+            options = {
+              atime = "off";
+              relatime = "off";
+              canmount = "on";
+            };
+          };
+          # dataset for root that gets rolled back on every boot
+          "local/system/root" = {
+            type = "zfs_fs";
+            mountpoint = "/";
+            options = {
+              canmount = "on";
+            };
+            postCreateHook = ''
+              zfs snapshot rpool/local/system/root@blank
+            '';
+          };
+
           # persist datasets are datasets that contain information that we would like to keep around
           "persist" = {
             type = "zfs_fs";
diff --git a/modules/nixos-modules/ollama.nix b/modules/nixos-modules/ollama.nix
index 99819bf..8f194cf 100644
--- a/modules/nixos-modules/ollama.nix
+++ b/modules/nixos-modules/ollama.nix
@@ -32,11 +32,17 @@
           enable = true;
           hideMounts = true;
           directories = [
+            {
+              directory = config.services.ollama.models;
+              user = config.services.ollama.user;
+              group = config.services.ollama.group;
+            }
             {
               directory = "/var/lib/private/ollama";
               user = config.services.ollama.user;
               group = config.services.ollama.group;
               mode = "0700";
+              defaultPerms.mode = "0700";
             }
           ];
         };
diff --git a/modules/nixos-modules/packages/default.nix b/modules/nixos-modules/packages/default.nix
new file mode 100644
index 0000000..208ee24
--- /dev/null
+++ b/modules/nixos-modules/packages/default.nix
@@ -0,0 +1,17 @@
+{pkgs, ...}: {
+  nixpkgs.overlays = [
+    (final: prev: {
+      webtoon-dl =
+        pkgs.callPackage
+        ./webtoon-dl.nix
+        {};
+    })
+    # TODO: this package always needs to be called with the --in-process-gpu flag for some reason, can we automate that?
+    (final: prev: {
+      prostudiomasters =
+        pkgs.callPackage
+        ./prostudiomasters.nix
+        {};
+    })
+  ];
+}
diff --git a/modules/common-modules/pkgs/prostudiomasters.nix b/modules/nixos-modules/packages/prostudiomasters.nix
similarity index 100%
rename from modules/common-modules/pkgs/prostudiomasters.nix
rename to modules/nixos-modules/packages/prostudiomasters.nix
diff --git a/modules/common-modules/pkgs/webtoon-dl.nix b/modules/nixos-modules/packages/webtoon-dl.nix
similarity index 100%
rename from modules/common-modules/pkgs/webtoon-dl.nix
rename to modules/nixos-modules/packages/webtoon-dl.nix
diff --git a/modules/nixos-modules/server/actual.nix b/modules/nixos-modules/server/actual.nix
deleted file mode 100644
index 7fc0b93..0000000
--- a/modules/nixos-modules/server/actual.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  dataDirectory = "/var/lib/actual/";
-in {
-  options.services.actual = {
-    subdomain = lib.mkOption {
-      type = lib.types.str;
-      default = "actual";
-      description = "subdomain of base domain that actual will be hosted at";
-    };
-  };
-
-  config = lib.mkIf config.services.actual.enable (lib.mkMerge [
-    {
-      systemd.tmpfiles.rules = [
-        "d ${dataDirectory} 2770 actual actual"
-      ];
-      host = {
-        reverse_proxy.subdomains.${config.services.actual.subdomain} = {
-          target = "http://localhost:${toString config.services.actual.settings.port}";
-        };
-      };
-
-      services.actual = {
-        settings = {
-          ACTUAL_DATA_DIR = dataDirectory;
-        };
-      };
-    }
-    (lib.mkIf config.services.fail2ban.enable {
-      # TODO: configuration for fail2ban for actual
-    })
-    (lib.mkIf config.host.impermanence.enable {
-      assertions = [
-        {
-          assertion = config.services.actual.settings.ACTUAL_DATA_DIR == dataDirectory;
-          message = "actual data location does not match persistence";
-        }
-      ];
-      environment.persistence."/persist/system/root" = {
-        directories = [
-          {
-            directory = dataDirectory;
-            user = "actual";
-            group = "actual";
-          }
-        ];
-      };
-    })
-  ]);
-}
diff --git a/modules/nixos-modules/server/adguardhome.nix b/modules/nixos-modules/server/adguardhome.nix
new file mode 100644
index 0000000..866ad8a
--- /dev/null
+++ b/modules/nixos-modules/server/adguardhome.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  dnsPort = 53;
+in {
+  options.host.adguardhome = {
+    enable = lib.mkEnableOption "should home-assistant be enabled on this computer";
+    directory = lib.mkOption {
+      type = lib.types.str;
+      default = "/var/lib/AdGuardHome/";
+    };
+  };
+  config = lib.mkIf config.host.adguardhome.enable (lib.mkMerge [
+    {
+      services.adguardhome = {
+        enable = true;
+        mutableSettings = false;
+        settings = {
+          dns = {
+            bootstrap_dns = [
+              "1.1.1.1"
+              "9.9.9.9"
+            ];
+            upstream_dns = [
+              "dns.quad9.net"
+            ];
+          };
+          filtering = {
+            protection_enabled = true;
+            filtering_enabled = true;
+
+            parental_enabled = false; # Parental control-based DNS requests filtering.
+            safe_search = {
+              enabled = false; # Enforcing "Safe search" option for search engines, when possible.
+            };
+          };
+          # The following notation uses map
+          # to not have to manually create {enabled = true; url = "";} for every filter
+          # This is, however, fully optional
+          filters =
+            map (url: {
+              enabled = true;
+              url = url;
+            }) [
+              "https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt"
+              "https://adguardteam.github.io/HostlistsRegistry/assets/filter_9.txt" # The Big List of Hacked Malware Web Sites
+              "https://adguardteam.github.io/HostlistsRegistry/assets/filter_11.txt" # malicious url blocklist
+            ];
+        };
+      };
+
+      networking.firewall.allowedTCPPorts = [
+        dnsPort
+      ];
+    }
+    (lib.mkIf config.host.impermanence.enable {
+      environment.persistence."/persist/system/root" = {
+        enable = true;
+        hideMounts = true;
+        directories = [
+          {
+            directory = config.host.adguardhome.directory;
+            user = "adguardhome";
+            group = "adguardhome";
+          }
+        ];
+      };
+    })
+  ]);
+}
diff --git a/modules/nixos-modules/server/default.nix b/modules/nixos-modules/server/default.nix
index 4ca50e2..7beee8b 100644
--- a/modules/nixos-modules/server/default.nix
+++ b/modules/nixos-modules/server/default.nix
@@ -8,11 +8,9 @@
     ./jellyfin.nix
     ./forgejo.nix
     ./searx.nix
-    ./home-assistant.nix
-    ./wyoming.nix
+    ./virt-home-assistant.nix
+    ./adguardhome.nix
     ./immich.nix
     ./qbittorent.nix
-    ./paperless.nix
-    ./actual.nix
   ];
 }
diff --git a/modules/nixos-modules/server/fail2ban.nix b/modules/nixos-modules/server/fail2ban.nix
index d19aeeb..be83e6f 100644
--- a/modules/nixos-modules/server/fail2ban.nix
+++ b/modules/nixos-modules/server/fail2ban.nix
@@ -16,6 +16,20 @@ in {
             failregex = "limiting requests, excess:.* by zone.*client: <HOST>"
           '')
         );
+        # "fail2ban/filter.d/hass.local".text = lib.mkIf config.services.home-assistant.enable (
+        #   pkgs.lib.mkDefault (pkgs.lib.mkAfter ''
+        #     [INCLUDES]
+        #     before = common.conf
+
+        #     [Definition]
+        #     failregex = ^%(__prefix_line)s.*Login attempt or request with invalid authentication from <HOST>.*$
+
+        #     ignoreregex =
+
+        #     [Init]
+        #     datepattern = ^%%Y-%%m-%%d %%H:%%M:%%S
+        #   '')
+        # );
       };
 
       services.fail2ban = {
@@ -47,6 +61,16 @@ in {
             bantime = 600;
             maxretry = 5;
           };
+          # home-assistant-iptables.settings = lib.mkIf config.services.home-assistant.enable {
+          #   enabled = true;
+          #   filter = "hass";
+          #   action = ''iptables-multiport[name=HTTP, port="http,https"]'';
+          #   logpath = "${config.services.home-assistant.configDir}/*.log";
+          #   backend = "auto";
+          #   findtime = 600;
+          #   bantime = 600;
+          #   maxretry = 5;
+          # };
           # TODO; figure out if there is any fail2ban things we can do on searx
           # searx-iptables.settings = lib.mkIf config.services.searx.enable {};
         };
diff --git a/modules/nixos-modules/server/forgejo.nix b/modules/nixos-modules/server/forgejo.nix
index de06f94..40a5303 100644
--- a/modules/nixos-modules/server/forgejo.nix
+++ b/modules/nixos-modules/server/forgejo.nix
@@ -19,12 +19,6 @@ in {
 
   config = lib.mkIf config.services.forgejo.enable (lib.mkMerge [
     {
-      assertions = [
-        {
-          assertion = config.services.forgejo.settings.server.BUILTIN_SSH_SERVER_USER == config.users.users.git.name;
-          message = "Forgejo BUILTIN_SSH_SERVER_USER hardcoded value does not match expected git user name";
-        }
-      ];
       host = {
         reverse_proxy.subdomains.${config.services.forgejo.subdomain} = {
           target = "http://localhost:${toString forgejoPort}";
@@ -34,12 +28,6 @@ in {
           extraUsers = {
             ${db_user} = {
               isClient = true;
-              createUser = true;
-            };
-          };
-          extraDatabases = {
-            ${db_user} = {
-              name = db_user;
             };
           };
         };
@@ -58,7 +46,7 @@ in {
             START_SSH_SERVER = true;
             SSH_LISTEN_PORT = sshPort;
             SSH_PORT = 22;
-            BUILTIN_SSH_SERVER_USER = "git";
+            BUILTIN_SSH_SERVER_USER = config.users.users.git.name;
             ROOT_URL = "https://git.jan-leila.com";
           };
           service = {
diff --git a/modules/nixos-modules/server/home-assistant.nix b/modules/nixos-modules/server/home-assistant.nix
index 57bedc1..a90bd6d 100644
--- a/modules/nixos-modules/server/home-assistant.nix
+++ b/modules/nixos-modules/server/home-assistant.nix
@@ -1,229 +1,130 @@
 {
   lib,
-  pkgs,
   config,
+  inputs,
   ...
 }: let
   configDir = "/var/lib/hass";
-  dbUser = "hass";
 in {
-  options.services.home-assistant = {
+  options.host.home-assistant = {
+    enable = lib.mkEnableOption "should home-assistant be enabled on this computer";
     subdomain = lib.mkOption {
       type = lib.types.str;
       description = "subdomain of base domain that home-assistant will be hosted at";
       default = "home-assistant";
     };
-
-    database = lib.mkOption {
-      type = lib.types.enum [
-        "builtin"
-        "postgres"
-      ];
-      description = "what database do we want to use";
-      default = "builtin";
-    };
-
-    extensions = {
-      sonos = {
-        enable = lib.mkEnableOption "enable the sonos plugin";
-        port = lib.mkOption {
-          type = lib.types.int;
-          default = 1400;
-          description = "what port to use for sonos discovery";
-        };
-      };
-      jellyfin = {
-        enable = lib.mkEnableOption "enable the jellyfin plugin";
-      };
-      wyoming = {
-        enable = lib.mkEnableOption "enable wyoming";
-      };
-    };
   };
 
-  config = lib.mkIf config.services.home-assistant.enable (lib.mkMerge [
+  config = lib.mkIf config.host.home-assistant.enable (lib.mkMerge [
     {
-      host = {
-        reverse_proxy.subdomains.${config.services.home-assistant.subdomain} = {
-          target = "http://localhost:${toString config.services.home-assistant.config.http.server_port}";
-
-          websockets.enable = true;
-          forwardHeaders.enable = true;
-
-          extraConfig = ''
-            add_header Upgrade $http_upgrade;
-            add_header Connection \"upgrade\";
-
-            proxy_buffering off;
-
-            proxy_read_timeout 90;
-          '';
-        };
-      };
-
-      services.home-assistant = {
-        configDir = configDir;
-        extraComponents = [
-          "default_config"
-          "esphome"
-          "met"
-          "radio_browser"
-          "isal"
-          "zha"
-          "webostv"
-          "tailscale"
-          "syncthing"
-          "analytics_insights"
-          "unifi"
-          "openweathermap"
-          "ollama"
-          "mobile_app"
-          "logbook"
-          "ssdp"
-          "usb"
-          "webhook"
-          "bluetooth"
-          "dhcp"
-          "energy"
-          "history"
-          "backup"
-          "assist_pipeline"
-          "conversation"
-          "sun"
-          "zeroconf"
-          "cpuspeed"
-        ];
-        config = {
-          http = {
-            server_port = 8123;
-            use_x_forwarded_for = true;
-            trusted_proxies = ["127.0.0.1" "::1"];
-            ip_ban_enabled = true;
-            login_attempts_threshold = 10;
-          };
-          homeassistant = {
-            external_url = "https://${config.services.home-assistant.subdomain}.${config.host.reverse_proxy.hostname}";
-            # internal_url = "http://192.168.1.2:8123";
-          };
-          recorder.db_url = "postgresql://@/${dbUser}";
-          "automation manual" = [];
-          "automation ui" = "!include automations.yaml";
-          mobile_app = {};
-        };
-        extraPackages = python3Packages:
-          with python3Packages; [
-            hassil
-            numpy
-            gtts
+      virtualisation.libvirt = {
+        swtpm.enable = true;
+        connections."qemu:///session" = {
+          networks = [
+            {
+              definition = inputs.nix-virt.lib.network.writeXML (inputs.nix-virt.lib.network.templates.bridge
+                {
+                  uuid = "d57e37e2-311f-4e5c-a484-97c2210c2770";
+                  subnet_byte = 71;
+                });
+              active = true;
+            }
           ];
+          domains = [
+            {
+              definition = inputs.nix-virt.lib.domain.writeXML (inputs.nix-virt.lib.domain.templates.linux
+                {
+                  name = "Home Assistant";
+                  uuid = "c5cc0efc-6101-4c1d-be31-acbba203ccde";
+                  memory = {
+                    count = 4;
+                    unit = "GiB";
+                  };
+                  # storage_vol = {
+                  #   pool = "MyPool";
+                  #   volume = "Penguin.qcow2";
+                  # };
+                });
+            }
+          ];
+        };
       };
 
-      # TODO: configure /var/lib/hass/secrets.yaml via sops
+      # systemd.tmpfiles.rules = [
+      #   "f ${config.services.home-assistant.configDir}/automations.yaml 0755 hass hass"
+      # ];
+      # services.home-assistant = {
+      #   enable = true;
+      #   configDir = configDir;
+      #   extraComponents = [
+      #     "met"
+      #     "radio_browser"
+      #     "isal"
+      #     "zha"
+      #     "jellyfin"
+      #     "webostv"
+      #     "tailscale"
+      #     "syncthing"
+      #     "sonos"
+      #     "analytics_insights"
+      #     "unifi"
+      #     "openweathermap"
+      #   ];
+      #   config = {
+      #     http = {
+      #       server_port = 8082;
+      #       use_x_forwarded_for = true;
+      #       trusted_proxies = ["127.0.0.1" "::1"];
+      #       ip_ban_enabled = true;
+      #       login_attempts_threshold = 10;
+      #     };
+      #     # recorder.db_url = "postgresql://@/${db_user}";
+      #     "automation manual" = [];
+      #     "automation ui" = "!include automations.yaml";
+      #   };
+      #   extraPackages = python3Packages:
+      #     with python3Packages; [
+      #       hassil
+      #       numpy
+      #       gtts
+      #     ];
+      # };
+      # host = {
+      #   reverse_proxy.subdomains.${config.host.home-assistant.subdomain} = {
+      #     target = "http://localhost:${toString config.services.home-assistant.config.http.server_port}";
 
-      networking.firewall.allowedUDPPorts = [
-        1900
-      ];
+      #     websockets.enable = true;
+      #     forwardHeaders.enable = true;
 
-      systemd.tmpfiles.rules = [
-        "f ${config.services.home-assistant.configDir}/automations.yaml 0755 hass hass"
-      ];
+      #     extraConfig = ''
+      #       add_header Upgrade $http_upgrade;
+      #       add_header Connection \"upgrade\";
+
+      #       proxy_buffering off;
+
+      #       proxy_read_timeout 90;
+      #     '';
+      #   };
+      # };
     }
-    (lib.mkIf (config.services.home-assistant.extensions.sonos.enable) {
-      services.home-assistant.extraComponents = ["sonos"];
-      networking.firewall.allowedTCPPorts = [
-        config.services.home-assistant.extensions.sonos.port
-      ];
-    })
-    (lib.mkIf (config.services.home-assistant.extensions.jellyfin.enable) {
-      services.home-assistant.extraComponents = ["jellyfin"];
-      # TODO: configure port, address, and login information here
-    })
-    (lib.mkIf (config.services.home-assistant.extensions.wyoming.enable) {
-      services.home-assistant.extraComponents = ["wyoming"];
-      services.wyoming.enable = true;
-    })
-    (lib.mkIf (config.services.home-assistant.database == "postgres") {
-      host = {
-        postgres = {
-          enable = true;
-          extraUsers = {
-            ${dbUser} = {
-              isClient = true;
-              createUser = true;
-            };
-          };
-          extraDatabases = {
-            ${dbUser} = {
-              name = dbUser;
-            };
-          };
-        };
-      };
-
-      services.home-assistant = {
-        extraPackages = python3Packages:
-          with python3Packages; [
-            psycopg2
-          ];
-      };
-
-      systemd.services.home-assistant = {
-        requires = [
-          config.systemd.services.postgresql.name
-        ];
-      };
-    })
-    (lib.mkIf config.services.fail2ban.enable {
-      environment.etc = {
-        "fail2ban/filter.d/hass.local".text = lib.mkIf config.services.home-assistant.enable (
-          pkgs.lib.mkDefault (pkgs.lib.mkAfter ''
-            [INCLUDES]
-            before = common.conf
-
-            [Definition]
-            failregex = ^%(__prefix_line)s.*Login attempt or request with invalid authentication from <HOST>.*$
-
-            ignoreregex =
-
-            [Init]
-            datepattern = ^%%Y-%%m-%%d %%H:%%M:%%S
-          '')
-        );
-      };
-
-      services.fail2ban = {
-        jails = {
-          home-assistant-iptables.settings = lib.mkIf config.services.home-assistant.enable {
-            enabled = true;
-            filter = "hass";
-            action = ''iptables-multiport[name=HTTP, port="http,https"]'';
-            logpath = "${config.services.home-assistant.configDir}/*.log";
-            backend = "auto";
-            findtime = 600;
-            bantime = 600;
-            maxretry = 5;
-          };
-        };
-      };
-    })
     (lib.mkIf config.host.impermanence.enable {
-      assertions = [
-        {
-          assertion = config.services.home-assistant.configDir == configDir;
-          message = "home assistant config directory does not match persistence";
-        }
-      ];
-      environment.persistence."/persist/system/root" = {
-        enable = true;
-        hideMounts = true;
-        directories = [
-          {
-            directory = configDir;
-            user = "hass";
-            group = "hass";
-          }
-        ];
-      };
+      # assertions = [
+      #   {
+      #     assertion = config.services.home-assistant.configDir == configDir;
+      #     message = "home assistant config directory does not match persistence";
+      #   }
+      # ];
+      # environment.persistence."/persist/system/root" = {
+      #   enable = true;
+      #   hideMounts = true;
+      #   directories = [
+      #     {
+      #       directory = configDir;
+      #       user = "hass";
+      #       group = "hass";
+      #     }
+      #   ];
+      # };
     })
   ]);
 }
diff --git a/modules/nixos-modules/server/jellyfin.nix b/modules/nixos-modules/server/jellyfin.nix
index 294c8e1..a8bbe71 100644
--- a/modules/nixos-modules/server/jellyfin.nix
+++ b/modules/nixos-modules/server/jellyfin.nix
@@ -52,15 +52,10 @@ in {
         ];
 
         networking.firewall.allowedTCPPorts = [jellyfinPort dlanPort];
-
-        systemd.tmpfiles.rules = [
-          "d ${config.services.jellyfin.media_directory} 2770 jellyfin jellyfin_media"
-          "A ${config.services.jellyfin.media_directory} -    -        -               - u:jellyfin:rwX,g:jellyfin_media:rwX,o::-"
-        ];
       }
       (lib.mkIf config.services.fail2ban.enable {
         environment.etc = {
-          "fail2ban/filter.d/jellyfin.local".text = (
+          "fail2ban/filter.d/jellyfin.local".text = lib.mkIf config.services.jellyfin.enable (
             pkgs.lib.mkDefault (pkgs.lib.mkAfter ''
               [Definition]
               failregex = "^.*Authentication request for .* has been denied \\\(IP: \"<ADDR>\"\\\)\\\."
@@ -70,7 +65,7 @@ in {
 
         services.fail2ban = {
           jails = {
-            jellyfin-iptables.settings = {
+            jellyfin-iptables.settings = lib.mkIf config.services.jellyfin.enable {
               enabled = true;
               filter = "jellyfin";
               action = ''iptables-multiport[name=HTTP, port="http,https"]'';
diff --git a/modules/nixos-modules/server/network_storage/default.nix b/modules/nixos-modules/server/network_storage/default.nix
index eaac7fe..00ea7ac 100644
--- a/modules/nixos-modules/server/network_storage/default.nix
+++ b/modules/nixos-modules/server/network_storage/default.nix
@@ -15,7 +15,7 @@ in {
       export_directory = lib.mkOption {
         type = lib.types.path;
         description = "what are exports going to be stored in";
-        default = "/exports";
+        default = "/export";
       };
       directories = lib.mkOption {
         type = lib.types.listOf (lib.types.submodule ({config, ...}: {
diff --git a/modules/nixos-modules/server/network_storage/nfs.nix b/modules/nixos-modules/server/network_storage/nfs.nix
index 297dc1a..bad0452 100644
--- a/modules/nixos-modules/server/network_storage/nfs.nix
+++ b/modules/nixos-modules/server/network_storage/nfs.nix
@@ -61,6 +61,8 @@
                       # loopback
                       "127.0.0.1"
                       "::1"
+                      # local network
+                      # "192.168.0.0/24"
                       # tailscale
                       "100.64.0.0/10"
                       "fd7a:115c:a1e0::/48"
@@ -82,7 +84,7 @@
             );
           };
         };
-        networking.firewall = let
+        networking.firewall.interfaces.${config.services.tailscale.interfaceName} = let
           ports = [
             111
             config.host.network_storage.nfs.port
@@ -92,12 +94,6 @@
             20048
           ];
         in {
-          # Allow NFS on Tailscale interface
-          interfaces.${config.services.tailscale.interfaceName} = {
-            allowedTCPPorts = ports;
-            allowedUDPPorts = ports;
-          };
-          # Allow NFS on local network (assuming default interface)
           allowedTCPPorts = ports;
           allowedUDPPorts = ports;
         };
diff --git a/modules/nixos-modules/server/paperless.nix b/modules/nixos-modules/server/paperless.nix
deleted file mode 100644
index b97c48d..0000000
--- a/modules/nixos-modules/server/paperless.nix
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  dataDir = "/var/lib/paperless";
-in {
-  options.services.paperless = {
-    subdomain = lib.mkOption {
-      type = lib.types.str;
-      description = "subdomain of base domain that paperless will be hosted at";
-      default = "paperless";
-    };
-    database = {
-      user = lib.mkOption {
-        type = lib.types.str;
-        description = "what is the user and database that we are going to use for paperless";
-        default = "paperless";
-      };
-    };
-  };
-
-  config = lib.mkIf config.services.paperless.enable (lib.mkMerge [
-    {
-      host = {
-        reverse_proxy.subdomains.${config.services.paperless.subdomain} = {
-          target = "http://${config.services.paperless.address}:${toString config.services.paperless.port}";
-
-          websockets.enable = true;
-          forwardHeaders.enable = true;
-
-          extraConfig = ''
-            # allow large file uploads
-            client_max_body_size 50000M;
-          '';
-        };
-        postgres = {
-          enable = true;
-          extraUsers = {
-            ${config.services.paperless.database.user} = {
-              isClient = true;
-              createUser = true;
-            };
-          };
-          extraDatabases = {
-            ${config.services.paperless.database.user} = {
-              name = config.services.paperless.database.user;
-            };
-          };
-        };
-      };
-      services.paperless = {
-        domain = "${config.services.paperless.subdomain}.${config.host.reverse_proxy.hostname}";
-        configureTika = true;
-        settings = {
-          PAPERLESS_DBENGINE = "postgresql";
-          PAPERLESS_DBHOST = "/run/postgresql";
-          PAPERLESS_DBNAME = config.services.paperless.database.user;
-          PAPERLESS_DBUSER = config.services.paperless.database.user;
-        };
-      };
-    }
-    (lib.mkIf config.services.fail2ban.enable {
-      environment.etc = {
-        "fail2ban/filter.d/paperless.local".text = (
-          pkgs.lib.mkDefault (pkgs.lib.mkAfter ''
-            [Definition]
-            failregex = Login failed for user `.*` from (?:IP|private IP) `<HOST>`\.$
-            ignoreregex =
-
-          '')
-        );
-      };
-
-      services.fail2ban = {
-        jails = {
-          paperless.settings = {
-            enabled = true;
-            filter = "paperless";
-            action = ''iptables-multiport[name=HTTP, port="http,https"]'';
-            logpath = "${config.services.paperless.dataDir}/log/*.log";
-            backend = "auto";
-            findtime = 600;
-            bantime = 600;
-            maxretry = 5;
-          };
-        };
-      };
-    })
-    (lib.mkIf config.host.impermanence.enable {
-      assertions = [
-        {
-          assertion = config.services.paperless.dataDir == dataDir;
-          message = "paperless data location does not match persistence";
-        }
-      ];
-      environment.persistence."/persist/system/root" = {
-        directories = [
-          {
-            directory = dataDir;
-            user = "paperless";
-            group = "paperless";
-          }
-        ];
-      };
-    })
-  ]);
-}
diff --git a/modules/nixos-modules/server/podman.nix b/modules/nixos-modules/server/podman.nix
index 9301140..e806e65 100644
--- a/modules/nixos-modules/server/podman.nix
+++ b/modules/nixos-modules/server/podman.nix
@@ -4,7 +4,7 @@
   ...
 }: {
   options.host.podman = {
-    enable = lib.mkEnableOption "should podman be enabled on this computer";
+    enable = lib.mkEnableOption "should home-assistant be enabled on this computer";
     macvlan = {
       subnet = lib.mkOption {
         type = lib.types.str;
diff --git a/modules/nixos-modules/server/qbittorent.nix b/modules/nixos-modules/server/qbittorent.nix
index 2d54587..9b7b7e8 100644
--- a/modules/nixos-modules/server/qbittorent.nix
+++ b/modules/nixos-modules/server/qbittorent.nix
@@ -1,20 +1,115 @@
 {
   lib,
+  pkgs,
   config,
   ...
 }: let
-  qbittorent_profile_directory = "/var/lib/qBittorrent/";
+  qbittorent_data_directory = "/var/lib/qbittorrent";
 in {
   options.services.qbittorrent = {
+    enable = lib.mkEnableOption "should the headless qbittorrent service be enabled";
+
+    dataDir = lib.mkOption {
+      type = lib.types.path;
+      default = "/var/lib/qbittorrent";
+      description = lib.mdDoc ''
+        The directory where qBittorrent stores its data files.
+      '';
+    };
+
     mediaDir = lib.mkOption {
       type = lib.types.path;
       description = lib.mdDoc ''
         The directory to create to store qbittorrent media.
       '';
     };
+
+    user = lib.mkOption {
+      type = lib.types.str;
+      default = "qbittorrent";
+      description = lib.mdDoc ''
+        User account under which qBittorrent runs.
+      '';
+    };
+
+    group = lib.mkOption {
+      type = lib.types.str;
+      default = "qbittorrent";
+      description = lib.mdDoc ''
+        Group under which qBittorrent runs.
+      '';
+    };
+
+    webPort = lib.mkOption {
+      type = lib.types.port;
+      default = 8080;
+      description = lib.mdDoc ''
+        qBittorrent web UI port.
+      '';
+    };
+
+    openFirewall = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Open services.qBittorrent.webPort to the outside network.";
+    };
+
+    package = lib.mkOption {
+      type = lib.types.package;
+      default = pkgs.qbittorrent-nox;
+      defaultText = lib.literalExpression "pkgs.qbittorrent-nox";
+      description = "The qbittorrent package to use.";
+    };
   };
 
   config = lib.mkIf config.services.qbittorrent.enable (lib.mkMerge [
+    {
+      networking.firewall = lib.mkIf config.services.qbittorrent.openFirewall {
+        allowedTCPPorts = [config.services.qbittorrent.webPort];
+      };
+
+      systemd.services.qbittorrent = {
+        # based on the plex.nix service module and
+        # https://github.com/qbittorrent/qBittorrent/blob/master/dist/unix/systemd/qbittorrent-nox%40.service.in
+        description = "qBittorrent-nox service";
+        documentation = ["man:qbittorrent-nox(1)"];
+        after = ["network.target"];
+        wantedBy = ["multi-user.target"];
+
+        serviceConfig = {
+          Type = "simple";
+          User = config.services.qbittorrent.user;
+          Group = config.services.qbittorrent.group;
+
+          # Run the pre-start script with full permissions (the "!" prefix) so it
+          # can create the data directory if necessary.
+          ExecStartPre = let
+            preStartScript = pkgs.writeScript "qbittorrent-run-prestart" ''
+              #!${pkgs.bash}/bin/bash
+
+              # Create data directory if it doesn't exist
+              if ! test -d "$QBT_PROFILE"; then
+                echo "Creating initial qBittorrent data directory in: $QBT_PROFILE"
+                install -d -m 0755 -o "${config.services.qbittorrent.user}" -g "${config.services.qbittorrent.group}" "$QBT_PROFILE"
+              fi
+            '';
+          in "!${preStartScript}";
+
+          #ExecStart = "${pkgs.qbittorrent-nox}/bin/qbittorrent-nox";
+          ExecStart = "${config.services.qbittorrent.package}/bin/qbittorrent-nox";
+          # To prevent "Quit & shutdown daemon" from working; we want systemd to
+          # manage it!
+          #Restart = "on-success";
+          #UMask = "0002";
+          #LimitNOFILE = cfg.openFilesLimit;
+        };
+
+        environment = {
+          QBT_PROFILE = config.services.qbittorrent.dataDir;
+          QBT_WEBUI_PORT = toString config.services.qbittorrent.webPort;
+        };
+      };
+    }
     (lib.mkIf config.host.impermanence.enable {
       fileSystems."/persist/system/qbittorrent".neededForBoot = true;
 
@@ -31,7 +126,7 @@ in {
 
       assertions = [
         {
-          assertion = config.services.qbittorrent.profileDir == qbittorent_profile_directory;
+          assertion = config.services.qbittorrent.dataDir == qbittorent_data_directory;
           message = "qbittorrent data directory does not match persistence";
         }
       ];
@@ -40,7 +135,7 @@ in {
         "/persist/system/root" = {
           directories = [
             {
-              directory = qbittorent_profile_directory;
+              directory = qbittorent_data_directory;
               user = "qbittorrent";
               group = "qbittorrent";
             }
diff --git a/modules/nixos-modules/server/virt-home-assistant.nix b/modules/nixos-modules/server/virt-home-assistant.nix
new file mode 100644
index 0000000..4212668
--- /dev/null
+++ b/modules/nixos-modules/server/virt-home-assistant.nix
@@ -0,0 +1,155 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  options.services.virt-home-assistant = {
+    enable = lib.mkEnableOption "Wether to enable home assistant virtual machine";
+    networkBridge = lib.mkOption {
+      type = lib.types.str;
+      description = "what network bridge should we attach to the image";
+    };
+    hostDevice = lib.mkOption {
+      type = lib.types.str;
+      description = "what host devices should be attached to the image";
+    };
+    initialVersion = lib.mkOption {
+      type = lib.types.str;
+      description = "what home assistant image version should we pull for initial instal";
+      default = "15.0";
+    };
+    imageName = lib.mkOption {
+      type = lib.types.str;
+      description = "where should the image be installed to";
+      default = "home-assistant.qcow2";
+    };
+    installLocation = lib.mkOption {
+      type = lib.types.str;
+      description = "where should the image be installed to";
+      default = "/etc/hass";
+    };
+    virtualMachineName = lib.mkOption {
+      type = lib.types.str;
+      description = "what name should we give the virtual machine";
+      default = "home-assistant";
+    };
+    subdomain = lib.mkOption {
+      type = lib.types.str;
+      description = "subdomain of base domain that home-assistant will be hosted at";
+      default = "home-assistant";
+    };
+  };
+  config = lib.mkIf config.services.virt-home-assistant.enable (lib.mkMerge [
+    {
+      # environment.systemPackages = with pkgs; [
+      #   virt-manager
+      # ];
+
+      # TODO: move this to external module and just have an assertion here that its enabled
+      # enable virtualization on the system
+      virtualisation = {
+        libvirtd = {
+          enable = true;
+          qemu.ovmf.enable = true;
+        };
+      };
+
+      # TODO: deactivation script?
+      # create service to install and start the container
+      systemd.services.virt-install-home-assistant = let
+        # TODO: all of these need to be escaped to be used in commands reliably
+        bridgedNetwork = config.services.virt-home-assistant.networkBridge;
+        hostDevice = config.services.virt-home-assistant.hostDevice;
+        virtualMachineName = config.services.virt-home-assistant.virtualMachineName;
+        imageName = config.services.virt-home-assistant.imageName;
+        installLocation = config.services.virt-home-assistant.installLocation;
+        installImage = "${installLocation}/${imageName}";
+        initialVersion = config.services.virt-home-assistant.initialVersion;
+
+        home-assistant-qcow2 = pkgs.fetchurl {
+          name = "home-assistant.qcow2";
+          url = "https://github.com/home-assistant/operating-system/releases/download/${initialVersion}/haos_ova-${initialVersion}.qcow2.xz";
+          hash = "sha256-V1BEjvvLNbMMKJVyMCmipjQ/3owoJteeVxoF9LDHo1U=";
+          postFetch = ''
+            cp $out src.xz
+            rm -r $out
+            ${pkgs.xz}/bin/unxz src.xz --stdout > $out/${imageName}
+          '';
+        };
+
+        # Write a script to install the Home Assistant OS qcow2 image
+        virtInstallScript = pkgs.writeShellScriptBin "virt-install-hass" ''
+          # Copy the initial image out of the package store to the install location if we don't have one yet
+          if [ ! -f ${installImage} ]; then
+            cp ${home-assistant-qcow2} ${installLocation}
+          fi
+
+          # Check if VM already exists, and other pre-conditions
+          if ! ${pkgs.libvirt}/bin/virsh list --all | grep -q ${virtualMachineName}; then
+            ${pkgs.virt-manager}/bin/virt-install --name ${virtualMachineName} \
+              --description "Home Assistant OS" \
+              --os-variant=generic \
+              --boot uefi \
+              --ram=2048 \
+              --vcpus=2 \
+              --import \
+              --disk ${installImage},bus=sata \
+              --network bridge=${bridgedNetwork} \
+              --host-device ${hostDevice} \
+              --graphics none
+            ${pkgs.libvirt}/bin/virsh autostart ${virtualMachineName}
+          fi
+        '';
+      in {
+        description = "Install and start Home Assistant";
+        wantedBy = ["multi-user.target"];
+        after = ["local-fs.target"];
+        requires = ["libvirtd.service"];
+        serviceConfig.Type = "oneshot";
+        serviceConfig = {
+          ExecStart = "${virtInstallScript}/bin/virt-install-hass";
+        };
+      };
+
+      # TODO: figure out what we need to proxy to the virtual image
+      # host = {
+      #   reverse_proxy.subdomains.${config.services.virt-home-assistant.subdomain} = {
+      #     target = "http://localhost:${toString config.services.home-assistant.config.http.server_port}";
+
+      #     websockets.enable = true;
+      #     forwardHeaders.enable = true;
+
+      #     extraConfig = ''
+      #       add_header Upgrade $http_upgrade;
+      #       add_header Connection \"upgrade\";
+
+      #       proxy_buffering off;
+
+      #       proxy_read_timeout 90;
+      #     '';
+      #   };
+      # };
+    }
+    (lib.mkIf config.services.fail2ban.enable {
+      # TODO: figure out how to write a config for this, prob based on nginx proxy logs?
+    })
+    (lib.mkIf config.host.impermanence.enable {
+      # assertions = [
+      #   {
+      #     assertion = config.services.virt-home-assistant.installLocation == configDir;
+      #     message = "home assistant install location does not match persistence";
+      #   }
+      # ];
+      environment.persistence."/persist/system/root" = {
+        enable = true;
+        hideMounts = true;
+        directories = [
+          {
+            directory = config.services.virt-home-assistant.installLocation;
+          }
+        ];
+      };
+    })
+  ]);
+}
diff --git a/modules/nixos-modules/server/wyoming.nix b/modules/nixos-modules/server/wyoming.nix
deleted file mode 100644
index 4894dd4..0000000
--- a/modules/nixos-modules/server/wyoming.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: {
-  options.services.wyoming.enable = lib.mkEnableOption "should wyoming be enabled on this device";
-  config = lib.mkIf config.services.wyoming.enable (lib.mkMerge [
-    {
-      services.wyoming = {
-        # Text to speech
-        piper = {
-          servers = {
-            "en" = {
-              enable = true;
-              # see https://github.com/rhasspy/rhasspy3/blob/master/programs/tts/piper/script/download.py
-              voice = "en-us-amy-low";
-              uri = "tcp://0.0.0.0:10200";
-              speaker = 0;
-            };
-          };
-        };
-
-        # Speech to text
-        faster-whisper = {
-          servers = {
-            "en" = {
-              enable = true;
-              # see https://github.com/rhasspy/rhasspy3/blob/master/programs/asr/faster-whisper/script/download.py
-              model = "tiny-int8";
-              language = "en";
-              uri = "tcp://0.0.0.0:10300";
-              device = "cpu";
-            };
-          };
-        };
-
-        openwakeword = {
-          enable = true;
-          uri = "tcp://0.0.0.0:10400";
-          preloadModels = [
-            "ok_nabu"
-          ];
-          # TODO: custom models
-        };
-      };
-
-      # needs access to /proc/cpuinfo
-      systemd.services."wyoming-faster-whisper-en".serviceConfig.ProcSubset = lib.mkForce "all";
-    }
-    (lib.mkIf config.host.impermanence.enable {
-      environment.persistence."/persist/system/root" = {
-        enable = true;
-        hideMounts = true;
-        directories = [
-          {
-            directory = "/var/lib/private/wyoming";
-            mode = "0700";
-          }
-        ];
-      };
-    })
-  ]);
-}
diff --git a/modules/nixos-modules/steam.nix b/modules/nixos-modules/steam.nix
deleted file mode 100644
index 20c0978..0000000
--- a/modules/nixos-modules/steam.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{...}: {
-  programs = {
-    steam = {
-      remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-      dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
-      localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
-    };
-  };
-}
diff --git a/modules/nixos-modules/sync.nix b/modules/nixos-modules/sync.nix
index bf43041..8915dc8 100644
--- a/modules/nixos-modules/sync.nix
+++ b/modules/nixos-modules/sync.nix
@@ -11,7 +11,6 @@ in {
     {
       systemd = lib.mkIf config.services.syncthing.enable {
         tmpfiles.rules = [
-          "A ${mountDir} -    -        -               - u:syncthing:rwX,g:syncthing:rwX,o::-"
           "d ${mountDir} 2755 syncthing syncthing -"
           "d ${config.services.syncthing.dataDir} 775 syncthing syncthing -"
           "d ${config.services.syncthing.configDir} 755 syncthing syncthing -"
diff --git a/modules/nixos-modules/system.nix b/modules/nixos-modules/system.nix
index b839067..51a92ed 100644
--- a/modules/nixos-modules/system.nix
+++ b/modules/nixos-modules/system.nix
@@ -1,5 +1,6 @@
 {...}: {
   nix = {
+    settings.download-buffer-size = 524288000;
     gc = {
       automatic = true;
       dates = "weekly";
diff --git a/modules/nixos-modules/users.nix b/modules/nixos-modules/users.nix
index 7fd43da..68bd78b 100644
--- a/modules/nixos-modules/users.nix
+++ b/modules/nixos-modules/users.nix
@@ -17,14 +17,13 @@
     eve = 1002;
     jellyfin = 2000;
     forgejo = 2002;
+    adguardhome = 2003;
     hass = 2004;
     syncthing = 2007;
     ollama = 2008;
     git = 2009;
     immich = 2010;
     qbittorrent = 2011;
-    paperless = 2012;
-    actual = 2013;
   };
 
   gids = {
@@ -34,14 +33,13 @@
     jellyfin_media = 2001;
     jellyfin = 2000;
     forgejo = 2002;
+    adguardhome = 2003;
     hass = 2004;
     syncthing = 2007;
     ollama = 2008;
     git = 2009;
     immich = 2010;
     qbittorrent = 2011;
-    paperless = 2012;
-    actual = 2013;
   };
 
   users = config.users.users;
@@ -129,6 +127,12 @@ in {
             group = config.users.users.forgejo.name;
           };
 
+          adguardhome = {
+            uid = lib.mkForce uids.adguardhome;
+            isSystemUser = true;
+            group = config.users.users.adguardhome.name;
+          };
+
           hass = {
             uid = lib.mkForce uids.hass;
             isSystemUser = true;
@@ -162,21 +166,9 @@ in {
 
           qbittorrent = {
             uid = lib.mkForce uids.qbittorrent;
-            isSystemUser = true;
+            isNormalUser = true;
             group = config.users.users.qbittorrent.name;
           };
-
-          paperless = {
-            uid = lib.mkForce uids.paperless;
-            isSystemUser = true;
-            group = config.users.users.paperless.name;
-          };
-
-          actual = {
-            uid = lib.mkForce uids.actual;
-            isSystemUser = true;
-            group = config.users.users.actual.name;
-          };
         };
 
         groups = {
@@ -227,6 +219,14 @@ in {
             ];
           };
 
+          adguardhome = {
+            gid = lib.mkForce gids.adguardhome;
+            members = [
+              users.adguardhome.name
+              # leyla
+            ];
+          };
+
           hass = {
             gid = lib.mkForce gids.hass;
             members = [
@@ -273,20 +273,6 @@ in {
               leyla
             ];
           };
-
-          paperless = {
-            gid = lib.mkForce gids.paperless;
-            members = [
-              users.paperless.name
-            ];
-          };
-
-          actual = {
-            gid = lib.mkForce gids.actual;
-            members = [
-              users.actual.name
-            ];
-          };
         };
       };
     }
diff --git a/nix-config-secrets b/nix-config-secrets
index f016767..3d63dff 160000
--- a/nix-config-secrets
+++ b/nix-config-secrets
@@ -1 +1 @@
-Subproject commit f016767c13aa36dde91503f7a9f01bdd02468045
+Subproject commit 3d63dff77f8eda1667e3586169642cf256c4aa34
diff --git a/rebuild.sh b/rebuild.sh
index 36a1201..45dae64 100755
--- a/rebuild.sh
+++ b/rebuild.sh
@@ -65,7 +65,7 @@ flake=${flake:-$target}
 mode=${mode:-switch}
 user=${user:-$USER}
 
-command="nixos-rebuild $mode --sudo --ask-sudo-password --flake .#$flake"
+command="nixos-rebuild $mode --use-remote-sudo --flake .#$flake"
 
 if [[ $host ]];
 then
diff --git a/util/default.nix b/util/default.nix
index 5b61779..4b713da 100644
--- a/util/default.nix
+++ b/util/default.nix
@@ -53,7 +53,7 @@
       ../modules/system-modules
     ];
 in {
-  forEachPkgs = lambda: forEachSystem (system: lambda system (pkgsFor system));
+  forEachPkgs = lambda: forEachSystem (system: lambda (pkgsFor system));
 
   mkUnless = condition: yes: (lib.mkIf (!condition) yes);
   mkIfElse = condition: yes: no: