diff --git a/flake.lock b/flake.lock index d7872d4..48bde4f 100644 --- a/flake.lock +++ b/flake.lock @@ -49,11 +49,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1781273728, - "narHash": "sha256-s/Hhlh8Ec568pZPim1bCx+8Um+ae51DGuf/QECmIo6M=", + "lastModified": 1781558888, + "narHash": "sha256-Rl5iLEdT3uZnPdaiE1Wh96KebXqfPA10aGBAzyf8nVc=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "c670bf44d94f23d6a1c97f20512f08d7afa97c94", + "rev": "cb01f184b9742890c0fffe5a5cf0615c91f9cf87", "type": "github" }, "original": { @@ -166,11 +166,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1781018471, - "narHash": "sha256-jQHNMqg2+Iey/WnF+RNvEs+HG3HFVdCX5W/7wne3UIM=", + "lastModified": 1781767284, + "narHash": "sha256-cjIw6fLHT1shDREFkhsMeZeRAYO7z+cnauxmpUkSdp4=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "39d9d125940996ed2eb32425ffec7f2de6ac7fba", + "rev": "d9b3cd77b1aa6fd4dc4baa3d876a598f884f5472", "type": "github" }, "original": { @@ -182,11 +182,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1781257359, - "narHash": "sha256-J2/PBS+5u6osnWZUB7UTjLaD+S8diM+6hlOWDoX/+bw=", + "lastModified": 1781605133, + "narHash": "sha256-lmxxhcZt3qSHPS3ETDeN2OIZqC4yIa3uVpMXuIR+8Rc=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "46b45d26b536195f3ee8bc510b96b7fa47567163", + "rev": "3d40b72fc3c40581269f9e7a12433950f2fd6d95", "type": "github" }, "original": { @@ -198,11 +198,11 @@ "catppuccin-userstyles": { "flake": false, "locked": { - "lastModified": 1781180892, - "narHash": "sha256-P1nGzEWw8Pu899cK3eI6mZwBM5NZy/1YCGLNU8BUCGY=", + "lastModified": 1781454464, + "narHash": "sha256-EerDaMwPCNjkVLZdcJkU2UGFn1FDKEBMAycEsw8ImsU=", "owner": "catppuccin", "repo": "userstyles", - "rev": "45dd7b201de27b1f3184aafeefa84854d6421235", + "rev": "cef1f1429e459a8f76db2a1a2f2ccc9bd37e00b4", "type": "github" }, "original": { @@ -250,12 +250,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1780941588, - "narHash": "sha256-cXxaBtTSYEYVtSxw4IH0hPa+p+VFxS0i+66GwxVFk7o=", - "rev": "70c28bcdd4dde10d04f39e7accb5738a1f5d5298", - "revCount": 421, + "lastModified": 1781815324, + "narHash": "sha256-5pDiPOe2tLKDOH59TkzP3MNiCCCbGxw3giDyRrSdP4E=", + "rev": "fdef7e382e042b1fe418f65770c3acda5933b155", + "revCount": 422, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.21.1/019ea867-5568-7d03-9579-e943ed6d4cef/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.21.2/019edc7b-7758-7223-a52e-d8a340361a73/source.tar.gz" }, "original": { "type": "tarball", @@ -265,37 +265,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-ctwRrPKWBSFkTqlCHRGz6MHBSWRkbSAEVGoelsxdr2g=", + "narHash": "sha256-pQ7YeoB96bBl3iJGRdUWjdOFwahPUMwNN1yl9fwJufY=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.2/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.2/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-qYFrMN6lSMRYV87D/uK5L2CUBvOpoLZAAfSYXvcp9cc=", + "narHash": "sha256-t6Tc358tx16GFely1je18dmrfB8Wv1FkV6nRnU7ITYY=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.2/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.2/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-BxzPf6fT1ekyvD5JA0vvDJOTPtIyjrzVg3Puuo0ftbg=", + "narHash": "sha256-M5e/05UlhljIuqS2ZMozD3OJ2MTTYol9SxQwqrzJdkk=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.2/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.2/x86_64-linux" } }, "discord-userstyle": { @@ -666,11 +666,11 @@ ] }, "locked": { - "lastModified": 1781305496, - "narHash": "sha256-g8Vv4Qfc7n+lgov97REu3X6BeJtvYY0hlSUZR1GrGQQ=", + "lastModified": 1781906751, + "narHash": "sha256-6Ld1PqmptFtFKblE+SynhRgyBApUWcmrISetWqWHeeo=", "owner": "nix-community", "repo": "home-manager", - "rev": "c87a39aa979acc4848016d2220c6238390d84779", + "rev": "37f21dfa5d27e71b75bacd9418b156f9265e312e", "type": "github" }, "original": { @@ -861,11 +861,11 @@ ] }, "locked": { - "lastModified": 1781197920, - "narHash": "sha256-+xooonbcllF9V8Y0GCaOP5D9mi1jDwgsJiWE/EEPT2c=", + "lastModified": 1781442805, + "narHash": "sha256-Kt56e6Bq2sfqN8yq1RHsS6z+8QKCZelmhaeQQRtZyqU=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "4a622b4a741dea4e287b23bdcf6f652d23cc45b0", + "rev": "1f90c674d51a1ef83c725cd6d02280b4c969fdf7", "type": "github" }, "original": { @@ -1087,11 +1087,11 @@ ] }, "locked": { - "lastModified": 1781181476, - "narHash": "sha256-4JLkQvN7/f77TyxXXtoEuUfovMqMLOgWpBaLMNX1dns=", + "lastModified": 1781649287, + "narHash": "sha256-ycG9a7svaV/zF9G03waY7BqUcNQn2HODMN/lXy3C7Zc=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0403b4b7e8b2612657f0053a4c315e6c43eee9e6", + "rev": "001e560fffc8f0235e9db20ebeb4ccde0ade1caf", "type": "github" }, "original": { @@ -1193,16 +1193,16 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1781292859, - "narHash": "sha256-etlzg6/H1NuHGTnrxxhvdmhDYQls/AMHk1IrBbNc0WM=", + "lastModified": 1781811723, + "narHash": "sha256-o0Y3TIykOACq7nwwoSzeQOhQhheI7P4x0PvHtUsoXPY=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "c57a7ab46f5e9b4eb32ed74ba6e7cd5bcd3a6e64", + "rev": "26da04e24aef2993ea256917be42d18f83ce8e8b", "type": "github" }, "original": { "owner": "xddxdd", - "ref": "master", + "ref": "release", "repo": "nix-cachyos-kernel", "type": "github" } @@ -1251,11 +1251,11 @@ ] }, "locked": { - "lastModified": 1780816331, - "narHash": "sha256-0BYqs8yKWkOz2Q7+SP18N5E5gmDKSo6LSxIVIa0wWes=", + "lastModified": 1781422160, + "narHash": "sha256-W7S8O86bVrw2gaomEwkHStOzmPpnFIHQ6lS4Q2HffJ0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "1a2ea89c917781e88508d9fd2b507f2d2a0e173c", + "rev": "854d04e2368fb2e9c328a36b3c0a04cd713bfae1", "type": "github" }, "original": { @@ -1284,11 +1284,11 @@ ] }, "locked": { - "lastModified": 1781263210, - "narHash": "sha256-yZgqxOJ6QMehLKMVvdonVNRzQ+8WLoIH4VtCdBlH28s=", + "lastModified": 1781880690, + "narHash": "sha256-kd14Sz9ymzOg+OarvHLY1I2V8L34iPYdDg0BbdYmVLs=", "owner": "adam01110", "repo": "nix-userstyles", - "rev": "c26592b47cc700b13dc37c3e0b7dd6487f87130a", + "rev": "a0a2faac9f6df36a1f1c000dc4ef78aa7b65ec37", "type": "github" }, "original": { @@ -1307,11 +1307,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1781313584, - "narHash": "sha256-eof0ZzVa7rwLITNI2cgyHq4rmfU9B469h2C18dkx8wg=", + "lastModified": 1781918107, + "narHash": "sha256-Fva6sbK1BiMgi9b+F7zDcBDNUeUlavWpO7hGi27xu4A=", "owner": "kaylorben", "repo": "nixcord", - "rev": "a921b74fa72d013b5ac87e84ce48df65b4d96291", + "rev": "d9aad20784cb2fe8142f2e934d29e1c722cc71d6", "type": "github" }, "original": { @@ -1322,11 +1322,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1779560665, - "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", + "lastModified": 1781074563, + "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", "type": "github" }, "original": { @@ -1447,12 +1447,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1780336545, - "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", - "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f", - "revCount": 1008784, + "lastModified": 1780930886, + "narHash": "sha256-rppURzHviaQN131F+nLiLdGfcb0uCd9gGP0E5+iw9MI=", + "rev": "8c3cede7ddc26bd659d2d383b5610efbd2c7a16e", + "revCount": 1012902, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.1008784%2Brev-4df1b885d76a54e1aa1a318f8d16fd6005b6401f/019e8725-c925-7ec1-8f35-3f9effcf169a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.1012902%2Brev-8c3cede7ddc26bd659d2d383b5610efbd2c7a16e/019eab22-bd1e-7e40-b919-277db893c789/source.tar.gz" }, "original": { "type": "tarball", @@ -1477,11 +1477,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1781246015, - "narHash": "sha256-C3D5TBgght7LBaqm5oGNRf6CynGl5lGED4jcDw2ZOOk=", + "lastModified": 1781793837, + "narHash": "sha256-T9/Q/A5B/Q1hC65fdwCz0aKVN7u1MDXGQXMKgoMQ1Hw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7bd229cbe77d7746d64a1e8c1a6f6cc08f606fc4", + "rev": "05eced6879632fc2f62fec56f2e33269157984ef", "type": "github" }, "original": { @@ -1509,11 +1509,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1781268102, - "narHash": "sha256-OzxtVgj26jwAo9t9GxmOsQD3waYIx71PJ3u++2hmWJQ=", - "rev": "49a4bd0573c376468dd7996ddb6f9fa31d8c4d97", + "lastModified": 1781607440, + "narHash": "sha256-eM+l4TVD26SNoEjcxRcpispqZi5Qrqj/G0ZY4LfqwfM=", + "rev": "3e41b24abd260e8f71dbe2f5737d24122f972158", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1015535.49a4bd0573c3/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1017567.3e41b24abd26/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1553,11 +1553,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1780799499, - "narHash": "sha256-YloRtLqJabzYUWvdLyh67zH4DZrR3kQj+dlQJwLPmPM=", + "lastModified": 1781404532, + "narHash": "sha256-ciNbueiFN7YcHct3k+n4dWbGkgzZVudMpfr4/5Nm96Q=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "f308426239665e3bc3d624014e9295b2ae2f58ff", + "rev": "d52844d40a697e47fea7bc0f1ec68aae9108ddf2", "type": "github" }, "original": { @@ -1576,11 +1576,11 @@ ] }, "locked": { - "lastModified": 1781355852, - "narHash": "sha256-rv3hrVM2lyH0ebdIu3BVC79r7IOA/vzN4x4Na7EaybY=", + "lastModified": 1781930652, + "narHash": "sha256-7VPaBziWHi8dJeiG9lrwunOC6rkhmgTsbUQVHCab6+U=", "owner": "nix-community", "repo": "NUR", - "rev": "6dedb495804a0bfbd9a641a2e888f295b94943b1", + "rev": "6b4d2c6477c8e23f7ac33040849a4c1c9ad633fc", "type": "github" }, "original": { @@ -1730,11 +1730,11 @@ ] }, "locked": { - "lastModified": 1778901413, - "narHash": "sha256-GSKXTAnFqRAMlZkJrIPcQMYf+lpMr66K3i60mB9STvc=", + "lastModified": 1780416763, + "narHash": "sha256-rRK3IFixgsrK6S3e14Xz9HAZm7+kMAIl3oi5zZlcwYI=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "a228447c3e179d477c1b6246ef3efa8cfe3c469a", + "rev": "ad83f1ead0e78e57b188f35cb57298affb06fc5f", "type": "github" }, "original": { @@ -1826,11 +1826,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1781101834, - "narHash": "sha256-gNVY6SYglFe37FpD+NnOjTipsqvVMM2vh/uc22KDEsA=", + "lastModified": 1781425310, + "narHash": "sha256-GTBka4Df/ZOacmisI/DI2LICyNChEqn/giah83LucdM=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "0243dd6707c969fc8440216c811b3f2e4a4cceb7", + "rev": "aeaf7c81a45d3761da61cb05bfc370ac6d1b0441", "type": "github" }, "original": { @@ -2125,11 +2125,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1781350511, - "narHash": "sha256-cntM2o4rT5P+OI4aUmAoq10cfJHQcGf/0TRgCPyLRSI=", + "lastModified": 1781718334, + "narHash": "sha256-Ova9OQemsGRmg2b22W9HQSRhtjwS1C9mLUtkYqEjyRs=", "owner": "notashelf", "repo": "tuigreet", - "rev": "48b998820f3457380d1ab70c9f6cc45d16b53e66", + "rev": "a75f469d51a11b35f9766153d35d15c535b268a6", "type": "github" }, "original": { @@ -2150,11 +2150,11 @@ ] }, "locked": { - "lastModified": 1779411315, - "narHash": "sha256-IMFlxeyClau51KplhhSRGhdGTvD/knShHdybP1UOTuk=", + "lastModified": 1781413266, + "narHash": "sha256-442W/86PUnx6XEK7azeUQ7+ie8IolyDj5B7WjcqwCy8=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "fdf2a76275d7a9c27deb5d2f2ab33526ac9052ff", + "rev": "8a41370bc4d5ab40d29ab405f22320957e47c8a2", "type": "github" }, "original": { @@ -2214,11 +2214,11 @@ ] }, "locked": { - "lastModified": 1781353552, - "narHash": "sha256-FHqsgWr7O3XcRNtBO/bjo/nI06EP9JjUb5AEz0Dh3HI=", + "lastModified": 1781896963, + "narHash": "sha256-77IYuReU5V9smjSB4hXBQb6in8ljg6XhJ8Ld66S4L0I=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b7562bb6de361d2982a2a6104ee27e4f3169efa5", + "rev": "8c5b06ac3d7157ed46ed770cc1afead935d99c1e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6d8ed83..6c82749 100644 --- a/flake.nix +++ b/flake.nix @@ -44,7 +44,7 @@ rust-overlay.follows = "tuigreet/rust-overlay"; }; }; - nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel?ref=master"; + nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel?ref=release"; nix-flatpak.url = "github:gmodena/nix-flatpak"; nix-index-database = { url = "github:nix-community/nix-index-database"; diff --git a/modules/desktop/hyprland/gestures.nix b/modules/desktop/hyprland/gestures.nix index a192e99..c6efd08 100644 --- a/modules/desktop/hyprland/gestures.nix +++ b/modules/desktop/hyprland/gestures.nix @@ -17,7 +17,7 @@ ; # keep-sorted start - noctalia = "${getExe' config.programs.noctalia-shell.package "noctalia-shell"} ipc --path ${config.programs.noctalia-shell.package}/share/noctalia-shell call"; + noctalia = "${getExe' config.programs.noctalia-shell.package "noctalia-shell"} ipc --path ${config.xdg.configHome}/quickshell/noctalia call"; overzicht = getExe config.programs.overzicht.package; # keep-sorted end diff --git a/modules/desktop/hyprland/keybinds/brightness.nix b/modules/desktop/hyprland/keybinds/brightness.nix index 732007f..1f55d60 100644 --- a/modules/desktop/hyprland/keybinds/brightness.nix +++ b/modules/desktop/hyprland/keybinds/brightness.nix @@ -18,7 +18,7 @@ cfg = config.hyprland.brightness; - noctalia = "${getExe' config.programs.noctalia-shell.package "noctalia-shell"} ipc --path ${config.programs.noctalia-shell.package}/share/noctalia-shell call"; + noctalia = "${getExe' config.programs.noctalia-shell.package "noctalia-shell"} ipc --path ${config.xdg.configHome}/quickshell/noctalia call"; in { options.hyprland.brightness.enable = mkEnableOption "function-row brightness keybindings"; diff --git a/modules/desktop/hyprland/keybinds/media.nix b/modules/desktop/hyprland/keybinds/media.nix index c81b85e..dcbe66c 100644 --- a/modules/desktop/hyprland/keybinds/media.nix +++ b/modules/desktop/hyprland/keybinds/media.nix @@ -9,7 +9,7 @@ inherit (lib) getExe'; inherit (lib.self) mkHylixBindGroup; - noctalia = "${getExe' config.programs.noctalia-shell.package "noctalia-shell"} ipc --path ${config.programs.noctalia-shell.package}/share/noctalia-shell call"; + noctalia = "${getExe' config.programs.noctalia-shell.package "noctalia-shell"} ipc --path ${config.xdg.configHome}/quickshell/noctalia call"; in { config.programs.hylix.bindGroups = [ (mkHylixBindGroup "Media" [ diff --git a/modules/desktop/hyprland/keybinds/shell.nix b/modules/desktop/hyprland/keybinds/shell.nix index 198e4a4..bd9a2cc 100644 --- a/modules/desktop/hyprland/keybinds/shell.nix +++ b/modules/desktop/hyprland/keybinds/shell.nix @@ -9,7 +9,7 @@ inherit (lib) getExe'; inherit (lib.self) mkHylixBindGroup; - noctalia = "${getExe' config.programs.noctalia-shell.package "noctalia-shell"} ipc --path ${config.programs.noctalia-shell.package}/share/noctalia-shell call"; + noctalia = "${getExe' config.programs.noctalia-shell.package "noctalia-shell"} ipc --path ${config.xdg.configHome}/quickshell/noctalia call"; in { config.programs.hylix.bindGroups = [ (mkHylixBindGroup "Shell" [ diff --git a/modules/desktop/hyprland/keybinds/system.nix b/modules/desktop/hyprland/keybinds/system.nix index 8f1e872..72b0f24 100644 --- a/modules/desktop/hyprland/keybinds/system.nix +++ b/modules/desktop/hyprland/keybinds/system.nix @@ -16,7 +16,7 @@ inherit (lib.self) mkHylixBindGroup; # keep-sorted start - noctalia = "${getExe' config.programs.noctalia-shell.package "noctalia-shell"} ipc --path ${config.programs.noctalia-shell.package}/share/noctalia-shell call"; + noctalia = "${getExe' config.programs.noctalia-shell.package "noctalia-shell"} ipc --path ${config.xdg.configHome}/quickshell/noctalia call"; overzicht = "${getExe config.programs.overzicht.package} ipc call"; # keep-sorted end in { diff --git a/modules/desktop/hyprland/plugins.nix b/modules/desktop/hyprland/plugins.nix index b49a281..6314295 100644 --- a/modules/desktop/hyprland/plugins.nix +++ b/modules/desktop/hyprland/plugins.nix @@ -39,7 +39,7 @@ index 900ff33..dc76942 100644 --- a/main.cpp +++ b/main.cpp - @@ -119,15 +119,6 @@ static void onFocusChange(PHLWINDOW window) { + @@ -143,15 +143,6 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) { APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) { PHANDLE = handle; @@ -52,9 +52,9 @@ - throw std::runtime_error("[hww] Version mismatch"); - } - - static auto P = Event::bus()->m_events.window.active.listen([&](PHLWINDOW w, Desktop::eFocusReason r) { onFocusChange(w); }); + static auto P = Event::bus()->m_events.window.active.listen([&](PHLWINDOW w, Desktop::eFocusReason r) { onFocusChange(w, r); }); - configValues.mode = makeShared("plugin:hyprfocus:mode", "mode to use", "flash"); + configValues.enable = makeShared("plugin:hyprfocus:enable", "enable or disable the plugin", true); ''; upstream = inputs.hyprland-plugins.overlays.default final prev; in diff --git a/modules/desktop/hyprland/rules.nix b/modules/desktop/hyprland/rules.nix index ca9dfb6..828f515 100644 --- a/modules/desktop/hyprland/rules.nix +++ b/modules/desktop/hyprland/rules.nix @@ -22,7 +22,6 @@ equibop = getExe config.programs.nixcord.equibop.package; grim = getExe pkgs.grim; hyprctl = getExe' osConfig.programs.hyprland.package "hyprctl"; - hyprfocus = "${pkgs.hyprlandPlugins.hyprfocus}/lib/libhyprfocus.so"; hyprpicker = getExe pkgs.hyprpicker; noctalia-qs = getExe' inputs.noctalia-qs.packages.${pkgs.stdenv.hostPlatform.system}.quickshell ".quickshell-wrapped"; overzicht = getExe' config.programs.quickshell.package ".quickshell-wrapped"; @@ -38,7 +37,7 @@ } { - binary = escapeRegex hyprfocus; + binary = ".*/libhyprfocus\\.so$"; mode = "allow"; type = "plugin"; } diff --git a/modules/desktop/noctalia/delobotomize.nix b/modules/desktop/noctalia/delobotomize.nix index c768ff2..a9af426 100644 --- a/modules/desktop/noctalia/delobotomize.nix +++ b/modules/desktop/noctalia/delobotomize.nix @@ -10,6 +10,7 @@ inherit (lib) # keep-sorted start + getExe mkForce mkOption optionals @@ -28,6 +29,7 @@ overrideArgs = removeAttrs cfg.packageOverrides ["package"]; locationFileEnv = optionals (cfg.systemd.locationFile != null) ["NOCTALIA_LOCATION_FILE=${cfg.systemd.locationFile}"]; + stableConfigPath = "${config.xdg.configHome}/quickshell/noctalia"; in { options = { programs.noctalia-shell = { @@ -103,12 +105,19 @@ # keep-sorted end }; + # Keep the Quickshell instance path stable across package rebuilds. + xdg.configFile."quickshell/noctalia".source = "${cfg.package}/share/noctalia-shell"; + # Pass through runtime settings paths and optional location override file. - systemd.user.services.noctalia-shell.Service.Environment = let + systemd.user.services.noctalia-shell.Service = let cfgEnv = config.programs.noctalia-shell.systemd; - in - optionals (cfgEnv.enable && cfgEnv.mutableRuntimeSettings) ["NOCTALIA_SETTINGS_FALLBACK=%h/.config/noctalia/gui-settings.json"] - ++ optionals cfgEnv.enable locationFileEnv; + in { + Environment = + optionals (cfgEnv.enable && cfgEnv.mutableRuntimeSettings) ["NOCTALIA_SETTINGS_FALLBACK=%h/.config/noctalia/gui-settings.json"] + ++ optionals cfgEnv.enable locationFileEnv; + + ExecStart = mkForce "${getExe cfg.package} --path ${stableConfigPath}"; + }; }; }; } diff --git a/modules/hosts/euclid/default.nix b/modules/hosts/euclid/default.nix index 51f9261..e687c38 100644 --- a/modules/hosts/euclid/default.nix +++ b/modules/hosts/euclid/default.nix @@ -91,6 +91,8 @@ wants = ["podman.socket"]; }; + networking.firewall.allowedUDPPorts = [7359]; + # Primary nvme disk for disko partitioning. disko.selectedDisk = "/dev/nvme0n1"; @@ -111,7 +113,7 @@ }; in { # keep-sorted start - "/mnt/immich" = mkBtrfsMount "/dev/disk/by-uuid/2262a52f-3110-462e-815a-7717886b8cc7" "root"; + "/mnt/immich" = mkBtrfsMount "/dev/disk/by-uuid/2262a52f-3110-462e-815a-7717886b8cc7" "immich"; "/mnt/media" = mkBtrfsMount "/dev/disk/by-uuid/7bf5484e-67c1-4c67-a20f-cd47b1d6fb21" "root"; # keep-sorted end }; diff --git a/modules/nix/kernel.nix b/modules/nix/kernel.nix index f0e8c7a..54a347e 100644 --- a/modules/nix/kernel.nix +++ b/modules/nix/kernel.nix @@ -5,7 +5,7 @@ # keep-sorted end ... }: { - flake-file.inputs.nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel?ref=master"; + flake-file.inputs.nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel?ref=release"; flake.overlays.nix-cachyos-kernel = inputs.nix-cachyos-kernel.overlays.pinned; diff --git a/modules/programs/gui/discord/themes/snippets.css b/modules/programs/gui/discord/themes/snippets.css index bfa3644..c055f6b 100644 --- a/modules/programs/gui/discord/themes/snippets.css +++ b/modules/programs/gui/discord/themes/snippets.css @@ -218,41 +218,41 @@ foreignObject { /* Theme vc buttons on servers. */ .iconBadge__650eb:not(.isCurrentUserConnected__650eb) { - background-color: var(--accent-1) !important; + background-color: var(--accent-1) !important; } /* Group online rect fix. */ -.container__1ce5d:has(.status_a423bd[style='background-color: rgb(69, 163, 102);'])::after { - background: var(--online-2) !important; +.container__1ce5d:has(.status_a423bd[style="background-color: rgb(69, 163, 102);"])::after { + background: var(--online-2) !important; } /* Review padding fix. */ .bodySpacerBottom__8a031 { - display: none !important; + display: none !important; } .footer__8a031.section__8a031 { - padding-top: 0px !important; + padding-top: 0px !important; } /* Themed toast progress bar. */ .vc-toast-notifications-notification-progressbar { - background-color: var(--accent-1); + background-color: var(--accent-1); } /* Fix for hover buttons. */ .controlIcon_cf09d8:hover { - color: var(--interactive-text-default) !important; + color: var(--interactive-text-default) !important; } /* Character count color fix. */ .vc-charCounter-selected { - color: var(--accent-1) !important; + color: var(--accent-1) !important; } /* Themed slate toolbar. */ #slate-toolbar { - background-color: var(--background-base-low); + background-color: var(--background-base-low); } #slate-toolbar::before { - border-top: 8px solid var(--background-base-low); + border-top: 8px solid var(--background-base-low); }