diff --git a/flake.lock b/flake.lock index 5212ec2..6aad7ed 100644 --- a/flake.lock +++ b/flake.lock @@ -48,11 +48,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1783353508, - "narHash": "sha256-JzU4Us0jo27PIG4B9Vzewejcxi6VAiLrcYuha/vE2VU=", + "lastModified": 1784059115, + "narHash": "sha256-HDox7X6IKv0tgURi1DoWX9NYjY/ngTOfMvlOJsEl0oI=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "d2f0782d5e43cc7e2d6f10a89faa6f25389816ce", + "rev": "1a0767799b4be2fc6d0dcf8b77d86f5838eafbc6", "type": "github" }, "original": { @@ -64,16 +64,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1781116246, - "narHash": "sha256-nmAX8nwZpdDcFAPvC9hAEp0x43RnFtGLUTAm7NcvNZo=", + "lastModified": 1783473460, + "narHash": "sha256-pGOd9+Una59JUgOcPC3PoqOqY08GkJtY+jgtk13rJ1Y=", "owner": "goauthentik", "repo": "authentik", - "rev": "b94d1f11124cad80523c46936636124cdfa8907c", + "rev": "c2942671a5b98dfa596de7bf247accb48a5c71ee", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2026.5.3", + "ref": "version/2026.5.4", "repo": "authentik", "type": "github" } @@ -165,11 +165,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1783173044, - "narHash": "sha256-IzB6XWH8zyBhR3zS2eCKwtVOLipOpVSwN8Lnpgn+5k0=", + "lastModified": 1783566754, + "narHash": "sha256-EyVTx67qTNB2utnXRUgOWnaZxV6c07XE2rVCq/qgWxI=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "d96a067ff30ed47ff1743d60a569b4badd2d7670", + "rev": "4065d7e175fb182a2e30b982b0d8121c97c8d46b", "type": "github" }, "original": { @@ -181,11 +181,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1782814529, - "narHash": "sha256-YGYe7cy8vUFguQzdCt6FP1B/viF53cJdFZhNJ8Rpp5Y=", + "lastModified": 1783564544, + "narHash": "sha256-oOgjJXRLkTDfOcgPQpHF7MwIBPOf1pHT77EC/YVfkm4=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "f98908d8b5cacc4c24a6039ffd9f41f6a0de4ba2", + "rev": "c624c9c8cffc11dd619a7d37f903556c60d24e9c", "type": "github" }, "original": { @@ -249,12 +249,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1783537817, - "narHash": "sha256-1Xu/0aFdCij0oyB5/i5flZBfGXOVCYeDvVE2jSv08PM=", - "rev": "7adcb07f6a603447b1d6aa674ce5747a4a91f029", - "revCount": 426, + "lastModified": 1784134975, + "narHash": "sha256-OPK60XYJEwUmnI5eeF2sCJBJzm0JWt+tzCDHI69yvKU=", + "rev": "e2a0eb345bf5d9c2ac0d2df26907e0881b99d6a3", + "revCount": 428, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.21.5/019f4326-f1c4-7f13-b58b-98979a78c513/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.21.7/019f66be-e2c8-7c52-b302-e6083daf3014/source.tar.gz" }, "original": { "type": "tarball", @@ -264,37 +264,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-oz9PLBISeJ+ipMoi4xmcVG41P/Q8IcptQ62xAJ9ZiZg=", + "narHash": "sha256-GNBW3JQlaPp5QIvUSZnMfSbPhdEIWI5AQ4wiga/pb14=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.7/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.7/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-tvhnv4tS6GIX0DkngUOxWcZ1wW+G7BEOTszojDNDBeY=", + "narHash": "sha256-/lYx8SGAuuNw0V1nlhyuRym3tkZAH+Oj1/CUdzgz0+s=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.7/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.7/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-brJCRiMDagnf2TLZLAq7UVfKrgow7I/5uNIXfhZsEWA=", + "narHash": "sha256-3JrcXRdrFvWsll/cnPLxSjrud5z6iRpxWGv1f44Tfkg=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.7/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.7/x86_64-linux" } }, "discord-userstyle": { @@ -665,11 +665,11 @@ ] }, "locked": { - "lastModified": 1783550008, - "narHash": "sha256-qbbZUk9IG9dLNwCPwdPBs6I5clxwugRpP+1YU+GPK20=", + "lastModified": 1784129366, + "narHash": "sha256-N5JiyICSeQF14x+OQebNyPpYowOT9Rs1iKyeCylSzOA=", "owner": "nix-community", "repo": "home-manager", - "rev": "f4d01c1d87c7c2ec909549165d5a8338f1bd3315", + "rev": "165228b0efefc3e635e5174020c40ea64271dc25", "type": "github" }, "original": { @@ -860,11 +860,11 @@ ] }, "locked": { - "lastModified": 1783451362, - "narHash": "sha256-tQIMYvE8XWk1kO25euWAYdyxJPT+Mishl/drVG0Hb1c=", + "lastModified": 1784102347, + "narHash": "sha256-piRpwar7VZI3YviYo0a/UMFz9+rLesfv3nRLGKxjVGg=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "15569344314eeedb4b8f4f4ef6144a9f5bde045e", + "rev": "7644cecdb947060682891a0db2a0cdc5c0b9e704", "type": "github" }, "original": { @@ -1124,12 +1124,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1783531012, - "narHash": "sha256-oR+h2cF6jderMyM+CMvGu/gbh8s3xceSY+oFqYOcrGg=", - "rev": "1318433ee92773c7c4ab7b3950c8c24d7a8bcc2b", - "revCount": 26214, + "lastModified": 1784130988, + "narHash": "sha256-2/DfNkCVKAv/Zbj7bW+8+aH39Ybc5DE3OEUZCEzzqc4=", + "rev": "469a08e76a130e51b7a9f5df1fcc48b7d4d4cd42", + "revCount": 26267, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.21.5/019f42f2-bfcf-72d3-ba62-dd63f71ea07e/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.21.7/019f66b5-938d-7930-9213-03e0658b3403/source.tar.gz" }, "original": { "type": "tarball", @@ -1145,11 +1145,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1783276891, - "narHash": "sha256-7+9RDZQxflIV5AuRqxIh+ZK+GrFUgngAzo5wPyhxBP4=", + "lastModified": 1783794640, + "narHash": "sha256-SgzzS5GtMFv323ritWP8A3rwhjphB7AYTfHLNSXGX3c=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "cf393892e55698ed5ac49377a24476d87bd880d4", + "rev": "6472f543b68e0b874603ad944419747815cfeb7a", "type": "github" }, "original": { @@ -1203,11 +1203,11 @@ ] }, "locked": { - "lastModified": 1783414108, - "narHash": "sha256-RY8e+gR2/DhXsYDxGDL6Hhe9+POD9u4+llwxMBqMQDs=", + "lastModified": 1783864904, + "narHash": "sha256-BQxN5UMg9FOevAsgBRwPxfxlh51Puj+dNn/8Dsi3sPM=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "96d6de10eb281b98f5cfcd1841394c03da5df77c", + "rev": "1111b9bc836afb7e31a7014e8d1272de9b1c917d", "type": "github" }, "original": { @@ -1260,11 +1260,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1783570676, - "narHash": "sha256-nprEToIeZ3IQ7udagxsQASOlJ/J27TCirC7xBucy71A=", + "lastModified": 1784134907, + "narHash": "sha256-gOhKspbHJGTz3VQ0wgfwk2PBJaq6Qhy5HFcnc3wsYeU=", "owner": "kaylorben", "repo": "nixcord", - "rev": "ba132526472f74dc0efa75b69e6fc2c03ca0d9d9", + "rev": "d3b4dc6c60d700f499333489f6d1777a21a58859", "type": "github" }, "original": { @@ -1275,11 +1275,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1783224372, - "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", + "lastModified": 1783776592, + "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d407951447dcd00442e97087bf374aad70c04cea", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "github" }, "original": { @@ -1400,12 +1400,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1782723713, - "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=", - "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8", - "revCount": 1024265, + "lastModified": 1783224372, + "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", + "rev": "d407951447dcd00442e97087bf374aad70c04cea", + "revCount": 1027867, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.1024265%2Brev-b5aa0fbd538984f6e3d201be0005b4463d8b09f8/019f3b54-a452-7bf0-9017-aa0cf4ad1907/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.1027867%2Brev-d407951447dcd00442e97087bf374aad70c04cea/019f5f44-877c-7d13-9197-5add91357247/source.tar.gz" }, "original": { "type": "tarball", @@ -1430,11 +1430,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1783264223, - "narHash": "sha256-3Uiwx/j6LYuQH3hYkPLOZrKjLtQO03fPkO3K0hIp8Jc=", + "lastModified": 1783760736, + "narHash": "sha256-PEXS6z/zIvH+O7J3Ua3N2OUE7IvMhhghwtKxZhVfm5U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "28d4faad49f8095ec21ebf0454aa8e9c7d7d0af9", + "rev": "bbb4df715cb62e53cd329090c2b69eb07f2bddac", "type": "github" }, "original": { @@ -1462,11 +1462,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1783279667, - "narHash": "sha256-2l8yOB5aYd+05Q9V9Y1YhgbSa1j1o5QX+nvYs5FL80A=", - "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", + "lastModified": 1784115452, + "narHash": "sha256-sV32iDQooUstJItsEiqRmWuhOuMcOR/vkMpHsT+87fI=", + "rev": "35d3407a3816f3b341d8cf1d60abaf2b7b8166ac", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1028110.f205b5574fd0/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1035098.35d3407a3816/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1506,11 +1506,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1783216767, - "narHash": "sha256-FkqDSA3wLaUqTR7E8zp1WrKuJGHs6Bq1jlnrRgJ/DHE=", + "lastModified": 1783820560, + "narHash": "sha256-ZTpxiN6evzEEca3DeMba7GtUkMVC/FJBHyIYy4uTLVc=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "c5571f5cbc39072e59e0ca7d56f8b5a2397d7fe1", + "rev": "606adedbfea92caba306730edd0f6adba4acf310", "type": "github" }, "original": { @@ -1529,11 +1529,11 @@ ] }, "locked": { - "lastModified": 1783581051, - "narHash": "sha256-23ouasHqej9n3qGGqnq682pEBfYcmCGHVPUnm6WDf8U=", + "lastModified": 1784135397, + "narHash": "sha256-WA4PncTfkvOwCjP0LozKXjvvJ4sIOq2Cgh/f4Ucr0cE=", "owner": "nix-community", "repo": "NUR", - "rev": "21d8513f565042678d71826adffd25fa1ac9418b", + "rev": "28bd816a4e946d4cbfeb095af5fa9b986df74c75", "type": "github" }, "original": { @@ -1545,21 +1545,17 @@ "nvf": { "inputs": { "flake-compat": "flake-compat_7", - "flake-parts": [ - "flake-parts" - ], "mnw": "mnw", "nixpkgs": [ "nixpkgs" - ], - "systems": "systems_6" + ] }, "locked": { - "lastModified": 1782839620, - "narHash": "sha256-MzptIDFv69GocQ8wQPNhgFltK6Go8I0HWP6jSWB7IVk=", + "lastModified": 1784074700, + "narHash": "sha256-4oxCCHC/t13BxiFstM0simEC5VDK7Kpkjd8cXEcuSEU=", "owner": "adam01110", "repo": "nvf", - "rev": "d8428d14bf7721cfca61ee609c25f9286e364ca3", + "rev": "cc6e2c6535dbe093861ec18c87038fe3a4d176c4", "type": "github" }, "original": { @@ -1581,7 +1577,7 @@ "nixpkgs" ], "quickshell": "quickshell", - "systems": "systems_7", + "systems": "systems_6", "treefmt-nix": [ "treefmt-nix" ] @@ -1798,14 +1794,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_8" + "systems": "systems_7" }, "locked": { - "lastModified": 1783303713, - "narHash": "sha256-d6Zs6wD0kvWQXn7qPU0YsuqoqBhT7zi5+1M365FINt8=", + "lastModified": 1783838433, + "narHash": "sha256-Zb8+v76qSPYDlUea1y30YzgdEoDjA97vRmeqfPAqwZs=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "d9d714243e2f8d10af28db5111f018ec2d77acc9", + "rev": "c6ab7371e40abd405313af9bddafd5f37cc94f83", "type": "github" }, "original": { @@ -1831,18 +1827,18 @@ "nur": [ "nur" ], - "systems": "systems_9", + "systems": "systems_8", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1783358511, - "narHash": "sha256-/F85cBWvU8b2hpawuCog464065ZTJtdMgVPWwJ9yHjE=", + "lastModified": 1784059683, + "narHash": "sha256-q5MZrmKlg9A4ORx3EQcr7qkuidMU1gVZ+xJ3nCK+xgc=", "owner": "danth", "repo": "stylix", - "rev": "14814ef555d8148ab82eba5054e654cd9eae3a1f", + "rev": "c8ccc31f3ea29dc3eb5b54945e5eb549529491d6", "type": "github" }, "original": { @@ -1971,21 +1967,6 @@ "type": "github" } }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tangled-catppuccin": { "flake": false, "locked": { @@ -2141,11 +2122,11 @@ ] }, "locked": { - "lastModified": 1783307743, - "narHash": "sha256-oseisp2tblvzYZdojkA5URLnMjrpPiemzr5T7BdUyuU=", + "lastModified": 1783511944, + "narHash": "sha256-Z/Ss9rWw9QYcRK+Qqkmty7PB1pIik5XGbrtit+ad2qs=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "288b0a580ede39d3d7f96e3d835f9df0a7080223", + "rev": "83995ef5e4ece3c9c704aa645bbff439e15a0ac3", "type": "github" }, "original": { @@ -2205,11 +2186,11 @@ ] }, "locked": { - "lastModified": 1783190846, - "narHash": "sha256-UcdKHKcDxLxBon0HsOjDRRA7l1vVT28R83LkCIAlYYc=", + "lastModified": 1784113456, + "narHash": "sha256-dvOjuJ8p4k5sRlicRh+j8bnxI5uE+vKbfZ8KfEUqyQY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0758bc86f7a55bbe002f0cede9e1a49e5a6e34d9", + "rev": "0633aae2e5b3a813ae222fc7456a44c50efc5aeb", "type": "github" }, "original": { diff --git a/modules/desktop/hyprland/plugins.nix b/modules/desktop/hyprland/plugins.nix index 381500a..c76426f 100644 --- a/modules/desktop/hyprland/plugins.nix +++ b/modules/desktop/hyprland/plugins.nix @@ -13,9 +13,15 @@ # keep-sorted end ... }: let + inherit (builtins) concatStringsSep; inherit (lib) mkOrder; in { - wayland.windowManager.hyprland.plugins = [pkgs.hyprlandPlugins.hyprfocus]; + wayland.windowManager.hyprland.plugins = with pkgs; [ + # keep-sorted start + hyprlandPlugins.hyprfocus + nur.repos.adam0.hyprlandPlugins.hypr-kinetic-scroll + # keep-sorted end + ]; programs.hylix = { _generatedConfig = mkOrder 899 '' @@ -31,6 +37,27 @@ 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/noctalia/plugins.nix b/modules/desktop/noctalia/plugins.nix index 62c911c..2d8d7a5 100644 --- a/modules/desktop/noctalia/plugins.nix +++ b/modules/desktop/noctalia/plugins.nix @@ -117,7 +117,7 @@ web-search = { # keep-sorted start max_results = 5; - search_engine = "Kagi"; + search_engine = "Brave Search"; show_suggestions = false; # keep-sorted end }; diff --git a/modules/programs/gui/discord/plugins/integrations.nix b/modules/programs/gui/discord/plugins/integrations.nix index 88ff726..7372e54 100644 --- a/modules/programs/gui/discord/plugins/integrations.nix +++ b/modules/programs/gui/discord/plugins/integrations.nix @@ -11,8 +11,8 @@ }; replaceGoogleSearch = { - customEngineName = "Kagi"; - customEngineUrl = "https://kagi.com/search?q="; + customEngineName = "Brave Search"; + customEngineUrl = "https://search.brave.com/search?q="; enable = true; replacementEngine = "custom"; }; diff --git a/modules/programs/gui/zen/extensions.nix b/modules/programs/gui/zen/extensions.nix index d3480e4..87fbe36 100644 --- a/modules/programs/gui/zen/extensions.nix +++ b/modules/programs/gui/zen/extensions.nix @@ -32,8 +32,6 @@ violentmonkey wikiwand-wikipedia-modernized # keep-sorted end - - kagi-search ]; }; @@ -50,6 +48,7 @@ # keep-sorted start "@crw-extension-firefox" = "consumer-rights-wiki"; "helloyanis@ageverif-bypass" = "age-verification-bypass"; + "knockoff@knockoff.shopping" = "knockoff"; "{76ef94a4-e3d0-4c6f-961a-d38a429a332b}" = "ttv-lol-pro"; "{microslop@4o4}" = "microslop"; # keep-sorted end diff --git a/modules/programs/gui/zen/search.nix b/modules/programs/gui/zen/search.nix index b9383cc..6b68233 100644 --- a/modules/programs/gui/zen/search.nix +++ b/modules/programs/gui/zen/search.nix @@ -3,15 +3,15 @@ programs.zen-browser.profiles.default = { search = { force = true; - default = "kagi"; + default = "brave"; engines = let nixIcon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; in { # General search engines. - kagi = { + brave = { urls = [ { - template = "https://kagi.com/search"; + template = "https://search.brave.com/search"; params = [ { name = "q"; @@ -20,8 +20,8 @@ ]; } ]; - iconMapObj."16" = "https://kagi.com/favicon.ico"; - definedAliases = ["@k"]; + iconMapObj."16" = "https://search.brave.com/favicon.ico"; + definedAliases = ["@b"]; }; google.metaData.alias = "@g"; diff --git a/modules/programs/tui/neovim/components/autocomplete.nix b/modules/programs/tui/neovim/components/autocomplete.nix index 63d734d..ff6b084 100644 --- a/modules/programs/tui/neovim/components/autocomplete.nix +++ b/modules/programs/tui/neovim/components/autocomplete.nix @@ -1,58 +1,62 @@ { flake.modules.homeManager.neovim = { - programs.nvf.settings.vim.autocomplete.blink-cmp = { - enable = true; - friendly-snippets.enable = true; + programs.nvf.settings.vim = { + snippets.luasnip.enable = true; - setupOpts = { - keymap.preset = "default"; + autocomplete.blink-cmp = { + enable = true; + friendly-snippets.enable = true; - # keep-sorted start - cmdline.completion.menu.auto_show = true; - fuzzy.implementation = "prefer_rust_with_warning"; - # keep-sorted end + setupOpts = { + keymap.preset = "default"; - # keep-sorted start block=yes newline_separated=yes - completion = { # keep-sorted start - documentation.auto_show = true; - ghost_text.enabled = true; + cmdline.completion.menu.auto_show = true; + fuzzy.implementation = "prefer_rust_with_warning"; # keep-sorted end - keyword.range = "full"; - }; - - signature = { - enabled = true; - - # keep-sorted start - show_on_insert = true; - show_on_keyword = true; - # keep-sorted end - }; + # keep-sorted start block=yes newline_separated=yes + completion = { + # keep-sorted start + documentation.auto_show = true; + ghost_text.enabled = true; + # keep-sorted end - sourcePlugins = { - ripgrep.enable = true; - }; + keyword.range = "full"; + }; - term = { - enabled = true; + signature = { + enabled = true; - completion = { # keep-sorted start - ghost_text.enabled = true; - menu.auto_show = true; + show_on_insert = true; + show_on_keyword = true; # keep-sorted end + }; - list.selection = { + sourcePlugins = { + ripgrep.enable = true; + }; + + term = { + enabled = true; + + completion = { # keep-sorted start - auto_insert = true; - preselect = true; + ghost_text.enabled = true; + menu.auto_show = true; # keep-sorted end + + list.selection = { + # keep-sorted start + auto_insert = true; + preselect = true; + # keep-sorted end + }; }; }; + # keep-sorted end }; - # keep-sorted end }; }; }; diff --git a/modules/programs/tui/neovim/components/highlight.nix b/modules/programs/tui/neovim/components/highlight.nix index 4cf4505..c2beaeb 100644 --- a/modules/programs/tui/neovim/components/highlight.nix +++ b/modules/programs/tui/neovim/components/highlight.nix @@ -1,62 +1,66 @@ { flake.modules.homeManager.neovim = { - programs.nvf.settings.vim.ui.colorizer = { - enable = true; + programs.nvf.settings.vim = { + utility.snacks-nvim.setupOpts.words.enabled = true; - setupOpts = { - filetypes = { - "*" = {}; - "!snacks_dashboard" = {}; - }; - - "options" = { - always_update = true; + ui.colorizer = { + enable = true; - # keep-sorted start block=yes newline_separated=yes - display = { - mode = "virtualtext"; - virtualtext = { - char = ""; - position = "before"; - }; + setupOpts = { + filetypes = { + "*" = {}; + "!snacks_dashboard" = {}; }; - parsers = { - # keep-sorted start - css = true; - css_color.enable = true; - css_fn = true; - css_var.enable = true; - css_var_rgb.enable = true; - hsl.enable = true; - hsluv.enable = true; - hwb.enable = true; - lab.enable = true; - lch.enable = true; - oklch.enable = true; - rgb.enable = true; - sass.enable = true; - xcolor.enable = true; - xterm.enable = true; - # keep-sorted end + "options" = { + always_update = true; # keep-sorted start block=yes newline_separated=yes - hex = { - rrggbbaa = true; - hash_aarrggbb = true; - aarrggbb = true; - no_hash = true; + display = { + mode = "virtualtext"; + virtualtext = { + char = ""; + position = "before"; + }; }; - tailwind = { - enable = true; - lsp.enable = true; + parsers = { + # keep-sorted start + css = true; + css_color.enable = true; + css_fn = true; + css_var.enable = true; + css_var_rgb.enable = true; + hsl.enable = true; + hsluv.enable = true; + hwb.enable = true; + lab.enable = true; + lch.enable = true; + oklch.enable = true; + rgb.enable = true; + sass.enable = true; + xcolor.enable = true; + xterm.enable = true; + # keep-sorted end + + # keep-sorted start block=yes newline_separated=yes + hex = { + rrggbbaa = true; + hash_aarrggbb = true; + aarrggbb = true; + no_hash = true; + }; + + tailwind = { + enable = true; + lsp.enable = true; - update_names = true; + update_names = true; + }; + # keep-sorted end }; # keep-sorted end }; - # keep-sorted end }; }; }; diff --git a/modules/programs/tui/neovim/components/indent.nix b/modules/programs/tui/neovim/components/indent.nix index 3664af6..a74aaa0 100644 --- a/modules/programs/tui/neovim/components/indent.nix +++ b/modules/programs/tui/neovim/components/indent.nix @@ -5,6 +5,7 @@ # keep-sorted start auto-indent-nvim.enable = true; guess-indent-nvim.enable = true; + smart-paste-nvim.enable = true; # keep-sorted end snacks-nvim.setupOpts.indent = { diff --git a/modules/programs/tui/neovim/components/statuscolumn.nix b/modules/programs/tui/neovim/components/statuscolumn.nix new file mode 100644 index 0000000..8ebdd66 --- /dev/null +++ b/modules/programs/tui/neovim/components/statuscolumn.nix @@ -0,0 +1,5 @@ +{ + flake.modules.homeManager.neovim = { + programs.nvf.settings.vim.utility.snacks-nvim.setupOpts.statuscolumn.enable = true; + }; +} diff --git a/modules/programs/tui/neovim/keymap.nix b/modules/programs/tui/neovim/keymap.nix index c51226d..d4d5c01 100644 --- a/modules/programs/tui/neovim/keymap.nix +++ b/modules/programs/tui/neovim/keymap.nix @@ -3,6 +3,13 @@ programs.nvf.settings.vim = { keymaps = [ # keep-sorted start block=yes newline_separated=yes + { + key = "Q"; + mode = "n"; + action = "q!"; + desc = "Force quit window"; + } + { key = "q"; mode = "n"; diff --git a/modules/programs/tui/neovim/languages/rust.nix b/modules/programs/tui/neovim/languages/rust.nix index 27a9715..f0b74e4 100644 --- a/modules/programs/tui/neovim/languages/rust.nix +++ b/modules/programs/tui/neovim/languages/rust.nix @@ -5,7 +5,10 @@ extensions.crates-nvim = { enable = true; - setupOpts = { + + setupOpts.popup = { + autofocus = true; + show_version_date = true; }; }; }; diff --git a/modules/services/security/crowdsec.nix b/modules/services/security/crowdsec.nix index 653b667..6d0631a 100644 --- a/modules/services/security/crowdsec.nix +++ b/modules/services/security/crowdsec.nix @@ -112,7 +112,6 @@ mkMerge # keep-sorted end ; - secrets = config.sops.secrets; templates = config.sops.templates; @@ -259,6 +258,9 @@ crowdsec = setupUnit; crowdsec-setup = setupUnit; + # Reloading leaves AppSec acquisition stopped on CrowdSec 1.7.8. + crowdsec-update-hub.serviceConfig.ExecStartPost = mkForce ["+systemctl restart crowdsec.service"]; + crowdsec-blocklist-import-frequent = { after = [ # keep-sorted start