Merge pull request #1 from nkoehring/main

sync Main and Master

dot.config/kak/autoload/stuff.kak

@@ -27,6 +27,6 @@ hook global WinSetOption filetype=rust %{
   set buffer indentwidth 4
 }
 hook global WinSetOption filetype=json %{
-  set window formatcmd 'jq .'
+  set window formatcmd 'jq --indent 2 .'
   hook window BufWritePre .* format
 }

dot.profile

@@ -23,11 +23,13 @@ alias howto="howdoi -c"
 alias icat="kitty +kitten icat"
 alias wttr="curl wttr.in"
 alias df="duf"
+alias du="dust"
 alias md="glow -p"
 alias ls="lsd"
 alias l="lsd -lha"
 alias ll="lsd -lh"
 alias lt="lsd --tree"
+alias pp="bat"
 
 # twtxt
 alias ttt="txtnish tweet"

dot.zsh/koehr.theme.zsh

@@ -72,16 +72,12 @@ ZSH_THEME_GIT_PROMPT_CLEAN="$CC_WRITE_IN_GREEN✓"
 CC_CURRENT_PATH="%1~"
 CC_HOSTNAME=`hostname`
 
-if [ "$CC_HOSTNAME" = 'koehr' ]; then
+if [ "$CC_HOSTNAME" = 'koehr-main' ]; then
   CC_HOSTNAME=$CC_SYMBOL_SERVER
 fi
 
-if [ "$CC_HOSTNAME" = 'HERENK' ]; then
-  CC_HOSTNAME=$CC_SYMBOL_WORK
-fi
-
-if [ "$CC_HOSTNAME" = 'liz' ]; then
-  CC_HOSTNAME=""
+if [ "$CC_HOSTNAME" = 'nkwd' ]; then
+  CC_HOSTNAME=$CC_SYMBOL_HOME
 fi
 
 RPROMPT='$(git_prompt_info)'"$CC_CRPROMPT $(_collapsed_path)%{$reset_color%}"

qmk/sofle-rev1-layout_koehr.json

@@ -0,0 +1,197 @@
+{
+  "version": 1,
+  "notes": "",
+  "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
+  "keyboard": "sofle/rev1",
+  "keymap": "layout_koehr",
+  "layout": "LAYOUT",
+  "layers": [
+    [
+      "KC_GESC",
+      "KC_1",
+      "KC_2",
+      "KC_3",
+      "KC_4",
+      "KC_5",
+      "KC_6",
+      "KC_7",
+      "KC_8",
+      "KC_9",
+      "KC_0",
+      "KC_MINS",
+      "KC_TAB",
+      "KC_Q",
+      "KC_W",
+      "KC_E",
+      "KC_R",
+      "KC_T",
+      "KC_Y",
+      "KC_U",
+      "KC_I",
+      "KC_O",
+      "KC_P",
+      "KC_LBRC",
+      "KC_LSPO",
+      "KC_A",
+      "KC_S",
+      "KC_D",
+      "KC_F",
+      "KC_G",
+      "KC_H",
+      "KC_J",
+      "KC_K",
+      "KC_L",
+      "KC_SCLN",
+      "KC_QUOT",
+      "KC_LCPO",
+      "KC_Z",
+      "KC_X",
+      "KC_C",
+      "KC_V",
+      "KC_B",
+      "KC_MUTE",
+      "KC_HOME",
+      "KC_N",
+      "KC_M",
+      "KC_COMM",
+      "KC_DOT",
+      "KC_SLSH",
+      "KC_RSPC",
+      "TT(1)",
+      "KC_LCTL",
+      "KC_LALT",
+      "KC_SPC",
+      "KC_LGUI",
+      "KC_ENT",
+      "KC_BSPC",
+      "KC_RALT",
+      "KC_RCTL",
+      "TT(2)"
+    ],
+    [
+      "KC_TRNS",
+      "KC_F1",
+      "KC_F2",
+      "KC_F3",
+      "KC_F4",
+      "KC_F5",
+      "KC_F6",
+      "KC_F7",
+      "KC_F8",
+      "KC_F9",
+      "KC_F10",
+      "KC_EQL",
+      "KC_TRNS",
+      "KC_F11",
+      "KC_F12",
+      "KC_F13",
+      "KC_F14",
+      "KC_F15",
+      "KC_F16",
+      "KC_F17",
+      "KC_F18",
+      "KC_F19",
+      "KC_F20",
+      "KC_RBRC",
+      "KC_TRNS",
+      "KC_F21",
+      "KC_F22",
+      "KC_F23",
+      "KC_F24",
+      "KC_NO",
+      "KC_HOME",
+      "KC_PGUP",
+      "KC_UP",
+      "KC_PGDN",
+      "KC_QUOT",
+      "KC_BSLS",
+      "KC_TRNS",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_MPLY",
+      "KC_END",
+      "KC_END",
+      "KC_LEFT",
+      "KC_DOWN",
+      "KC_RGHT",
+      "KC_LBRC",
+      "KC_RBRC",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_DEL",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS"
+    ],
+    [
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_WH_L",
+      "KC_MS_U",
+      "KC_WH_R",
+      "KC_WH_U",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_MS_L",
+      "KC_MS_D",
+      "KC_MS_R",
+      "KC_WH_D",
+      "DEBUG",
+      "RESET",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_BTN1",
+      "KC_BTN2",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO",
+      "KC_TRNS"
+    ]
+  ],
+  "author": ""
+}