From f837b848924b98c0f5f43323e59a894d031c2e9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Wed, 19 Jun 2024 09:26:06 +0200 Subject: [PATCH] chore: update inputs --- flake.lock | 49 +++++++-------------------- flake.nix | 2 +- modules/programs/hyprland/_config.nix | 6 ++-- 3 files changed, 17 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index 939c222..0d11316 100644 --- a/flake.lock +++ b/flake.lock @@ -479,22 +479,22 @@ "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", - "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_4", "systems": "systems_4", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1713660608, - "narHash": "sha256-Wy9I4K1vuWtOv/UEpKmpDb6O8YaAY3GcC3pZu70DWMY=", + "lastModified": 1713283263, + "narHash": "sha256-Urb/njWiHYUudXpmK8EKl9Z58esTIG0PxXw5LuM2r5g=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "7c3bd4c19fe47f2d92463b81d9b38651b7a1a268", + "rev": "fe7b748eb668136dd0558b7c8279bfcd7ab4d759", "type": "github" }, "original": { "owner": "hyprwm", + "ref": "v0.39.1", "repo": "Hyprland", "type": "github" } @@ -549,31 +549,6 @@ "type": "github" } }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1713619586, - "narHash": "sha256-fIhNlYhPhG5AJ8DxX3LaitnccnQ+X2MCL39W2Abp7mM=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "9e13e0915273959bfd98a10662f678c15ac71c77", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "impermanence": { "locked": { "lastModified": 1708968331, @@ -1063,11 +1038,11 @@ "river": { "flake": false, "locked": { - "lastModified": 1713527168, - "narHash": "sha256-oYVyqNfXjmR6axGyki+jZVOOHFVt1YWAX08eqxtVE6c=", + "lastModified": 1717761690, + "narHash": "sha256-OtCZpdV+2oEfKu81qV0gpfqvdARadW8Fy4L+xjUFMGA=", "ref": "refs/heads/master", - "rev": "9bbd34a0e31b6d429df2d39a59d8990a9585e186", - "revCount": 1248, + "rev": "8da69699e952ee6163bb626c637c34ad7754bab7", + "revCount": 1270, "submodules": true, "type": "git", "url": "https://github.com/riverwm/river" @@ -1132,16 +1107,16 @@ }, "stable": { "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "lastModified": 1718086528, + "narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "rev": "47b604b07d1e8146d5398b42d3306fdebd343986", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 85c7319..3b9b154 100644 --- a/flake.nix +++ b/flake.nix @@ -54,7 +54,7 @@ # Hyprland hypr-contrib.url = "github:hyprwm/contrib"; - hyprland.url = "github:hyprwm/Hyprland"; + hyprland.url = "github:hyprwm/Hyprland/v0.39.1"; # Laptop asus-touchpad-numpad-driver.url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout"; diff --git a/modules/programs/hyprland/_config.nix b/modules/programs/hyprland/_config.nix index 284ed91..a5c67bd 100644 --- a/modules/programs/hyprland/_config.nix +++ b/modules/programs/hyprland/_config.nix @@ -47,11 +47,13 @@ in col.active_border = rgba(1affffee) col.inactive_border = rgba(595959aa) - cursor_inactive_timeout = 1 - layout = dwindle } + cursor { + inactive_timeout = 1 + } + decoration { # See https://wiki.hyprland.org/Configuring/Variables/ for more