diff --git a/flake.lock b/flake.lock index c58ac6c..c07fc2b 100644 --- a/flake.lock +++ b/flake.lock @@ -69,11 +69,11 @@ ] }, "locked": { - "lastModified": 1731746438, - "narHash": "sha256-f3SSp1axoOk0NAI7oFdRzbxG2XPBSIXC+/DaAXnvS1A=", + "lastModified": 1732645828, + "narHash": "sha256-+4U2I2653JvPFxcux837ulwYS864QvEueIljUkwytsk=", "owner": "nix-community", "repo": "disko", - "rev": "cb64993826fa7a477490be6ccb38ba1fa1e18fa8", + "rev": "869ba3a87486289a4197b52a6c9e7222edf00b3e", "type": "github" }, "original": { @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1731235328, - "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "60bb110917844d354f3c18e05450606a435d2d10", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "type": "github" }, "original": { @@ -139,17 +139,39 @@ "type": "github" } }, + "hyprlang": { + "inputs": { + "nixpkgs": [ + "rose-pine-hyprcursor", + "nixpkgs" + ], + "systems": "systems_3" + }, + "locked": { + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, "hyprpanel": { "inputs": { "ags": "ags", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1730958442, - "narHash": "sha256-8vmh+ehnDnIenBNibGTPCu8p7cJiFP6bzj0E7pBxgQQ=", + "lastModified": 1732389316, + "narHash": "sha256-zC1BbRzt1JGOuL7zEhhiEfDU0ShQTKjKOce/iBkkjKg=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "dbd932941b46ced4eac5da30994d5af2ca80530c", + "rev": "f4834ec308545d1ac27815e210e998f61c3435c8", "type": "github" }, "original": { @@ -192,11 +214,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1731503721, - "narHash": "sha256-sEDguy1Fy9oGwdJTD27axz7yjUmFUe9SREkaWEybsRU=", + "lastModified": 1732700907, + "narHash": "sha256-ZxkFup7yaK0Rqp7sCCGwP1HGOFew7OxFDNHft2GyTZg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "83cabf210fb7b5f0adc67142ceb4dab95519ccdd", + "rev": "6b88838224de5b86f449e9d01755eae4efe4a1e4", "type": "github" }, "original": { @@ -208,11 +230,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731239293, - "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", + "lastModified": 1731797254, + "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", + "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "type": "github" }, "original": { @@ -240,11 +262,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -256,11 +278,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -270,6 +292,22 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -280,7 +318,28 @@ "nixpkgs": "nixpkgs_4", "nixpkgs-b69de56": "nixpkgs-b69de56", "nixpkgs-master": "nixpkgs-master", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable", + "rose-pine-hyprcursor": "rose-pine-hyprcursor" + } + }, + "rose-pine-hyprcursor": { + "inputs": { + "hyprlang": "hyprlang", + "nixpkgs": "nixpkgs_5", + "utils": "utils" + }, + "locked": { + "lastModified": 1718180692, + "narHash": "sha256-J5IYvKcdGRL/sBuST5WaoESEIl7KPv8aJK8aLY6C91E=", + "owner": "ndom91", + "repo": "rose-pine-hyprcursor", + "rev": "40ce26cb29206722ff73839ead0d871d94751e90", + "type": "github" + }, + "original": { + "owner": "ndom91", + "repo": "rose-pine-hyprcursor", + "type": "github" } }, "systems": { @@ -312,6 +371,54 @@ "repo": "default-linux", "type": "github" } + }, + "systems_3": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 1232f46..eb5c8e2 100644 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,7 @@ }; hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; + rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor"; dotfiles = { url = "git+https://code.m3tam3re.com/m3tam3re/dotfiles.git"; diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix index 2bf17ae..8ab563d 100644 --- a/home/features/desktop/default.nix +++ b/home/features/desktop/default.nix @@ -105,6 +105,7 @@ # stable.nyxt # pcmanfm protonmail-desktop + rose-pine-hyprcursor # qt5ct # qt6.qtwayland #rustdesk diff --git a/home/features/desktop/hyprland.nix b/home/features/desktop/hyprland.nix index 5f9cb3d..ed49401 100644 --- a/home/features/desktop/hyprland.nix +++ b/home/features/desktop/hyprland.nix @@ -14,6 +14,7 @@ env = [ "XCURSOR_SIZE,32" + "HYPRCURSOR_THEME,rose-pine-hyprcursor" "WLR_NO_HARDWARE_CURSORS,1" "GTK_THEME,Dracula" ]; @@ -37,12 +38,14 @@ }; decoration = { - "col.shadow" = "rgba(1E202966)"; - drop_shadow = true; - shadow_range = 60; - shadow_offset = "1 2"; - shadow_render_power = 3; - shadow_scale = 0.97; + shadow = { + enabled = true; + range = 60; + render_power = 3; + color = "rgba(1E202966)"; + offset = "1 2"; + scale = 0.97; + }; rounding = 8; blur = { enabled = true; diff --git a/overlays/default.nix b/overlays/default.nix index 3cd050d..56a64d8 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,8 +2,8 @@ # This one brings our custom packages from the 'pkgs' directory additions = final: prev: (import ../pkgs {pkgs = final;}) - // (inputs.hyprpanel.overlay final prev); - + // (inputs.hyprpanel.overlay final prev) + // {rose-pine-hyprcursor = inputs.rose-pine-hyprcursor.packages.${prev.system}.default;}; # This one contains whatever you want to overlay # You can change versions, add patches, set compilation flags, anything really. # https://nixos.wiki/wiki/Overlays