Use my FlakeTools and rearrange specialArgs

flake.lock

@@ -125,8 +125,7 @@
         "fenix": "fenix",
         "homeManager": "homeManager",
         "hyprland": "hyprland",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_2"
-        "utils": "utils"
       }
     },
     "rust-analyzer-src": {
@@ -161,39 +160,6 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "wlroots": {
       "flake": false,
       "locked": {

flake.nix

@@ -23,8 +23,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    utils = {
+    tools = {
-      url = "github:numtide/flake-utils";
+      url                    = "github:RGBCube/FlakeTools";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     fenix = {
@@ -37,12 +38,22 @@
     };
   };
 
-  outputs = { nixpkgs, homeManager, utils, fenix, ... } @ inputs: utils.lib.eachDefaultSystem (system: let
+  outputs = { nixpkgs, homeManager, tools, fenix, ... } @ inputs: tools.eachDefaultArch (system: let
+    upkgs = {
+      theme = import ./themes/gruvbox.nix;
+
+      hyprland = inputs.hyprland.packages.${system}.default;
+    };
+
     lib = nixpkgs.lib;
 
-    ulib = rec {
+    ulib = {
-      recursiveUpdate3 = x: y: z: lib.recursiveUpdate x (lib.recursiveUpdate y z);
+      inherit (tools) recursiveUpdateMap;
 
+      recursiveUpdate3 = x: y: z: lib.recursiveUpdate x (lib.recursiveUpdate y z);
+    };
+
+    abstractions = rec {
       importAll = paths: {
         imports = paths;
       };
@@ -76,10 +87,6 @@
       };
     };
 
-    theme = import ./themes/gruvbox.nix;
-
-    hyprland = inputs.hyprland.packages.${system}.default;
-
     defaultConfiguration = host: ulib.systemConfiguration {
       nix.gc = {
           automatic  = true;
@@ -110,8 +117,8 @@
       home-manager.useUserPackages = true;
     };
 
-    specialArgs = ulib // {
+    specialArgs = abstractions // {
-      inherit theme hyprland;
+      inherit upkgs ulib;
     };
 
     importConfiguration = host: lib.nixosSystem {

machines/enka/default.nix

@@ -1,4 +1,4 @@
-{ recursiveUpdate3, systemConfiguration, homeConfiguration, importAll, ... }: recursiveUpdate3
+{ ulib, systemConfiguration, homeConfiguration, importAll, ... }: ulib.recursiveUpdate3
 
 (systemConfiguration {
   boot.loader = {

machines/enka/dunst/default.nix

@@ -1,7 +1,9 @@
-{ pkgs, theme, homeConfiguration, enabled, ... }:
+{ pkgs, upkgs, homeConfiguration, enabled, ... }:
 
 homeConfiguration "nixos" {
-  services.dunst = enabled {
+  services.dunst = let
+    inherit (upkgs) theme;
+  in enabled {
     iconTheme = {
       name    = "Gruvbox-Dark";
       package = pkgs.gruvbox-dark-icons-gtk;

machines/enka/fuzzel/default.nix

@@ -1,4 +1,4 @@
-{ theme, homeConfiguration, enabled, ... }:
+{ upkgs, homeConfiguration, enabled, ... }:
 
 homeConfiguration "nixos" {
   programs.fuzzel = enabled {
@@ -16,7 +16,9 @@ homeConfiguration "nixos" {
       inner-pad      = 10;
     };
 
-    settings.colors = {
+    settings.colors = let
+      inherit (upkgs) theme;
+    in {
       background     = theme.background      + theme.transparency;
       text           = theme.foreground      + theme.transparency;
       match          = theme.activeHighlight + theme.transparency;

machines/enka/hyprland/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, recursiveUpdate3, hyprland, theme, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: recursiveUpdate3
+{ pkgs, upkgs, ulib, theme, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: ulib.recursiveUpdate3
 
 (systemConfiguration {
   hardware.opengl = enabled {};
@@ -12,9 +12,11 @@
 
 (homeConfiguration "nixos" {
   wayland.windowManager.hyprland = enabled {
-    package = hyprland;
+    package = upkgs.hyprland;
 
-    extraConfig =
+    extraConfig = let
+      inherit (upkgs) theme;
+    in
     ''
       monitor = , preferred, auto, 1
     ''

machines/enka/kitty/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, theme, homeConfiguration, enabled, ... }:
+{ pkgs, upkgs, homeConfiguration, enabled, ... }:
 
 homeConfiguration "nixos" {
   programs.kitty = enabled {
@@ -12,7 +12,9 @@ homeConfiguration "nixos" {
 
     theme = "Gruvbox Dark";
 
-    settings = {
+    settings = let
+      inherit (upkgs) theme;
+    in {
       allow_remote_control    = true;
       confirm_os_window_close = 0;
       focus_follows_mouse     = true;

machines/enka/nushell/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, recursiveUpdate3, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: recursiveUpdate3
+{ pkgs, ulib, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: ulib.recursiveUpdate3
 
 (systemConfiguration {
   users.defaultUserShell = pkgs.nushell;