From ea7c4cbf317e5b8f56845cc67bfa5d1ad197a3fc Mon Sep 17 00:00:00 2001
From: Joakim Repomaa <joakim@repomaa.com>
Date: Thu, 30 Jan 2025 19:33:33 +0200
Subject: [PATCH] global pkgs

---
 .../commander-nvim/default.nix                      |  0
 .../custom-pkgs => custom-pkgs}/crystal/default.nix |  0
 .../custom-pkgs => custom-pkgs}/crystal/package.nix |  0
 .../home/custom-pkgs => custom-pkgs}/default.nix    |  0
 .../fb-client/default.nix                           |  0
 .../fb-client/package.nix                           |  0
 .../flameshot/default.nix                           |  0
 .../flameshot/package.nix                           |  0
 .../gen-nvim/default.nix                            |  0
 .../custom-pkgs => custom-pkgs}/otp/default.nix     |  0
 .../custom-pkgs => custom-pkgs}/otp/package.nix     |  0
 {radish/home/custom-pkgs => custom-pkgs}/util.nix   |  0
 .../vimpeccable/default.nix                         |  0
 .../windline-nvim/default.nix                       |  0
 .../wl-copy-both/default.nix                        |  0
 .../wl-copy-both/package.nix                        |  0
 radish/home/common/default.nix                      |  3 +--
 radish/home/default.nix                             | 13 ++++++++++---
 radish/packages.nix                                 |  3 ++-
 19 files changed, 13 insertions(+), 6 deletions(-)
 rename {radish/home/custom-pkgs => custom-pkgs}/commander-nvim/default.nix (100%)
 rename {radish/home/custom-pkgs => custom-pkgs}/crystal/default.nix (100%)
 rename {radish/home/custom-pkgs => custom-pkgs}/crystal/package.nix (100%)
 rename {radish/home/custom-pkgs => custom-pkgs}/default.nix (100%)
 rename {radish/home/custom-pkgs => custom-pkgs}/fb-client/default.nix (100%)
 rename {radish/home/custom-pkgs => custom-pkgs}/fb-client/package.nix (100%)
 rename {radish/home/custom-pkgs => custom-pkgs}/flameshot/default.nix (100%)
 rename {radish/home/custom-pkgs => custom-pkgs}/flameshot/package.nix (100%)
 rename {radish/home/custom-pkgs => custom-pkgs}/gen-nvim/default.nix (100%)
 rename {radish/home/custom-pkgs => custom-pkgs}/otp/default.nix (100%)
 rename {radish/home/custom-pkgs => custom-pkgs}/otp/package.nix (100%)
 rename {radish/home/custom-pkgs => custom-pkgs}/util.nix (100%)
 rename {radish/home/custom-pkgs => custom-pkgs}/vimpeccable/default.nix (100%)
 rename {radish/home/custom-pkgs => custom-pkgs}/windline-nvim/default.nix (100%)
 rename {radish/home/custom-pkgs => custom-pkgs}/wl-copy-both/default.nix (100%)
 rename {radish/home/custom-pkgs => custom-pkgs}/wl-copy-both/package.nix (100%)

diff --git a/radish/home/custom-pkgs/commander-nvim/default.nix b/custom-pkgs/commander-nvim/default.nix
similarity index 100%
rename from radish/home/custom-pkgs/commander-nvim/default.nix
rename to custom-pkgs/commander-nvim/default.nix
diff --git a/radish/home/custom-pkgs/crystal/default.nix b/custom-pkgs/crystal/default.nix
similarity index 100%
rename from radish/home/custom-pkgs/crystal/default.nix
rename to custom-pkgs/crystal/default.nix
diff --git a/radish/home/custom-pkgs/crystal/package.nix b/custom-pkgs/crystal/package.nix
similarity index 100%
rename from radish/home/custom-pkgs/crystal/package.nix
rename to custom-pkgs/crystal/package.nix
diff --git a/radish/home/custom-pkgs/default.nix b/custom-pkgs/default.nix
similarity index 100%
rename from radish/home/custom-pkgs/default.nix
rename to custom-pkgs/default.nix
diff --git a/radish/home/custom-pkgs/fb-client/default.nix b/custom-pkgs/fb-client/default.nix
similarity index 100%
rename from radish/home/custom-pkgs/fb-client/default.nix
rename to custom-pkgs/fb-client/default.nix
diff --git a/radish/home/custom-pkgs/fb-client/package.nix b/custom-pkgs/fb-client/package.nix
similarity index 100%
rename from radish/home/custom-pkgs/fb-client/package.nix
rename to custom-pkgs/fb-client/package.nix
diff --git a/radish/home/custom-pkgs/flameshot/default.nix b/custom-pkgs/flameshot/default.nix
similarity index 100%
rename from radish/home/custom-pkgs/flameshot/default.nix
rename to custom-pkgs/flameshot/default.nix
diff --git a/radish/home/custom-pkgs/flameshot/package.nix b/custom-pkgs/flameshot/package.nix
similarity index 100%
rename from radish/home/custom-pkgs/flameshot/package.nix
rename to custom-pkgs/flameshot/package.nix
diff --git a/radish/home/custom-pkgs/gen-nvim/default.nix b/custom-pkgs/gen-nvim/default.nix
similarity index 100%
rename from radish/home/custom-pkgs/gen-nvim/default.nix
rename to custom-pkgs/gen-nvim/default.nix
diff --git a/radish/home/custom-pkgs/otp/default.nix b/custom-pkgs/otp/default.nix
similarity index 100%
rename from radish/home/custom-pkgs/otp/default.nix
rename to custom-pkgs/otp/default.nix
diff --git a/radish/home/custom-pkgs/otp/package.nix b/custom-pkgs/otp/package.nix
similarity index 100%
rename from radish/home/custom-pkgs/otp/package.nix
rename to custom-pkgs/otp/package.nix
diff --git a/radish/home/custom-pkgs/util.nix b/custom-pkgs/util.nix
similarity index 100%
rename from radish/home/custom-pkgs/util.nix
rename to custom-pkgs/util.nix
diff --git a/radish/home/custom-pkgs/vimpeccable/default.nix b/custom-pkgs/vimpeccable/default.nix
similarity index 100%
rename from radish/home/custom-pkgs/vimpeccable/default.nix
rename to custom-pkgs/vimpeccable/default.nix
diff --git a/radish/home/custom-pkgs/windline-nvim/default.nix b/custom-pkgs/windline-nvim/default.nix
similarity index 100%
rename from radish/home/custom-pkgs/windline-nvim/default.nix
rename to custom-pkgs/windline-nvim/default.nix
diff --git a/radish/home/custom-pkgs/wl-copy-both/default.nix b/custom-pkgs/wl-copy-both/default.nix
similarity index 100%
rename from radish/home/custom-pkgs/wl-copy-both/default.nix
rename to custom-pkgs/wl-copy-both/default.nix
diff --git a/radish/home/custom-pkgs/wl-copy-both/package.nix b/custom-pkgs/wl-copy-both/package.nix
similarity index 100%
rename from radish/home/custom-pkgs/wl-copy-both/package.nix
rename to custom-pkgs/wl-copy-both/package.nix
diff --git a/radish/home/common/default.nix b/radish/home/common/default.nix
index 31424d4..928cd29 100644
--- a/radish/home/common/default.nix
+++ b/radish/home/common/default.nix
@@ -1,7 +1,6 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, ... }:
 {
   nixpkgs.config.allowUnfree = true;
-  nixpkgs.overlays = [ (import ../custom-pkgs { inherit lib inputs; }) ];
   imports = [ ../gnome ../custom-programs ./neovim ];
 
   # This value determines the Home Manager release that your configuration is
diff --git a/radish/home/default.nix b/radish/home/default.nix
index c689500..41610a3 100644
--- a/radish/home/default.nix
+++ b/radish/home/default.nix
@@ -1,5 +1,12 @@
-{ config, pkgs, ksoloti-pr, inputs, ... }:
+{ ksoloti-pr, inputs, ... }:
 {
-  home-manager.users.jokke = import ./jokke { inherit pkgs ksoloti-pr inputs; };
-  home-manager.users.moco = import ./moco { inherit config pkgs inputs; };
+  home-manager = {
+    users = {
+      jokke = import ./jokke;
+      moco = import ./moco;
+    };
+    extraSpecialArgs = { inherit ksoloti-pr inputs; };
+    useUserPackages = true;
+    useGlobalPkgs = true;
+  };
 }
diff --git a/radish/packages.nix b/radish/packages.nix
index 6c183ce..9c42480 100644
--- a/radish/packages.nix
+++ b/radish/packages.nix
@@ -1,6 +1,7 @@
-{ pkgs, ... }:
+{ pkgs, lib, inputs, ... }:
 {
   nixpkgs.config.allowUnfree = true;
+  nixpkgs.overlays = [ (import ../custom-pkgs { inherit lib inputs; }) ];
 
   environment = {
     systemPackages = with pkgs; [