Merge remote-tracking branch 'origin/nixos' into nixos-work

hosts/nixos-desktop/default.nix

@@ -24,6 +24,7 @@
     programs.hyprland.enable = true;
     programs.hyprland.nvidiaSupport = true;
     programs.hyprland.keyboardLayouts = [ "us" "de" ];
+    programs.hyprland.monitors."HDMI-A-2" = { scale = 1.2; };
     programs.exercism.enable = true;
     services.wallpaper.enable = true;
   };

hosts/nixos-laptop/default.nix

@@ -20,11 +20,119 @@
       webis.enable = true;
       impermanence.enable = true;
     };
-    programs.hyprland.enable = true;
-    programs.gitbutler.enable = true;
+    programs.river.enable = true;
+    programs.hyprland.enable = false;
     programs.exercism.enable = true;
   };
 
+  users.users.moritz.packages = [ pkgs.poetry ];
+
+  home-manager.users.moritz.services.kanshi.profiles = {
+    undocked = {
+      outputs = [
+        {
+          criteria = "eDP-1";
+        }
+      ];
+    };
+    docked = {
+      outputs = [
+        {
+          criteria = "eDP-1";
+          position = "640,1800"; # NOTE: 2160 / 1.2 = 1800
+        }
+        {
+          criteria = "DP-3";
+          scale = 1.2;
+          position = "0,0";
+        }
+      ];
+    };
+  };
+
+  services.kanata = {
+    enable = true;
+    keyboards = {
+      laptop = {
+        devices = [
+          "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
+        ];
+        config = "
+          (defsrc
+            grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc
+            tab  q    w    e    r    t    y    u    i    o    p    [    ]    \
+            caps a    s    d    f    g    h    j    k    l    ;    '    ret
+            lsft z    x    c    v    b    n    m    ,    .    /    rsft
+            lctl lmet lalt           spc            ralt      rctl
+          )
+
+          (deflayermap (default)
+            ;; tarmak 1a
+            j n
+            n k
+            k e
+
+            ;; tarmak 1b
+            h m
+            m h
+
+            ;; tarmak 2a
+            b z
+            z x
+            x c
+
+            ;; tarmak 2b
+            e f
+            f t
+            t b
+
+            ;; tarmak 3
+            c d
+            d s
+            s r
+
+            ;; tarmak 4
+            r p
+            p ;
+            ; o
+            o y
+            y j
+
+            ;; tarmak 5
+            u l
+            l i
+            i u
+
+            ;; caps-word tap-dance
+            lsft (tap-dance 200 (_ (caps-word 2000) _ _))
+
+            ;; change ctrl alt and meta
+            lctl lalt
+            lmet lctl
+            lalt (tap-dance 200 (lmet (multi lmet alt) lmet lmet))
+
+            ;; hjkl layer
+            ralt (tap-hold 200 200 (layer-switch hjkl) (layer-while-held hjkl)) ;; tap: switch   hold: switch while held
+
+            ;; switch to normal keyboard layout
+            rctl (layer-switch normal)
+          )
+
+          (deflayermap (normal)
+            rctl (layer-switch default))
+
+          (deflayermap (hjkl)
+            h left
+            j down
+            k up
+            l right
+
+            ralt (layer-switch default))
+        ";
+      };
+    };
+  };
+
   # BOOT
   boot = {
     supportedFilesystems = [ "zfs" ];
@@ -33,8 +141,8 @@
 
   # SERVICES
   services = {
-    xserver.libinput.enable = true;
-    xserver.libinput.touchpad.disableWhileTyping = true;
+    libinput.enable = true;
+    libinput.touchpad.disableWhileTyping = true;
     printing.enable = true;
     logind.lidSwitch = "hybrid-sleep";
   };