From 507b016a03eda6ee0f44a2d63e1703d2726aed1b Mon Sep 17 00:00:00 2001
From: lulusilly <lunita@puppygirl.onl>
Date: Sun, 5 Apr 2026 00:44:25 -0400
Subject: [PATCH 1/6] Reworked directory structure, changed aroundthings here
 and there in Kanata conf.kbd, Emacs init.el, and common.nix (added direnv)

---
 nix/flake.lock => flake.lock                  |   0
 nix/flake.nix => flake.nix                    |   0
 {nix/hosts => hosts}/common.nix               |   2 +
 .../dotfiles/emacs.d}/init.el                 |   3 +
 {nix/hosts => hosts}/dotfiles/ghostty/config  |   0
 {nix/hosts => hosts}/dotfiles/hypr/bg.jpg     | Bin
 .../dotfiles/hypr/hyprland.conf               |   0
 {nix/hosts => hosts}/dotfiles/hypr/start.sh   |   0
 {nix/hosts => hosts}/dotfiles/mpv/mpv.conf    |   0
 .../dotfiles/neofetch/config.conf             |   0
 {nix/hosts => hosts}/dotfiles/nvim/init.lua   |   0
 {nix/hosts => hosts}/dotfiles/waybar/config   |   0
 .../hosts => hosts}/dotfiles/waybar/style.css |   0
 {nix/hosts => hosts}/home.nix                 |   2 +-
 .../kirigiri/configuration.nix                |   0
 .../kirigiri/hardware-configuration.nix       |   0
 {nix/modules => modules}/efi.nix              |   0
 {nix/modules => modules}/hypr.nix             |   0
 {nix/modules => modules}/kanata/conf.kbd      |  99 ++++++++----------
 {nix/modules => modules}/kanata/kanata.nix    |   0
 {nix/modules => modules}/laptop.nix           |   0
 {nix/modules => modules}/syncthing.nix        |   0
 {nix/modules => modules}/virt.nix             |   0
 nix/hosts/cantor/configuration.nix            |  18 ----
 nix/hosts/cantor/hardware-configuration.nix   |  46 --------
 25 files changed, 52 insertions(+), 118 deletions(-)
 rename nix/flake.lock => flake.lock (100%)
 rename nix/flake.nix => flake.nix (100%)
 rename {nix/hosts => hosts}/common.nix (98%)
 rename {nix/hosts/dotfiles/.emacs.d => hosts/dotfiles/emacs.d}/init.el (93%)
 rename {nix/hosts => hosts}/dotfiles/ghostty/config (100%)
 rename {nix/hosts => hosts}/dotfiles/hypr/bg.jpg (100%)
 rename {nix/hosts => hosts}/dotfiles/hypr/hyprland.conf (100%)
 rename {nix/hosts => hosts}/dotfiles/hypr/start.sh (100%)
 rename {nix/hosts => hosts}/dotfiles/mpv/mpv.conf (100%)
 rename {nix/hosts => hosts}/dotfiles/neofetch/config.conf (100%)
 rename {nix/hosts => hosts}/dotfiles/nvim/init.lua (100%)
 rename {nix/hosts => hosts}/dotfiles/waybar/config (100%)
 rename {nix/hosts => hosts}/dotfiles/waybar/style.css (100%)
 rename {nix/hosts => hosts}/home.nix (98%)
 rename {nix/hosts => hosts}/kirigiri/configuration.nix (100%)
 rename {nix/hosts => hosts}/kirigiri/hardware-configuration.nix (100%)
 rename {nix/modules => modules}/efi.nix (100%)
 rename {nix/modules => modules}/hypr.nix (100%)
 rename {nix/modules => modules}/kanata/conf.kbd (59%)
 rename {nix/modules => modules}/kanata/kanata.nix (100%)
 rename {nix/modules => modules}/laptop.nix (100%)
 rename {nix/modules => modules}/syncthing.nix (100%)
 rename {nix/modules => modules}/virt.nix (100%)
 delete mode 100644 nix/hosts/cantor/configuration.nix
 delete mode 100644 nix/hosts/cantor/hardware-configuration.nix

diff --git a/nix/flake.lock b/flake.lock
similarity index 100%
rename from nix/flake.lock
rename to flake.lock
diff --git a/nix/flake.nix b/flake.nix
similarity index 100%
rename from nix/flake.nix
rename to flake.nix
diff --git a/nix/hosts/common.nix b/hosts/common.nix
similarity index 98%
rename from nix/hosts/common.nix
rename to hosts/common.nix
index 655fff2..8e58d4f 100644
--- a/nix/hosts/common.nix
+++ b/hosts/common.nix
@@ -56,6 +56,8 @@
   programs.zsh.enable = true;
   # Browser
   programs.firefox.enable = true;
+  # Direnv
+  programs.direnv.enable = true;
   # Flatpak
   # services.flatpak.enable = true;
   # Tailscale
diff --git a/nix/hosts/dotfiles/.emacs.d/init.el b/hosts/dotfiles/emacs.d/init.el
similarity index 93%
rename from nix/hosts/dotfiles/.emacs.d/init.el
rename to hosts/dotfiles/emacs.d/init.el
index befb419..8115b32 100644
--- a/nix/hosts/dotfiles/.emacs.d/init.el
+++ b/hosts/dotfiles/emacs.d/init.el
@@ -45,6 +45,9 @@
    (latex . t) ;; Latex support
    (shell . t)) ;; Posix Shell support
 )
+;; For when I'm writing blog posts and whatnot
+(require 'markdown-mode)
+(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
 ;; Set the default export directory
 (setq org-export-directory "~/org_exports/")
 ;; Show inline images in org documents
diff --git a/nix/hosts/dotfiles/ghostty/config b/hosts/dotfiles/ghostty/config
similarity index 100%
rename from nix/hosts/dotfiles/ghostty/config
rename to hosts/dotfiles/ghostty/config
diff --git a/nix/hosts/dotfiles/hypr/bg.jpg b/hosts/dotfiles/hypr/bg.jpg
similarity index 100%
rename from nix/hosts/dotfiles/hypr/bg.jpg
rename to hosts/dotfiles/hypr/bg.jpg
diff --git a/nix/hosts/dotfiles/hypr/hyprland.conf b/hosts/dotfiles/hypr/hyprland.conf
similarity index 100%
rename from nix/hosts/dotfiles/hypr/hyprland.conf
rename to hosts/dotfiles/hypr/hyprland.conf
diff --git a/nix/hosts/dotfiles/hypr/start.sh b/hosts/dotfiles/hypr/start.sh
similarity index 100%
rename from nix/hosts/dotfiles/hypr/start.sh
rename to hosts/dotfiles/hypr/start.sh
diff --git a/nix/hosts/dotfiles/mpv/mpv.conf b/hosts/dotfiles/mpv/mpv.conf
similarity index 100%
rename from nix/hosts/dotfiles/mpv/mpv.conf
rename to hosts/dotfiles/mpv/mpv.conf
diff --git a/nix/hosts/dotfiles/neofetch/config.conf b/hosts/dotfiles/neofetch/config.conf
similarity index 100%
rename from nix/hosts/dotfiles/neofetch/config.conf
rename to hosts/dotfiles/neofetch/config.conf
diff --git a/nix/hosts/dotfiles/nvim/init.lua b/hosts/dotfiles/nvim/init.lua
similarity index 100%
rename from nix/hosts/dotfiles/nvim/init.lua
rename to hosts/dotfiles/nvim/init.lua
diff --git a/nix/hosts/dotfiles/waybar/config b/hosts/dotfiles/waybar/config
similarity index 100%
rename from nix/hosts/dotfiles/waybar/config
rename to hosts/dotfiles/waybar/config
diff --git a/nix/hosts/dotfiles/waybar/style.css b/hosts/dotfiles/waybar/style.css
similarity index 100%
rename from nix/hosts/dotfiles/waybar/style.css
rename to hosts/dotfiles/waybar/style.css
diff --git a/nix/hosts/home.nix b/hosts/home.nix
similarity index 98%
rename from nix/hosts/home.nix
rename to hosts/home.nix
index e3b7618..416e44a 100644
--- a/nix/hosts/home.nix
+++ b/hosts/home.nix
@@ -137,7 +137,7 @@
     # Neovim
     ".config/nvim/init.lua" .source = dotfiles/nvim/init.lua;
     # Emacs
-    ".emacs.d/init.el" .source = dotfiles/.emacs.d/init.el;
+    "emacs.d/init.el" .source = dotfiles/.emacs.d/init.el;
     # MPV
     ".config/mpv/mpv.conf" .source = dotfiles/mpv/mpv.conf;
     # Neofetch
diff --git a/nix/hosts/kirigiri/configuration.nix b/hosts/kirigiri/configuration.nix
similarity index 100%
rename from nix/hosts/kirigiri/configuration.nix
rename to hosts/kirigiri/configuration.nix
diff --git a/nix/hosts/kirigiri/hardware-configuration.nix b/hosts/kirigiri/hardware-configuration.nix
similarity index 100%
rename from nix/hosts/kirigiri/hardware-configuration.nix
rename to hosts/kirigiri/hardware-configuration.nix
diff --git a/nix/modules/efi.nix b/modules/efi.nix
similarity index 100%
rename from nix/modules/efi.nix
rename to modules/efi.nix
diff --git a/nix/modules/hypr.nix b/modules/hypr.nix
similarity index 100%
rename from nix/modules/hypr.nix
rename to modules/hypr.nix
diff --git a/nix/modules/kanata/conf.kbd b/modules/kanata/conf.kbd
similarity index 59%
rename from nix/modules/kanata/conf.kbd
rename to modules/kanata/conf.kbd
index 6b13055..4a58eea 100644
--- a/nix/modules/kanata/conf.kbd
+++ b/modules/kanata/conf.kbd
@@ -9,14 +9,12 @@
     FEEL FREE TO FORK!!!
 |#
 (defcfg
+    process-unmapped-keys yes
+    block-unmapped-keys yes
     concurrent-tap-hold yes
     movemouse-smooth-diagonals yes
 )
-#|
-    Trying to be minimal in order to reduce constant editing 
-    of layer keys, not to mention how ugly having a 60% layout 
-    is when you have mapped keys in the grid.
-|#
+
 (defsrc
     caps
     q w e r t y u i o p
@@ -24,13 +22,13 @@
     z x c v b n m , . /
     lalt spc ralt
 )
-;; Variables for clean code
+
 (defvar
     tap-time 200
     hold-time 250
     chord-time 50
 )
-;; Bindings
+
 (defalias
     ;; Normal keyboard layer for gaming/other normie usage
     normie (layer-switch norm)
@@ -41,13 +39,18 @@
     cho    (chord ch o)
     chs    (chord ch s)
     chd    (chord ch d)
+    chf    (chord ch f)
+    chj    (chord ch j)
     chk    (chord ch k)
     chl    (chord ch l)
     ch_lalt    (chord ch lalt)
     ch_ralt    (chord ch ralt)
+    ;; Hyper and Meh Aliases
+    hyper (multi lmet lsft lctl lalt)
+    meh (multi lsft lctl lalt)
     ;; Remap Caps to Escape/Nav layer
     navlayer (layer-while-held nav)
-    caps   (tap-hold $tap-time $hold-time (tap-dance 200 (esc caps)) @navlayer)  
+    caps   (tap-hold $tap-time $hold-time (tap-dance 200 (lctl @hyper caps)) @navlayer)  
     ;; Home row mods
     a      (tap-hold $tap-time $hold-time a    lmet)
     s      (tap-hold $tap-time $hold-time s    lalt)
@@ -57,22 +60,19 @@
     k      (tap-hold $tap-time $hold-time k    lctl)
     l      (tap-hold $tap-time $hold-time l    lalt)
     scln   (tap-hold $tap-time $hold-time scln rmet)
-    ;; Numpad layer
+
     numpad (layer-while-held num)
     g      (tap-hold $tap-time $hold-time g @numpad) 
-    ;; Function key layer
+
     fnkeys (layer-while-held fn)
     h      (tap-hold $tap-time $hold-time h @fnkeys)
-    #|
-        Hyper key when V or M are held down to allow for either hand to
-        use hyper key for AHK/Raycast shortcuts.
-    |#
-    v	 (tap-hold $tap-time $hold-time v (multi lsft lctl lalt))
+
+    v	 (tap-hold $tap-time $hold-time v @meh)
     m	 (tap-hold $tap-time $hold-time m (multi lsft lctl lalt))
-    ;; Holding Spacebar activates symbol layer
+
     symbols (layer-while-held symbol)
     spc    (tap-hold $tap-time $hold-time spc @symbols) 
-    ;; Media layer when  Z or / are held.
+
     medialy (layer-while-held md)
     z    (tap-hold $tap-time $hold-time z @medialy)
     /    (tap-hold $tap-time $hold-time / @medialy)
@@ -80,39 +80,34 @@
 ;; Chord definitions. Kind of weird to read as a layperson
 ;; so I provided sufficient comments for general understanding.
 (defchords ch $chord-time
-    (w   ) w ;; W => W
-    (   e) e ;; E => E
-    (w  e) ret ;; W + E => Enter
-    (i   ) i ;; I => I
-    (   o) o ;; O => O
-    (i  o) bspc ;; I + O => Backspace
-    (s   ) @s ;; S => S
-    (   d) @d ;; D => D
-    (s  d) tab ;; S + D => Tab
-    (k   ) @k ;; K => K (See defalias)
-    (   l) @l ;; L => L (See defalias)
-    (k  l) esc ;; K + L => Escape
-    (lalt   ) (tap-dance $tap-time ((multi lsft lctl lalt lmet) lalt)) ;; LAlt => Hyper Key, LAlt × 2 => LAlt
-    (   ralt) (tap-dance $tap-time ((multi lsft lctl lalt lmet) lalt)) ;; RAlt => Hyper Key, RAlt × 2 => RAlt
-    #| 
-        Put simply, the below line allows for toggling a no-bind
-        layer for when you may require a standard layout (such as
-        playing Street Fighter, Counter Strike, etc.) by pressing
-        both alt keys at the same time. You can toggle back to the
-        base layer by holding both alts at the same time, as to allow
-        for normal functionality when holding either key down for a shortcut.
-    |#
+    (w   ) w
+    (   e) e
+    (w  e) XX
+    (i   ) i
+    (   o) o
+    (i  o) XX
+    (s   ) @s
+    (   d) @d 
+    (s  d) tab 
+    (f   ) @f
+    (f  d) tab
+    (j  k) esc
+    (k   ) @k
+    (   l) @l
+    (k  l) ret
+    (lalt   ) (tap-dance $tap-time ((multi lsft lctl lalt lmet) lalt))
+    (   ralt) (tap-dance $tap-time ((multi lsft lctl lalt lmet) lalt))
     (lalt ralt) (tap-hold $tap-time $hold-time @normie (layer-switch base))
 )
-;; Base layer with all binds enabled
+
 (deflayer base
     @caps
     q @chw @che r t y u @chi @cho p
-    @a @chs @chd @f @g @h @j @chk @chl @scln
+    @a @chs @chd @chf @g @h @chj @chk @chl @scln
     @z x c @v b n @m , . @/
     @ch_lalt @spc @ch_ralt
 )
-;; Navigation layer
+
 (deflayer nav
     _
     mbck (movemouse-up 3 3) mfwd _ _ _ mlft mrgt pgup pgdn 
@@ -120,7 +115,7 @@
     _ _ _ _ _ _ _ _ _ _
     _ _ _
 )
-;; Numpad Layer
+
 (deflayer num
     _
     _ _ _ _ _ _ 7 8 9 _
@@ -128,7 +123,7 @@
     _ _ _ _ _ 1 2 3 _
     _ _ _
 )
-;; Function key layer
+
 (deflayer fn
     _
     f1 f2 f3 f4 _ _ _ _ _ _
@@ -136,16 +131,15 @@
     f9 f10 f11 f12 _ _ _ _ _
     _ _ _
 )
-;; Symbol layer
+
 (deflayer symbol
     _
     S-1 S-2 S-3 S-4 S-5 S-6 S-7 S-8 S-9 S-0
-    - S-= S-[ S-] [ ] S-` S-scln S-\ \ 
-    = _ _ ` _ S-- _ _ ' S-'
+    S-\ = - S-= S-- ` S-` S-scln ' S-'
+    _ \ S-[ S-] S-, S-. [ ] _ _
     _ _ _
 )
-;; Aformentioned standard layer with combo binds for toggling back
-;; to base layer.
+
 (deflayer norm
     esc
     q w e r t y u i o p
@@ -153,12 +147,11 @@
     z x c v b n m , . /
     @ch_lalt spc @ch_ralt
 )
-;; Media layer
-;; NOTE: On Windows the brdn and brup keys cause Kanata to crash for some reason as of kanata_gui 1.8.1
+
 (deflayer md
     _
     _ _ _ _ _ _ _ _ _ _
-    prev pp next mute vold volu brdn brup ins del 
+    prev pp next mute _ _ vold volu brdn brup  
     _ _ _ _ _ _ _ _ _ _
     _ _ _
-)
\ No newline at end of file
+)
diff --git a/nix/modules/kanata/kanata.nix b/modules/kanata/kanata.nix
similarity index 100%
rename from nix/modules/kanata/kanata.nix
rename to modules/kanata/kanata.nix
diff --git a/nix/modules/laptop.nix b/modules/laptop.nix
similarity index 100%
rename from nix/modules/laptop.nix
rename to modules/laptop.nix
diff --git a/nix/modules/syncthing.nix b/modules/syncthing.nix
similarity index 100%
rename from nix/modules/syncthing.nix
rename to modules/syncthing.nix
diff --git a/nix/modules/virt.nix b/modules/virt.nix
similarity index 100%
rename from nix/modules/virt.nix
rename to modules/virt.nix
diff --git a/nix/hosts/cantor/configuration.nix b/nix/hosts/cantor/configuration.nix
deleted file mode 100644
index 6a167b1..0000000
--- a/nix/hosts/cantor/configuration.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ config, pkgs, lib, inputs, ... }:
-
-{
-  imports =
-    [
-      ./hardware-configuration.nix
-      ../../modules/kanata/kanata.nix
-      ../../modules/laptop.nix
-      ../../modules/efi.nix
-      ../../modules/hypr.nix
-      ../../modules/syncthing.nix
-    ]; 
-
-  networking.hostName = "cantor";
-  # Overriding this, as the touchpad doesn't work properly anymore.
-  services.libinput.enable = lib.mkForce false;
-  system.stateVersion = "25.05";
-}
diff --git a/nix/hosts/cantor/hardware-configuration.nix b/nix/hosts/cantor/hardware-configuration.nix
deleted file mode 100644
index 9da5aeb..0000000
--- a/nix/hosts/cantor/hardware-configuration.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/b6a3dc2d-983b-4be5-a1ae-e834b786377f";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/12CE-A600";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  fileSystems."/data/hdd" =
-    { device = "/dev/disk/by-uuid/8db7c071-8946-4619-96fd-83259ae8d228";
-      fsType = "xfs";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/222e2b22-388c-490a-845f-35f774c395a8"; }
-    ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

From 87702dd40ea61f5c00ce0d7359c52982b5a5f658 Mon Sep 17 00:00:00 2001
From: lulusilly <lunita@puppygirl.onl>
Date: Sun, 5 Apr 2026 00:47:45 -0400
Subject: [PATCH 2/6] Fixed mixup in home file definition for Emacs

---
 hosts/home.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosts/home.nix b/hosts/home.nix
index 416e44a..b24adb0 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -137,7 +137,7 @@
     # Neovim
     ".config/nvim/init.lua" .source = dotfiles/nvim/init.lua;
     # Emacs
-    "emacs.d/init.el" .source = dotfiles/.emacs.d/init.el;
+    ".emacs.d/init.el" .source = dotfiles/emacs.d/init.el;
     # MPV
     ".config/mpv/mpv.conf" .source = dotfiles/mpv/mpv.conf;
     # Neofetch

From 7ec42e3bd29f2c87a8d14defca01059665802281 Mon Sep 17 00:00:00 2001
From: lulusilly <lunita@puppygirl.onl>
Date: Sun, 5 Apr 2026 00:53:29 -0400
Subject: [PATCH 3/6] I fucked up Kanata configuration yippee

---
 modules/kanata/conf.kbd | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/kanata/conf.kbd b/modules/kanata/conf.kbd
index 4a58eea..6eb3be7 100644
--- a/modules/kanata/conf.kbd
+++ b/modules/kanata/conf.kbd
@@ -88,13 +88,14 @@
     (i  o) XX
     (s   ) @s
     (   d) @d 
-    (s  d) tab 
+    (s  d) ret 
     (f   ) @f
     (f  d) tab
+    (j   ) @j
     (j  k) esc
     (k   ) @k
     (   l) @l
-    (k  l) ret
+    (k  l) bspc
     (lalt   ) (tap-dance $tap-time ((multi lsft lctl lalt lmet) lalt))
     (   ralt) (tap-dance $tap-time ((multi lsft lctl lalt lmet) lalt))
     (lalt ralt) (tap-hold $tap-time $hold-time @normie (layer-switch base))

From 88c333a11c8cf73220e4aa23479a262ee648dd55 Mon Sep 17 00:00:00 2001
From: lulusilly <lunita@puppygirl.onl>
Date: Sun, 5 Apr 2026 01:02:03 -0400
Subject: [PATCH 4/6] Modified init.el & conf.kbd

---
 hosts/dotfiles/emacs.d/init.el | 3 ---
 modules/kanata/conf.kbd        | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/hosts/dotfiles/emacs.d/init.el b/hosts/dotfiles/emacs.d/init.el
index 8115b32..befb419 100644
--- a/hosts/dotfiles/emacs.d/init.el
+++ b/hosts/dotfiles/emacs.d/init.el
@@ -45,9 +45,6 @@
    (latex . t) ;; Latex support
    (shell . t)) ;; Posix Shell support
 )
-;; For when I'm writing blog posts and whatnot
-(require 'markdown-mode)
-(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
 ;; Set the default export directory
 (setq org-export-directory "~/org_exports/")
 ;; Show inline images in org documents
diff --git a/modules/kanata/conf.kbd b/modules/kanata/conf.kbd
index 6eb3be7..b8d7aa7 100644
--- a/modules/kanata/conf.kbd
+++ b/modules/kanata/conf.kbd
@@ -111,8 +111,8 @@
 
 (deflayer nav
     _
-    mbck (movemouse-up 3 3) mfwd _ _ _ mlft mrgt pgup pgdn 
-    (movemouse-left 3 3) (movemouse-down 3 3) (movemouse-right 3 3) _ home left down up right end
+    mbck (movemouse-up 3 2) mfwd _ _ _ mlft mrgt (mwheel-up 50 120) (mwheel-down 50 120) 
+    (movemouse-left 3 2) (movemouse-down 3 2) (movemouse-right 3 2) _ home left down up right end
     _ _ _ _ _ _ _ _ _ _
     _ _ _
 )

From ea569b851afe8938c539c67d51568638d6cb1c74 Mon Sep 17 00:00:00 2001
From: lulusilly <lunita@puppygirl.onl>
Date: Sun, 5 Apr 2026 01:05:11 -0400
Subject: [PATCH 5/6] more kanata slop

---
 modules/kanata/conf.kbd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kanata/conf.kbd b/modules/kanata/conf.kbd
index b8d7aa7..06e33e9 100644
--- a/modules/kanata/conf.kbd
+++ b/modules/kanata/conf.kbd
@@ -50,7 +50,7 @@
     meh (multi lsft lctl lalt)
     ;; Remap Caps to Escape/Nav layer
     navlayer (layer-while-held nav)
-    caps   (tap-hold $tap-time $hold-time (tap-dance 200 (lctl @hyper caps)) @navlayer)  
+    caps   (tap-hold $tap-time $hold-time (tap-dance 200 (esc @hyper caps)) @navlayer)  
     ;; Home row mods
     a      (tap-hold $tap-time $hold-time a    lmet)
     s      (tap-hold $tap-time $hold-time s    lalt)

From b94c5e119f8622797500035139e7c030b356e51b Mon Sep 17 00:00:00 2001
From: lulusilly <lunita@puppygirl.onl>
Date: Tue, 7 Apr 2026 20:37:32 -0400
Subject: [PATCH 6/6] Modified Kanata config

---
 modules/kanata/conf.kbd | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/modules/kanata/conf.kbd b/modules/kanata/conf.kbd
index 06e33e9..c4638a1 100644
--- a/modules/kanata/conf.kbd
+++ b/modules/kanata/conf.kbd
@@ -1,13 +1,3 @@
-#|
-    Kanata Config
-    ○ Ergonomic (kinda?) 34-key QWERTY layout
-    ○ GACS home-row mods
-    ○ Layers for function, number, media, and symbol keys 
-    ○ Dedicated (and non-intrusive!) standard layout toggle for reliant tasks
-    ○ Decently commented for beginners and seasoned veterans alike.
-    
-    FEEL FREE TO FORK!!!
-|#
 (defcfg
     process-unmapped-keys yes
     block-unmapped-keys yes
@@ -30,9 +20,8 @@
 )
 
 (defalias
-    ;; Normal keyboard layer for gaming/other normie usage
     normie (layer-switch norm)
-    ;; Key chord definitions
+
     chw    (chord ch w)
     che    (chord ch e)
     chi    (chord ch i)
@@ -45,13 +34,13 @@
     chl    (chord ch l)
     ch_lalt    (chord ch lalt)
     ch_ralt    (chord ch ralt)
-    ;; Hyper and Meh Aliases
+
     hyper (multi lmet lsft lctl lalt)
     meh (multi lsft lctl lalt)
-    ;; Remap Caps to Escape/Nav layer
+
     navlayer (layer-while-held nav)
-    caps   (tap-hold $tap-time $hold-time (tap-dance 200 (esc @hyper caps)) @navlayer)  
-    ;; Home row mods
+    caps   (tap-hold $tap-time $hold-time (tap-dance 200 ((multi @hyper d) @hyper caps)) @navlayer)  
+    
     a      (tap-hold $tap-time $hold-time a    lmet)
     s      (tap-hold $tap-time $hold-time s    lalt)
     d      (tap-hold $tap-time $hold-time d    lctl)
@@ -77,8 +66,7 @@
     z    (tap-hold $tap-time $hold-time z @medialy)
     /    (tap-hold $tap-time $hold-time / @medialy)
 )
-;; Chord definitions. Kind of weird to read as a layperson
-;; so I provided sufficient comments for general understanding.
+
 (defchords ch $chord-time
     (w   ) w
     (   e) e