diff --git a/dot_config/kmonad/thinkpad.kbd b/dot_config/kmonad/thinkpad.kbd
index a8c75ad..458a074 100644
--- a/dot_config/kmonad/thinkpad.kbd
+++ b/dot_config/kmonad/thinkpad.kbd
@@ -42,7 +42,7 @@
   s13 S-KeyF13
   c13 C-KeyF13
   low (tap-hold-next-release 150 spc (layer-toggle lower))
-  upp (tap-hold-next-release 150 ret (layer-toggle upper))
+  upp (layer-toggle upper)
   uti (layer-toggle util)
   esc #(esc C-KeyF13)
   ssf (sticky-key 750 lsft)
@@ -50,6 +50,7 @@
   sct (sticky-key 750 lctl)
   sme (sticky-key 750 lmet)
   ar  A-ret
+  cr  C-ret
   ctl (tap-hold-next-release 500 S-KeyF13 lctl)
   met (tap-hold-next-release 500 C-KeyF13 lmet)
 )
@@ -64,8 +65,8 @@
 
 (deflayer lower
   grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc
-  tab  @esc tab  end  r    C-t  @cle pgdn pgup @cri @esc [    ]    \
-  lctl home @ssf del  tab  @sme left down up   rght :    "    ret
+  tab  @esc tab  end  @cr  C-t  @cle pgdn pgup @cri @esc [    ]    \
+  lctl home @ssf del  ret  @sme left down up   rght :    "    ret
   lsft C-z  C-x  @sct @sal @s13 bspc @ar  <    >    ?    rsft
   lctl lalt @met           @low           @uti _    bspc
 )
diff --git a/dot_config/private_fish/env.fish.tmpl b/dot_config/private_fish/env.fish.tmpl
index f25103b..4d46f2e 100644
--- a/dot_config/private_fish/env.fish.tmpl
+++ b/dot_config/private_fish/env.fish.tmpl
@@ -42,11 +42,11 @@ set -x LESSHISTFILE '-'
 # nnn (filemanager) settings
 if type -q nnn
     set -x NNN_CONTEXT_COLORS '4231'
-    {{- if eq .chezmoi.osRelease.id "arch" }}
+    {{- if eq .chezmoi.hostname "arch" }}
     set -x NNN_BMS 'm:/mnt/;h:/mnt/hdd/;t:/mnt/hdd/torrent;v:/mnt/hdd/vids;B:/mnt/hdd/bass;b:/mnt/hdd/books;M:/mnt/hdd/books/manga;d:~/dl;.:~/.config'
-    {{- else if eq .chezmoi.osRelease.id "buzz" }}
+    {{- else if eq .chezmoi.hostname "buzz" }}
     set -x NNN_BMS 'u:/usbkey;m:/mnt/;d:~/dl;t:~/dl/torrent;.:~/.config'
-    {{ end }}
+    {{- end }}
 end
 
 # python