using a config.programs.<program>.package to denote what package to use for scripts and stuff

18 files changed, 44 insertions, 50 deletions

diff --git a/modules/programs/bluetui/default.nix b/modules/programs/bluetui/default.nix
index d214d4b..a2a97ec 100644
--- a/modules/programs/bluetui/default.nix
+++ b/modules/programs/bluetui/default.nix
@@ -9,11 +9,10 @@
 {
   options.programs.bluetui = {
     enable = lib.mkEnableOption "Enables bluetui.";
+    package = lib.mkPackageOption pkgs "bluetui" { };
   };
 
   config = lib.mkIf config.programs.bluetui.enable {
-    home.packages = with pkgs; [
-      bluetui
-    ];
+    home.packages = [ config.programs.bluetui.package ];
   };
 }
diff --git a/modules/programs/brightnessctl/default.nix b/modules/programs/brightnessctl/default.nix
index 5092ede..cea3517 100644
--- a/modules/programs/brightnessctl/default.nix
+++ b/modules/programs/brightnessctl/default.nix
@@ -9,11 +9,10 @@
 {
   options.programs.brightnessctl = {
     enable = lib.mkEnableOption "Enables brightnessctl.";
+    package = lib.mkPackageOption pkgs "brightnessctl" { };
   };
 
   config = lib.mkIf config.programs.brightnessctl.enable {
-    home.packages = with pkgs; [
-      brightnessctl
-    ];
+    home.packages = [ config.programs.brightnessctl.package ];
   };
 }
diff --git a/modules/programs/bruno/default.nix b/modules/programs/bruno/default.nix
index 72932db..d55941e 100644
--- a/modules/programs/bruno/default.nix
+++ b/modules/programs/bruno/default.nix
@@ -9,11 +9,10 @@
 {
   options.programs.bruno = {
     enable = lib.mkEnableOption "Enables bruno.";
+    package = lib.mkPackageOption pkgs "bruno" { };
   };
 
   config = lib.mkIf config.programs.bruno.enable {
-    home.packages = with pkgs; [
-      bruno
-    ];
+    home.packages = [ config.programs.bruno.package ];
   };
 }
diff --git a/modules/programs/devenv/default.nix b/modules/programs/devenv/default.nix
index 633fd0d..ff23e5b 100644
--- a/modules/programs/devenv/default.nix
+++ b/modules/programs/devenv/default.nix
@@ -9,6 +9,7 @@
 {
   options.programs.devenv = {
     enable = lib.mkEnableOption "Enables devenv.";
+    package = lib.mkPackageOption pkgs "devenv" { };
   };
 
   config =
@@ -16,9 +17,7 @@
       shellIntegration = builtins.readFile ./alias.sh;
     in
     lib.mkIf config.programs.devenv.enable {
-      home.packages = with pkgs; [
-        devenv
-      ];
+      home.packages = [ config.programs.devenv.package ];
 
       programs.zsh.initContent = lib.mkIf config.programs.zsh.enable (lib.mkAfter shellIntegration);
       programs.bash.initExtra = lib.mkIf config.programs.bash.enable (lib.mkAfter shellIntegration);
diff --git a/modules/programs/ffmpeg/default.nix b/modules/programs/ffmpeg/default.nix
index 88f7a00..d86b5a6 100644
--- a/modules/programs/ffmpeg/default.nix
+++ b/modules/programs/ffmpeg/default.nix
@@ -9,11 +9,10 @@
 {
   options.programs.ffmpeg = {
     enable = lib.mkEnableOption "Enables ffmpeg.";
+    package = lib.mkPackageOption pkgs "ffmpeg-full" { };
   };
 
   config = lib.mkIf config.programs.ffmpeg.enable {
-    home.packages = with pkgs; [
-      ffmpeg-full
-    ];
+    home.packages = [ config.programs.ffmpeg.package ];
   };
 }
diff --git a/modules/programs/impala/default.nix b/modules/programs/impala/default.nix
index 6802381..69bdc66 100644
--- a/modules/programs/impala/default.nix
+++ b/modules/programs/impala/default.nix
@@ -9,11 +9,10 @@
 {
   options.programs.impala = {
     enable = lib.mkEnableOption "Enables impala.";
+    package = lib.mkPackageOption pkgs "impala" { };
   };
 
   config = lib.mkIf config.programs.impala.enable {
-    home.packages = with pkgs; [
-      impala
-    ];
+    home.packages = [ config.programs.impala.package ];
   };
 }
diff --git a/modules/programs/maim/default.nix b/modules/programs/maim/default.nix
index 76ef80d..3e30c88 100644
--- a/modules/programs/maim/default.nix
+++ b/modules/programs/maim/default.nix
@@ -9,11 +9,10 @@
 {
   options.programs.maim = {
     enable = lib.mkEnableOption "Enables maim.";
+    package = lib.mkPackageOption pkgs "maim" { };
   };
 
   config = lib.mkIf config.programs.maim.enable {
-    home.packages = with pkgs; [
-      maim
-    ];
+    home.packages = [ config.programs.maim.package ];
   };
 }
diff --git a/modules/programs/nvtop/default.nix b/modules/programs/nvtop/default.nix
index ef35c21..fa1979e 100644
--- a/modules/programs/nvtop/default.nix
+++ b/modules/programs/nvtop/default.nix
@@ -9,11 +9,10 @@
 {
   options.programs.nvtop = {
     enable = lib.mkEnableOption "Enables nvtop.";
+    package = lib.mkPackageOption pkgs "nvtopPackages.full" { };
   };
 
   config = lib.mkIf config.programs.nvtop.enable {
-    home.packages = with pkgs; [
-      nvtopPackages.full
-    ];
+    home.packages = [ config.programs.nvtop.package ];
   };
 }
diff --git a/modules/programs/openvpn/default.nix b/modules/programs/openvpn/default.nix
index c70192a..d0edef3 100644
--- a/modules/programs/openvpn/default.nix
+++ b/modules/programs/openvpn/default.nix
@@ -9,11 +9,10 @@
 {
   options.programs.openvpn = {
     enable = lib.mkEnableOption "Enables openvpn.";
+    package = lib.mkPackageOption pkgs "openvpn" { };
   };
 
   config = lib.mkIf config.programs.openvpn.enable {
-    home.packages = with pkgs; [
-      openvpn
-    ];
+    home.packages = [ config.programs.openvpn.package ];
   };
 }
diff --git a/modules/programs/ouch/default.nix b/modules/programs/ouch/default.nix
index 69c8ae5..2b4411e 100644
--- a/modules/programs/ouch/default.nix
+++ b/modules/programs/ouch/default.nix
@@ -9,11 +9,10 @@
 {
   options.programs.ouch = {
     enable = lib.mkEnableOption "Enables ouch.";
+    package = lib.mkPackageOption pkgs "ouch" { };
   };
 
   config = lib.mkIf config.programs.ouch.enable {
-    home.packages = with pkgs; [
-      ouch
-    ];
+    home.packages = [ config.programs.ouch.package ];
   };
 }
diff --git a/modules/programs/pamixer/default.nix b/modules/programs/pamixer/default.nix
index 8262770..b84e9cf 100644
--- a/modules/programs/pamixer/default.nix
+++ b/modules/programs/pamixer/default.nix
@@ -9,11 +9,10 @@
 {
   options.programs.pamixer = {
     enable = lib.mkEnableOption "Enables pamixer.";
+    package = lib.mkPackageOption pkgs "pamixer" { };
   };
 
   config = lib.mkIf config.programs.pamixer.enable {
-    home.packages = with pkgs; [
-      pamixer
-    ];
+    home.packages = [ config.programs.pamixer.package ];
   };
 }
diff --git a/modules/programs/playerctl/default.nix b/modules/programs/playerctl/default.nix
index f2b5e67..d501abd 100644
--- a/modules/programs/playerctl/default.nix
+++ b/modules/programs/playerctl/default.nix
@@ -9,11 +9,10 @@
 {
   options.programs.playerctl = {
     enable = lib.mkEnableOption "Enables playerctl.";
+    package = lib.mkPackageOption pkgs "playerctl" { };
   };
 
   config = lib.mkIf config.programs.playerctl.enable {
-    home.packages = with pkgs; [
-      playerctl
-    ];
+    home.packages = [ config.programs.playerctl.package ];
   };
 }
diff --git a/modules/programs/qemu/default.nix b/modules/programs/qemu/default.nix
index f883636..7c18323 100644
--- a/modules/programs/qemu/default.nix
+++ b/modules/programs/qemu/default.nix
@@ -9,10 +9,16 @@
 {
   options.programs.qemu = {
     enable = lib.mkEnableOption "Enables qemu.";
+    packages = {
+      qemu = lib.mkPackageOption pkgs "qemu" { };
+      libvirt = lib.mkPackageOption pkgs "libvirt" { };
+      virtiofsd = lib.mkPackageOption pkgs "virtiofsd" { };
+      virt-manager = lib.mkPackageOption pkgs "virt-manager" { };
+    };
   };
 
   config = lib.mkIf config.programs.qemu.enable {
-    home.packages = with pkgs; [
+    home.packages = with config.programs.qemu.packages; [
       qemu
       libvirt
       virtiofsd
diff --git a/modules/programs/slop/default.nix b/modules/programs/slop/default.nix
index 115523e..c86181b 100644
--- a/modules/programs/slop/default.nix
+++ b/modules/programs/slop/default.nix
@@ -9,11 +9,10 @@
 {
   options.programs.slop = {
     enable = lib.mkEnableOption "Enables slop.";
+    package = lib.mkPackageOption pkgs "slop" { };
   };
 
   config = lib.mkIf config.programs.slop.enable {
-    home.packages = with pkgs; [
-      slop
-    ];
+    home.packages = [ config.programs.slop.package ];
   };
 }
diff --git a/modules/programs/systemctl-tui/default.nix b/modules/programs/systemctl-tui/default.nix
index 8958d26..77dca8c 100644
--- a/modules/programs/systemctl-tui/default.nix
+++ b/modules/programs/systemctl-tui/default.nix
@@ -9,11 +9,10 @@
 {
   options.programs.systemctl-tui = {
     enable = lib.mkEnableOption "Enables systemctl-tui.";
+    package = lib.mkPackageOption pkgs "systemctl-tui" { };
   };
 
   config = lib.mkIf config.programs.systemctl-tui.enable {
-    home.packages = with pkgs; [
-      systemctl-tui
-    ];
+    home.packages = [ config.programs.systemctl-tui.package ];
   };
 }
diff --git a/modules/programs/tor/default.nix b/modules/programs/tor/default.nix
index 0b35030..3a19c8a 100644
--- a/modules/programs/tor/default.nix
+++ b/modules/programs/tor/default.nix
@@ -9,12 +9,11 @@
 {
   options.programs.tor = {
     enable = lib.mkEnableOption "Enables tor.";
+    package = lib.mkPackageOption pkgs "tor" { };
   };
 
   config = lib.mkIf config.programs.tor.enable {
-    home.packages = with pkgs; [
-      tor
-    ];
+    home.packages = [ config.programs.tor.package ];
 
     home.file.".config/tor/torrc".text = ''
       SocksPort 127.0.0.1:9050
diff --git a/modules/programs/umu-launcher/default.nix b/modules/programs/umu-launcher/default.nix
index 8b46cbd..6e8fa96 100644
--- a/modules/programs/umu-launcher/default.nix
+++ b/modules/programs/umu-launcher/default.nix
@@ -9,10 +9,14 @@
 {
   options.programs.umu-launcher = {
     enable = lib.mkEnableOption "Enables umu-launcher.";
+    packages = {
+      umu-launcher = lib.mkPackageOption pkgs "umu-launcher" { };
+      winetricks = lib.mkPackageOption pkgs "winetricks" { };
+    };
   };
 
   config = lib.mkIf config.programs.umu-launcher.enable {
-    home.packages = with pkgs; [
+    home.packages = with config.programs.umu-launcher.packages; [
       umu-launcher
       winetricks
     ];
diff --git a/modules/programs/vlc/default.nix b/modules/programs/vlc/default.nix
index 3b07ea7..aa81f85 100644
--- a/modules/programs/vlc/default.nix
+++ b/modules/programs/vlc/default.nix
@@ -9,11 +9,10 @@
 {
   options.programs.vlc = {
     enable = lib.mkEnableOption "Enables vlc.";
+    package = lib.mkPackageOption pkgs "vlc" { };
   };
 
   config = lib.mkIf config.programs.vlc.enable {
-    home.packages = with pkgs; [
-      vlc
-    ];
+    home.packages = [ config.programs.vlc.package ];
   };
 }