From e340e44b7bc69d5e545535b8c84b38fddf9fa1c4 Mon Sep 17 00:00:00 2001 From: tristan Date: Fri, 1 Mar 2024 12:14:00 +0000 Subject: [PATCH] update hyprland to 36.0 --- flake.lock | 71 ++++++++++++++----------------- flake.nix | 11 ++--- home/desktop/hyprland/default.nix | 9 ++-- 3 files changed, 43 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index bee0195..92d5dd8 100644 --- a/flake.lock +++ b/flake.lock @@ -241,22 +241,25 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs", + "hyprlang": "hyprlang", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1707098342, - "narHash": "sha256-dU5m6Cd4+WQZal2ICDVf1kww/dNzo1YUWRxWeCctEig=", + "lastModified": 1709080360, + "narHash": "sha256-oZe4k6jtO/0govmERGcbeyvE9EfTvXY5bnyIs6AsL9U=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "84ab8d11e8951a6551d1e1bf87796a8589da6d47", + "rev": "1c460e98f870676b15871fe4e5bfeb1a32a3d6d8", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.35.0", + "ref": "v0.36.0", "repo": "Hyprland", "type": "github" } @@ -290,16 +293,19 @@ "inputs": { "nixpkgs": [ "hyprland", - "xdph", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1704287638, - "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", + "lastModified": 1709082138, + "narHash": "sha256-upV2PWOoQ5hKbeuMwiJ4RJUa1JDVqzxdr5LL7YJJ/f4=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", + "rev": "42c66f6b44eb9ac64af9b6ef26325c16909a7650", "type": "github" }, "original": { @@ -310,18 +316,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706191920, - "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", + "lastModified": 1709150264, + "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", + "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08", "type": "github" }, "original": { - "owner": "NixOS", + "id": "nixpkgs", "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "indirect" } }, "nixpkgs-stable": { @@ -341,21 +346,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1709150264, - "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1708751719, "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=", @@ -371,7 +361,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1700856099, "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", @@ -391,7 +381,7 @@ "inputs": { "home-manager": "home-manager", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "sops-nix": "sops-nix", "stable-nixpkgs": "stable-nixpkgs", "stylix": "stylix" @@ -399,7 +389,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -445,7 +435,7 @@ "flake-compat": "flake-compat", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1708896938, @@ -480,18 +470,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1706359063, - "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", + "lastModified": 1708558866, + "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", "owner": "wlroots", "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" } }, @@ -501,7 +491,10 @@ "hyprland", "hyprland-protocols" ], - "hyprlang": "hyprlang", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" diff --git a/flake.nix b/flake.nix index 71fd11d..454f473 100644 --- a/flake.nix +++ b/flake.nix @@ -9,16 +9,16 @@ inputs.nixpkgs.follows = "nixpkgs"; }; stylix.url = "github:danth/stylix"; - hyprland.url = "github:hyprwm/Hyprland/v0.35.0"; + hyprland = { + url = "github:hyprwm/Hyprland/v0.36.0"; + inputs.nixpkgs.follows = "nixpkgs"; + }; sops-nix.url = "github:Mic92/sops-nix"; }; outputs = inputs: let system = "x86_64-linux"; - pkgs = import inputs.nixpkgs { - inherit system; - overlays = [inputs.hyprland.overlays]; - }; + pkgs = import inputs.nixpkgs { inherit system; }; user = "tristan"; userFullname = "Tristan Beedell"; auto-login = import ./nixos/programs/auto-login.nix; @@ -29,6 +29,7 @@ nixosConfigurations = { zenix = mkConf [ + inputs.hyprland.nixosModules.default ./hardware/zenix.nix (auto-login "Hyprland") ./nixos/programs/gamer.nix diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix index 8169e4b..021f539 100644 --- a/home/desktop/hyprland/default.nix +++ b/home/desktop/hyprland/default.nix @@ -33,10 +33,6 @@ in { kb_layout = lib.mkDefault "gb"; numlock_by_default = true; }; - "device:zsa-technology-labs-moonlander-mark-i" = { - kb_variant = ""; - kb_options = "esperanto:qwerty,lv3:ralt_switch"; - }; gestures = { workspace_swipe = true; workspace_swipe_numbered = false; @@ -186,6 +182,11 @@ in { bind = SUPER, escape, submap, reset submap = reset + device { + name = zsa-technology-labs-moonlander-mark-i + kb_variant = + kb_options = esperanto:qwerty,lv3:ralt_switch + } ''; };