feat(flake): add module for overlays

flake.nix

@@ -62,31 +62,6 @@
   };
 
   outputs = inputs@{ self, flake-parts, ... }:
-    let
-      defaultOverlays = [
-        inputs.hypr-contrib.overlays.default
-        self.overlays.default
-      ];
-
-      finalOverlays = defaultOverlays ++ [
-        (
-          _: prev: {
-            master = import inputs.master {
-              inherit (prev) system;
-              overlays = defaultOverlays;
-            };
-            stable = import inputs.stable {
-              inherit (prev) system;
-              overlays = defaultOverlays;
-            };
-            nur = import inputs.nur {
-              pkgs = prev;
-              nurpkgs = prev;
-            };
-          }
-        )
-      ];
-    in
     flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [
         inputs.pre-commit-hooks.flakeModule
@@ -95,12 +70,6 @@
 
       systems = [ "x86_64-linux" ];
       perSystem = { config, self', inputs', pkgs, system, ... }: {
-        _module.args.pkgs =
-          import inputs.nixpkgs {
-            inherit system;
-            overlays = finalOverlays;
-          };
-
         devshells.default = {
           devshell.startup.pre-commit-hook.text = config.pre-commit.installationScript;
           commands = [
@@ -155,20 +124,12 @@
 
         legacyPackages = pkgs;
 
-        packages =
-          self.lib.filterAttrs (_: self.lib.isDerivation)
-            (self.overlays.default pkgs pkgs);
       };
 
       flake = {
         lib = inputs.nixpkgs.lib.extend
           (self: _: { my = import ./lib { lib = self; }; });
 
-        overlays.default = import ./overlays {
-          inherit inputs;
-          inherit (self) lib;
-        };
-
         nixosConfigurations = self.lib.my.mapModules
           (path: self.lib.nixosSystem {
             inherit (self) lib;
@@ -178,12 +139,6 @@
             modules =
               [
                 ./modules
-                {
-                  nixpkgs = {
-                    overlays = finalOverlays;
-                    config.allowUnfree = true;
-                  };
-                }
                 {
                   home-manager = {
                     useGlobalPkgs = true;

modules/nixpkgs.nix

@@ -0,0 +1,60 @@
+{ config, lib, ... }:
+
+with lib;
+let
+  cfg = config.my.nixpkgs;
+
+  overlayType = mkOptionType {
+    name = "nixpkgs-overlay";
+    description = "nixpkgs overlay";
+    check = lib.isFunction;
+    merge = lib.mergeOneOption;
+  };
+in
+{
+  options.my.nixpkgs = {
+    overlays = mkOption {
+      default = [ ];
+      type = types.listOf overlayType;
+      example = literalExpression
+        ''
+          [
+            (self: super: {
+              openssh = super.openssh.override {
+                hpnSupport = true;
+                kerberos = self.libkrb5;
+              };
+            })
+          ]
+        '';
+    };
+    channels = mkOption {
+      default = { };
+      example = literalExpression ''
+        {
+          stable = inputs.nixpkgs-stable;
+        }
+      '';
+      type = with types; attrsOf package;
+    };
+    overlaysForAllChannels = mkEnableOption "apply overlays for all channels";
+  };
+
+  config.nixpkgs = {
+    overlays =
+      let
+        channelOverlays = _: prev:
+          mapAttrs
+            (_: value:
+              import value {
+                inherit (prev) system;
+                overlays = optional cfg.overlaysForAllChannels cfg.overlays;
+              }
+            )
+            cfg.channels;
+      in
+      cfg.overlays ++ [ channelOverlays ];
+
+    config.allowUnfree = true;
+  };
+}

modules/profiles/base.nix

@@ -1,6 +1,7 @@
 { config
 , lib
 , pkgs
+, inputs
 , ...
 }:
 
@@ -88,6 +89,95 @@ in
   time.timeZone = "Europe/Berlin";
 
   my = {
+    nixpkgs = {
+      overlays = [
+        (_: prev:
+          {
+            nur = import inputs.nur {
+              pkgs = prev;
+              nurpkgs = prev;
+            };
+          }
+        )
+        (
+          final: _:
+
+            with final.lib;
+            rec {
+              fishFile =
+                { name
+                , destination
+                , content
+                , checkPhase ? null
+                }:
+                final.writeTextFile {
+                  inherit name destination;
+                  executable = true;
+                  allowSubstitutes = true;
+                  preferLocalBuild = false;
+                  text = ''
+                    #!${getExe final.fish}
+
+                    ${content}
+                  '';
+
+                  checkPhase =
+                    if checkPhase == null then ''
+                      runHook preCheck
+                      ${getExe final.fish} -n "$target"
+                      runHook postCheck
+                    ''
+                    else checkPhase;
+                };
+
+              writeFishApplication =
+                { name
+                , text
+                , completions ? null
+                , runtimeInputs ? [ ]
+                , checkPhase ? null
+                }:
+                let
+                  runtimeHeader = optionalString (runtimeInputs != [ ])
+                    ''export PATH="${makeBinPath runtimeInputs}:$PATH"'';
+
+                  script = fishFile {
+                    inherit checkPhase;
+                    name = "${name}_script";
+                    destination = "/bin/${name}";
+                    content = concatLines [ runtimeHeader text ];
+                  };
+                  completions_file = fishFile {
+                    inherit checkPhase;
+                    name = "${name}_completions";
+                    destination = "/share/fish/vendor_completions.d/${name}.fish";
+                    content = concatLines [ runtimeHeader completions ];
+                  };
+                in
+                final.symlinkJoin {
+                  inherit name;
+                  paths = [
+                    script
+                  ] ++ optional (completions != null) completions_file;
+                };
+            }
+        )
+        (
+          _: prev: {
+            xorg = prev.xorg // {
+              lndir = prev.xorg.lndir.overrideAttrs (_: {
+                meta.mainProgram = "lndir";
+              });
+            };
+          }
+        )
+      ];
+      channels = {
+        master = inputs.master;
+        stable = inputs.stable;
+      };
+    };
+
     bin.enable = true;
     shell = {
       abbreviations = {

modules/programs/hyprland/default.nix

@@ -43,6 +43,9 @@ in
 
   config = mkIf cfg.enable {
     my = {
+      nixpkgs.overlays = [
+        inputs.hypr-contrib.overlays.default
+      ];
       programs = {
         wallpaper.enable = true;
         kitty.enable = true;

modules/programs/nvim/default.nix

@@ -10,15 +10,27 @@ in
   options.my.programs.nvim.enable = mkEnableOption "nvim";
 
   config = mkIf cfg.enable {
-    home-manager.users.moritz = {
+    my.nixpkgs.overlays = [
-      home.packages = with pkgs; [
       (
-          if config.my.programs.hyprland.enable
+        _: prev:
-          then neovide-hyprland
+          with lib.my;
-          else neovide
+          {
+            vimPlugins = prev.vimPlugins // {
+              nvim-treesitter = prev.vimPlugins.nvim-treesitter.overrideAttrs (_: {
+                version = mkVersionInput inputs.nvim-treesitter;
+                src = inputs.nvim-treesitter;
+              });
+
+              # HACK: to fix error in nixpkgs version of nvim-lspconfig
+              nvim-lspconfig = prev.vimPlugins.nvim-lspconfig.overrideAttrs (_: {
+                version = mkVersionInput inputs.nvim-lspconfig;
+                src = inputs.nvim-lspconfig;
+              });
+            };
+          }
       )
     ];
-
+    home-manager.users.moritz = {
       programs.neovim = {
         enable = true;
         package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;

modules/programs/nvim/plugins/coding.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, inputs, ... }:
 
 with builtins;
 {
@@ -115,7 +115,10 @@ with builtins;
       conf = readFile ./lua/nvim-lspconfig.lua;
       dependencies = [
         {
-          plugin = null-ls-nvim;
+          plugin = pkgs.vimPlugins.null-ls-nvim.overrideAttrs (_: {
+            version = lib.my.mkVersionInput inputs.none-ls-nvim;
+            src = inputs.none-ls-nvim;
+          });
           conf = readFile ./lua/null-ls-nvim.lua;
           dependencies = [
             { plugin = which-key-nvim; }
@@ -144,7 +147,13 @@ with builtins;
             { plugin = dressing-nvim; }
           ];
         }
-        { plugin = actions-preview-nvim; }
+        {
+          plugin = pkgs.vimUtils.buildVimPlugin {
+            pname = "actions-preview-nvim";
+            version = lib.my.mkVersionInput inputs.actions-preview-nvim;
+            src = inputs.actions-preview-nvim;
+          };
+        }
       ];
     }
     {
@@ -325,7 +334,11 @@ with builtins;
       ];
     }
     {
-      plugin = nvim-puppeteer;
+      plugin = pkgs.vimUtils.buildVimPlugin {
+        pname = "nvim-puppeteer";
+        version = lib.my.mkVersionInput inputs.nvim-puppeteer;
+        src = inputs.nvim-puppeteer;
+      };
       lazy = false; # NOTE: plugin lazy-loads itself.
     }
     {

modules/programs/nvim/plugins/treesitter.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 
 with builtins;
 {

modules/programs/nvim/plugins/ui.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, inputs, ... }:
 
 with builtins;
 {
@@ -21,12 +21,19 @@ with builtins;
       opts = { };
     }
     {
-      plugin = statuscol-nvim;
+      plugin = pkgs.vimPlugins.statuscol-nvim.overrideAttrs (_: {
+        version = lib.my.mkVersionInput inputs.statuscol-nvim;
+        src = inputs.statuscol-nvim;
+      });
       event = [ "VeryLazy" ];
       conf = readFile ./lua/statuscol-nvim.lua;
     }
     {
-      plugin = smartcolumn-nvim;
+      plugin = pkgs.vimUtils.buildVimPlugin {
+        pname = "smartcolumn-nvim";
+        version = lib.my.mkVersionInput inputs.smartcolumn-nvim;
+        src = inputs.smartcolumn-nvim;
+      };
       event = [ "BufReadPost" "BufNewFile" ];
       opts = {
         colorcolumn = "120";

overlays/builders.nix

@@ -1,62 +0,0 @@
-_:
-
-final: _:
-with final.lib;
-rec {
-  fishFile =
-    { name
-    , destination
-    , content
-    , checkPhase ? null
-    }:
-    final.writeTextFile {
-      inherit name destination;
-      executable = true;
-      allowSubstitutes = true;
-      preferLocalBuild = false;
-      text = ''
-        #!${getExe final.fish}
-
-        ${content}
-      '';
-
-      checkPhase =
-        if checkPhase == null then ''
-          runHook preCheck
-          ${getExe final.fish} -n "$target"
-          runHook postCheck
-        ''
-        else checkPhase;
-    };
-
-  writeFishApplication =
-    { name
-    , text
-    , completions ? null
-    , runtimeInputs ? [ ]
-    , checkPhase ? null
-    }:
-    let
-      runtimeHeader = optionalString (runtimeInputs != [ ])
-        ''export PATH="${makeBinPath runtimeInputs}:$PATH"'';
-
-      script = fishFile {
-        inherit checkPhase;
-        name = "${name}_script";
-        destination = "/bin/${name}";
-        content = concatLines [ runtimeHeader text ];
-      };
-      completions_file = fishFile {
-        inherit checkPhase;
-        name = "${name}_completions";
-        destination = "/share/fish/vendor_completions.d/${name}.fish";
-        content = concatLines [ runtimeHeader completions ];
-      };
-    in
-    final.symlinkJoin {
-      inherit name;
-      paths = [
-        script
-      ] ++ optional (completions != null) completions_file;
-    };
-}

overlays/default.nix

@@ -1,4 +0,0 @@
-{ lib, ... }@args:
-
-lib.composeManyExtensions
-  (lib.my.mapModules' (file: import file args) ./.)

overlays/fixes.nix

@@ -1,16 +0,0 @@
-{ lib, ... }:
-
-final: prev: {
-  # python-poetry/poetry#5929
-  poetry = final.symlinkJoin {
-    name = "poetry";
-    paths = [ prev.poetry ];
-    postBuild =
-      let
-        regex = "s/'([a-z]*[[:blank:]][a-z]*)''/\1'/g";
-      in
-      ''
-        ${lib.getExe final.gnused} -i -E "${regex}" "$out/share/fish/vendor_completions.d/poetry.fish"
-      '';
-  };
-}

overlays/lib.nix

@@ -1,5 +0,0 @@
-{ lib, ... }:
-
-_: _: {
-  inherit lib;
-}

overlays/packages.nix

@@ -1,10 +0,0 @@
-_:
-
-_: prev:
-{
-  xorg = prev.xorg // {
-    lndir = prev.xorg.lndir.overrideAttrs (_: {
-      meta.mainProgram = "lndir";
-    });
-  };
-}

overlays/vimPlugins.nix

@@ -1,63 +0,0 @@
-{ inputs, lib }:
-
-_: prev:
-with lib.my;
-{
-  vimPlugins = prev.vimPlugins // {
-    smartcolumn-nvim = prev.vimUtils.buildVimPlugin {
-      pname = "smartcolumn-nvim";
-      version = mkVersionInput inputs.smartcolumn-nvim;
-      src = inputs.smartcolumn-nvim;
-    };
-
-    telekasten-nvim = prev.vimUtils.buildVimPlugin {
-      pname = "telekasten-nvim";
-      version = mkVersionInput inputs.telekasten-nvim;
-      src = inputs.telekasten-nvim;
-    };
-
-    actions-preview-nvim = prev.vimUtils.buildVimPlugin {
-      pname = "actions-preview-nvim";
-      version = mkVersionInput inputs.actions-preview-nvim;
-      src = inputs.actions-preview-nvim;
-    };
-
-    nvim-treesitter = prev.vimPlugins.nvim-treesitter.overrideAttrs (_: {
-      version = mkVersionInput inputs.nvim-treesitter;
-      src = inputs.nvim-treesitter;
-    });
-
-    statuscol-nvim = prev.vimPlugins.statuscol-nvim.overrideAttrs (_: {
-      version = mkVersionInput inputs.statuscol-nvim;
-      src = inputs.statuscol-nvim;
-    });
-
-    # HACK: to fix error in nixpkgs version of nvim-lspconfig
-    nvim-lspconfig = prev.vimPlugins.nvim-lspconfig.overrideAttrs (_: {
-      version = mkVersionInput inputs.nvim-lspconfig;
-      src = inputs.nvim-lspconfig;
-    });
-
-    nvim-puppeteer = prev.vimUtils.buildVimPlugin {
-      pname = "nvim-puppeteer";
-      version = mkVersionInput inputs.nvim-puppeteer;
-      src = inputs.nvim-puppeteer;
-    };
-
-    null-ls-nvim = prev.vimPlugins.null-ls-nvim.overrideAttrs (_: {
-      version = mkVersionInput inputs.none-ls-nvim;
-      src = inputs.none-ls-nvim;
-    });
-
-    neotest-python = prev.vimPlugins.neotest-python.overrideAttrs (_: {
-      version = mkVersionInput inputs.neotest-python;
-      src = inputs.neotest-python;
-    });
-
-    gen-nvim = prev.vimUtils.buildVimPlugin {
-      pname = "gen-nvim";
-      version = mkVersionInput inputs.gen-nvim;
-      src = inputs.gen-nvim;
-    };
-  };
-}

overlays/wayland.nix

@@ -1,25 +0,0 @@
-_:
-
-final: prev: {
-  neovide-hyprland = final.symlinkJoin {
-    name = "neovide-hyprland-${final.neovide.version}";
-    paths = [ final.neovide ];
-    nativeBuildInputs = [ final.makeWrapper ];
-    postBuild = ''
-      rm $out/bin/neovide
-      makeWrapper ${final.neovide}/bin/neovide $out/bin/neovide --set WINIT_UNIX_BACKEND x11
-    '';
-    meta = final.neovide.meta // {
-      mainProgram = "neovide";
-    };
-  };
-  logseq-wayland = prev.symlinkJoin {
-    name = "logseq-wayland";
-    paths = [ prev.logseq ];
-    nativeBuildInputs = [ prev.makeWrapper ];
-    postBuild = ''
-      wrapProgram $out/bin/logseq \
-        --add-flags "--socket=wayland --enable-features=UseOzonePlatform --ozone-platform=wayland"
-    '';
-  };
-}