feat: infuse

flake.nix

@@ -55,13 +55,15 @@
 
     fenix.url = "github:nix-community/fenix";
     fenix.inputs.nixpkgs.follows = "nixpkgs";
+
+    infuse.url = "git+https://codeberg.org/amjoseph/infuse.nix";
+    infuse.flake = false;
   };
 
   outputs =
     {
       self,
       nixpkgs,
-      nixos-wsl,
       ...
     }@inputs:
     let
@@ -75,6 +77,15 @@
             ${hostname} = mkSystem hostname;
           }) (builtins.attrNames (builtins.readDir ./config/hosts))
         );
+
+      lib = nixpkgs.lib.extend (
+        final: prev: {
+          inherit (inputs.home-manager.lib) hm;
+          inherit infuse;
+          my = import ./lib { lib = final; };
+        }
+      );
+      infuse = (import inputs.infuse { inherit (nixpkgs) lib; }).v1.infuse;
     in
     {
       packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
@@ -99,18 +110,11 @@
         }
       );
 
-      overlays = import ./overlays { inherit inputs; };
+      overlays = import ./overlays { inherit inputs infuse; };
 
       nixosConfigurations = forAllHosts (
         hostname:
         let
-          lib = import ./lib/stdlib-extended.nix (
-            nixpkgs.lib.extend (
-              final: prev: {
-                inherit (inputs.home-manager.lib) hm;
-              }
-            )
-          );
           overlays = builtins.attrValues self.overlays ++ [
             inputs.go-musicfox.overlays.default
             inputs.omz.overlays.default
@@ -131,6 +135,9 @@
                 withHyprland = false;
               };
             })
+            (final: prev: {
+              inherit lib;
+            })
           ];
           home = {
             home-manager = {
@@ -140,9 +147,12 @@
                 inputs.stylix.homeManagerModules.stylix
                 inputs.niri.homeModules.niri
                 # workaround for annoying stylix
+                (
+                  { lib, ... }:
                   {
                     nixpkgs.overlays = lib.mkForce null;
                   }
+                )
               ];
               useGlobalPkgs = true;
             };
@@ -157,7 +167,6 @@
             inherit
               inputs
               outputs
-              nixos-wsl
               hostname
               ;
 

modules/desktop/terminal/kitty/default.nix

@@ -16,6 +16,8 @@ lib.my.makeHomeProgramConfig {
         initial_window_height = 600;
         enable_audio_bell = "no";
         term = "xterm-256color";
+
+        close_on_child_death = "yes";
       };
       font = {
         name = "monospace";

modules/desktop/wm/niri/config.nix

@@ -85,10 +85,6 @@
     };
 
     spawn-at-startup = map (c: { command = c; }) [
-      [
-        "alacritty"
-        "--daemon"
-      ]
       [ "${lib.getExe pkgs.xwayland-satellite-unstable}" ]
       [ "${lib.getExe' pkgs.swaynotificationcenter "swaync"}" ]
       [
@@ -123,19 +119,16 @@
       with config.my.home.lib.niri.actions;
       {
         "Ctrl+Alt+T".action.spawn = [
-          "alacritty"
+          "kitty"
-          "msg"
+          "-1"
-          "create-window"
         ];
         "Mod+T".action.spawn = [
-          "alacritty"
+          "kitty"
-          "msg"
+          "-1"
-          "create-window"
         ];
         "Mod+Return".action.spawn = [
-          "alacritty"
+          "kitty"
-          "msg"
+          "-1"
-          "create-window"
         ];
         "Mod+G".action.spawn = [ "chromium" ];
         "Mod+E".action.spawn = [ "nemo" ];

overlays/default.nix

@@ -1,19 +1,17 @@
-{ inputs, ... }:
+{ inputs, infuse, ... }:
 {
   additions = final: prev: import ../pkgs prev;
 
-  modifications = final: prev: {
+  modifications =
-    cage = prev.cage.overrideAttrs {
+    final: prev:
-      patches = [ ./cage-specify-output-name.patch ];
+    infuse prev {
-    };
+      cage.__output.patches.__append = [ ./cage-specify-output-name.patch ];
-    qq = prev.qq.overrideAttrs {
+      qq.__output.preInstall.__append = ''
-      preInstall = ''
         gappsWrapperArgs+=(
           --prefix GTK_IM_MODULE : fcitx
         )
       '';
     };
-  };
 
   # this allows us to access specific version of nixpkgs
   # by `pkgs.unstable`, `pkgs.stable` and `pkgs.master`