diff --git a/secrets.yaml b/secrets.yaml --- a/secrets.yaml +++ b/secrets.yaml @@ -124,8 +124,8 @@ w2ToACYVigKMSlqPNG9bKcK75XI/iAONG48DQm1Nse3yB9/q3jwd+Q== -----END AGE ENCRYPTED FILE----- recipient: age1yl52c6aemw9anmfuqayamvsnkvlu6fmy0kk3gzvrraexxd9pr90qvs8pe5 - lastmodified: "2026-07-10T22:51:04Z" - mac: ENC[AES256_GCM,data:5cSuovN76A7i6NORN2zd4oJq30tvbtz0PeFWdyotNEJOKweTtGqN4OJMdFwVgIJGXu57yc7FOGs3cym6l+DVa6h/V/fXEYZaBLHTBt9OYieAsfZJmj8uG1uT8KVy5cu2yORCwprS0T4kUpfYI17iKSsz805BPTdamHnRF2izMis=,iv:jdGJu1wl+TaToyj+XyfHg7Fb7VtNBMtdYF3ll9AYNn8=,tag:oe+73I+hD0hVaRTwFZ9kIQ==,type:str] + lastmodified: "2026-07-15T23:16:37Z" + mac: ENC[AES256_GCM,data:VedEHG6Ij27zRV/dqOZd36SRxnAIDA4re6b901Q9Ucna1nYv0ODCghoSLHgX1dXDw+TkZ9DGqJgjGlaSnNbzvYN/88vRottr9iX+Y+80zlW6M2mbVh2pUmhYk1kugYRA9YnvCwlnoSaRYthCSZah9cSH0Al9F+bnvafob4lAfGw=,iv:qDXeoJNGh7kK4RKjSi/IDLfKGrFVzhLYPeEyZ8unVow=,tag:qeaGivNWVguXBfnDEO+S9A==,type:str] pgp: - created_at: "2026-06-02T01:50:38Z" enc: |- diff --git a/modules/desktop/hyprland/plugins.nix b/modules/desktop/hyprland/plugins.nix --- a/modules/desktop/hyprland/plugins.nix +++ b/modules/desktop/hyprland/plugins.nix @@ -13,13 +13,40 @@ # keep-sorted end ... }: let - inherit (builtins) concatStringsSep; - inherit (lib) mkOrder; - in { - wayland.windowManager.hyprland.plugins = with pkgs; [ + inherit + (lib) # keep-sorted start - hyprlandPlugins.hyprfocus - nur.repos.adam0.hyprlandPlugins.hypr-kinetic-scroll + concatMapStringsSep + mkOrder + # keep-sorted end + ; + + kineticScroll = pkgs.nur.repos.adam0.hyprlandPlugins.hypr-kinetic-scroll; + kineticScrollDisabledClasses = [ + # keep-sorted start + "Beeper" + "Bitwarden" + "com.github.tchx84.Flatseal" + "equibop" + "gimp" + "io.github.dp0sk.Crosspipe" + "org.bleachbit.BleachBit" + "org.gnome.Decibels" + "org.gnome.Loupe" + "org.gnome.Showtime" + "org.gnome.seahorse.Application" + "org.pwmt.zathura" + "proton.vpn.app.gtk" + "steam" + "zen-beta" + # keep-sorted end + ]; + kineticScrollDisableRules = concatMapStringsSep "\n" (class: " hl.plugin.kinetic_scroll.disable(\"${class}\")") kineticScrollDisabledClasses; + in { + wayland.windowManager.hyprland.plugins = [ + # keep-sorted start + pkgs.hyprlandPlugins.hyprfocus + kineticScroll # keep-sorted end ]; @@ -28,6 +55,8 @@ -- Expose hyprsplit for keybind dispatchers. hyprsplit = dofile("${pkgs.nur.repos.adam0.hyprsplit}/init.lua") hyprsplit.config({ num_workspaces = 8 }) + + ${kineticScrollDisableRules} ''; settings.plugin.hyprfocus = { @@ -37,27 +66,6 @@ shrink_percentage = 0.995; # keep-sorted end }; - - settings.plugin.kinetic-scroll.disabled_classes = concatStringsSep ", " [ - # keep-sorted start - ".protonvpn-app-wrapped" - "BeeperTexts" - "bitwarden" - "bleachbit" - "com.github.tchx84.Flatseal" - "equibop" - "gimp" - "io.github.dp0sk.Crosspipe" - "org.gnome.Decibels" - "org.gnome.Loupe" - "org.gnome.Showtime" - "org.gnome.seahorse.Application" - "org.pwmt.zathura" - "steam" - "zen" - "zen-beta" - # keep-sorted end - ]; }; }; diff --git a/modules/desktop/hyprland/rules.nix b/modules/desktop/hyprland/rules.nix --- a/modules/desktop/hyprland/rules.nix +++ b/modules/desktop/hyprland/rules.nix @@ -23,6 +23,7 @@ grim = getExe pkgs.grim; hyprctl = getExe' osConfig.programs.hyprland.package "hyprctl"; hyprpicker = getExe pkgs.hyprpicker; + kineticScroll = "${pkgs.nur.repos.adam0.hyprlandPlugins.hypr-kinetic-scroll}/lib/libhypr-kinetic-scroll.so"; noctalia-qs = getExe' inputs.noctalia-qs.packages.${pkgs.stdenv.hostPlatform.system}.quickshell ".quickshell-wrapped"; overzicht = getExe' config.programs.quickshell.package ".quickshell-wrapped"; xdg-desktop-portal-hyprland = getExe' osConfig.programs.hyprland.portalPackage ".xdg-desktop-portal-hyprland-wrapped"; @@ -30,8 +31,10 @@ in { programs.hylix = { permissions = [ + # Plugnis. + # keep-sorted start block=yes newline_separated=yes { - binary = escapeRegex hyprctl; + binary = escapeRegex kineticScroll; mode = "allow"; type = "plugin"; } @@ -42,6 +45,14 @@ type = "plugin"; } + { + binary = escapeRegex hyprctl; + mode = "allow"; + type = "plugin"; + } + # keep-sorted end + + # Screenscopy. # keep-sorted start block=yes newline_separated=yes { binary = escapeRegex equibop; @@ -223,7 +234,7 @@ { match = { # keep-sorted start - class = "zen(-beta)?"; + class = "zen-beta"; title = "Bitwarden"; # keep-sorted end }; diff --git a/modules/programs/tui/neovim/components/autocomplete.nix b/modules/programs/tui/neovim/components/autocomplete.nix --- a/modules/programs/tui/neovim/components/autocomplete.nix +++ b/modules/programs/tui/neovim/components/autocomplete.nix @@ -9,9 +9,9 @@ }: let inherit (lib.generators) mkLuaInline; - blinkGitTokenPath = config.sops.secrets."neovim/blink_cmp_git_token".path; + blinkGitTokenPath = config.sops.secrets.github_token.path; in { - sops.secrets."neovim/blink_cmp_git_token" = {}; + sops.secrets.github_token = {}; programs.nvf.settings.vim = { snippets.luasnip.enable = true; @@ -58,7 +58,6 @@ fuzzy.implementation = "prefer_rust_with_warning"; # keep-sorted end - # keep-sorted start block=yes newline_separated=yes completion = { # keep-sorted start documentation.auto_show = true; @@ -107,8 +106,8 @@ lockIcon = ""; in { # keep-sorted start - lockedPR = lockIcon; lockedIssue = lockIcon; + lockedPR = lockIcon; # keep-sorted end }; }; @@ -144,7 +143,6 @@ }; }; }; - # keep-sorted end }; }; };