diff --git a/flake.lock b/flake.lock index 38838fd..1031165 100644 --- a/flake.lock +++ b/flake.lock @@ -1004,27 +1004,6 @@ "type": "github" } }, - "hyprWorkspaceLayouts": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1771715236, - "narHash": "sha256-+xtlpMZYQ+ScVXeNn6whkFygsRwCMbsEn3XK+aSyGgs=", - "owner": "zakk4223", - "repo": "hyprWorkspaceLayouts", - "rev": "d1d943209a6fe13ba4107d172179774748bea0fc", - "type": "github" - }, - "original": { - "owner": "zakk4223", - "repo": "hyprWorkspaceLayouts", - "type": "github" - } - }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -1123,7 +1102,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks": "pre-commit-hooks_3", "systems": "systems_5", "xdph": "xdph" @@ -1277,7 +1256,7 @@ "hyprlang": "hyprlang_2", "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "systems": "systems_6" }, "locked": { @@ -1587,7 +1566,7 @@ "cachyos-kernel-patches": "cachyos-kernel-patches", "flake-compat": "flake-compat_9", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1771525883, @@ -1646,7 +1625,7 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1768062066, @@ -1805,22 +1784,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1772198003, - "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1719082008, "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", @@ -1869,22 +1832,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1758198701, - "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1772198003, "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", @@ -1900,7 +1847,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1766070988, "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", @@ -1916,7 +1863,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1759070547, "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", @@ -1932,7 +1879,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1771482645, "narHash": "sha256-MpAKyXfJRDTgRU33Hja+G+3h9ywLAJJNRq4Pjbb4dQs=", @@ -1948,7 +1895,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1767364772, "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", @@ -1964,6 +1911,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1772198003, + "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nmd": { "flake": false, "locked": { @@ -2155,7 +2118,7 @@ "inputs": { "flake-compat": "flake-compat_8", "gitignore": "gitignore_6", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1760663237, @@ -2174,7 +2137,7 @@ "pyprland": { "inputs": { "flake-compat": "flake-compat_10", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_10", "pyproject-nix": "pyproject-nix", "systems": "systems_10" }, @@ -2225,7 +2188,6 @@ "git-hooks": "git-hooks", "hb-downloader": "hb-downloader", "home-manager": "home-manager_2", - "hyprWorkspaceLayouts": "hyprWorkspaceLayouts", "hyprland": "hyprland", "hyprlock": "hyprlock", "lanzaboote": "lanzaboote", @@ -2237,7 +2199,7 @@ "nix-gaming": "nix-gaming", "nix-index-database": "nix-index-database", "nix-on-droid": "nix-on-droid", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "note": "note", "pyprland": "pyprland", "secrets": "secrets", diff --git a/flake.nix b/flake.nix index dfe7396..253eeaf 100644 --- a/flake.nix +++ b/flake.nix @@ -125,12 +125,6 @@ # Pyland for hyprland plugins pyprland.url = "github:hyprland-community/pyprland"; - # Hyprland layout per workspace - hyprWorkspaceLayouts = { - url = "github:zakk4223/hyprWorkspaceLayouts"; - inputs.hyprland.follows = "hyprland"; # to make sure that the plugin is built for the correct version of hyprland - }; - # AAGL aagl.url = "github:ezKEa/aagl-gtk-on-nix"; aagl.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/linux/home-manager/hyprland.nix b/modules/linux/home-manager/hyprland.nix index e442603..99e7386 100644 --- a/modules/linux/home-manager/hyprland.nix +++ b/modules/linux/home-manager/hyprland.nix @@ -107,8 +107,6 @@ in { systemd.enable = false; # Using USWM globally - plugins = [inputs.hyprWorkspaceLayouts.packages.${pkgs.stdenv.hostPlatform.system}.default]; - settings = { "$mod" = "SUPER"; "$menu" = "tofi"; @@ -177,7 +175,6 @@ in { border_size = 1; gaps_in = 3; gaps_out = 6; - layout = "workspacelayout"; allow_tearing = true; };