diff --git a/flake.lock b/flake.lock index cf8884a..2dee801 100644 --- a/flake.lock +++ b/flake.lock @@ -1192,7 +1192,7 @@ "inputs": { "flake-parts": "flake-parts_6", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -1251,7 +1251,9 @@ "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_4", "libgit2": "libgit2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression", "pre-commit-hooks": "pre-commit-hooks" @@ -1434,7 +1436,7 @@ "flake-compat": "flake-compat_3", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1723043911, @@ -1451,22 +1453,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1686020360, "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=", @@ -1482,7 +1468,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1714912032, "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", @@ -1498,7 +1484,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1720957393, "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", @@ -1595,22 +1581,6 @@ } }, "nixpkgs_7": { - "locked": { - "lastModified": 1723062461, - "narHash": "sha256-CmOcGVVyf6tOoqJVyTdxq1GwOtPF2xL98VFJa/gbEWQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0ec40869d52f68a5a27017a3a62a01a8965a3038", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1722813957, "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", @@ -1626,7 +1596,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1720781449, "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", @@ -1642,6 +1612,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nmd": { "flake": false, "locked": { @@ -3330,7 +3316,7 @@ "nix-super": "nix-super", "nixos-hardware": "nixos-hardware", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixpkgs-wayland": "nixpkgs-wayland", "quickshell": "quickshell", "schizofox": "schizofox", @@ -3446,7 +3432,7 @@ "spicetify-nix": { "inputs": { "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1704167711, @@ -3495,7 +3481,7 @@ "flake-compat": "flake-compat_5", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1722946882, @@ -3685,7 +3671,7 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1722330636, diff --git a/flake.nix b/flake.nix index 4deaddd..0e437a8 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,10 @@ }; # Nix but better - nix-super.url = "github:privatevoid-net/nix-super"; + nix-super = { + url = "github:privatevoid-net/nix-super"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager"; diff --git a/modules/wms/wayland/hypr/land.nix b/modules/wms/wayland/hypr/land.nix index 5b7e725..c902958 100644 --- a/modules/wms/wayland/hypr/land.nix +++ b/modules/wms/wayland/hypr/land.nix @@ -18,7 +18,7 @@ (inputs'.split-monitor-workspaces.packages) split-monitor-workspaces ; - inherit (lib) mkIf; + inherit (lib) mkIf; in { config = mkIf cfg.enable { # programs.hyprland = { @@ -125,9 +125,9 @@ in { ]; # Input settings input = { - kb_layout = "de"; - kb_variant = ""; - kb_model = ""; + kb_layout = "de,us"; + kb_variant = ",colemak_dh_wide"; + kb_options = "grp:alt_shift_toggle"; follow_mouse = true;