From 2df6aad1734a949ba47fe62436dace84cd29aaa7 Mon Sep 17 00:00:00 2001
From: Adam0 <alumail@protonmail.com>
Date: Thu, 28 May 2026 22:07:43 +0000
Subject: [PATCH] fixes

---
 flake.lock | 18 +++++++++---------
 modules/capabilities.nix | 2 +-
 modules/desktop/tablet.nix | 7 ++++++-
 modules/desktop/tuigreet.nix | 7 +++++--
 modules/nix/home-manager.nix | 3 ++-
 modules/nix/nur.nix | 1 -
 modules/pkgs/default.nix | 1 -
 modules/pkgs/lutris.nix | 5 +++--
 modules/profiles/base.nix | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 modules/profiles/personal.nix | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 modules/desktop/hyprland/default.nix | 5 ++++-
 modules/desktop/hyprland/plugins.nix | 2 --
 modules/desktop/noctalia/default.nix | 7 ++++++-
 modules/desktop/noctalia/systemmonitor.nix | 7 +++++--
 modules/desktop/xdg/portal.nix | 7 +++++--
 modules/hosts/laptop/home.nix | 5 +++--
 modules/profiles/stylix/base.nix | 5 +++--
 modules/profiles/stylix/personal.nix | 4 ++--
 modules/programs/cli/bat.nix | 7 +++++--
 modules/programs/cli/eh.nix | 16 ++++++++++++----
 modules/programs/cli/fastfetch.nix | 9 ++++++---
 modules/programs/cli/gh.nix | 7 +++++--
 modules/programs/cli/gitfetch.nix | 7 ++++++-
 modules/programs/cli/onefetch.nix | 7 ++++++-
 modules/programs/cli/zfetch.nix | 24 ------------------------
 modules/programs/gui/lutris.nix | 9 +--------
 modules/programs/gui/optiscaler.nix | 17 +++++++++++++++++
 modules/programs/gui/warehouse.nix | 7 -------
 modules/programs/gui/zaread.nix | 1 -
 modules/programs/tui/atuin.nix | 7 ++++++-
 modules/desktop/hyprland/keybinds/applications.nix | 12 +++++++++---
 modules/desktop/hyprland/keybinds/default.nix | 12 +++++++++---
 modules/programs/cli/ripgrep-all/adapters.nix | 2 +-
 modules/programs/tui/neovim/default.nix | 7 +++++--
 modules/programs/tui/opencode/default.nix | 7 +++++--
 modules/programs/tui/yazi/default.nix | 7 ++++++-
 modules/programs/tui/yazi/plugins.nix | 7 +++++--
 modules/programs/cli/ripgrep-all/adapters/other.nix | 3 ---
 modules/programs/tui/neovim/components/yazi.nix | 7 ++++++-
 39 file(s) changed, 394 insertion(s)(+), 122 deletion(s)(-)

diff --git a/flake.lock b/flake.lock
--- a/flake.lock
+++ b/flake.lock
@@ -296,11 +296,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778940504,
-        "narHash": "sha256-icE/A507esXXgvNN0KjrqlWNupu9dx61J0qV9sU645E=",
+        "lastModified": 1779984401,
+        "narHash": "sha256-NmHQCjNHSP52KP2bfSb0bQ4Ej8kFqLOmTOX47ukKjGE=",
         "owner": "NotAShelf",
         "repo": "eh",
-        "rev": "add693289faa2291b04c1168befcb772ebf734b6",
+        "rev": "b0f0ea0c45c0fdf00441374c94f9d5aa0fd1aeb0",
         "type": "github"
       },
       "original": {
@@ -1185,11 +1185,11 @@
     },
     "nix-flatpak": {
       "locked": {
-        "lastModified": 1777402031,
-        "narHash": "sha256-6gkfl9y3+ti0Z6dgby8/R4/DRT8sWU0I0TLCIxwWtjk=",
+        "lastModified": 1779998907,
+        "narHash": "sha256-8CSkdFNkAF49pmhFneEFNAO4UX9/0FnoMwXMY3yyvi0=",
         "owner": "gmodena",
         "repo": "nix-flatpak",
-        "rev": "22a3adbe7c5c8c8a10a635d32c9ef7fc01a6e4b8",
+        "rev": "744221c2aef17f1f2a13278abfeabd9bd5e40180",
         "type": "github"
       },
       "original": {
@@ -1508,11 +1508,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779982645,
-        "narHash": "sha256-lY+CoGk/GUiXa0f9juTgrG4Ib4VNzFKc/dxjPgP6P3s=",
+        "lastModified": 1780005963,
+        "narHash": "sha256-XhdH6LiIC0/ogVIFlupBGd6OvDwl0oMpY0gdMCIFJbk=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "9cd3d768ff6322cb1657dc698715dd048b027be8",
+        "rev": "feb35e92f7dab5c66ce0072b2078f606d4f1ec33",
         "type": "github"
       },
       "original": {
diff --git a/modules/capabilities.nix b/modules/capabilities.nix
--- a/modules/capabilities.nix
+++ b/modules/capabilities.nix
@@ -2,7 +2,7 @@
   inherit (lib) mkEnableOption;
 in {
   flake.modules.nixos.capabilities = {
-    key = "infra-nixos-capabilities";
+    key = "nixos-capabilities";
 
     options.capabilities = {
       # keep-sorted start
diff --git a/modules/desktop/tablet.nix b/modules/desktop/tablet.nix
--- a/modules/desktop/tablet.nix
+++ b/modules/desktop/tablet.nix
@@ -21,7 +21,12 @@
       name: (monitors.${name}.position or null) == "0x0"
     ) (attrNames monitors);
   in {
-    imports = [self.modules.homeManager.hyprland];
+    imports = [
+      {
+        key = "homeManager-hyprland";
+        imports = [self.modules.homeManager.hyprland];
+      }
+    ];
 
     config = mkIf (candidates != []) {
       programs.nixhypr.devices = [
diff --git a/modules/desktop/tuigreet.nix b/modules/desktop/tuigreet.nix
--- a/modules/desktop/tuigreet.nix
+++ b/modules/desktop/tuigreet.nix
@@ -32,9 +32,12 @@
     tomlFormat = pkgs.formats.toml {};
   in {
     imports = with self.modules; [
-      # keep-sorted start
+      # keep-sorted start block=yes
       generic.vars
-      nixos.uwsm
+      {
+        key = "nixos-uwsm";
+        imports = [nixos.uwsm];
+      }
       # keep-sorted end
     ];
 
diff --git a/modules/nix/home-manager.nix b/modules/nix/home-manager.nix
--- a/modules/nix/home-manager.nix
+++ b/modules/nix/home-manager.nix
@@ -34,7 +34,7 @@
     home-manager = {
       useGlobalPkgs = true;
       useUserPackages = true;
-      extraSpecialArgs = {inherit inputs self vars;};
+      extraSpecialArgs = {inherit inputs pkgs self vars;};
 
       startAsUserService = true;
       backupCommand = "${pkgs.trash-cli}/bin/trash";
@@ -42,6 +42,7 @@
       users.${username} = {
         home = {
           inherit username;
+          enableNixpkgsReleaseCheck = false;
           homeDirectory = "/home/${username}";
 
           # Align home manager state version with the system.
diff --git a/modules/nix/nur.nix b/modules/nix/nur.nix
--- a/modules/nix/nur.nix
+++ b/modules/nix/nur.nix
@@ -12,6 +12,5 @@
   };
 
   flake.modules.homeManager.nur = {
-    imports = [inputs.nur.modules.homeManager.default];
   };
 }
diff --git a/modules/pkgs/default.nix b/modules/pkgs/default.nix
--- a/modules/pkgs/default.nix
+++ b/modules/pkgs/default.nix
@@ -7,7 +7,6 @@
       (packages)
       # keep-sorted start
       djvutorga-adapter
-      lutris
       man-preview
       nocheatsheet-nvim
       os-age
diff --git a/modules/pkgs/lutris.nix b/modules/pkgs/lutris.nix
--- a/modules/pkgs/lutris.nix
+++ b/modules/pkgs/lutris.nix
@@ -63,8 +63,7 @@
         gstreamer
         # keep-sorted end
       ];
-  in {
-    packages.lutris = buildFHSEnv {
+    lutris = buildFHSEnv {
       pname = "lutris";
       inherit (pkgs.lutris-unwrapped) version;
       runScript = "lutris";
@@ -208,5 +207,7 @@
         mainProgram = "lutris";
       };
     };
+  in {
+    packages.lutris = lutris;
   };
 }
diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -1,31 +1,104 @@
 {self, ...}: {
   flake.modules.nixos.base = {
     imports = with self.modules.nixos; [
+      # Core
       # keep-sorted start
       capabilities
       disko
+      envfs
       firmware
       home-manager
       kernel
       lanzaboote
-      locale
-      network
-      nftables
       nix
       nix-ld
-      slim
-      stylixBase
-      timezone
-      tmp
-      tweaks
-      udisks2
       users
+      # keep-sorted end
+
+      # Profiles
+      stylixBase
+
+      # Services
+      # keep-sorted start
+      ananicy
+      avahi
+      bpftune
+      locate
+      network
+      nftables
+      printing
+      timesyncd
+      tmp
+      udisks2
       zram
       # keep-sorted end
+
+      # Common
+      # keep-sorted start
+      locale
+      slim
+      timezone
+      tweaks
+      # keep-sorted end
+
+      # CLI
+      # keep-sorted start
+      bandwhich
+      eh
+      man
+      sudo
+      # keep-sorted end
+
+      # TUI
+      neovim
     ];
   };
 
   flake.modules.homeManager.base = {
-    imports = [self.modules.homeManager.stylixBase];
+    imports = with self.modules.homeManager; [
+      # Profiles
+      stylixBase
+
+      # Desktop
+      # keep-sorted start
+      xdg
+      xdgCleanup
+      xdgDirs
+      # keep-sorted end
+
+      # CLI
+      # keep-sorted start
+      bat
+      bun
+      eh
+      eza
+      fastfetch
+      fd
+      nh
+      nix-index
+      npm
+      nys
+      ouch
+      ripgrep
+      speedtest
+      starship
+      tlrc
+      # keep-sorted end
+
+      # TUI
+      # keep-sorted start block=yes
+      atuin
+      fzf
+      neovim
+      {
+        key = "homeManager-btop";
+        imports = [btop];
+      }
+      {
+        key = "homeManager-yazi";
+        imports = [yazi];
+      }
+      # keep-sorted end
+    ];
   };
 }
diff --git a/modules/profiles/personal.nix b/modules/profiles/personal.nix
--- a/modules/profiles/personal.nix
+++ b/modules/profiles/personal.nix
@@ -3,20 +3,53 @@
     imports = with self.modules;
       [generic.determinate]
       ++ (with nixos; [
+        # Profiles
+        # keep-sorted start
         base
+        stylixPersonal
+        # keep-sorted end
 
+        # Desktop
+        # keep-sorted start block=yes
+        hyprland
+        noctalia
+        polkit
+        tablet
+        tuigreet
+        xdgPortal
+        {
+          key = "nixos-uwsm";
+          imports = [uwsm];
+        }
+        # keep-sorted end
+
+        # Programs
         # keep-sorted start
         appimage
-        hyprland
         java
-        noctalia
+        # keep-sorted end
+
+        # GUI
+        seahorse
+
+        # Services
+        # keep-sorted start
+        evolution-data-server
+        flatpak
+        geoclue
+        gnome-keyring
+        gvfs
+        libinput
         pipewire
-        polkit
         power-profiles-daemon
-        stylixPersonal
-        tuigreet
         upower
-        xdgPortal
+        # keep-sorted end
+
+        # Gaming
+        # keep-sorted start
+        lsfg
+        optiscaler
+        steam
         # keep-sorted end
       ]);
 
@@ -25,15 +58,121 @@
 
   flake.modules.homeManager.personal = {
     imports = with self.modules.homeManager; [
+      # Profiles
       base
 
+      # Common
       # keep-sorted start
       env
       face
-      git
+      gh
+      gpg
+      ssh
+      sshfs
+      # keep-sorted end
+
+      # Desktop
+      # keep-sorted start block=yes
+      polkit
+      stylixPersonal
+      tablet
+      uwsm
+      xdgApplications
+      xdgPortal
+      xdgTerminal
+      {
+        key = "homeManager-hyprland";
+        imports = [hyprland];
+      }
+      {
+        key = "homeManager-noctalia";
+        imports = [noctalia];
+      }
+      {
+        key = "homeManager-overzicht";
+        imports = [overzicht];
+      }
+      # keep-sorted end
+
+      # Programs
+      # keep-sorted start block=yes
       gtk
-      hyprland
+      {
+        key = "homeManager-git";
+        imports = [git];
+      }
+      # keep-sorted end
+
+      # CLI
+      # keep-sorted start block=yes
+      bonsai
+      cpond
+      direnv
+      gitfetch
+      onefetch
+      pipes
+      ripgrep-all
+      rumdl
+      zoxide
+      {
+        key = "homeManager-fish";
+        imports = [fish];
+      }
+      # keep-sorted end
+
+      # TUI
+      # keep-sorted start block=yes
+      cava
       nvtop
+      opencode
+      wiremix
+      {
+        key = "homeManager-television";
+        imports = [television];
+      }
+      # keep-sorted end
+
+      # GUI
+      # keep-sorted start block=yes
+      aseprite
+      beeper
+      bitwarden
+      bleachbit
+      crosspipe
+      decibels
+      flatseal
+      ghostty
+      gimp
+      loupe
+      onlyoffice
+      proton
+      showtime
+      spotify
+      upscayl
+      zaread
+      zathura
+      {
+        key = "homeManager-discord";
+        imports = [discord];
+      }
+      {
+        key = "homeManager-zen";
+        imports = [zen];
+      }
+      # keep-sorted end
+
+      # Services
+      flatpak
+
+      # Gaming
+      # keep-sorted start
+      heroic
+      lutris
+      mangohud
+      mcpelauncher
+      optiscaler
+      prism
+      sober
       # keep-sorted end
     ];
   };
diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix
--- a/modules/desktop/hyprland/default.nix
+++ b/modules/desktop/hyprland/default.nix
@@ -25,7 +25,10 @@
 
     pkgs-unstable = inputs.hyprland.inputs.nixpkgs.legacyPackages.${system};
   in {
-    nixpkgs.overlays = [self.overlays.hyprland];
+    nixpkgs.overlays = with self.overlays; [
+      hyprland
+      hyprland-plugins
+    ];
 
     programs.hyprland = {
       enable = true;
diff --git a/modules/desktop/hyprland/plugins.nix b/modules/desktop/hyprland/plugins.nix
--- a/modules/desktop/hyprland/plugins.nix
+++ b/modules/desktop/hyprland/plugins.nix
@@ -15,8 +15,6 @@
   flake.modules.homeManager.hyprland = {pkgs, ...}: {
     imports = [self.modules.homeManager.nur];
 
-    nixpkgs.overlays = [self.overlays.hyprland-plugins];
-
     wayland.windowManager.hyprland.plugins = [pkgs.hyprlandPlugins.hyprfocus];
 
     programs.nixhypr = {
diff --git a/modules/desktop/noctalia/default.nix b/modules/desktop/noctalia/default.nix
--- a/modules/desktop/noctalia/default.nix
+++ b/modules/desktop/noctalia/default.nix
@@ -37,7 +37,12 @@
   flake.modules.homeManager.noctalia = {lib, ...}: let
     inherit (lib) mkEnableOption;
   in {
-    imports = [inputs.noctalia.homeModules.default];
+    imports = [
+      # keep-sorted start
+      inputs.noctalia.homeModules.default
+      self.modules.homeManager.cliphist
+      # keep-sorted end
+    ];
 
     # Expose an enable toggle for battery widgets.
     options.programs.noctalia-shell.battery.enable = mkEnableOption "Enable the battery service & widgets.";
diff --git a/modules/desktop/noctalia/systemmonitor.nix b/modules/desktop/noctalia/systemmonitor.nix
--- a/modules/desktop/noctalia/systemmonitor.nix
+++ b/modules/desktop/noctalia/systemmonitor.nix
@@ -11,9 +11,12 @@
     cfgGpu = config.programs.noctalia-shell.systemMonitor.enableGpu;
   in {
     imports = with self.modules.homeManager; [
-      # keep-sorted start
-      btop
+      # keep-sorted start block=yes
       xdgTerminal
+      {
+        key = "homeManager-btop";
+        imports = [btop];
+      }
       # keep-sorted end
     ];
 
diff --git a/modules/desktop/xdg/portal.nix b/modules/desktop/xdg/portal.nix
--- a/modules/desktop/xdg/portal.nix
+++ b/modules/desktop/xdg/portal.nix
@@ -17,9 +17,12 @@
     inherit ((import "${inputs.hyprland}/nix/lib.nix" lib)) toHyprlang;
   in {
     imports = with self.modules.homeManager; [
-      # keep-sorted start
-      hyprland
+      # keep-sorted start block=yes
       xdgTerminal
+      {
+        key = "homeManager-hyprland";
+        imports = [hyprland];
+      }
       # keep-sorted end
     ];
 
diff --git a/modules/hosts/laptop/home.nix b/modules/hosts/laptop/home.nix
--- a/modules/hosts/laptop/home.nix
+++ b/modules/hosts/laptop/home.nix
@@ -10,9 +10,10 @@
   in {
     home-manager.users.${username} = {
       imports = with self.modules.homeManager; [
-        # keep-sorted start
         personal
-        # keep-sorted end
+
+        bluetui
+        impala
       ];
 
       # keep-sorted start block=yes newline_separated=yes
diff --git a/modules/profiles/stylix/base.nix b/modules/profiles/stylix/base.nix
--- a/modules/profiles/stylix/base.nix
+++ b/modules/profiles/stylix/base.nix
@@ -1,6 +1,7 @@
 {inputs, ...}: let
   stylixConfig = {
     enable = true;
+    enableReleaseChecks = false;
     autoEnable = false;
 
     polarity = "dark";
@@ -46,7 +47,7 @@
   };
 
   flake.modules.nixos.stylixBase = {
-    key = "infra-nixos-stylixBase";
+    key = "nixos-stylixBase";
 
     imports = [inputs.stylix.nixosModules.stylix];
 
@@ -58,7 +59,7 @@
     osConfig ? null,
     ...
   }: {
-    key = "infra-homeManager-stylixBase";
+    key = "homeManager-stylixBase";
 
     imports = lib.optional (osConfig == null) inputs.stylix.homeModules.stylix;
 
diff --git a/modules/profiles/stylix/personal.nix b/modules/profiles/stylix/personal.nix
--- a/modules/profiles/stylix/personal.nix
+++ b/modules/profiles/stylix/personal.nix
@@ -14,7 +14,7 @@
   ];
 in {
   flake.modules.nixos.stylixPersonal = {pkgs, ...}: {
-    key = "infra-nixos-stylixPersonal";
+    key = "nixos-stylixPersonal";
 
     imports = with self.modules.nixos; [
       # keep-sorted start
@@ -66,7 +66,7 @@
   };
 
   flake.modules.homeManager.stylixPersonal = {
-    key = "infra-homeManager-stylixPersonal";
+    key = "homeManager-stylixPersonal";
 
     imports = [self.modules.homeManager.stylixBase];
 
diff --git a/modules/programs/cli/bat.nix b/modules/programs/cli/bat.nix
--- a/modules/programs/cli/bat.nix
+++ b/modules/programs/cli/bat.nix
@@ -11,9 +11,12 @@
     bat = getExe config.programs.bat.package;
   in {
     imports = with self.modules.homeManager; [
-      # keep-sorted start
-      fish
+      # keep-sorted start block=yes
       nur
+      {
+        key = "homeManager-fish";
+        imports = [fish];
+      }
       # keep-sorted end
     ];
 
diff --git a/modules/programs/cli/eh.nix b/modules/programs/cli/eh.nix
--- a/modules/programs/cli/eh.nix
+++ b/modules/programs/cli/eh.nix
@@ -19,12 +19,18 @@
     # keep-sorted end
     ...
   }: let
-    inherit (lib) getExe;
+    inherit
+      (lib)
+      # keep-sorted start
+      getExe
+      getExe'
+      # keep-sorted end
+      ;
     inherit (pkgs) writeShellApplication;
 
     # keep-sorted start
     eh = getExe pkgs.eh;
-    nix = getExe pkgs.nix;
+    nix = getExe' pkgs.nix "nix";
     # keep-sorted end
 
     nixWrapper = writeShellApplication {
@@ -46,9 +52,11 @@
       '';
     };
   in {
-    nixpkgs.overlays = [self.overlays.eh];
-
     home.packages = [pkgs.eh nixWrapper];
+  };
+
+  flake.modules.nixos.eh = {
+    nixpkgs.overlays = [self.overlays.eh];
   };
 
   flake.overlays.eh = final: _prev: let
diff --git a/modules/programs/cli/fastfetch.nix b/modules/programs/cli/fastfetch.nix
--- a/modules/programs/cli/fastfetch.nix
+++ b/modules/programs/cli/fastfetch.nix
@@ -13,9 +13,12 @@
     # Escape code for fastfetch color formatting.
     esc = fromJSON "\"\\u001b\"";
   in {
-    imports = [self.modules.homeManager.shellAbbreviations];
-
-    nixpkgs.overlays = [self.overlays.pkgs];
+    imports = [
+      {
+        key = "homeManager-shellAbbreviations";
+        imports = [self.modules.homeManager.shellAbbreviations];
+      }
+    ];
 
     programs.fastfetch = {
       enable = true;
diff --git a/modules/programs/cli/gh.nix b/modules/programs/cli/gh.nix
--- a/modules/programs/cli/gh.nix
+++ b/modules/programs/cli/gh.nix
@@ -3,9 +3,12 @@
     inherit (vars) gitUsername;
   in {
     imports = with self.modules; [
-      # keep-sorted start
+      # keep-sorted start block=yes
       generic.vars
-      homeManager.git
+      {
+        key = "homeManager-git";
+        imports = [homeManager.git];
+      }
       # keep-sorted end
     ];
 
diff --git a/modules/programs/cli/gitfetch.nix b/modules/programs/cli/gitfetch.nix
--- a/modules/programs/cli/gitfetch.nix
+++ b/modules/programs/cli/gitfetch.nix
@@ -7,7 +7,12 @@
   }: let
     inherit (pkgs) gitfetch;
   in {
-    imports = [self.modules.homeManager.shellAbbreviations];
+    imports = [
+      {
+        key = "homeManager-shellAbbreviations";
+        imports = [self.modules.homeManager.shellAbbreviations];
+      }
+    ];
 
     home.packages = [gitfetch];
     home.shellAbbreviations.gf = "gitfetch";
diff --git a/modules/programs/cli/onefetch.nix b/modules/programs/cli/onefetch.nix
--- a/modules/programs/cli/onefetch.nix
+++ b/modules/programs/cli/onefetch.nix
@@ -7,7 +7,12 @@
   }: let
     inherit (pkgs) onefetch;
   in {
-    imports = [self.modules.homeManager.shellAbbreviations];
+    imports = [
+      {
+        key = "homeManager-shellAbbreviations";
+        imports = [self.modules.homeManager.shellAbbreviations];
+      }
+    ];
 
     home.packages = [onefetch];
     home.shellAbbreviations.of = "onefetch";
diff --git a/modules/programs/cli/zfetch.nix b/modules/programs/cli/zfetch.nix
deleted file mode 100644
--- a/modules/programs/cli/zfetch.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{self, ...}: {
-  flake.modules.homeManager.zfetch = {pkgs, ...}: let
-    inherit (pkgs.nur.repos.adam0) zfetch-rs;
-
-    tomlFormat = pkgs.formats.toml {};
-  in {
-    imports = [self.modules.homeManager.nur];
-
-    home.packages = [zfetch-rs];
-
-    xdg.configFile."zfetch/config.toml".source = tomlFormat.generate "zfetch-config.toml" {
-      userspace = {
-        packages = false;
-        ui = false;
-
-        colors_style = "box";
-      };
-
-      display = {
-        box_style = "square";
-      };
-    };
-  };
-}
diff --git a/modules/programs/gui/lutris.nix b/modules/programs/gui/lutris.nix
--- a/modules/programs/gui/lutris.nix
+++ b/modules/programs/gui/lutris.nix
@@ -3,22 +3,15 @@
     # keep-sorted start
     osConfig,
     pkgs,
-    self,
     # keep-sorted end
     ...
   }: let
-    bluetoothEnabled = osConfig.capabilities.bluetooth;
     inherit (osConfig.programs) steam;
   in {
-    nixpkgs.overlays = [self.overlays.pkgs];
-
     programs.lutris = {
       enable = true;
 
-      package = pkgs.lutris.override {
-        inherit bluetoothEnabled;
-        steamSupport = true;
-      };
+      package = pkgs.lutris;
 
       # Add umu launcher for proton outside of steam.
       extraPackages = [pkgs.umu-launcher] ++ steam.extraPackages;
diff --git a/modules/programs/gui/optiscaler.nix b/modules/programs/gui/optiscaler.nix
new file mode 100644
--- /dev/null
+++ b/modules/programs/gui/optiscaler.nix
@@ -0,0 +1,17 @@
+{self, ...}: {
+  flake.modules.nixos.optiscaler = {
+    nix.settings = let
+      cache = "https://uriotv.cachix.org";
+    in {
+      substituters = [cache];
+      trusted-substituters = [cache];
+      trusted-public-keys = ["uriotv.cachix.org-1:goitmxx1/DXbyeFNubk9Dmp9nvg4V188Wvu4CdrRsyI="];
+    };
+  };
+
+  flake.modules.homeManager.optiscaler = {pkgs, ...}: {
+    imports = [self.modules.homeManager.nur];
+
+    home.packages = [pkgs.nur.repos.uriotv.optiscaler-client];
+  };
+}
diff --git a/modules/programs/gui/warehouse.nix b/modules/programs/gui/warehouse.nix
deleted file mode 100644
--- a/modules/programs/gui/warehouse.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{self, ...}: {
-  flake.modules.homeManager.warehouse = {pkgs, ...}: {
-    imports = [self.modules.homeManager.flatpak];
-
-    home.packages = [pkgs.warehouse];
-  };
-}
diff --git a/modules/programs/gui/zaread.nix b/modules/programs/gui/zaread.nix
--- a/modules/programs/gui/zaread.nix
+++ b/modules/programs/gui/zaread.nix
@@ -8,7 +8,6 @@
     ...
   }: {
     imports = [self.modules.homeManager.zathura];
-    nixpkgs.overlays = [self.overlays.pkgs];
 
     # keep-sorted start block=yes newline_separated=yes
     home.packages = [pkgs.zaread];
diff --git a/modules/programs/tui/atuin.nix b/modules/programs/tui/atuin.nix
--- a/modules/programs/tui/atuin.nix
+++ b/modules/programs/tui/atuin.nix
@@ -2,7 +2,12 @@
   flake.modules.homeManager.atuin = {config, ...}: let
     inherit (config.xdg) cacheHome;
   in {
-    imports = [self.modules.homeManager.fish];
+    imports = [
+      {
+        key = "homeManager-fish";
+        imports = [self.modules.homeManager.fish];
+      }
+    ];
 
     programs.atuin = let
       logLevel = "error";
diff --git a/modules/desktop/hyprland/keybinds/applications.nix b/modules/desktop/hyprland/keybinds/applications.nix
--- a/modules/desktop/hyprland/keybinds/applications.nix
+++ b/modules/desktop/hyprland/keybinds/applications.nix
@@ -11,10 +11,16 @@
     inherit (lib.self) mkNixhyprBindGroup;
   in {
     imports = with self.modules.homeManager; [
-      # keep-sorted start
-      discord
+      # keep-sorted start block=yes
       ghostty
-      zen
+      {
+        key = "homeManager-discord";
+        imports = [discord];
+      }
+      {
+        key = "homeManager-zen";
+        imports = [zen];
+      }
       # keep-sorted end
     ];
 
diff --git a/modules/desktop/hyprland/keybinds/default.nix b/modules/desktop/hyprland/keybinds/default.nix
--- a/modules/desktop/hyprland/keybinds/default.nix
+++ b/modules/desktop/hyprland/keybinds/default.nix
@@ -1,10 +1,16 @@
 {self, ...}: {
   flake.modules.homeManager.hyprland = {
     imports = with self.modules.homeManager; [
-      # keep-sorted start
+      # keep-sorted start block=yes
       nixhyprBinds
-      noctalia
-      overzicht
+      {
+        key = "homeManager-noctalia";
+        imports = [noctalia];
+      }
+      {
+        key = "homeManager-overzicht";
+        imports = [overzicht];
+      }
       # keep-sorted end
     ];
 
diff --git a/modules/programs/cli/ripgrep-all/adapters.nix b/modules/programs/cli/ripgrep-all/adapters.nix
--- a/modules/programs/cli/ripgrep-all/adapters.nix
+++ b/modules/programs/cli/ripgrep-all/adapters.nix
@@ -24,7 +24,7 @@
               # keep-sorted start
               csvkit
               fastgron
-              nur.repos.adam0.qq-jfry
+              nur.repos.adam0.qq-jfryy
               # keep-sorted end
             ])
           }
diff --git a/modules/programs/tui/neovim/default.nix b/modules/programs/tui/neovim/default.nix
--- a/modules/programs/tui/neovim/default.nix
+++ b/modules/programs/tui/neovim/default.nix
@@ -46,9 +46,12 @@
     imports =
       [inputs.nvf.homeManagerModules.default]
       ++ (with self.modules.homeManager; [
-        # keep-sorted start
-        git
+        # keep-sorted start block=yes
         stylixBase
+        {
+          key = "homeManager-git";
+          imports = [git];
+        }
         # keep-sorted end
       ]);
 
diff --git a/modules/programs/tui/opencode/default.nix b/modules/programs/tui/opencode/default.nix
--- a/modules/programs/tui/opencode/default.nix
+++ b/modules/programs/tui/opencode/default.nix
@@ -44,10 +44,13 @@
     );
   in {
     imports = with self.modules.homeManager; [
-      # keep-sorted start
+      # keep-sorted start block=yes
       nur
-      shellAbbreviations
       xdgTerminal
+      {
+        key = "homeManager-shellAbbreviations";
+        imports = [shellAbbreviations];
+      }
       # keep-sorted end
     ];
 
diff --git a/modules/programs/tui/yazi/default.nix b/modules/programs/tui/yazi/default.nix
--- a/modules/programs/tui/yazi/default.nix
+++ b/modules/programs/tui/yazi/default.nix
@@ -1,6 +1,11 @@
 {self, ...}: {
   flake.modules.homeManager.yazi = {
-    imports = [self.modules.homeManager.git];
+    imports = [
+      {
+        key = "homeManager-git";
+        imports = [self.modules.homeManager.git];
+      }
+    ];
 
     # Yazi tui file manager.
     programs.yazi = {
diff --git a/modules/programs/tui/yazi/plugins.nix b/modules/programs/tui/yazi/plugins.nix
--- a/modules/programs/tui/yazi/plugins.nix
+++ b/modules/programs/tui/yazi/plugins.nix
@@ -10,12 +10,15 @@
     inherit (pkgs.lib.generators) mkLuaInline;
   in {
     imports = with self.modules.homeManager; [
-      # keep-sorted start
+      # keep-sorted start block=yes
       bat
       fd
       nur
       ripgrep
-      television
+      {
+        key = "homeManager-television";
+        imports = [television];
+      }
       # keep-sorted end
     ];
 
diff --git a/modules/programs/cli/ripgrep-all/adapters/other.nix b/modules/programs/cli/ripgrep-all/adapters/other.nix
--- a/modules/programs/cli/ripgrep-all/adapters/other.nix
+++ b/modules/programs/cli/ripgrep-all/adapters/other.nix
@@ -3,7 +3,6 @@
     # keep-sorted start
     lib,
     pkgs,
-    self,
     # keep-sorted end
     ...
   }: let
@@ -20,8 +19,6 @@
     pptx2md = getExe pkgs.pptx2md-adapter;
     # keep-sorted end
   in {
-    nixpkgs.overlays = [self.overlays.pkgs];
-
     programs.ripgrep-all.custom_adapters = [
       # keep-sorted start block=yes newline_separated=yes
       # Extract plain text from DjVu files with a local wrapper.
diff --git a/modules/programs/tui/neovim/components/yazi.nix b/modules/programs/tui/neovim/components/yazi.nix
--- a/modules/programs/tui/neovim/components/yazi.nix
+++ b/modules/programs/tui/neovim/components/yazi.nix
@@ -1,6 +1,11 @@
 {self, ...}: {
   flake.modules.homeManager.neovim = {config, ...}: {
-    imports = [self.modules.homeManager.yazi];
+    imports = [
+      {
+        key = "homeManager-yazi";
+        imports = [self.modules.homeManager.yazi];
+      }
+    ];
 
     programs.nvf.settings.vim.utility.yazi-nvim = {
       enable = true;

--
tangled.sh