diff --git a/home/firefox.nix b/home/firefox.nix index dc04b3f8..655b95f7 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -32,6 +32,16 @@ install_url = "https://addons.mozilla.org/firefox/downloads/latest/keepassxc-browser/latest.xpi"; installation_mode = "force_installed"; }; + + "sponsorBlocker@ajay.app" = { + install_url = "https://addons.mozilla.org/firefox/downloads/file/4292214/sponsorblock-5.6.xpi"; + installation_mode = "force_installed"; + }; + + "tridactyl.vim@cmcaine.co.uk" = { + install_url = "https://addons.mozilla.org/firefox/downloads/file/4261352/tridactyl_vim-1.24.1.xpi"; + installation_mode = "force_installed"; + }; }; }; diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 59a5506b..12e6f976 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -54,11 +54,9 @@ }; general = { - gaps_in = 5; - gaps_out = 5; + gaps_in = 10; + gaps_out = 15; border_size = 2; -# "col.active_border" = "rgba(5bcefaee) rgba(f5a9b8ee) 45deg"; -# "col.inactive_border" = "rgba(595959aa)"; layout = "dwindle"; @@ -66,7 +64,7 @@ }; decoration = { - rounding = 3; + rounding = 10; blur = { enabled = true; @@ -77,7 +75,6 @@ drop_shadow = true; shadow_range = 4; shadow_render_power = 3; -# "col.shadow" = "rgba(1a1a1aee)"; }; animations = { @@ -110,10 +107,10 @@ bind = [ "$mainMod, Q, exec, $terminal" "$mainMod, C, killactive," - "$mainMod, backspace, exit," + "$mainMod, backspace, exec, hyprlock," "$mainMod, E, exec, $fileManager" "$mainMod, O, togglefloating," - "$mainMod, R, exec, pkill wofi || wofi --show=drun" + "$mainMod, R, exec, rofi -show drun" "$mainMod, P, pseudo," "$mainMod, J, togglesplit," @@ -123,9 +120,9 @@ "$mainMod, M, togglespecialworkspace, chatgpt" "$mainMod, M, exec, [workspace special:chatgpt] pgrep firefox | xargs ps -fp | grep -- '-P ChatGPT --url chat.openai.com' || firefox -P ChatGPT --url chat.openai.com" - ", print, exec, grim -g \"$(slurp)\" - | wl-copy && wl-paste > ~/sync/Screenshots/$(date +'%s')_spectre-pad.png && notify-send Area Captured" - "CTRL, print, exec, grim - | wl-copy && wl-paste > ~/sync/Screenshots/$(date +'%s')_spectre-pad.png && notify-send Screen Captured" - + ", print, exec, hyprshot -m region -o /home/lilith/sync/screenshots -z" + "CTRL, print, exec, hyprshot -m output -o /home/lilith/sync/screenshots -z" + "$mainMod, left, movefocus, l" "$mainMod, right, movefocus, r" "$mainMod, up, movefocus, u" @@ -155,9 +152,6 @@ "$mainMod, S, togglespecialworkspace, magic" "$mainMod SHIFT, S, movetoworkspace, special:magic" - - "$mainMod, mouse_down, workspace, e+1" - "$mainMod, mouse_up, workspace, e-1" ]; bindm = [ diff --git a/home/hyprland/hyprpaper.nix b/home/hyprland/hyprpaper.nix index 51f4a57e..a54c164d 100644 --- a/home/hyprland/hyprpaper.nix +++ b/home/hyprland/hyprpaper.nix @@ -1,21 +1,21 @@ { conf, ... }: { home.file.".config/hypr/wallpaper.png" = { - source = ../../wallpapers/default.png; + source = ../../wallpapers/${conf.wallpaper}; }; services.hyprpaper = let - default = "/home/lilith/.config/hypr/wallpaper.png"; + default = "/home/lilith/.config/hypr/wallpaper.png"; in { enable = true; settings = { splash = false; - preload = [ "/home/lilith/.config/hypr/wallpaper.png" ]; + preload = [ default ]; wallpaper = [ - ",/home/lilith/.config/hypr/wallpaper.png" + ",${default}" ]; }; }; diff --git a/home/persist.nix b/home/persist.nix index 09476d41..1224b924 100644 --- a/home/persist.nix +++ b/home/persist.nix @@ -27,6 +27,7 @@ directories = [ ".cache/nix" ".cache/spotify" + ".cache/keepassxc" ".cargo" ".local/state/wireplumber" "tmp" diff --git a/wallpapers/default.png b/wallpapers/default.png index b2e9ad01..2a9aea2c 100644 Binary files a/wallpapers/default.png and b/wallpapers/default.png differ