diff --git a/example/configuration.nix b/example/configuration.nix index 317d3b7a..5d962143 100644 --- a/example/configuration.nix +++ b/example/configuration.nix @@ -1,8 +1,8 @@ { nix-config, pkgs, lib, ... }: let - inherit (builtins) attrValues; inherit (lib) singleton; + inherit (builtins) attrValues; in { imports = attrValues { diff --git a/home/ironbar.nix b/home/ironbar.nix index fcdcd0a0..7245426a 100644 --- a/home/ironbar.nix +++ b/home/ironbar.nix @@ -1,10 +1,10 @@ { config, lib, pkgs, ... }: let - inherit (builtins) toJSON; inherit (lib) singleton; inherit (config.lib.stylix.colors) base00 base01 base04 base05 base09; inherit (pkgs) ironbar inotify-tools; + inherit (builtins) toJSON; mullvadScript = "ironbar/mullvad.fish"; mullvadNotification = "ironbar/mullvad-notification.fish"; diff --git a/modules/desktop.nix b/modules/desktop.nix index 4b6b82ca..4ff0fbd0 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -5,9 +5,9 @@ let inherit (lib.types) str float int; inherit (config.modules.system) username; inherit (cfg) bloat gnome plasma container theme opacity fontSize; - inherit (builtins) attrValues; inherit (nix-config.packages.${pkgs.system}) aleo-fonts; inherit (pkgs) phinger-cursors noto-fonts-cjk-sans maple-mono noto-fonts-emoji; + inherit (builtins) attrValues; cfg = config.modules.desktop; in diff --git a/modules/hardware.nix b/modules/hardware.nix index 252c32f4..8e6d1aca 100644 --- a/modules/hardware.nix +++ b/modules/hardware.nix @@ -1,11 +1,11 @@ { pkgs, config, lib, ... }: let - inherit (builtins) toJSON; inherit (lib) mkEnableOption mkIf getExe singleton; inherit (pkgs) piper interception-tools; inherit (pkgs.interception-tools-plugins) dual-function-keys; inherit (cfg) mouseSettings disableLaptopKeyboard lidIgnore powerIgnore keyboardBinds; + inherit (builtins) toJSON; dualFunctionKeysConfig = "dual-function-keys.yaml"; diff --git a/modules/shell.nix b/modules/shell.nix index 3114d172..048246e7 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -3,9 +3,9 @@ let inherit (pkgs) fish; inherit (lib) mkEnableOption mkIf mkMerge singleton; - inherit (builtins) attrValues; inherit (cfg) postgres; inherit (config.modules.system) username; + inherit (builtins) attrValues; cfg = config.modules.shell; in