From 413a7d123eb47c517c04ebc4ea61960930721356 Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Fri, 19 Jun 2026 06:56:48 +0200 Subject: [PATCH 1/5] chore: moonlander keyboard layout --- profiles/contexts/desktop/wm/hyprland.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/profiles/contexts/desktop/wm/hyprland.nix b/profiles/contexts/desktop/wm/hyprland.nix index f5666b2..2063090 100644 --- a/profiles/contexts/desktop/wm/hyprland.nix +++ b/profiles/contexts/desktop/wm/hyprland.nix @@ -98,16 +98,34 @@ in { device = [ { - name = "zsa-technology-labs-moonlander-mark-i"; + name = "zsa-technology-labs-moonlander-mark-i-keyboard"; kb_layout = "us"; + kb_options = "ctrl:nocaps"; + } + { + name = "zsa-technology-labs-moonlander-mark-i-1"; + kb_layout = "us"; + kb_options = "ctrl:nocaps"; + } + { + name = "zsa-technology-labs-moonlander-mark-i-consumer-control"; + kb_layout = "us"; + kb_options = "ctrl:nocaps"; + } + { + name = "zsa-technology-labs-moonlander-mark-i-system-control"; + kb_layout = "us"; + kb_options = "ctrl:nocaps"; } { name = "vibe-typer-virtual-keyboard"; kb_layout = "de"; + kb_options = "ctrl:nocaps"; } { name = "keychron-keychron-k7"; kb_layout = "us"; + kb_options = "ctrl:nocaps"; } ]; From aa249c1f31843c04ad36bb0671cb219bfa74273c Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Fri, 19 Jun 2026 11:29:02 +0200 Subject: [PATCH 2/5] chore: moonlander keyboard layout --- profiles/contexts/desktop/wm/hyprland.nix | 36 +++++++++++++++-------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/profiles/contexts/desktop/wm/hyprland.nix b/profiles/contexts/desktop/wm/hyprland.nix index 2063090..b6d1020 100644 --- a/profiles/contexts/desktop/wm/hyprland.nix +++ b/profiles/contexts/desktop/wm/hyprland.nix @@ -40,7 +40,7 @@ in { ]; input = { - kb_layout = "de,us"; + kb_layout = "us"; kb_variant = ""; kb_model = ""; kb_rules = ""; @@ -97,24 +97,20 @@ in { }; device = [ + # Alle normalen Keyboards explizit auf de setzen: { - name = "zsa-technology-labs-moonlander-mark-i-keyboard"; - kb_layout = "us"; + name = "video-bus"; + kb_layout = "de,us"; kb_options = "ctrl:nocaps"; } { - name = "zsa-technology-labs-moonlander-mark-i-1"; - kb_layout = "us"; + name = "razer-razer-pro-click-v2-vertical-edition-keyboard"; + kb_layout = "de,us"; kb_options = "ctrl:nocaps"; } { - name = "zsa-technology-labs-moonlander-mark-i-consumer-control"; - kb_layout = "us"; - kb_options = "ctrl:nocaps"; - } - { - name = "zsa-technology-labs-moonlander-mark-i-system-control"; - kb_layout = "us"; + name = "razer-razer-pro-click-v2-vertical-edition-1"; + kb_layout = "de,us"; kb_options = "ctrl:nocaps"; } { @@ -127,6 +123,22 @@ in { kb_layout = "us"; kb_options = "ctrl:nocaps"; } + # Moonlander Sub-Devices bleiben us (erben global) + { + name = "zsa-technology-labs-moonlander-mark-i-consumer-control"; + kb_layout = "us"; + kb_options = "ctrl:nocaps"; + } + { + name = "zsa-technology-labs-moonlander-mark-i-keyboard"; + kb_layout = "us"; + kb_options = "ctrl:nocaps"; + } + { + name = "zsa-technology-labs-moonlander-mark-i-system-control"; + kb_layout = "us"; + kb_options = "ctrl:nocaps"; + } ]; windowrule = [ From 0ae4996d974a1e5ddd3088525eeaebfd345e7d88 Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Sat, 20 Jun 2026 08:34:18 +0200 Subject: [PATCH 3/5] chore: vibetyper rec indicator --- profiles/contexts/desktop/wm/hyprland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/contexts/desktop/wm/hyprland.nix b/profiles/contexts/desktop/wm/hyprland.nix index b6d1020..4a2c549 100644 --- a/profiles/contexts/desktop/wm/hyprland.nix +++ b/profiles/contexts/desktop/wm/hyprland.nix @@ -179,7 +179,7 @@ in { "match:initial_title .*streamlabs.com.*, decorate off" "match:initial_title .*streamlabs.com.*, no_shadow on" "match:initial_title .*streamlabs.com.*, no_blur on" - "match:class ^vibe-typer$, match:title ^Recording Indicator$, no_blur on" + # "match:class ^vibe-typer$, match:title ^Recording Indicator$, no_blur on" "border_color rgb(ffffff), match:xwayland 1" ]; From 6be0ad4ea0a0f3d70b65eb85cd4ddc0a04fddc42 Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Sat, 20 Jun 2026 10:51:46 +0200 Subject: [PATCH 4/5] fix: remove deprecated matchBlocks from work profile --- users/m3tam3re/identities/work.nix | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/users/m3tam3re/identities/work.nix b/users/m3tam3re/identities/work.nix index 8aaef44..0d4f292 100644 --- a/users/m3tam3re/identities/work.nix +++ b/users/m3tam3re/identities/work.nix @@ -44,29 +44,29 @@ programs.ssh = { enable = true; enableDefaultConfig = false; - matchBlocks = { + settings = { "AZ-CLD-1" = { - hostname = "152.53.186.119"; - user = "sascha.koenig"; - port = 2022; - identityFile = "~/.ssh/sascha.koenig"; + HostName = "152.53.186.119"; + User = "sascha.koenig"; + Port = 2022; + IdentityFile = "~/.ssh/sascha.koenig"; }; "AZ-PRM-1" = { - hostname = "192.168.152.76"; - user = "sascha.koenig"; - port = 2022; - identityFile = "~/.ssh/sascha.koenig"; + HostName = "192.168.152.76"; + User = "sascha.koenig"; + Port = 2022; + IdentityFile = "~/.ssh/sascha.koenig"; }; "git.az-gruppe.com" = { - hostname = "git.az-gruppe.com"; - port = 2022; - user = "sascha.koenig"; - identityFile = "~/.ssh/sascha.koenig"; + HostName = "git.az-gruppe.com"; + Port = 2022; + User = "sascha.koenig"; + IdentityFile = "~/.ssh/sascha.koenig"; }; "code.m3ta.dev" = { - hostname = "code.m3ta.dev"; - user = "m3tam3re"; - identityFile = "~/.ssh/sascha.koenig"; + HostName = "code.m3ta.dev"; + User = "m3tam3re"; + IdentityFile = "~/.ssh/sascha.koenig"; }; }; }; From 9cd60383f885e877892e60a3f6034ffd1734c64c Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Sat, 20 Jun 2026 10:58:22 +0200 Subject: [PATCH 5/5] fix: vibetyper hyprland setting --- profiles/contexts/desktop/wm/hyprland.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/profiles/contexts/desktop/wm/hyprland.nix b/profiles/contexts/desktop/wm/hyprland.nix index 4a2c549..fb11344 100644 --- a/profiles/contexts/desktop/wm/hyprland.nix +++ b/profiles/contexts/desktop/wm/hyprland.nix @@ -179,7 +179,11 @@ in { "match:initial_title .*streamlabs.com.*, decorate off" "match:initial_title .*streamlabs.com.*, no_shadow on" "match:initial_title .*streamlabs.com.*, no_blur on" - # "match:class ^vibe-typer$, match:title ^Recording Indicator$, no_blur on" + "match:class ^vibe-typer$, match:title ^Recording Indicator$, no_blur on" + "match:class ^vibe-typer$, match:title ^Recording Indicator$, no_shadow on" + "match:class ^vibe-typer$, match:title ^Recording Indicator$, no_anim on" + "match:class ^vibe-typer$, match:title ^Recording Indicator$, border_size 0" + "match:class ^vibe-typer$, match:title ^Recording Indicator$, no_focus on" "border_color rgb(ffffff), match:xwayland 1" ];