Merge pull request #26 from datsfilipe/zellij-swtich-flake

refactor: add zellij-switch from it's own flake

flake.nix

@@ -12,6 +12,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
       url = "github:Mic92/sops-nix/master";
     };
+    zellij-switch = {
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:datsfilipe/zellij-switch/flake";
+    };
     datsnvim = {
       flake = false;
       url = "git+file:///home/dtsf/.dotfiles/home/base/tui/editors/neovim/conf?shallow=1";

home/base/tui/zellij/default.nix

@@ -1,4 +1,4 @@
-{mypkgs, config, lib, ...}: let
+{mypkgs, zellij-switch, config, lib, ...}: let
   shellAliases = {
     "zj" = "zellij";
   };

lib/spec.nix

@@ -9,11 +9,16 @@ in {
   };
 
   testScanPaths = {
-    expr = mylib.file.scanPaths ../modules/nupkgs;
+    expr = mylib.file.scanPaths ../modules;
     expected = [
-      ../modules/nupkgs/devtunnel-cli
-      ../modules/nupkgs/home.nix
-      ../modules/nupkgs/zellij-switch
+      ../modules/base.nix
+      ../modules/colorscheme
+      ../modules/conf
+      ../modules/devenvs
+      ../modules/nixos
+      ../modules/nupkgs
+      ../modules/secrets
+      ../modules/wallpaper
     ];
   };
 

modules/nupkgs/default.nix

@@ -1,15 +1,19 @@
-{ lib, pkgs, mylib, ... }: let
+{ lib, pkgs, mylib, zellij-switch, ... }: let
+  packageFiles = lib.filter
+    (path: !lib.strings.hasPrefix (toString ./overlays) (toString path))
+    (mylib.file.scanPaths ./.);
+
+  pkgsWithOverlays = pkgs.extend zellij-switch.overlays.default;
+
   packages = builtins.listToAttrs (
-    map 
-      (file: 
-        let
-          name = lib.strings.removeSuffix ".nix" (baseNameOf file);
-        in {
-          inherit name;
-          value = pkgs.callPackage file {};
-        }
-      )
-      (mylib.file.scanPaths ./.)
-  );
+    map
+      (file: {
+        name = lib.strings.removeSuffix ".nix" (baseNameOf file);
+        value = pkgsWithOverlays.callPackage file {};
+      })
+      packageFiles
+  ) // {
+    inherit (pkgsWithOverlays) zellij-switch;
+  };
 in
   packages

outputs/default.nix

@@ -6,7 +6,7 @@
   inherit (inputs.nixpkgs) lib;
   myvars = import ../vars;
   mylib = import ../lib {inherit lib; inherit (builtins) builtins;};
-  genMypkgs = system: import ../modules/nupkgs {
+  genMypkgs = system: import ../modules/nupkgs (inputs // {
     inherit lib mylib;
     pkgs = import inputs.nixpkgs {
       inherit system;
@@ -15,7 +15,7 @@
         "openssl-1.1.1w"
       ];
     };
-  };
+  });
 
   genSpecialArgs = system:
     let

templates/flake.template.nix

@@ -23,6 +23,7 @@ in genFlake ./flake.template.nix
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
+    zellij-switch = (ext "github:datsfilipe/zellij-switch/flake");
     home-manager = (ext "github:nix-community/home-manager/master");
     sops-nix = (ext "github:Mic92/sops-nix/master");
     datsnvim = (local ../home/base/tui/editors/neovim/conf);