created program option entries for all packages that needs continual state

configurations/home-manager/leyla/packages/default.nix

@@ -45,10 +45,6 @@ in {
         ++ (
           lib.lists.optionals hardware.directAccess.enable (with pkgs; [
             #foss platforms
-            # TODO: move signal to package with impermanence
-            signal-desktop-bin
-            # TODO: move bitwarden to package with impermanence
-            bitwarden
             ungoogled-chromium
             libreoffice
             inkscape
@@ -57,42 +53,25 @@ in {
             freecad
             # cura
             # kicad-small
-            # TODO: move makemkv to package with configs set and impermanence
-            makemkv
             onionshare
             # rhythmbox
 
-            # TODO: move obs to package with impermanence
-            (lib.mkIf hardware.graphicsAcceleration.enable obs-studio)
             # wireshark
             # rpi-imager
             # fritzing
             mfoc
             tor-browser
-            anki
             pdfarranger
-            calibre
-            qbittorrent
             picard
 
             # proprietary platforms
-            # TODO: move discord to package with impermanence
-            discord
-            # TODO: move obsidian to package with impermanence
-            obsidian
-            # TODO: move prostudiomasters to package with impermanence
-            prostudiomasters
             (lib.mkIf hardware.graphicsAcceleration.enable davinci-resolve)
 
             # development tools
             # androidStudioPackages.canary
-            # TODO: move idea to package with impermanence and installed extensions
-            jetbrains.idea-community
             qFlipper
 
             # system tools
-            # TODO: move protonvpn to package with impermanence and installed extensions
-            protonvpn-gui
             openvpn
             noisetorch
 
@@ -103,12 +82,35 @@ in {
           ])
         )
       );
-      programs = {
-        # Let Home Manager install and manage itself.
-        home-manager.enable = true;
-
-        bash.enable = true;
-      };
+      programs = lib.mkMerge [
+        {
+          # Let Home Manager install and manage itself.
+          home-manager.enable = true;
+          bash.enable = true;
+        }
+        (lib.mkIf (config.user.isDesktopUser || config.user.isTerminalUser) {
+          git.enable = true;
+          openssh.enable = true;
+        })
+        (lib.mkIf hardware.directAccess.enable {
+          anki.enable = true;
+          bitwarden.enable = true;
+          signal-desktop-bin.enable = true;
+          makemkv.enable = true;
+          obs-studio.enable = hardware.graphicsAcceleration.enable;
+          calibre.enable = true;
+          qbittorrent.enable = true;
+          discord.enable = true;
+          obsidian.enable = true;
+          prostudiomasters.enable = true;
+          jetbrains.idea-community.enable = true;
+          protonvpn-gui.enable = true;
+        })
+        (lib.mkIf (hardware.directAccess.enable && config.user.isDesktopUser) {
+          vscode.enable = true;
+          firefox.enable = true;
+        })
+      ];
     })
   ];
 }

configurations/home-manager/leyla/packages/firefox.nix

@@ -2,12 +2,10 @@
   lib,
   pkgs,
   inputs,
-  config,
   ...
 }: {
   config = {
     programs.firefox = {
-      enable = config.user.isDesktopUser;
       profiles.leyla = {
         settings = {
           "browser.search.defaultenginename" = "Searx";

configurations/home-manager/leyla/packages/git.nix

@@ -1,8 +1,7 @@
-{config, ...}: {
+{...}: {
   config = {
     programs = {
       git = {
-        enable = config.user.isDesktopUser || config.user.isTerminalUser;
         userName = "Leyla Becker";
         userEmail = "git@jan-leila.com";
         extraConfig.init.defaultBranch = "main";

configurations/home-manager/leyla/packages/openssh.nix

@@ -6,7 +6,6 @@
   config = {
     programs = {
       openssh = {
-        enable = config.user.isDesktopUser;
         authorizedKeys = [
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJHeItmt8TRW43uNcOC+eIurYC7Eunc0V3LGocQqLaYj leyla@horizon"
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIILimFIW2exEH/Xo7LtXkqgE04qusvnPNpPWSCeNrFkP leyla@defiant"
@@ -20,6 +19,5 @@
         ];
       };
     };
-    # TODO: impermanence module, prob in home-manager-modules?
   };
 }

configurations/home-manager/leyla/packages/vscode/default.nix

@@ -26,8 +26,6 @@ in {
         open-vsx = extensions.open-vsx;
         vscode-marketplace = extensions.vscode-marketplace;
       in {
-        enable = true;
-
         package = pkgs.vscodium;
 
         mutableExtensionsDir = false;