diff --git a/nixosVista/homeManager/hyprlock/main.nix b/nixosVista/homeManager/hyprlock/main.nix index 460851e..232f182 100644 --- a/nixosVista/homeManager/hyprlock/main.nix +++ b/nixosVista/homeManager/hyprlock/main.nix @@ -7,11 +7,24 @@ root = nixosVista; cfg = root.hyprlock; - hyprlockConfig = '' + +in { + config = lib.mkIf cfg.enable { + + + + # warnings = [">>> HYPRLOCK ACTIVE <<<"]; + + +programs.hyprlock = { + enable = true; + + settings = { general = { - disable_loading_bar = true; - grace = 0; + # does not exsist: + # disable_loading_bar = true; + # grace = 0; hide_cursor = true; }; @@ -84,18 +97,10 @@ valign = "center"; } ]; - ''; -in { - config = lib.mkIf cfg.enable { + }; +}; - # warnings = [">>> HYPRLOCK ACTIVE <<<"]; - - - programs.hyprlock = { - enable = true; - extraConfig = hyprlockConfig + "\n" + cfg.extraConfig; - }; }; } diff --git a/nixosVista/systemWide/font.nix b/nixosVista/systemWide/font.nix index d989937..f6d87a6 100644 --- a/nixosVista/systemWide/font.nix +++ b/nixosVista/systemWide/font.nix @@ -7,7 +7,7 @@ cfg = config.nixosVista; in { config = lib.mkIf cfg.enable { -# warnings = [">>> fonts ACTIVE <<<"]; + # warnings = [">>> fonts ACTIVE <<<"]; fonts.packages = with pkgs; [ nerd-fonts.jetbrains-mono diff --git a/showcaseVM/nixosVista.nix b/showcaseVM/nixosVista.nix index 5bc421c..db03c79 100644 --- a/showcaseVM/nixosVista.nix +++ b/showcaseVM/nixosVista.nix @@ -85,9 +85,6 @@ preset = "default"; extra = [ # "bind = SUPER, RETURN, exec, kitty" - - - ]; }; @@ -101,29 +98,27 @@ ]; }; -windowRules = { - preset = "default"; + windowRules = { + preset = "default"; - extra = [ - # Firefox Picture in Picture rules - "windowrule = float 1, match:class ^(librewolf)$, match:title ^(Picture-in-Picture)$" - "windowrule = size 800 450, match:class ^(librewolf)$, match:title ^(Picture-in-Picture)$" - "windowrule = pin 1, match:class ^(librewolf)$, match:title ^(Picture-in-Picture)$" - # "windowrule = nofullscreen 1, match:class ^(librewolf)$, match:title ^(Picture-in-Picture)$" - ]; -}; - -customBottom = '' - input { - kb_layout = de,us - kb_options = grp:alt_shift_toggle - } -''; + extra = [ + # Firefox Picture in Picture rules + "windowrule = float 1, match:class ^(librewolf)$, match:title ^(Picture-in-Picture)$" + "windowrule = size 800 450, match:class ^(librewolf)$, match:title ^(Picture-in-Picture)$" + "windowrule = pin 1, match:class ^(librewolf)$, match:title ^(Picture-in-Picture)$" + # "windowrule = nofullscreen 1, match:class ^(librewolf)$, match:title ^(Picture-in-Picture)$" + ]; + }; + customBottom = '' + input { + kb_layout = de,us + kb_options = grp:alt_shift_toggle + } + ''; }; - -hyprlock.enable = true; + hyprlock.enable = true; ########################################################## # Waybar