From 7b705fd938e8f277d062e334411b7ff93fa4db58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Mon, 6 Jul 2026 10:21:34 +0200 Subject: [PATCH] feat: luci stuff --- hosts/aero/home.nix | 1 - hosts/shark/default.nix | 9 +++---- hosts/shark/home.nix | 1 - modules/home-manager/packages/default.nix | 2 ++ modules/home-manager/theme/hyprland.lua | 2 -- modules/nixos/default.nix | 1 + modules/nixos/hardware/fv43u.nix | 7 +++++ modules/nixos/hardware/luci-keyboard | 18 +++++++++++++ modules/nixos/hardware/luci-keyboard.nix | 33 +++++++++++++++++++++++ 9 files changed, 64 insertions(+), 10 deletions(-) create mode 100644 modules/nixos/hardware/luci-keyboard create mode 100644 modules/nixos/hardware/luci-keyboard.nix diff --git a/hosts/aero/home.nix b/hosts/aero/home.nix index e3a1f49..1644ba2 100755 --- a/hosts/aero/home.nix +++ b/hosts/aero/home.nix @@ -29,7 +29,6 @@ mfact = 0.65; always_keep_position = true; }; - input.kb_options = "lv3:caps_switch"; }; monitor = [ { diff --git a/hosts/shark/default.nix b/hosts/shark/default.nix index 4854f42..4e1f30a 100644 --- a/hosts/shark/default.nix +++ b/hosts/shark/default.nix @@ -60,15 +60,11 @@ locale.preset.theaninova.enable = true; services.xserver = { - xkb = { - #variant = "altgr-intl"; - #layout = "us"; - layout = "de"; - }; videoDrivers = [ "nvidia" ]; }; services.airprint.enable = true; + services.languagetool.enable = true; hardware = { q3279vwf.enable = true; @@ -83,7 +79,7 @@ }; }; }; - cc1.enable = true; + luci-keyboard.enable = true; nvidia.preset.proprietary.enable = true; @@ -178,6 +174,7 @@ nfs-utils opensc openssl + github-copilot-cli # secure boot / tmp2 sbctl tpm2-tss diff --git a/hosts/shark/home.nix b/hosts/shark/home.nix index 6f69392..d22db47 100755 --- a/hosts/shark/home.nix +++ b/hosts/shark/home.nix @@ -23,7 +23,6 @@ }) ]; }; - wayland.windowManager.hyprland.settings.config.input.kb_options = "lv3:caps_switch"; services.nextcloud-client.enable = true; systemd.user.services = { nm-applet = { diff --git a/modules/home-manager/packages/default.nix b/modules/home-manager/packages/default.nix index 95bb283..3aa2b99 100644 --- a/modules/home-manager/packages/default.nix +++ b/modules/home-manager/packages/default.nix @@ -53,6 +53,8 @@ # development ghidra kdePackages.kate + tinymist + typewriter # utils kdePackages.ark diff --git a/modules/home-manager/theme/hyprland.lua b/modules/home-manager/theme/hyprland.lua index 88ba1d3..555c30c 100644 --- a/modules/home-manager/theme/hyprland.lua +++ b/modules/home-manager/theme/hyprland.lua @@ -49,5 +49,3 @@ hl.animation({ leaf = "border", enabled = true, speed = 1, spring = "default" }) hl.animation({ leaf = "fade", enabled = true, speed = 3, bezier = "linear" }) hl.animation({ leaf = "fadeShadow", enabled = true, speed = 4, bezier = "linear" }) hl.animation({ leaf = "fadeDim", enabled = true, speed = 4, bezier = "linear" }) - -hl.animation({ leaf = "workspaces", enabled = true, speed = 1, spring = "default", style = "slidevert" }) diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 9260eb5..8afc613 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -15,6 +15,7 @@ ./hardware/astro-a50.nix ./hardware/audio.nix ./hardware/gbmonctl.nix + ./hardware/luci-keyboard.nix ./hardware/nvidia-proprietary.nix ./hardware/nvidia-nouveau.nix ./hardware/amdgpu.nix diff --git a/modules/nixos/hardware/fv43u.nix b/modules/nixos/hardware/fv43u.nix index 5f09748..d8bdfbe 100644 --- a/modules/nixos/hardware/fv43u.nix +++ b/modules/nixos/hardware/fv43u.nix @@ -56,6 +56,13 @@ in no_break_fs_vrr = 1; }; }; + animation = { + leaf = "workspaces"; + enabled = true; + speed = 1; + spring = "default"; + style = "slidevert"; + }; monitor = { output = "DP-3"; mode = "3840x2160@144"; diff --git a/modules/nixos/hardware/luci-keyboard b/modules/nixos/hardware/luci-keyboard new file mode 100644 index 0000000..3a59f44 --- /dev/null +++ b/modules/nixos/hardware/luci-keyboard @@ -0,0 +1,18 @@ +xkb_symbols "luci-keyboard" +{ + include "de(basic)" + + key {[backslash, bar]}; + key { + type="ONE_LEVEL", + symbols[Group1] = [ bar ] + }; + key {[braceleft]}; + key {[braceright]}; + key { + type="ONE_LEVEL", + symbols[Group1] = [ at ] + }; + key {[asciitilde]}; +}; + diff --git a/modules/nixos/hardware/luci-keyboard.nix b/modules/nixos/hardware/luci-keyboard.nix new file mode 100644 index 0000000..669d049 --- /dev/null +++ b/modules/nixos/hardware/luci-keyboard.nix @@ -0,0 +1,33 @@ +{ + pkgs, + lib, + config, + username, + ... +}: +with lib; + +let + cfg = config.hardware.luci-keyboard; +in +{ + options.hardware.luci-keyboard = { + enable = mkEnableOption "Enable Luci Keyboard Layout"; + }; + + config = mkIf cfg.enable { + home-manager.users."${username}".xdg.configFile."xkb/symbols/luci-keyboard".source = + ./luci-keyboard; + console.useXkbConfig = true; + services.xserver.xkb = { + layout = "luci-keyboard"; + extraLayouts.luci-keyboard = { + description = "Luci's optimized layout"; + languages = [ + "ger" + ]; + symbolsFile = ./luci-keyboard; + }; + }; + }; +}