Restructure flake source hierarchy

14 files changed, 15 insertions, 13 deletions

diff --git a/flake.nix b/flake.nix
index 7ac20f1..66f48ee 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,12 +11,16 @@
     nur.url = "github:nix-community/NUR";
   };
 
-  outputs = { home-manager, nur, ... }: {
+  outputs = { self, home-manager, nur, ... }: {
+    overlay = self: super: {
+      local = import ./pkgs self.local super;
+    };
+
     homeConfigurations."ale@p-user" = home-manager.lib.homeManagerConfiguration {
       system = "x86_64-linux";
       configuration = {
-        imports = [ ./home.nix ];
-        nixpkgs.overlays = [ nur.overlay ];
+        imports = [ ./home ];
+        nixpkgs.overlays = [ nur.overlay self.overlay ];
       };
 
       username = "ale";
diff --git a/alacritty.nix b/home/alacritty.nix
index 7a40b67..7a40b67 100644
--- a/alacritty.nix
+++ b/home/alacritty.nix
diff --git a/home.nix b/home/default.nix
index c18e3e5..abd034b 100644
--- a/home.nix
+++ b/home/default.nix
@@ -1,6 +1,4 @@
-{ lib, config, pkgs, ... }: let
-  local = import ./pkgs.nix pkgs;
-in {
+{ lib, config, pkgs, ... }: {
   imports = [ ./unfree.nix ];
 
   home = {
@@ -35,7 +33,7 @@ in {
       ".xinitrc".text = "exec ${pkgs.i3-gaps}/bin/i3";
     };
 
-    packages = import ./path.nix { inherit pkgs local; };
+    packages = import ./path.nix pkgs;
   };
 
   fonts.fontconfig.enable = true;
@@ -73,7 +71,7 @@ in {
       "i3/config".text = import ./i3-config.nix {
         inherit (pkgs) i3lock-color xautolock;
         inherit (pkgs.xorg) setxkbmap;
-        inherit (local) tmux-lift;
+        inherit (pkgs.local) tmux-lift;
 
         alacritty = config.programs.alacritty.package;
         i3status-rust = config.programs.i3status-rust.package;
diff --git a/i3-config.nix b/home/i3-config.nix
index 846e59a..846e59a 100644
--- a/i3-config.nix
+++ b/home/i3-config.nix
diff --git a/path.nix b/home/path.nix
index 016c09a..31629f5 100644
--- a/path.nix
+++ b/home/path.nix
@@ -1,4 +1,4 @@
-{ pkgs, local }: let
+pkgs: let
   py = pkgs.python39Packages;
 in [
   pkgs.calc
@@ -18,7 +18,7 @@ in [
   pkgs.rustup
   pkgs.signal-desktop
   pkgs.tdesktop
-  local.tmux-lift
+  pkgs.local.tmux-lift
   pkgs.units
   pkgs.unzip
   pkgs.zip
diff --git a/unfree.nix b/home/unfree.nix
index 1bb3788..1bb3788 100644
--- a/unfree.nix
+++ b/home/unfree.nix
diff --git a/zshrc.nix b/home/zshrc.nix
index 134ee5a..134ee5a 100644
--- a/zshrc.nix
+++ b/home/zshrc.nix
diff --git a/pkgs.nix b/pkgs.nix
deleted file mode 100644
index 519bd20..0000000
--- a/pkgs.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-pkgs: {
-  tmux-lift = pkgs.callPackage ./tmux-lift {};
-}
diff --git a/pkgs/default.nix b/pkgs/default.nix
new file mode 100644
index 0000000..cf752d9
--- /dev/null
+++ b/pkgs/default.nix
@@ -0,0 +1,3 @@
+self: super: {
+  tmux-lift = super.callPackage ./tmux-lift {};
+}
diff --git a/tmux-lift/Makefile b/pkgs/tmux-lift/Makefile
index eee4dde..eee4dde 100644
--- a/tmux-lift/Makefile
+++ b/pkgs/tmux-lift/Makefile
diff --git a/tmux-lift/default.nix b/pkgs/tmux-lift/default.nix
index 9d1adf2..9d1adf2 100644
--- a/tmux-lift/default.nix
+++ b/pkgs/tmux-lift/default.nix
diff --git a/tmux-lift/lift.c b/pkgs/tmux-lift/lift.c
index 71d959b..71d959b 100644
--- a/tmux-lift/lift.c
+++ b/pkgs/tmux-lift/lift.c
diff --git a/tmux-lift/lift.h b/pkgs/tmux-lift/lift.h
index e09d869..e09d869 100644
--- a/tmux-lift/lift.h
+++ b/pkgs/tmux-lift/lift.h
diff --git a/tmux-lift/unlift.c b/pkgs/tmux-lift/unlift.c
index d8d3a72..d8d3a72 100644
--- a/tmux-lift/unlift.c
+++ b/pkgs/tmux-lift/unlift.c