diff --git a/flake.lock b/flake.lock index 0fc5e86..d972275 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1738183445, - "narHash": "sha256-C1He3N1SA8D2u+TSlldbA9wiYwDvXI4GxX3zKaeD7qU=", + "lastModified": 1738456976, + "narHash": "sha256-cufyHbOMnSt9V4w4OVSzNcpJ+8DwzRZRJaca2Q89KVI=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "48a000cf35dd10bfeb231152735aebbe875f4b74", + "rev": "257b2050790ab3b1eb389e0f8bdc400eb9510139", "type": "github" }, "original": { @@ -265,7 +265,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -310,15 +310,16 @@ ] }, "locked": { - "lastModified": 1737619027, - "narHash": "sha256-jEzZs9dHdmVP5X9HCC/7jrv08aWFfqZV5cZ+cZWYGA4=", - "owner": "feel-co", + "lastModified": 1738531378, + "narHash": "sha256-5r1LcMRDt6uyIPyApfrce/ijucp83aZt+/Kq3w+zMSQ=", + "owner": "nezia1", "repo": "hjem", - "rev": "48cfa21987672a31a358b7e4d582fc174556e633", + "rev": "f9a2fc1b176601fcb304168ab5b37e3943a0a87e", "type": "github" }, "original": { - "owner": "feel-co", + "owner": "nezia1", + "ref": "implement-environment-variables", "repo": "hjem", "type": "github" } @@ -389,11 +390,11 @@ ] }, "locked": { - "lastModified": 1738018829, - "narHash": "sha256-5Ol5iahMlELx3lWuChyZsqqLk6sP6aqaJCJFw92OZGo=", + "lastModified": 1738437059, + "narHash": "sha256-J+8ecqaP3zD9GHeN8Y4hUapoELSoggp0IZI8laTFt/0=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "12cd7034e441a5ebfdef1a090c0788413b4a635b", + "rev": "5ac80e3686a4dfa55d2bd15c81a266b89594a295", "type": "github" }, "original": { @@ -511,11 +512,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1738499523, - "narHash": "sha256-vSdIeH/G/qEuz9TTjWWQC7W5VFrYjXRlJrK2zekJK1Y=", + "lastModified": 1738524329, + "narHash": "sha256-LcSNAFcY6xkNuUUl/vu/0jYkHxVje1W2Udc00BTjxJI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "97a24ec6f3abd2b2ce4c2e00627679a2713848dd", + "rev": "31431a92714ab7f53c25d2ececb26c5b7264b7e3", "type": "github" }, "original": { @@ -561,11 +562,11 @@ ] }, "locked": { - "lastModified": 1737556638, - "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", + "lastModified": 1738422629, + "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", + "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", "type": "github" }, "original": { @@ -606,35 +607,6 @@ "type": "github" } }, - "hyprland-qt-support_2": { - "inputs": { - "hyprlang": [ - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, "hyprland-qtutils": { "inputs": { "hyprland-qt-support": "hyprland-qt-support", @@ -671,34 +643,6 @@ "type": "github" } }, - "hyprland-qtutils_2": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support_2", - "hyprlang": "hyprlang_2", - "hyprutils": [ - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_5" - }, - "locked": { - "lastModified": 1737981711, - "narHash": "sha256-lh6cL5D8nPplB3WovCQjLUZ7k7MViiBrMlpkfm4R7/c=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "96bf0677fa9cd13508294e3d4559dfbbc8beff73", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -728,32 +672,6 @@ "type": "github" } }, - "hyprlang_2": { - "inputs": { - "hyprutils": "hyprutils_2", - "nixpkgs": [ - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, "hyprlock": { "inputs": { "hyprgraphics": "hyprgraphics_2", @@ -849,33 +767,6 @@ "type": "github" } }, - "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "hyprland-qtutils", - "hyprlang", - "nixpkgs" - ], - "systems": [ - "hyprland-qtutils", - "hyprlang", - "systems" - ] - }, - "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -1198,11 +1089,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1738410390, + "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", "type": "github" }, "original": { @@ -1481,14 +1372,14 @@ "plugin-vim-startify": "plugin-vim-startify", "plugin-which-key": "plugin-which-key", "plugin-yanky-nvim": "plugin-yanky-nvim", - "systems": "systems_7" + "systems": "systems_6" }, "locked": { - "lastModified": 1738275588, - "narHash": "sha256-u51BeYedYfIIArHDAq5YvpDzhTH201b7Da1DOoSTZcA=", + "lastModified": 1738504946, + "narHash": "sha256-/btrLwD7UFgNWPxdewMdYYiI2GJxYipGnLuX7pRVAjc=", "owner": "notashelf", "repo": "nvf", - "rev": "e5f6aa23ea63dcbf6c918157cf5b9c818286e958", + "rev": "944327329712eda9eec8a86a972e0abd7ea368e6", "type": "github" }, "original": { @@ -4208,7 +4099,6 @@ "hjem": "hjem", "hypridle": "hypridle", "hyprland": "hyprland", - "hyprland-qtutils": "hyprland-qtutils_2", "hyprlock": "hyprlock", "hyprpaper": "hyprpaper", "hyprwm-contrib": "hyprwm-contrib", @@ -4305,21 +4195,6 @@ } }, "systems_5": { - "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_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -4334,7 +4209,7 @@ "type": "github" } }, - "systems_7": { + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index 7756bfb..758bafb 100644 --- a/flake.nix +++ b/flake.nix @@ -55,10 +55,6 @@ deploy-rs.url = "github:serokell/deploy-rs"; hyprland.url = "github:hyprwm/Hyprland"; - hyprland-qtutils = { - url = "github:hyprwm/hyprland-qtutils"; - inputs.nixpkgs.follows = "nixpkgs"; - }; hypridle = { url = "github:hyprwm/hypridle"; inputs = { @@ -91,7 +87,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hjem = { - url = "github:feel-co/hjem"; + url = "github:nezia1/hjem/implement-environment-variables"; # TODO: change to github:feel-co/hjem if env var PR gets in inputs.nixpkgs.follows = "nixpkgs"; }; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.5.0"; diff --git a/modules/programs/hypr/land/default.nix b/modules/programs/hypr/land/default.nix index 153bcc7..acc45b8 100644 --- a/modules/programs/hypr/land/default.nix +++ b/modules/programs/hypr/land/default.nix @@ -6,7 +6,6 @@ config, ... }: let - inherit (builtins) toString; inherit (lib) mkIf mkMerge optionalAttrs; inherit (lib'.generators) toHyprConf; inherit (config.local.systemVars) username; @@ -31,10 +30,6 @@ }); in { config = mkIf config.local.modules.hyprland.enable { - environment.systemPackages = [ - inputs.hyprland-qtutils.packages.${pkgs.system}.default - ]; - programs.hyprland = { enable = true; package = inputs.hyprland.packages.${pkgs.system}.hyprland; @@ -167,9 +162,9 @@ in { GDK_SCALE = 1; } (mkIf styleCfg.enable { - HYPRCURSOR_THEME = "${styleCfg.cursorTheme.name}"; - HYPRCURSOR_SIZE = "${toString styleCfg.cursorTheme.size}"; - XCURSOR_SIZE = "${toString styleCfg.cursorTheme.size}"; + HYPRCURSOR_THEME = styleCfg.cursorTheme.name; + HYPRCURSOR_SIZE = styleCfg.cursorTheme.size; + XCURSOR_SIZE = styleCfg.cursorTheme.size; }) (mkIf config.local.modules.nvidia.enable { LIBVA_DRIVER_NAME = "nvidia";