diff --git a/flake.lock b/flake.lock index 1fdfc0d..bec760d 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1759499898, - "narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=", + "lastModified": 1765900596, + "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "655e067f96fd44b3f5685e17f566b0e4d535d798", + "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace", "type": "github" }, "original": { @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1759544172, - "narHash": "sha256-oSkKuK4qWhN9ccvRMcnYhSCO9TJOmBb67z9+LIRdtNg=", + "lastModified": 1767198468, + "narHash": "sha256-FxDbqVgsT/ofpcVD4oNSO4YyPK0bu0/w4TGr/p87E4A=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "942530872529aad21e9ac205b630694ef6b755de", + "rev": "ff02fe1802aa90146fe3c236ec504c788825b152", "type": "github" }, "original": { @@ -59,11 +59,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -122,11 +122,11 @@ ] }, "locked": { - "lastModified": 1759550472, - "narHash": "sha256-JLM3D6RbnGmXR8x+3WNac9neklAxA1JtZHZscwukFYw=", + "lastModified": 1767104570, + "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", "owner": "nix-community", "repo": "home-manager", - "rev": "817ace497b72b38da0c08728a683b7febaccf9cf", + "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1759490292, - "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=", + "lastModified": 1763733840, + "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "9431db625cd9bb66ac55525479dce694101d6d7a", + "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", "type": "github" }, "original": { @@ -198,8 +198,8 @@ "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", + "hyprland-guiutils": "hyprland-guiutils", "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", "hyprlang": [ "hyprlang" ], @@ -207,6 +207,7 @@ "hyprutils" ], "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwire": "hyprwire", "nixpkgs": [ "nixpkgs" ], @@ -217,11 +218,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1759530922, - "narHash": "sha256-9NgZKpibALekGTPDc2O8lP8vFealQSZkXe+L+S7MMZU=", + "lastModified": 1767201430, + "narHash": "sha256-2FF66EaIbsc7CL1jKHbRFslSePDq40fzlTTbUlm5v3k=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "76d998743ac10e712238c1016db4d8e8d16f1049", + "rev": "48a024e0322bbd7c4c88126498ec478444ec4cb2", "type": "github" }, "original": { @@ -230,6 +231,52 @@ "type": "github" } }, + "hyprland-guiutils": { + "inputs": { + "aquamarine": [ + "hyprland", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprtoolkit": "hyprtoolkit", + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1765643131, + "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=", + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "rev": "e50ae912813bdfa8372d62daf454f48d6df02297", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "type": "github" + } + }, "hyprland-hy3": { "inputs": { "hyprland": [ @@ -237,11 +284,11 @@ ] }, "locked": { - "lastModified": 1759126670, - "narHash": "sha256-p+HObKRf2j3DfI4mcrJoF+WR7IIg9demMioYBsRH0GM=", + "lastModified": 1766381032, + "narHash": "sha256-Wuk2MULnGfgAbP1N/Rp6H6k7zG/ynDiy54mPvkt/4bM=", "owner": "outfoxxed", "repo": "hy3", - "rev": "af94b011af255de87b2b026121fab1e6f2c56c6d", + "rev": "50643d625829f303239f9ec019021f17d7e9f3fc", "type": "github" }, "original": { @@ -262,11 +309,11 @@ ] }, "locked": { - "lastModified": 1749046714, - "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", + "lastModified": 1765214753, + "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", + "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", "type": "github" }, "original": { @@ -275,74 +322,6 @@ "type": "github" } }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1749154592, - "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1759080228, - "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -356,11 +335,11 @@ ] }, "locked": { - "lastModified": 1758927902, - "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", + "lastModified": 1764612430, + "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", + "rev": "0d00dc118981531aa731150b6ea551ef037acddd", "type": "github" }, "original": { @@ -369,6 +348,58 @@ "type": "github" } }, + "hyprtoolkit": { + "inputs": { + "aquamarine": [ + "hyprland", + "hyprland-guiutils", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprland-guiutils", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprland-guiutils", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-guiutils", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprland-guiutils", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "hyprland-guiutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-guiutils", + "systems" + ] + }, + "locked": { + "lastModified": 1764592794, + "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -379,11 +410,11 @@ ] }, "locked": { - "lastModified": 1759490926, - "narHash": "sha256-7IbZGJ5qAAfZsGhBHIsP8MBsfuFYS0hsxYHVkkeDG5Q=", + "lastModified": 1766253372, + "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "94cce794344538c4d865e38682684ec2bbdb2ef3", + "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9", "type": "github" }, "original": { @@ -404,11 +435,11 @@ ] }, "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "lastModified": 1763640274, + "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", "type": "github" }, "original": { @@ -417,6 +448,35 @@ "type": "github" } }, + "hyprwire": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1766253200, + "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "1079777525b30a947c8d657fac158e00ae85de9d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwire", + "type": "github" + } + }, "impurity": { "locked": { "lastModified": 1689836741, @@ -439,11 +499,11 @@ ] }, "locked": { - "lastModified": 1759032422, - "narHash": "sha256-WZf+FhebP2/1pK2np5xj/NuDjD6fXK2BHnq/tPUN18o=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "ec7a78cb0e098832d8acac091a4df393259c4839", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -474,11 +534,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1766902085, + "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", "type": "github" }, "original": { @@ -495,11 +555,11 @@ ] }, "locked": { - "lastModified": 1759562581, - "narHash": "sha256-Ws/2AeBPNO0rKZClWMZGHzpYYxvzipkQe0Uv0bRcYDM=", + "lastModified": 1767202981, + "narHash": "sha256-XF68CQaLfPcCk5DVAP/OLbyqchc9uj4E65AEf363HI8=", "owner": "nix-community", "repo": "NUR", - "rev": "fc4bde0d1bbd11352fd7836af54e56573f6649e6", + "rev": "8666a7d3d9d26a7a3031ba4d5688ba4e6f83d6bd", "type": "github" }, "original": { @@ -518,11 +578,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1765911976, + "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", "type": "github" }, "original": { @@ -538,11 +598,11 @@ ] }, "locked": { - "lastModified": 1759303785, - "narHash": "sha256-EUXrK7pUIzOQWR1dquZh26A6W8lsY2oiHEEZzQnsarM=", + "lastModified": 1766725085, + "narHash": "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs=", "ref": "refs/heads/master", - "rev": "9662234759eb57f2a1057f2a1c667da1bf128c1c", - "revCount": 686, + "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", + "revCount": 715, "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell" }, @@ -571,11 +631,11 @@ }, "stable": { "locked": { - "lastModified": 1759281824, - "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", + "lastModified": 1767051569, + "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b5be50345d4113d04ba58c444348849f5585b4a", + "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd", "type": "github" }, "original": { @@ -627,11 +687,11 @@ ] }, "locked": { - "lastModified": 1755354946, - "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=", + "lastModified": 1761431178, + "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0", + "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", "type": "github" }, "original": { diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix index 93ba4fd..c4c5f5f 100644 --- a/modules/emacs/default.nix +++ b/modules/emacs/default.nix @@ -3,22 +3,6 @@ (with inputs.emacs-overlay.overlays; [ emacs package - - (final: prev: { - tree-sitter = prev.tree-sitter.override { - extraGrammars = { - tree-sitter-astro = { - version = "master"; - src = pkgs.fetchFromGitHub { - owner = "virchau13"; - repo = "tree-sitter-astro"; - rev = "0ad33e32ae9726e151d16ca20ba3e507ff65e01f"; - sha256 = "LhehKOhCDPExEgEiOj3TiuFk8/DohzYhy/9GmUSxaIg="; - }; - }; - }; - }; - }) ]); tree-sitter-parsers = grammars: with grammars; [ @@ -56,15 +40,25 @@ tree-sitter-toml tree-sitter-tsx tree-sitter-typescript - tree-sitter-astro tree-sitter-vim tree-sitter-yaml tree-sitter-zig + (pkgs.tree-sitter.buildGrammar { + language = "astro"; + version = "master"; + src = pkgs.fetchFromGitHub { + owner = "virchau13"; + repo = "tree-sitter-astro"; + rev = "0ad33e32ae9726e151d16ca20ba3e507ff65e01f"; + sha256 = "LhehKOhCDPExEgEiOj3TiuFk8/DohzYhy/9GmUSxaIg="; + }; + }) ]; custom-emacs = with newpkgs; ((emacsPackagesFor (emacs30-pgtk.override { withNativeCompilation = true; })).emacsWithPackages (epkgs: with epkgs; [ + aidermacs transient avy better-jumper company @@ -89,6 +83,7 @@ lsp-ui lsp-haskell lsp-java + dap-mode magit markdown-mode nasm-mode @@ -107,7 +102,14 @@ use-package vertico which-key - melpaPackages.ws-butler + (melpaPackages.ws-butler.overrideAttrs { # https://github.com/nix-community/emacs-overlay/issues/499 + src = pkgs.fetchFromSavannah { + repo = "emacs/nongnu"; + rev = "9ee5a7657a22e836618813c2e2b64a548d27d2f"; + hash = "sha256-S9aFJcFMkyB1KozJc9hpwKjAMkOyEnCZ6Wf3JVZ8d0c="; + }; + }) + minuet zig-ts-mode ])); in { diff --git a/modules/hyprland/hyprland.conf b/modules/hyprland/hyprland.conf index cc5ae63..a90f0d7 100644 --- a/modules/hyprland/hyprland.conf +++ b/modules/hyprland/hyprland.conf @@ -70,7 +70,7 @@ misc { render { direct_scanout = true - new_render_scheduling = true + new_render_scheduling = false } binds { @@ -108,48 +108,36 @@ debug { monitor = , preferred, auto, 1 -layerrule = blur, test -layerrule = ignorezero, test -layerrule = noanim, test +layerrule = match:namespace shell:background, animation fade -layerrule = blur, wofi -layerrule = ignorezero, wofi -layerrule = noanim, ^(selection)$ +layerrule = match:namespace shell:bar, blur on +layerrule = match:namespace shell:bar, blur_popups on +layerrule = match:namespace shell:bar, ignore_alpha 0 +layerrule = match:namespace shell:notifications, blur on +layerrule = match:namespace shell:notifications, ignore_alpha 0 +layerrule = match:namespace shell:notifications, animation 0 +layerrule = match:namespace shell:screenshot, animation 0 -layerrule = blur, termspawner -layerrule = ignorezero, termspawner -layerrule = noanim, termspawner +layerrule = match:namespace shell:launcher, blur on +layerrule = match:namespace shell:launcher, ignore_alpha 0 +layerrule = match:namespace shell:launcher, animation popin 90% -layerrule = animation fade, shell:background +windowrule = match:class org.kde.polkit-kde-authentication-agent-1, float on +windowrule = match:class org.kde.polkit-kde-authentication-agent-1, dim_around on -layerrule = blur, shell:bar -layerrule = blurpopups, shell:bar -layerrule = ignorezero, shell:bar -layerrule = blur, shell:notifications -layerrule = ignorezero, shell:notifications -layerrule = noanim, shell:notifications +windowrule = match:class gcr-prompter, float on +windowrule = match:class gcr-prompter, dim_around on -layerrule = noanim, shell:screenshot +windowrule = match:class org.freedesktop.impl.portal.desktop.kde, float on +windowrule = match:class org.freedesktop.impl.portal.desktop.kde, size 1000 700 +windowrule = match:class org.freedesktop.impl.portal.desktop.kde, dim_around on -layerrule = blur, shell:launcher -layerrule = ignorezero, shell:launcher -layerrule = animation popin 90%, shell:launcher +windowrule = match:title ^(OpenSSH Authentication Passphrase request)$, float on +windowrule = match:title ^(KeePassXC - Access Request)$, float on +windowrule = match:title ^(Unlock Database - KeePassXC)$, float on +windowrule = match:class org.keepassxc.KeePassXC, no_screen_share on -windowrulev2 = float, class:^(opensnitch_ui)$ -windowrulev2 = dimaround, class:^(opensnitch_ui)$ -windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ -windowrulev2 = dimaround, class:^(org.kde.polkit-kde-authentication-agent-1)$ -windowrulev2 = float, class:^(gcr-prompter)$ -windowrulev2 = dimaround, class:^(gcr-prompter)$ -windowrulev2 = float, class:^(org.freedesktop.impl.portal.desktop.kde)$ -windowrulev2 = size 1000 700, class:^(org.freedesktop.impl.portal.desktop.kde)$ -windowrulev2 = center, class:^(org.freedesktop.impl.portal.desktop.kde)$ -windowrulev2 = dimaround, class:^(org.freedesktop.impl.portal.desktop.kde)$ -windowrulev2 = float, title:^(OpenSSH Authentication Passphrase request)$ -windowrulev2 = float, title:^(KeePassXC - Access Request)$ -windowrulev2 = float, title:^(Unlock Database - KeePassXC)$ - -windowrulev2 = float, class:^(AlacrittyFloating)$ +windowrule = match:class AlacrittyFloating, float on $mod = SUPER $launcher = qs -c shell ipc call launcher open @@ -261,6 +249,5 @@ bind = $mod+SHIFT, 8, hy3:movetoworkspace, 08 bind = $mod+SHIFT, 9, hy3:movetoworkspace, 09 bind = $mod+SHIFT, 0, hy3:movetoworkspace, 10 -workspace = f[1], gapsout:0, gapsin:0 -windowrule = bordersize 0, floating:0, onworkspace:f[1] -windowrule = rounding 0, floating:0, onworkspace:f[1] +workspace = f[1], gapsout:0 +windowrule = match:fullscreen_state_internal 1, border_size 0