flake.nix

@@ -104,17 +104,11 @@
 
       channelsConfig.allowUnfree = true;
 
-      lib = nixpkgs.lib.extend
-        (self: super: { my = import ./lib { lib = self; }; });
-
       ################
       ### Overlays ###
       ################
 
-      overlay = import ./overlays {
+      overlay = import ./overlays { inherit inputs; };
-        inherit inputs;
-        inherit (self) lib;
-      };
 
       channels.nixpkgs.overlaysBuilder = channels: [
         inputs.emacs.overlays.default
@@ -140,8 +134,8 @@
         ./modules/profiles/gaming.nix
         ./modules/profiles/desktop.nix
       ];
-      hostDefaults = {
+
-        modules = [
+      hostDefaults.modules = [
         ./modules/default.nix
         self.nixosModules.base
         inputs.home-manager.nixosModule
@@ -156,7 +150,6 @@
         inputs.agenix.nixosModules.age
         inputs.howdy.nixosModules.default
       ];
-      };
 
       hosts.nixos-laptop.modules = [
         ./hosts/nixos-laptop

lib/default.nix

@@ -1,16 +0,0 @@
-{ lib, ... }:
-
-lib.makeExtensible (self: rec {
-  mkDate = longDate: lib.concatStringsSep "-" [
-    (builtins.substring 0 4 longDate)
-    (builtins.substring 4 2 longDate)
-    (builtins.substring 6 2 longDate)
-  ];
-  mkVersionSrc = src: "unstable-" + builtins.substring 0 7 src.rev;
-  mkVersionInput = input:
-    let
-      date = mkDate (input.lastModifiedDate or "19700101");
-      rev = input.shortRev or "dirty";
-    in
-    "unstable-${date}_${rev}}";
-})

overlays/channels.nix

@@ -1,12 +0,0 @@
-{ lib, inputs }:
-
-final: prev: {
-  master = import inputs.master {
-    inherit (prev) system;
-    config.allowUnfree = true;
-  };
-  stable = import inputs.stable {
-    inherit (prev) system;
-    config.allowUnfree = true;
-  };
-}

overlays/default.nix

@@ -1,8 +1,81 @@
-{ inputs, lib }:
+{ inputs }: final: prev:
+let
+  mkDate = longDate: (prev.lib.concatStringsSep "-" [
+    (builtins.substring 0 4 longDate)
+    (builtins.substring 4 2 longDate)
+    (builtins.substring 6 2 longDate)
+  ]);
+  mkVersionSrc = src: "unstable-" + builtins.substring 0 7 src.rev;
+  mkVersionInput = input: "unstable-" + mkDate (input.lastModifiedDate or "19700101") + "_" + (input.shortRev or "dirty");
+in
+{
+  agenix = inputs.agenix.packages.${prev.system}.default;
+  attic = inputs.attic.packages.${prev.system}.default;
+  hyprpaper = inputs.hyprpaper.packages.${prev.system}.default;
+  neovim-nightly = inputs.neovim.packages.${prev.system}.default;
+  nil = inputs.nil.packages.${prev.system}.default;
 
-lib.composeManyExtensions [
+  logseq-wayland = prev.symlinkJoin {
-  (import ./channels.nix { inherit inputs lib; })
+    name = "logseq-wayland";
-  (import ./packages.nix { inherit inputs lib; })
+    paths = [ prev.logseq ];
-  (import ./vimPlugins.nix { inherit inputs lib; })
+    nativeBuildInputs = [ prev.makeWrapper ];
-  (import ./wayland.nix { inherit inputs lib; })
+    postBuild = ''
-]
+      wrapProgram $out/bin/logseq \
+        --add-flags "--socket=wayland --enable-features=UseOzonePlatform --ozone-platform=wayland"
+    '';
+  };
+
+  waybar-hyprland = prev.waybar.overrideAttrs (old: {
+    pname = "${old.pname}-hyprland";
+    postPatch = old.postPatch or "" + ''
+      sed -i 's,zext_workspace_handle_v1_activate(workspace_handle_);,const std::string command = "${final.hyprland}/bin/hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());,g' src/modules/wlr/workspace_manager.cpp
+    '';
+    mesonFlags = old.mesonFlags or [ ] ++ [ "-Dexperimental=true" ];
+  });
+
+  vimPlugins = prev.vimPlugins // {
+    nvim-treesitter-textsubjects = prev.vimUtils.buildVimPluginFrom2Nix {
+      pname = "nvim-treesitter-textsubjects";
+      version = mkVersionInput inputs.nvim-treesitter-textsubjects;
+      src = inputs.nvim-treesitter-textsubjects;
+    };
+
+    smartcolumn-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
+      pname = "smartcolumn-nvim";
+      version = mkVersionInput inputs.smartcolumn-nvim;
+      src = inputs.smartcolumn-nvim;
+    };
+
+    copilot-lua = prev.vimPlugins.copilot-lua.overrideAttrs (old: {
+      version = mkVersionInput inputs.copilot-lua;
+      src = inputs.copilot-lua;
+    });
+
+    lspsaga-nvim-original = prev.vimPlugins.lspsaga-nvim-original.overrideAttrs (old: {
+      version = mkVersionInput inputs.lspsaga-nvim;
+      src = inputs.lspsaga-nvim;
+    });
+  };
+
+  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";
+    };
+  };
+
+  master = import inputs.master {
+    inherit (prev) system;
+    config.allowUnfree = true;
+  };
+  stable = import inputs.stable {
+    inherit (prev) system;
+    config.allowUnfree = true;
+  };
+}

overlays/packages.nix

@@ -1,10 +0,0 @@
-{ inputs, lib }:
-
-final: prev:
-{
-  agenix = inputs.agenix.packages.${prev.system}.default;
-  attic = inputs.attic.packages.${prev.system}.default;
-  hyprpaper = inputs.hyprpaper.packages.${prev.system}.default;
-  neovim-nightly = inputs.neovim.packages.${prev.system}.default;
-  nil = inputs.nil.packages.${prev.system}.default;
-}

overlays/vimPlugins.nix

@@ -1,29 +0,0 @@
-{ inputs, lib }:
-
-final: prev:
-with lib.my;
-{
-  vimPlugins = prev.vimPlugins // {
-    nvim-treesitter-textsubjects = prev.vimUtils.buildVimPluginFrom2Nix {
-      pname = "nvim-treesitter-textsubjects";
-      version = mkVersionInput inputs.nvim-treesitter-textsubjects;
-      src = inputs.nvim-treesitter-textsubjects;
-    };
-
-    smartcolumn-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
-      pname = "smartcolumn-nvim";
-      version = mkVersionInput inputs.smartcolumn-nvim;
-      src = inputs.smartcolumn-nvim;
-    };
-
-    copilot-lua = prev.vimPlugins.copilot-lua.overrideAttrs (old: {
-      version = mkVersionInput inputs.copilot-lua;
-      src = inputs.copilot-lua;
-    });
-
-    lspsaga-nvim-original = prev.vimPlugins.lspsaga-nvim-original.overrideAttrs (old: {
-      version = mkVersionInput inputs.lspsaga-nvim;
-      src = inputs.lspsaga-nvim;
-    });
-  };
-}

overlays/wayland.nix

@@ -1,33 +0,0 @@
-{ lib, inputs }:
-
-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"
-    '';
-  };
-
-  waybar-hyprland = prev.waybar.overrideAttrs (old: {
-    pname = "${old.pname}-hyprland";
-    postPatch = old.postPatch or "" + ''
-      sed -i 's,zext_workspace_handle_v1_activate(workspace_handle_);,const std::string command = "${final.hyprland}/bin/hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());,g' src/modules/wlr/workspace_manager.cpp
-    '';
-    mesonFlags = old.mesonFlags or [ ] ++ [ "-Dexperimental=true" ];
-  });
-}