From 92f0ed1082ed8bb07ccb26122fca3a69f60a8a19 Mon Sep 17 00:00:00 2001 From: LarsZauberer Date: Sat, 13 Apr 2024 09:32:56 +0200 Subject: [PATCH 1/3] Simple hyprland config changed --- hosts/lars/hyprland.nix | 3 +++ hosts/lars/programs.nix | 2 ++ 2 files changed, 5 insertions(+) diff --git a/hosts/lars/hyprland.nix b/hosts/lars/hyprland.nix index 24afae1..16d7b37 100644 --- a/hosts/lars/hyprland.nix +++ b/hosts/lars/hyprland.nix @@ -49,6 +49,9 @@ in { "$mod, Q, killactive" "$mod, return, exec, alacritty" "$mod SHIFT, return, exec, firefox" + + # Application + "$mod SHIFT, c, exec, code" # Monitor management "$mod SHIFT, k, movecurrentworkspacetomonitor, DP-2" diff --git a/hosts/lars/programs.nix b/hosts/lars/programs.nix index 97a5b03..633eb9a 100644 --- a/hosts/lars/programs.nix +++ b/hosts/lars/programs.nix @@ -48,6 +48,8 @@ in { tmux firefox kitty + nextcloud-client + vscode ]; }; } From dd4982d56f4397c3439f6735924c489026905556 Mon Sep 17 00:00:00 2001 From: LarsZauberer Date: Sat, 13 Apr 2024 10:34:50 +0200 Subject: [PATCH 2/3] Hyprlock update --- flake.lock | 153 +++++++++++++++++------------------------------------ 1 file changed, 49 insertions(+), 104 deletions(-) diff --git a/flake.lock b/flake.lock index 1c1e138..319d786 100644 --- a/flake.lock +++ b/flake.lock @@ -222,7 +222,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_5" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -330,14 +330,17 @@ "hyprcursor": { "inputs": { "hyprlang": [ + "split-monitor-workspaces", "hyprland", "hyprlang" ], "nixpkgs": [ + "split-monitor-workspaces", "hyprland", "nixpkgs" ], "systems": [ + "split-monitor-workspaces", "hyprland", "systems" ] @@ -361,19 +364,17 @@ "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_2", + "nixpkgs": "nixpkgs_5", + "systems": "systems_3", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1712877538, - "narHash": "sha256-FK4Rhq9mEf8wpS3/K/ueB5Sql2XOeCQX/SzCe/QySNk=", + "lastModified": 1712969717, + "narHash": "sha256-vAtfM8lHOLjuHh/CTzSFUaCJp0qlAWttWimin3KoDXM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "b1a94302897ae559c877471f7d365651bcd24ad4", + "rev": "582d6233c802327fea45a14d146e7cbab5fe4b1e", "type": "github" }, "original": { @@ -385,10 +386,12 @@ "hyprland-protocols": { "inputs": { "nixpkgs": [ + "split-monitor-workspaces", "hyprland", "nixpkgs" ], "systems": [ + "split-monitor-workspaces", "hyprland", "systems" ] @@ -410,10 +413,12 @@ "hyprlang": { "inputs": { "nixpkgs": [ + "split-monitor-workspaces", "hyprland", "nixpkgs" ], "systems": [ + "split-monitor-workspaces", "hyprland", "systems" ] @@ -432,50 +437,6 @@ "type": "github" } }, - "hyprlang_2": { - "inputs": { - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": "systems_3" - }, - "locked": { - "lastModified": 1711250455, - "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlock": { - "inputs": { - "hyprlang": "hyprlang_2", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_4" - }, - "locked": { - "lastModified": 1712861866, - "narHash": "sha256-7ISUD6Z8FivTw/Db8tGJdiJeqpvJs7CSCwadopb1oro=", - "owner": "hyprwm", - "repo": "hyprlock", - "rev": "6fa65e1172d633e61ed957a49e7cf96010432623", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlock", - "type": "github" - } - }, "lib-aggregate": { "inputs": { "flake-utils": "flake-utils", @@ -697,6 +658,22 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1712439257, + "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1712918680, @@ -718,8 +695,6 @@ "anyrun": "anyrun", "fenix": "fenix", "home-manager": "home-manager_2", - "hyprland": "hyprland", - "hyprlock": "hyprlock", "nixpkgs": "nixpkgs_2", "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", @@ -794,9 +769,7 @@ }, "split-monitor-workspaces": { "inputs": { - "hyprland": [ - "hyprland" - ], + "hyprland": "hyprland", "nix-filter": "nix-filter" }, "locked": { @@ -830,16 +803,16 @@ }, "systems_2": { "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" } }, @@ -858,36 +831,6 @@ "type": "github" } }, - "systems_4": { - "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_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -913,37 +856,39 @@ "wlroots": { "flake": false, "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1709983277, - "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" + "lastModified": 1712935342, + "narHash": "sha256-zzIbTFNFd/as42jyGx23fil2uBDYYv+8GA5JmRq5y9c=", + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "62eeffbe233d199f520a5755c344e85f8eab7940", + "type": "github" }, "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "62eeffbe233d199f520a5755c344e85f8eab7940", + "type": "github" } }, "xdph": { "inputs": { "hyprland-protocols": [ + "split-monitor-workspaces", "hyprland", "hyprland-protocols" ], "hyprlang": [ + "split-monitor-workspaces", "hyprland", "hyprlang" ], "nixpkgs": [ + "split-monitor-workspaces", "hyprland", "nixpkgs" ], "systems": [ + "split-monitor-workspaces", "hyprland", "systems" ] From cfebfbd7463d5ab040d5eee4c13110deadf635f1 Mon Sep 17 00:00:00 2001 From: LarsZauberer Date: Sat, 13 Apr 2024 10:34:59 +0200 Subject: [PATCH 3/3] hyprland monitor fix --- hosts/lars/hyprland.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hosts/lars/hyprland.nix b/hosts/lars/hyprland.nix index 6dbcc8b..f9178a7 100644 --- a/hosts/lars/hyprland.nix +++ b/hosts/lars/hyprland.nix @@ -9,7 +9,7 @@ in { monitor = mkOption { description = "hyprland monitor config"; default = ",preferred,auto,1"; - type = types.listof(types.str); + type = types.listOf(types.str); }; }; @@ -41,6 +41,9 @@ in { wayland.windowManager.hyprland = { enable = true; settings = { + # Monitor config + monitor = cfg.monitor; + "$mod" = "SUPER"; input = { @@ -51,9 +54,10 @@ in { "$mod, Q, killactive" "$mod, return, exec, alacritty" "$mod SHIFT, return, exec, firefox" + "$mod SHIFT, m, exit" # Application - "$mod SHIFT, c, exec, code" + "$mod SHIFT, c, exec, code --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu" # Monitor management "$mod SHIFT, k, movecurrentworkspacetomonitor, DP-2"