From 7473ad541586ed857039bc651567c3b1d7278ce0 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Tue, 3 Jun 2025 11:19:34 -0500
Subject: [PATCH] moved more packages to module

---
 .../home-manager/leyla/packages/default.nix   | 66 +++++++++----------
 .../home-manager-modules/programs/bruno.nix   | 24 +++++++
 .../home-manager-modules/programs/dbeaver.nix | 24 +++++++
 .../home-manager-modules/programs/default.nix |  2 +
 4 files changed, 83 insertions(+), 33 deletions(-)
 create mode 100644 modules/home-manager-modules/programs/bruno.nix
 create mode 100644 modules/home-manager-modules/programs/dbeaver.nix

diff --git a/configurations/home-manager/leyla/packages/default.nix b/configurations/home-manager/leyla/packages/default.nix
index ff32361..8f06441 100644
--- a/configurations/home-manager/leyla/packages/default.nix
+++ b/configurations/home-manager/leyla/packages/default.nix
@@ -16,6 +16,39 @@ in {
   ];
 
   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;
+        })
+        (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;
+        })
+      ];
+    }
     (lib.mkIf config.user.isTerminalUser {
       home.packages = with pkgs; [
         # command line tools
@@ -32,14 +65,10 @@ in {
 
       home.packages = (
         (with pkgs; [
-          # helvetica font
           aileron
 
           gnomeExtensions.dash-to-dock
 
-          # development tools
-          dbeaver-bin
-          bruno
           proxmark3
         ])
         ++ (
@@ -82,35 +111,6 @@ in {
           ])
         )
       );
-      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 config.user.isDesktopUser {
-          bitwarden.enable = true;
-          obs-studio.enable = hardware.graphicsAcceleration.enable;
-          qbittorrent.enable = true;
-          prostudiomasters.enable = true;
-          protonvpn-gui.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;
-        })
-      ];
     })
   ];
 }
diff --git a/modules/home-manager-modules/programs/bruno.nix b/modules/home-manager-modules/programs/bruno.nix
new file mode 100644
index 0000000..b7e6ae3
--- /dev/null
+++ b/modules/home-manager-modules/programs/bruno.nix
@@ -0,0 +1,24 @@
+{
+  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 {
+        # TODO: map impermanence for bruno
+      }
+    )
+  ]);
+}
diff --git a/modules/home-manager-modules/programs/dbeaver.nix b/modules/home-manager-modules/programs/dbeaver.nix
new file mode 100644
index 0000000..fed1d6d
--- /dev/null
+++ b/modules/home-manager-modules/programs/dbeaver.nix
@@ -0,0 +1,24 @@
+{
+  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 {
+        # TODO: map impermanence for dbeaver
+      }
+    )
+  ]);
+}
diff --git a/modules/home-manager-modules/programs/default.nix b/modules/home-manager-modules/programs/default.nix
index a9139bc..aa15701 100644
--- a/modules/home-manager-modules/programs/default.nix
+++ b/modules/home-manager-modules/programs/default.nix
@@ -13,5 +13,7 @@
     ./idea.nix
     ./protonvpn.nix
     ./calibre.nix
+    ./bruno.nix
+    ./dbeaver.nix
   ];
 }