From c5739925e9d79f857e2066c90ed019fbf4af170f Mon Sep 17 00:00:00 2001 From: ooks-io Date: Tue, 14 May 2024 23:18:52 +1200 Subject: [PATCH] fix(hyprland): adjusted to reflect changes to new hyprland version --- flake.lock | 313 +++++------------- flake.nix | 45 ++- .../wayland/lockscreen/hyprlock/default.nix | 125 ++++--- .../hyprland/settings/appearance.nix | 5 +- .../hyprland/settings/hyprpaper.nix | 9 +- 5 files changed, 179 insertions(+), 318 deletions(-) diff --git a/flake.lock b/flake.lock index 7140c3e..07dcb07 100644 --- a/flake.lock +++ b/flake.lock @@ -359,7 +359,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_9" + "systems": "systems_3" }, "locked": { "lastModified": 1701680307, @@ -377,7 +377,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_10" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -395,7 +395,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_11" + "systems": "systems_5" }, "locked": { "lastModified": 1701680307, @@ -413,7 +413,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_12" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -431,7 +431,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_15" + "systems": "systems_10" }, "locked": { "lastModified": 1710146030, @@ -579,11 +579,18 @@ }, "hypridle": { "inputs": { - "hyprlang": "hyprlang", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ + "hyprland", "nixpkgs" ], - "systems": "systems_3" + "systems": [ + "hyprland", + "systems" + ] }, "locked": { "lastModified": 1715635326, @@ -602,12 +609,10 @@ "hyprland": { "inputs": { "hyprcursor": "hyprcursor", - "hyprlang": "hyprlang_2", + "hyprlang": "hyprlang", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_4", + "nixpkgs": "nixpkgs_2", + "systems": "systems_2", "xdph": "xdph" }, "locked": { @@ -704,28 +709,6 @@ } }, "hyprlang": { - "inputs": { - "nixpkgs": [ - "hypridle", - "nixpkgs" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -750,54 +733,13 @@ "type": "github" } }, - "hyprlang_3": { - "inputs": { - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": "systems_5" - }, - "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_4": { - "inputs": { - "nixpkgs": "nixpkgs_3", - "systems": "systems_7" - }, - "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_5": { + "hyprlang_2": { "inputs": { "nixpkgs": [ "xdg-portal-hyprland", "nixpkgs" ], - "systems": "systems_13" + "systems": "systems_8" }, "locked": { "lastModified": 1713121246, @@ -815,9 +757,18 @@ }, "hyprlock": { "inputs": { - "hyprlang": "hyprlang_3", - "nixpkgs": "nixpkgs_2", - "systems": "systems_6" + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] }, "locked": { "lastModified": 1715610114, @@ -835,9 +786,18 @@ }, "hyprpaper": { "inputs": { - "hyprlang": "hyprlang_4", - "nixpkgs": "nixpkgs_4", - "systems": "systems_8" + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] }, "locked": { "lastModified": 1714910693, @@ -881,6 +841,7 @@ "hyprwm-contrib": { "inputs": { "nixpkgs": [ + "hyprland", "nixpkgs" ] }, @@ -981,7 +942,7 @@ "inputs": { "flake-parts": "flake-parts_3", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_5", "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -1076,7 +1037,7 @@ "devshell": "devshell", "flake-parts": "flake-parts_2", "flake-root": "flake-root", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_3", "treefmt-nix": "treefmt-nix", "vpnconfinement": "vpnconfinement" }, @@ -1213,11 +1174,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { @@ -1228,38 +1189,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1713562564, "narHash": "sha256-NQpYhgoy0M89g9whRixSwsHb8RFIbwlxeYiVSDwSXJg=", @@ -1275,7 +1204,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1715534503, "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", @@ -1291,7 +1220,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1715037484, "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", @@ -1307,7 +1236,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { "lastModified": 1712963716, "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", @@ -1323,7 +1252,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_7": { "locked": { "lastModified": 1715037484, "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", @@ -1487,11 +1416,12 @@ "nix-colors": "nix-colors", "nix-on-droid": "nix-on-droid", "nixarr": "nixarr", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_4", "nixpkgs-wayland": "nixpkgs-wayland", "nixvim": "nixvim", "ooks-scripts": "ooks-scripts", "sops-nix": "sops-nix", + "systems": "systems_7", "xdg-portal-hyprland": "xdg-portal-hyprland", "zjstatus": "zjstatus" } @@ -1613,81 +1543,6 @@ "type": "github" } }, - "systems_11": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_12": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_13": { - "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_14": { - "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_15": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1689347949, @@ -1705,61 +1560,61 @@ }, "systems_3": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, "systems_4": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, "systems_5": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, "systems_6": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1795,16 +1650,16 @@ }, "systems_9": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1896,9 +1751,9 @@ "xdg-portal-hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols_2", - "hyprlang": "hyprlang_5", - "nixpkgs": "nixpkgs_8", - "systems": "systems_14" + "hyprlang": "hyprlang_2", + "nixpkgs": "nixpkgs_6", + "systems": "systems_9" }, "locked": { "lastModified": 1714662532, @@ -1948,7 +1803,7 @@ "inputs": { "crane": "crane_2", "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_7", "rust-overlay": "rust-overlay_2" }, "locked": { diff --git a/flake.nix b/flake.nix index 41603e5..3087f50 100644 --- a/flake.nix +++ b/flake.nix @@ -36,37 +36,54 @@ # url = "github:schizofox/schizofox"; # inputs.nixpkgs.follows = "nixpkgs"; # }; - hyprwm-contrib = { - url = "github:hyprwm/contrib"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - + + systems.url = "github:nix-systems/default-linux"; + # hyprland "ecosystem" + hyprland = { url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - inputs.nixpkgs.follows = "nixpkgs"; }; - + hyprland-plugins = { url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; }; - hyprlock.url = "github:hyprwm/hyprlock"; + hyprwm-contrib = { + url = "github:hyprwm/contrib"; + inputs.nixpkgs.follows = "hyprland/nixpkgs"; + }; + + hypridle = { + url = "github:hyprwm/hypridle"; + inputs.nixpkgs.follows = "hyprland/nixpkgs"; + inputs.systems.follows = "hyprland/systems"; + inputs.hyprlang.follows = "hyprland/hyprlang"; + }; + + hyprlock = { + url = "github:hyprwm/hyprlock"; + inputs.nixpkgs.follows = "hyprland/nixpkgs"; + inputs.systems.follows = "hyprland/systems"; + inputs.hyprlang.follows = "hyprland/hyprlang"; + }; + + hyprpaper = { + url = "github:hyprwm/hyprpaper"; + inputs.nixpkgs.follows = "hyprland/nixpkgs"; + inputs.systems.follows = "hyprland/systems"; + inputs.hyprlang.follows = "hyprland/hyprlang"; + }; xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland"; - hypridle = { - url = "github:hyprwm/hypridle"; - inputs.nixpkgs.follows = "nixpkgs"; - }; ooks-scripts = { url = "github:ooks-io/scripts"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprpaper.url = "github:hyprwm/hyprpaper"; - + helix = { url = "github:helix-editor/helix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix b/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix index d020e7c..ea60131 100644 --- a/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix +++ b/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix @@ -8,81 +8,70 @@ in { imports = [ - inputs.hyprlock.homeManagerModules.default + # inputs.hyprlock.homeManagerModules.default # inputs.hypridle.homeManagerModules.default ]; config = lib.mkIf cfg.enable { home.sessionVariables.LOCKER = "hyprlock"; programs.hyprlock = { - enable = true; - general = { - hide_cursor = true; - no_fade_in = true; + settings = { + enable = true; + general = { + hide_cursor = true; + no_fade_in = true; + }; + backgrounds = [ + { + monitor = ""; + path = ""; + color = "0xff${colors.base01}"; + } + ]; + input-fields = [ + { + size = { + width = 300; + height = 40; + }; + position = { + x = 0; + y = 0; + }; + outline_thickness = 2; + dots_spacing = 0.2; + fade_on_empty = false; + placeholder_text = ""; + outer_color = "0xff${colors.base02}"; + inner_color = "0xff${colors.base00}"; + font_color = "0xff${colors.base05}"; + } + ]; + labels = [ + { + monitor = ""; + text = "  "; + position = { + x = 0; + y = 80; + }; + color = "0xff${colors.base08}"; + font_size = 30; + font_family = "${fonts.monospace.family}"; + } + { + monitor = ""; + text = "$TIME"; + position = { + x = 0; + y = -80; + }; + color = "0xff${colors.base0B}"; + font_size = 20; + font_family = "${fonts.monospace.family}"; + } + ]; }; - backgrounds = [ - { - monitor = ""; - path = ""; - color = "0xff${colors.base01}"; - } - ]; - input-fields = [ - { - size = { - width = 300; - height = 40; - }; - position = { - x = 0; - y = 0; - }; - outline_thickness = 2; - dots_spacing = 0.2; - fade_on_empty = false; - placeholder_text = ""; - outer_color = "0xff${colors.base02}"; - inner_color = "0xff${colors.base00}"; - font_color = "0xff${colors.base05}"; - } - ]; - labels = [ - { - monitor = ""; - text = "  "; - position = { - x = 0; - y = 80; - }; - color = "0xff${colors.base08}"; - font_size = 30; - font_family = "${fonts.monospace.family}"; - } - { - monitor = ""; - text = "$TIME"; - position = { - x = 0; - y = -80; - }; - color = "0xff${colors.base0B}"; - font_size = 20; - font_family = "${fonts.monospace.family}"; - } - ]; }; - # services.hypridle = { - # enable = true; - # package = pkgs.hypridle; - # beforeSleepCmd = "${pkgs.systemd}/bin/loginctl lock-session"; - # lockCmd = lib.getExe config.programs.hyprlock.package; - - # listeners = [ - # { - # timeout = 500; - # onTimeout = lib.getExe config.programs.hyprlock.package; - # } - # ]; - # }; }; } diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix index 4d84048..fec2cc4 100644 --- a/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix +++ b/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix @@ -9,12 +9,13 @@ in config = lib.mkIf cfg.enable { wayland.windowManager.hyprland = { settings = { + cursor = { + inactive_timeout = 4; + }; general = { - gaps_in = 10; gaps_out = 10; border_size = 2; - cursor_inactive_timeout = 4; "col.active_border" = "0xff${config.colorscheme.colors.base05}"; "col.inactive_border" = "0xff${config.colorscheme.colors.base02}"; }; diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/hyprpaper.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/hyprpaper.nix index 636d4c9..a3c5c29 100644 --- a/home/modules/desktop/wayland/windowManager/hyprland/settings/hyprpaper.nix +++ b/home/modules/desktop/wayland/windowManager/hyprland/settings/hyprpaper.nix @@ -6,14 +6,13 @@ let in { - imports = [ inputs.hyprpaper.homeManagerModules.hyprpaper ]; - config = lib.mkIf cfg.enable { services.hyprpaper = { enable = true; - preloads = ["${wallpaperPath}"]; - wallpapers = [", ${wallpaperPath}"]; - ipc = false; }; + xdg.configFile."hypr/hyprpaper.conf".text = '' + preload = ${wallpaperPath} + wallpaper = , ${wallpaperPath} + ''; }; }