From 5596cdc23a720dd62540034422f80bbae44a9fcf Mon Sep 17 00:00:00 2001 From: Peritia Date: Mon, 2 Mar 2026 15:48:09 +0100 Subject: [PATCH] Chore: alejandra --- .../homeManager/hyprland/keybindings.nix | 3 +- nixosVista/homeManager/hyprlock/default.nix | 1 - nixosVista/homeManager/hyprlock/main.nix | 16 ++++---- nixosVista/options.nix | 37 ++++++++----------- nixosVista/systemWide/font.nix | 13 +++---- 5 files changed, 30 insertions(+), 40 deletions(-) diff --git a/nixosVista/homeManager/hyprland/keybindings.nix b/nixosVista/homeManager/hyprland/keybindings.nix index 8908867..5c8a10d 100644 --- a/nixosVista/homeManager/hyprland/keybindings.nix +++ b/nixosVista/homeManager/hyprland/keybindings.nix @@ -43,10 +43,9 @@ # Launcher "bind = $mainMod, D, exec, $menu" - # lock + # lock "bind = $mainMod, L, exec, hyprlock" - # Workspaces "bind = $mainMod, 1, workspace, 1" "bind = $mainMod, 2, workspace, 2" diff --git a/nixosVista/homeManager/hyprlock/default.nix b/nixosVista/homeManager/hyprlock/default.nix index b51043f..9ae1a03 100644 --- a/nixosVista/homeManager/hyprlock/default.nix +++ b/nixosVista/homeManager/hyprlock/default.nix @@ -2,6 +2,5 @@ imports = [ # Main entry: ./main.nix - ]; } diff --git a/nixosVista/homeManager/hyprlock/main.nix b/nixosVista/homeManager/hyprlock/main.nix index 5af1109..089f3ad 100644 --- a/nixosVista/homeManager/hyprlock/main.nix +++ b/nixosVista/homeManager/hyprlock/main.nix @@ -1,11 +1,14 @@ -{ config, lib, nixosVista, ... }: - -let +{ + config, + lib, + nixosVista, + ... +}: let root = nixosVista; cfg = root.hyprlock; hyprlockConfig = '' - + general = { disable_loading_bar = true; grace = 0; @@ -82,12 +85,11 @@ let } ]; ''; -in -{ +in { config = lib.mkIf cfg.enable { programs.hyprlock = { enable = true; extraConfig = hyprlockConfig + "\n" + cfg.extraConfig; }; }; -} \ No newline at end of file +} diff --git a/nixosVista/options.nix b/nixosVista/options.nix index 453f53e..8618f4c 100644 --- a/nixosVista/options.nix +++ b/nixosVista/options.nix @@ -254,30 +254,23 @@ with lib; { }; }; + ############################################################ + # Lock screen (Hyprlock) + ############################################################ + hyprlock = { + enable = mkEnableOption "Enable Hyprlock lock screen"; - - - - -############################################################ -# Lock screen (Hyprlock) -############################################################ - -hyprlock = { - enable = mkEnableOption "Enable Hyprlock lock screen"; - - # Future-proof: allow raw config injection - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Extra Hyprlock configuration appended to the generated config. - Useful for custom labels, blur tweaks, etc. - ''; - }; -}; - + # Future-proof: allow raw config injection + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra Hyprlock configuration appended to the generated config. + Useful for custom labels, blur tweaks, etc. + ''; + }; + }; waybar = { enable = mkOption { diff --git a/nixosVista/systemWide/font.nix b/nixosVista/systemWide/font.nix index 68acbdc..d7b7f39 100644 --- a/nixosVista/systemWide/font.nix +++ b/nixosVista/systemWide/font.nix @@ -3,12 +3,9 @@ lib, pkgs, ... -}: - { - -fonts.packages = with pkgs; [ - nerd-fonts.jetbrains-mono - noto-fonts -]; - +}: { + fonts.packages = with pkgs; [ + nerd-fonts.jetbrains-mono + noto-fonts + ]; }