From 81fedb6261248bf52e9ea938f8969a522eec69df Mon Sep 17 00:00:00 2001
From: marc <marc@sastre.cat>
Date: Sun, 1 Dec 2024 15:54:58 +0100
Subject: [PATCH] Add greek keyboard layout and include kanata in hyprland

---
 hosts/reykjavik/default.nix  |  6 ++++--
 modules/desktop/hyprland.nix | 10 +++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/hosts/reykjavik/default.nix b/hosts/reykjavik/default.nix
index b52fe64..61db599 100644
--- a/hosts/reykjavik/default.nix
+++ b/hosts/reykjavik/default.nix
@@ -62,7 +62,6 @@ in
     system.gpg.enable = true;
     system.pass.enable = true;
     system.sshfs.enable = true;
-    system.kanata.enable = true;
 
     server.vatnajokull.enable = true;
 
@@ -71,7 +70,10 @@ in
       inherit wallpaper;
       enable = true;
       laptop = true;
-      hyprland.enable = true;
+      hyprland = {
+        enable = true;
+        kb_layout = "es,gr";
+      };
     };
 
     # - Editors and development ------------------
diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix
index b2dd891..54445c3 100644
--- a/modules/desktop/hyprland.nix
+++ b/modules/desktop/hyprland.nix
@@ -10,10 +10,10 @@ in {
 
     mod = my.mkOpt' types.str "Mod4" "Main modifier key for hyprland";
 
-    laptop = mkEnableOption "Enable features for a laptop (trackpad, battery, etc...)";
+    kb_layout = my.mkOpt' types.str "es" "Keyboard layout(s) for hyprland";
 
     extraKeybindings = my.mkOpt (types.listOf types.str) [ ];
-    extraStartup = my.mkOpt (types.listOf types.attrs) [ ];
+    # extraStartup = my.mkOpt (types.listOf types.attrs) [ ];
   };
 
   config = lib.mkIf cfg.enable {
@@ -60,6 +60,7 @@ in {
     # - Dependencies -----------------------------
     samfelag.modules.desktop.rofi.enable = true;
     samfelag.modules.desktop.eww.enable = true;
+    samfelag.modules.system.kanata.enable = true;
 
     # - Configuration -----------------------------
 
@@ -85,7 +86,7 @@ in {
 
       settings = {
         input = {
-          kb_layout = "es";
+          kb_layout = cfg.kb_layout;
         };
 
         monitor = ",highres,auto,1";
@@ -163,6 +164,9 @@ in {
           ", XF86AudioPrev, exec, playerctl previous"
           ", XF86AudioStop, exec, playerctl stop"
 
+          # - Keyboard ---------------------------
+          "${cfg.mod} SHIFT, K, exec, hyprctl switchxkblayout kanata next"
+
         ] ++ cfg.extraKeybindings;
 
         binde = [