diff --git a/dotfiles/kanata/conf.kbd b/dotfiles/kanata/conf.kbd
index 856af3c..81876d0 100755
--- a/dotfiles/kanata/conf.kbd
+++ b/dotfiles/kanata/conf.kbd
@@ -49,14 +49,14 @@
     navlayer (layer-while-held nav)
     caps   (tap-hold $tap-time $hold-time (tap-dance 200 (esc caps)) @navlayer)  
     ;; Home row mods
-    a      (tap-hold $tap-time $hold-time a    lctl)
+    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    lmet)
+    d      (tap-hold $tap-time $hold-time d    lctl)
     f      (tap-hold $tap-time $hold-time f    lsft)
     j      (tap-hold $tap-time $hold-time j    rsft)
-    k      (tap-hold $tap-time $hold-time k    lmet)
+    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 rctl)
+    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) 
diff --git a/flake.nix b/flake.nix
index 97e0648..b3eebf3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,7 +42,7 @@
         taps = [];
         brews = [
           "kanata" 
-          "hugo"
+          #"hugo"
           "mpv"
           "lua"
           "luarocks"
@@ -63,10 +63,10 @@
       };
 
 
-      services.yabai = {
+      /*services.yabai = {
         enable = true;
         extraConfig = builtins.readFile ./dotfiles/yabai/yabairc;
-      };
+      };*/
       /* services.skhd = {
         enable = true;
         skhdConfig = builtins.readFile ./dotfiles/skhd/skhdrc;
diff --git a/home.nix b/home.nix
index 983a4d5..7055b6b 100644
--- a/home.nix
+++ b/home.nix
@@ -12,15 +12,16 @@
     tmux # Terminal multiplexer
     btop # Resource monitor
     irssi # Terminal based IRC client
+    direnv # 
   ];
 
   home.file = {
     ".config/ghostty/config" .source = dotfiles/ghostty/config;
     ".config/kanata/conf.kbd" .source = dotfiles/kanata/conf.kbd;
-    ".config/nvim/init.lua" .source = builtins.fetchurl {
+    /* ".config/nvim/init.lua" .source = builtins.fetchurl {
       url = "https://git.luluslly.xyz/lulusilly/dotfiles/raw/branch/master/.config/nvim/init.lua";
       sha256 = "fc7104ae4957a7ff92375557725daf9872f836645556f7940fdd6366b04386e0";
-    };
+    }; */
   };
 
   home.sessionVariables = {