Creates packages/default.nix for mapping

2 files changed, 25 insertions, 9 deletions

diff --git a/packages.nix b/packages.nix
index 13379ba..a59b1d5 100644
--- a/packages.nix
+++ b/packages.nix
@@ -1,16 +1,20 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 let
-  dmenu = pkgs.callPackage ./packages/dmenu/pkg.nix {};
+  localPkgs = import ./packages/default.nix { pkgs = pkgs; };
   customPackages = [
-    (pkgs.callPackage ./packages/sensible-apps/pkg.nix {})
-    (pkgs.callPackage ./packages/shotkey/pkg.nix {})
-    (pkgs.callPackage ./packages/dwm/pkg.nix {})
-    (pkgs.callPackage ./packages/dwmblocks/pkg.nix {})
-    (pkgs.callPackage ./packages/st/pkg.nix {})
-    dmenu
+    localPkgs.sensible-apps
+    localPkgs.shotkey
+    localPkgs.dwm
+    localPkgs.dwmblocks
+    localPkgs.st
+    localPkgs.dmenu
+    #localPkgs.anypinentry
   ];
 
+  # security.setuidPrograms = [ "bslock" ];
+  # security.wrappers.bslock.source = "${bslock.out}/bin/bslock";
+
   devPackages = with pkgs; [
     # Dev
     neovim
@@ -46,6 +50,7 @@ let
 
   utils = with pkgs; [
     w3m
+    mtm
     lf
     libnotify
     dunst
@@ -78,7 +83,7 @@ in {
     (import ./external/nvim/neovim.nix)
     (import ./external/qutebrowser/overlay.nix)
     (self: super: {
-      pass = super.pass.override { dmenu = dmenu; };
+      pass = super.pass.override { dmenu = localPkgs.dmenu; };
     })
   ];
 
diff --git a/packages/default.nix b/packages/default.nix
new file mode 100644
index 0000000..9e0f39c
--- /dev/null
+++ b/packages/default.nix
@@ -0,0 +1,11 @@
+{ pkgs }:
+{
+  dmenu = pkgs.callPackage ./dmenu/pkg.nix {};
+  bslock = pkgs.callPackage ./bslock/pkg.nix {};
+  sensible-apps = pkgs.callPackage ./sensible-apps/pkg.nix {};
+  shotkey = pkgs.callPackage ./shotkey/pkg.nix {};
+  dwm = pkgs.callPackage ./dwm/pkg.nix {};
+  dwmblocks = pkgs.callPackage ./dwmblocks/pkg.nix {};
+  st = pkgs.callPackage ./st/pkg.nix {};
+  anypinentry = pkgs.callPackage ./anypinentry/pkg.nix {};
+}