diff --git a/modules/desktop/hyprland/appearance.nix b/modules/desktop/hyprland/appearance.nix index bc5e2a5..ab55548 100644 --- a/modules/desktop/hyprland/appearance.nix +++ b/modules/desktop/hyprland/appearance.nix @@ -1,5 +1,7 @@ -{ - flake.modules.homeManager.hyprland = { +{inputs, ...}: { + flake.modules.homeManager.hyprland = {lib, ...}: let + inherit ((import "${inputs.hyprland}/nix/lib.nix" lib)) toHyprlang; + in { programs.nixhypr = { settings = { # Window decoration options including blur and shadow. @@ -241,8 +243,8 @@ }; # Style hints for applications that read hypr conf snippets. - xdg.configFile."hypr/application-style.conf".text = '' - roundness=0 - ''; + xdg.configFile."hypr/application-style.conf".text = toHyprlang {} { + roundness = 0; + }; }; } diff --git a/modules/desktop/hyprland/cursor.nix b/modules/desktop/hyprland/cursor.nix index 47dce5f..481b690 100644 --- a/modules/desktop/hyprland/cursor.nix +++ b/modules/desktop/hyprland/cursor.nix @@ -1,11 +1,11 @@ {self, ...}: { flake.modules.homeManager.hyprland = { # keep-sorted start - config, lib, - pkgs, ... + pkgs, # keep-sorted end + ... }: let inherit (lib) mkForce; in { diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix index f1ad776..31f3580 100644 --- a/modules/desktop/hyprland/default.nix +++ b/modules/desktop/hyprland/default.nix @@ -16,10 +16,10 @@ flake.modules.nixos.hyprland = { # keep-sorted start - inputs, - pkgs, ... + pkgs, # keep-sorted end + ... }: let inherit (pkgs.stdenv.hostPlatform) system; @@ -44,9 +44,11 @@ }; flake.modules.homeManager.hyprland = { + # keep-sorted start config, inputs, lib, + # keep-sorted end ... }: let inherit diff --git a/modules/desktop/hyprland/gestures.nix b/modules/desktop/hyprland/gestures.nix index 4d796ca..9a24a76 100644 --- a/modules/desktop/hyprland/gestures.nix +++ b/modules/desktop/hyprland/gestures.nix @@ -1,10 +1,10 @@ { flake.modules.homeManager.hyprland = { # keep-sorted start - config, - lib, ... + lib, # keep-sorted end + ... }: let inherit (lib) diff --git a/modules/desktop/hyprland/plugins.nix b/modules/desktop/hyprland/plugins.nix index a9a1c11..9293e18 100644 --- a/modules/desktop/hyprland/plugins.nix +++ b/modules/desktop/hyprland/plugins.nix @@ -1,9 +1,9 @@ { # keep-sorted start - inputs, - self, ... + self, # keep-sorted end + ... }: { flake-file.inputs = { hyprland-plugins = { diff --git a/modules/desktop/hyprland/rules.nix b/modules/desktop/hyprland/rules.nix index 15da286..fcf0e90 100644 --- a/modules/desktop/hyprland/rules.nix +++ b/modules/desktop/hyprland/rules.nix @@ -1,13 +1,13 @@ { flake.modules.homeManager.hyprland = { # keep-sorted start - config, inputs, lib, osConfig, - pkgs, ... + pkgs, # keep-sorted end + ... }: let inherit (lib) diff --git a/modules/desktop/tuigreet.nix b/modules/desktop/tuigreet.nix index b6fe27a..a75451c 100644 --- a/modules/desktop/tuigreet.nix +++ b/modules/desktop/tuigreet.nix @@ -1,6 +1,8 @@ { + # keep-sorted start inputs, self, + # keep-sorted end ... }: { flake-file.inputs.tuigreet = { diff --git a/modules/nix/home-manager.nix b/modules/nix/home-manager.nix index 4615f87..5ebee06 100644 --- a/modules/nix/home-manager.nix +++ b/modules/nix/home-manager.nix @@ -9,8 +9,10 @@ imports = [inputs.home-manager.flakeModules.home-manager]; flake.modules.nixos.home-manager = { + # keep-sorted start config, vars, + # keep-sorted end ... }: let inherit (vars) username; diff --git a/modules/nix/kernel.nix b/modules/nix/kernel.nix index 220801b..942926f 100644 --- a/modules/nix/kernel.nix +++ b/modules/nix/kernel.nix @@ -1,6 +1,8 @@ { + # keep-sorted start inputs, self, + # keep-sorted end ... }: { flake-file.inputs.nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel?ref=release"; diff --git a/modules/nix/lanzaboote.nix b/modules/nix/lanzaboote.nix index e96b843..2215d7c 100644 --- a/modules/nix/lanzaboote.nix +++ b/modules/nix/lanzaboote.nix @@ -6,11 +6,11 @@ flake.modules.nixos.lanzaboote = { # keep-sorted start - inputs, lib, - pkgs, ... + pkgs, # keep-sorted end + ... }: let inherit (builtins) attrValues; inherit (lib) mkForce; diff --git a/modules/nix/lib.nix b/modules/nix/lib.nix index d77d705..cfdebdd 100644 --- a/modules/nix/lib.nix +++ b/modules/nix/lib.nix @@ -1,6 +1,8 @@ { + # keep-sorted start inputs, self, + # keep-sorted end ... }: let lib = inputs.nixpkgs.lib.extend (_final: prev: { diff --git a/modules/nix/nur.nix b/modules/nix/nur.nix index de2ef2d..e26df5d 100644 --- a/modules/nix/nur.nix +++ b/modules/nix/nur.nix @@ -6,6 +6,7 @@ nixpkgs.follows = "nixpkgs"; }; }; + flake.modules.nixos.nur = { imports = [inputs.nur.modules.nixos.default]; }; diff --git a/modules/nix/sops.nix b/modules/nix/sops.nix index fd47bd5..c1a4b5d 100644 --- a/modules/nix/sops.nix +++ b/modules/nix/sops.nix @@ -1,6 +1,8 @@ { + # keep-sorted start inputs, self, + # keep-sorted end ... }: let sopsConfig = { diff --git a/modules/profiles/stylix/personal.nix b/modules/profiles/stylix/personal.nix index fe2ed87..98bafa8 100644 --- a/modules/profiles/stylix/personal.nix +++ b/modules/profiles/stylix/personal.nix @@ -1,6 +1,8 @@ { + # keep-sorted start lib, self, + # keep-sorted end ... }: let inherit (lib.self) stylixDisabledTargets; diff --git a/modules/programs/cli/fish/aliases.nix b/modules/programs/cli/fish/aliases.nix index 7054c4b..b60a3df 100644 --- a/modules/programs/cli/fish/aliases.nix +++ b/modules/programs/cli/fish/aliases.nix @@ -1,10 +1,10 @@ { flake.modules.homeManager.fish = { # keep-sorted start - lib, - pkgs, ... + pkgs, # keep-sorted end + ... }: let inherit (lib) getExe'; in { diff --git a/modules/programs/cli/fish/default.nix b/modules/programs/cli/fish/default.nix index b20fa22..21b1fe2 100644 --- a/modules/programs/cli/fish/default.nix +++ b/modules/programs/cli/fish/default.nix @@ -1,8 +1,10 @@ { flake.modules.homeManager.fish = { + # keep-sorted start config, lib, pkgs, + # keep-sorted end ... }: let inherit diff --git a/modules/programs/cli/fish/greeting.nix b/modules/programs/cli/fish/greeting.nix index 86e1475..a608571 100644 --- a/modules/programs/cli/fish/greeting.nix +++ b/modules/programs/cli/fish/greeting.nix @@ -1,10 +1,10 @@ { flake.modules.homeManager.fish = { # keep-sorted start - lib, - pkgs, ... + pkgs, # keep-sorted end + ... }: let inherit (lib) getExe; diff --git a/modules/programs/cli/rumdl.nix b/modules/programs/cli/rumdl.nix index c1a4189..a905b1a 100644 --- a/modules/programs/cli/rumdl.nix +++ b/modules/programs/cli/rumdl.nix @@ -1,7 +1,9 @@ { flake.modules.homeManager.rumdl = { + # keep-sorted start config, pkgs, + # keep-sorted end ... }: let tomlFormat = pkgs.formats.toml {}; diff --git a/modules/programs/git.nix b/modules/programs/git.nix index f0e3acd..4ca593f 100644 --- a/modules/programs/git.nix +++ b/modules/programs/git.nix @@ -2,8 +2,8 @@ # keep-sorted start lib, self, - ... # keep-sorted end + ... }: { flake.modules.homeManager.git = { # keep-sorted start diff --git a/modules/programs/gui/discord/default.nix b/modules/programs/gui/discord/default.nix index ab9621a..aa6df76 100644 --- a/modules/programs/gui/discord/default.nix +++ b/modules/programs/gui/discord/default.nix @@ -1,6 +1,8 @@ { + # keep-sorted start inputs, self, + # keep-sorted end ... }: { flake-file.inputs.nixcord = { diff --git a/modules/programs/gui/ghostty/default.nix b/modules/programs/gui/ghostty/default.nix index f6fd8cf..99eb269 100644 --- a/modules/programs/gui/ghostty/default.nix +++ b/modules/programs/gui/ghostty/default.nix @@ -5,9 +5,11 @@ }; flake.modules.homeManager.ghostty = { + # keep-sorted start config, lib, pkgs, + # keep-sorted end ... }: let inherit (lib) getExe; diff --git a/modules/programs/gui/spotify/default.nix b/modules/programs/gui/spotify/default.nix index 6eb9884..a990af5 100644 --- a/modules/programs/gui/spotify/default.nix +++ b/modules/programs/gui/spotify/default.nix @@ -1,6 +1,8 @@ { + # keep-sorted start inputs, self, + # keep-sorted end ... }: { flake-file.inputs.spicetify-nix = { diff --git a/modules/programs/gui/spotify/theme.nix b/modules/programs/gui/spotify/theme.nix index 86daee7..9fe0ca2 100644 --- a/modules/programs/gui/spotify/theme.nix +++ b/modules/programs/gui/spotify/theme.nix @@ -1,11 +1,15 @@ { + # keep-sorted start inputs, self, + # keep-sorted end ... }: { flake.modules.homeManager.spotify = { + # keep-sorted start config, pkgs, + # keep-sorted end ... }: let inherit (config.lib.stylix) colors; diff --git a/modules/programs/gui/steam.nix b/modules/programs/gui/steam.nix index 79600e4..bcd295d 100644 --- a/modules/programs/gui/steam.nix +++ b/modules/programs/gui/steam.nix @@ -1,6 +1,8 @@ { + # keep-sorted start inputs, self, + # keep-sorted end ... }: { flake-file.inputs.millennium = { diff --git a/modules/programs/gui/zen/default.nix b/modules/programs/gui/zen/default.nix index 087c469..78d6b39 100644 --- a/modules/programs/gui/zen/default.nix +++ b/modules/programs/gui/zen/default.nix @@ -1,6 +1,8 @@ { + # keep-sorted start inputs, self, + # keep-sorted end ... }: { flake-file.inputs = { diff --git a/modules/programs/tui/neovim/default.nix b/modules/programs/tui/neovim/default.nix index 96fe661..303c343 100644 --- a/modules/programs/tui/neovim/default.nix +++ b/modules/programs/tui/neovim/default.nix @@ -1,6 +1,8 @@ { + # keep-sorted start inputs, self, + # keep-sorted end ... }: { flake-file.inputs = { @@ -24,8 +26,10 @@ }; flake.modules.homeManager.neovim = { + # keep-sorted start config, lib, + # keep-sorted end ... }: let inherit diff --git a/modules/programs/tui/television/channels/zoxide.nix b/modules/programs/tui/television/channels/zoxide.nix index 33b47b8..0519c48 100644 --- a/modules/programs/tui/television/channels/zoxide.nix +++ b/modules/programs/tui/television/channels/zoxide.nix @@ -1,7 +1,9 @@ { flake.modules.homeManager.television = { + # keep-sorted start config, lib, + # keep-sorted end ... }: let inherit diff --git a/modules/programs/tui/television/nix-search.nix b/modules/programs/tui/television/nix-search.nix index cb27bf1..fda1c18 100644 --- a/modules/programs/tui/television/nix-search.nix +++ b/modules/programs/tui/television/nix-search.nix @@ -6,8 +6,10 @@ ... }: { flake.modules.homeManager.television = { + # keep-sorted start osConfig, pkgs, + # keep-sorted end ... }: let inherit (builtins) toJSON; diff --git a/modules/users.nix b/modules/users.nix index 3e3fa8d..282d066 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -1,11 +1,11 @@ {self, ...}: { flake.modules.nixos.users = { # keep-sorted start - config, pkgs, - vars, ... + vars, # keep-sorted end + ... }: let inherit (vars)