From ad106c6185ea2ee45b7b31be44692164b730e8ee Mon Sep 17 00:00:00 2001 From: scouckel Date: Tue, 2 Dec 2025 04:17:56 -0600 Subject: hyprlock changes, symbols in waybar, update --- flake.lock | 42 +++++++++++++-------------- modules/home-manager/hypr/hyprlock.nix | 8 ++--- modules/home-manager/hypr/waybar-hyprland.nix | 21 ++++++++++++++ 3 files changed, 46 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 0ad8198..390a60a 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1764351487, - "narHash": "sha256-7XJcTfz0dPhBd7nfyjcFxT1LIIctJZ2LthiI2Ltd7zY=", + "lastModified": 1764596563, + "narHash": "sha256-tH3AGDWlAN3ImVuBBCLmqaqD0EbkISiPCHGeMcd430k=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "2031f4a0507d0f7ab3e1aaff4c027a010feee447", + "rev": "0701ee838b0fb34a77b6dd4b35476b4bb09fbca9", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1764544324, - "narHash": "sha256-GVBGjO7UsmzLrlOJV8NlKSxukHaHencrJqWkCA6FkqI=", + "lastModified": 1764636297, + "narHash": "sha256-S41K55kw+hWgDfgKmZ9/fMZ3F0BQDMvqFfE120fMHeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4e25a8c310fa45f2a8339c7972dc43d2845a612", + "rev": "ff067cfc619fdf6f82d50344e7d19ff2323f0827", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -325,11 +325,11 @@ ] }, "locked": { - "lastModified": 1764572521, - "narHash": "sha256-+6Dm1GeDeaYcByk/OqybAT0N6gnvzVwYXA1PY/iZxQA=", + "lastModified": 1764661329, + "narHash": "sha256-X0OBhP+ii/AWcGmCxhNLdOD61AA+x7oM5XvNYEAfv4k=", "owner": "nix-community", "repo": "NUR", - "rev": "04a42e80d67f798f30ff4e904bec42965e53e4d4", + "rev": "6acac2b8cee8b1b866c918688457c1f530be9361", "type": "github" }, "original": { @@ -404,11 +404,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1763985453, - "narHash": "sha256-vUqODgLIjeyHN7DP8dVx7oH9yB/L8qcxpN//4EmMQcM=", + "lastModified": 1764646743, + "narHash": "sha256-/5yRp+FegTtzImqQhZQActnGD0NtKPOPJ6dXTQxGIq8=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "89cd40c646ec5b12e5c20c0e18f082e7629d4819", + "rev": "e33278c5f9a18180c88e0aee037f99d2d6ce069c", "type": "github" }, "original": { @@ -455,11 +455,11 @@ ] }, "locked": { - "lastModified": 1764534155, - "narHash": "sha256-HQyLJT0ikblWDR/8pzDJ7WYEZoFzkUrgwZk/f+JULBI=", + "lastModified": 1764598958, + "narHash": "sha256-sJQHRL8trBoG/ArR+mUlyp5cyKU0pgQY+qDQzZGnVgM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "fb066e133e614c024a470608ff56585c4f707b44", + "rev": "8cded25e10b13e2999241f1c73a7d4e5e5d6f69e", "type": "github" }, "original": { diff --git a/modules/home-manager/hypr/hyprlock.nix b/modules/home-manager/hypr/hyprlock.nix index dfaee43..675773a 100644 --- a/modules/home-manager/hypr/hyprlock.nix +++ b/modules/home-manager/hypr/hyprlock.nix @@ -7,7 +7,7 @@ settings = { general = { - disable_loading_bar = true; + disable_loading_bar = false; hide_cursor = false; no_fade_in = true; }; @@ -16,7 +16,7 @@ { path = "screenshot"; # path = ~/.config/hypr/wallpaper_effects/.wallpaper_current; - blur_passes = 4; + blur_passes = 5; blur_size = 7; } ]; @@ -25,13 +25,13 @@ { size = "200, 50"; position = "0, 0"; - fade_on_empty = false; + fade_on_empty = true; font_color = "rgb(212, 190, 152)"; inner_color = "rgb(29, 32, 33)"; outer_color = "rgb(125, 174, 163)"; outline_thickness = 2; rounding = 0; - placeholder_text = "🔒🔒🔒"; + placeholder_text = ""; } ]; diff --git a/modules/home-manager/hypr/waybar-hyprland.nix b/modules/home-manager/hypr/waybar-hyprland.nix index bd0196b..3969f7d 100644 --- a/modules/home-manager/hypr/waybar-hyprland.nix +++ b/modules/home-manager/hypr/waybar-hyprland.nix @@ -14,9 +14,30 @@ modules-center = [ "hyprland/window" ]; modules-right = [ "pulseaudio" "battery" "clock" ]; + "battery" = { + "bat" = "BAT2"; + "interval" = 60; + "states" = { + "warning" = 30; + "critical" = 15; + }; + "format" = "{capacity}% {icon}"; + "format-icons" = ["" "" "" "" ""]; + "max-length" = 25; + }; + "hyprland/window" = { on-click = "rofi -show window"; }; + + "pulseaudio" = { + format = "{volume}% {icon}"; + format-bluetooth = "{volume}% {icon}"; + format-muted = ""; + format-icons = { + default = ["" ""]; + }; + }; }; }; -- cgit v1.3