From 2aad75a334050e30f9fba9567d231ff6d338bda7 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Thu, 4 Sep 2025 15:23:59 -0500
Subject: [PATCH] moved more packages to modules

---
 configurations/home-manager/eve/packages.nix  |  2 +-
 .../home-manager/leyla/packages/default.nix   | 66 ++++++-------------
 .../programs/davinci-resolve.nix              | 30 +++++++++
 .../home-manager-modules/programs/default.nix | 18 +++++
 .../home-manager-modules/programs/freecad.nix | 29 ++++++++
 .../programs/gdx-liftoff.nix                  | 17 +++++
 .../home-manager-modules/programs/gimp.nix    | 29 ++++++++
 .../programs/inkscape.nix                     | 29 ++++++++
 .../programs/libreoffice.nix                  | 29 ++++++++
 .../home-manager-modules/programs/mfoc.nix    | 17 +++++
 .../programs/noisetorch.nix                   | 17 +++++
 .../programs/onionshare.nix                   | 17 +++++
 .../home-manager-modules/programs/openrgb.nix | 17 +++++
 .../home-manager-modules/programs/openvpn.nix | 17 +++++
 .../programs/pdfarranger.nix                  | 17 +++++
 .../home-manager-modules/programs/picard.nix  | 29 ++++++++
 .../programs/proxmark3.nix                    | 17 +++++
 .../programs/qflipper.nix                     | 29 ++++++++
 .../programs/tor-browser.nix                  | 29 ++++++++
 .../programs/ungoogled-chromium.nix           | 29 ++++++++
 modules/home-manager-modules/programs/via.nix | 17 +++++
 21 files changed, 453 insertions(+), 48 deletions(-)
 create mode 100644 modules/home-manager-modules/programs/davinci-resolve.nix
 create mode 100644 modules/home-manager-modules/programs/freecad.nix
 create mode 100644 modules/home-manager-modules/programs/gdx-liftoff.nix
 create mode 100644 modules/home-manager-modules/programs/gimp.nix
 create mode 100644 modules/home-manager-modules/programs/inkscape.nix
 create mode 100644 modules/home-manager-modules/programs/libreoffice.nix
 create mode 100644 modules/home-manager-modules/programs/mfoc.nix
 create mode 100644 modules/home-manager-modules/programs/noisetorch.nix
 create mode 100644 modules/home-manager-modules/programs/onionshare.nix
 create mode 100644 modules/home-manager-modules/programs/openrgb.nix
 create mode 100644 modules/home-manager-modules/programs/openvpn.nix
 create mode 100644 modules/home-manager-modules/programs/pdfarranger.nix
 create mode 100644 modules/home-manager-modules/programs/picard.nix
 create mode 100644 modules/home-manager-modules/programs/proxmark3.nix
 create mode 100644 modules/home-manager-modules/programs/qflipper.nix
 create mode 100644 modules/home-manager-modules/programs/tor-browser.nix
 create mode 100644 modules/home-manager-modules/programs/ungoogled-chromium.nix
 create mode 100644 modules/home-manager-modules/programs/via.nix

diff --git a/configurations/home-manager/eve/packages.nix b/configurations/home-manager/eve/packages.nix
index f7f0c78..f738fe2 100644
--- a/configurations/home-manager/eve/packages.nix
+++ b/configurations/home-manager/eve/packages.nix
@@ -17,7 +17,6 @@ in {
     # See https://search.nixos.org/packages for all options
     home.packages = lib.lists.optionals userConfig.isDesktopUser (
       with pkgs; [
-        ungoogled-chromium
         gnomeExtensions.dash-to-panel
       ]
     );
@@ -61,6 +60,7 @@ in {
         steam.enable = true;
         piper.enable = hardware.piperMouse.enable;
         krita.enable = true;
+        ungoogled-chromium.enable = true;
       })
     ];
   };
diff --git a/configurations/home-manager/leyla/packages/default.nix b/configurations/home-manager/leyla/packages/default.nix
index 717b153..86bbd96 100644
--- a/configurations/home-manager/leyla/packages/default.nix
+++ b/configurations/home-manager/leyla/packages/default.nix
@@ -37,6 +37,12 @@ in {
           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;
@@ -50,6 +56,19 @@ in {
           firefox.enable = true;
           steam.enable = true;
           krita.enable = true;
+          ungoogled-chromium.enable = true;
+          libreoffice.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;
         })
       ];
     }
@@ -66,53 +85,6 @@ in {
       nixpkgs.config = {
         allowUnfree = true;
       };
-
-      home.packages = (
-        (with pkgs; [
-          proxmark3
-        ])
-        ++ (
-          lib.lists.optionals hardware.directAccess.enable (with pkgs; [
-            #foss platforms
-            ungoogled-chromium
-            libreoffice
-            inkscape
-            gimp
-            freecad
-            # cura
-            # kicad-small
-            onionshare
-            # rhythmbox
-
-            # wireshark
-            # rpi-imager
-            # fritzing
-            mfoc
-            tor-browser
-            pdfarranger
-            picard
-
-            gdx-liftoff
-
-            # proprietary platforms
-            (lib.mkIf hardware.graphicsAcceleration.enable davinci-resolve)
-
-            # development tools
-            # androidStudioPackages.canary
-            qFlipper
-
-            # system tools
-            openvpn
-            noisetorch
-
-            # hardware management tools
-            (lib.mkIf hardware.openRGB.enable openrgb)
-            (lib.mkIf hardware.viaKeyboard.enable via)
-
-            (lib.mkIf osConfig.host.ai.enable claude-code)
-          ])
-        )
-      );
     })
   ];
 }
diff --git a/modules/home-manager-modules/programs/davinci-resolve.nix b/modules/home-manager-modules/programs/davinci-resolve.nix
new file mode 100644
index 0000000..00ba525
--- /dev/null
+++ b/modules/home-manager-modules/programs/davinci-resolve.nix
@@ -0,0 +1,30 @@
+{
+  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/default.nix b/modules/home-manager-modules/programs/default.nix
index f2a22ee..d1c13db 100644
--- a/modules/home-manager-modules/programs/default.nix
+++ b/modules/home-manager-modules/programs/default.nix
@@ -19,5 +19,23 @@
     ./dbeaver.nix
     ./steam.nix
     ./vscode
+    ./ungoogled-chromium.nix
+    ./libreoffice.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/freecad.nix b/modules/home-manager-modules/programs/freecad.nix
new file mode 100644
index 0000000..ec17205
--- /dev/null
+++ b/modules/home-manager-modules/programs/freecad.nix
@@ -0,0 +1,29 @@
+{
+  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
new file mode 100644
index 0000000..b29230d
--- /dev/null
+++ b/modules/home-manager-modules/programs/gdx-liftoff.nix
@@ -0,0 +1,17 @@
+{
+  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
new file mode 100644
index 0000000..428068e
--- /dev/null
+++ b/modules/home-manager-modules/programs/gimp.nix
@@ -0,0 +1,29 @@
+{
+  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/inkscape.nix b/modules/home-manager-modules/programs/inkscape.nix
new file mode 100644
index 0000000..facb08f
--- /dev/null
+++ b/modules/home-manager-modules/programs/inkscape.nix
@@ -0,0 +1,29 @@
+{
+  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/libreoffice.nix b/modules/home-manager-modules/programs/libreoffice.nix
new file mode 100644
index 0000000..b61ea58
--- /dev/null
+++ b/modules/home-manager-modules/programs/libreoffice.nix
@@ -0,0 +1,29 @@
+{
+  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/mfoc.nix b/modules/home-manager-modules/programs/mfoc.nix
new file mode 100644
index 0000000..7b92007
--- /dev/null
+++ b/modules/home-manager-modules/programs/mfoc.nix
@@ -0,0 +1,17 @@
+{
+  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
new file mode 100644
index 0000000..c53e3a9
--- /dev/null
+++ b/modules/home-manager-modules/programs/noisetorch.nix
@@ -0,0 +1,17 @@
+{
+  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/onionshare.nix b/modules/home-manager-modules/programs/onionshare.nix
new file mode 100644
index 0000000..ed1903d
--- /dev/null
+++ b/modules/home-manager-modules/programs/onionshare.nix
@@ -0,0 +1,17 @@
+{
+  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
new file mode 100644
index 0000000..0260c91
--- /dev/null
+++ b/modules/home-manager-modules/programs/openrgb.nix
@@ -0,0 +1,17 @@
+{
+  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
new file mode 100644
index 0000000..814c16d
--- /dev/null
+++ b/modules/home-manager-modules/programs/openvpn.nix
@@ -0,0 +1,17 @@
+{
+  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
new file mode 100644
index 0000000..d4e33b5
--- /dev/null
+++ b/modules/home-manager-modules/programs/pdfarranger.nix
@@ -0,0 +1,17 @@
+{
+  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
new file mode 100644
index 0000000..d2c1fe2
--- /dev/null
+++ b/modules/home-manager-modules/programs/picard.nix
@@ -0,0 +1,29 @@
+{
+  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/proxmark3.nix b/modules/home-manager-modules/programs/proxmark3.nix
new file mode 100644
index 0000000..ad1e298
--- /dev/null
+++ b/modules/home-manager-modules/programs/proxmark3.nix
@@ -0,0 +1,17 @@
+{
+  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/qflipper.nix b/modules/home-manager-modules/programs/qflipper.nix
new file mode 100644
index 0000000..abc2442
--- /dev/null
+++ b/modules/home-manager-modules/programs/qflipper.nix
@@ -0,0 +1,29 @@
+{
+  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/tor-browser.nix b/modules/home-manager-modules/programs/tor-browser.nix
new file mode 100644
index 0000000..2c58578
--- /dev/null
+++ b/modules/home-manager-modules/programs/tor-browser.nix
@@ -0,0 +1,29 @@
+{
+  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
new file mode 100644
index 0000000..5b52cd6
--- /dev/null
+++ b/modules/home-manager-modules/programs/ungoogled-chromium.nix
@@ -0,0 +1,29 @@
+{
+  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
new file mode 100644
index 0000000..0b79452
--- /dev/null
+++ b/modules/home-manager-modules/programs/via.nix
@@ -0,0 +1,17 @@
+{
+  lib,
+  pkgs,
+  config,
+  osConfig,
+  ...
+}: {
+  options.programs.via = {
+    enable = lib.mkEnableOption "enable via";
+  };
+
+  config = lib.mkIf config.programs.via.enable {
+    home.packages = with pkgs; [
+      via
+    ];
+  };
+}