@@ -6,3 +6,9 @@ config/fish/functions/__z_clean.fish
 config/fish/functions/__z_complete.fish
 config/fish/functions/fisher.fish
 config/fish/completions/helm.fish
+config/fish/completions/nvm.fish
+config/fish/functions/_nvm_index_update.fish
+config/fish/functions/_nvm_list.fish
+config/fish/functions/_nvm_version_activate.fish
+config/fish/functions/_nvm_version_deactivate.fish
+config/fish/functions/nvm.fish

@@ -1,8 +1,8 @@ 
 Host github.com
         Hostname ssh.github.com
         Port 443
-    TCPKeepAlive yes
-        IdentityFile ~/.ssh/github
+        TCPKeepAlive yes
+        IdentityFile ~/.ssh/github-new
 
 Host deepsource
     Hostname github.com

@@ -1,8 +1,6 @@ 
 HISTFILE=$HOME/.ksh_history
 HISTSIZE=20000
 
-set -o emacs
-
 for i in ~/.kshrc.d/[0-9]*; do
     . "$i"
 done

@@ -1,19 +0,0 @@ 
-export MARKPATH=$HOME/.marks
-
-function mark {
-  mkdir -p "$MARKPATH"; ln -s "$PWD" "$MARKPATH/$1"
-}
-
-function unmark {
-    rm -i "$MARKPATH/"$(basename $PWD)""
-}
-
-function marks {
-    for f in "$MARKPATH"/*; do
-        printf '%s → %s\n' "$(basename "$f")" "$(readlink "$f")"
-    done
-}
-
-function j {
-  cd -P "$MARKPATH/$1" 2>/dev/null || printf '%s\n' "error: no such mark $1"
-}

@@ -5,7 +5,6 @@ alias gc="git commit -v -s"
 alias ga="git add"
 alias gd="git diff --minimal"
 alias gl="git log --oneline --decorate --graph"
-alias ls="colorls -G"
 alias vim="nvim"
 alias ..="cd .."
 alias m="nail"
@@ -45,3 +44,11 @@ 
 gcl() {
     git clone "$@"
 }
+
+ls() {
+    if [ "$(uname)" == "OpenBSD" ]; then
+        colorls -G "$@"
+    else
+        /bin/ls -G "$@"
+    fi
+}

@@ -1,25 +1,23 @@ 
 set -o emacs
-lf='
-'
 cr=$(print -n '\r')
 esc=$(print -n '\033')
 ps1flag=$(print -n '\001')
 
 red="$esc[31m"
-grn="$esc[32m"
-ylw="$esc[33m"
 cyn="$esc[36m"
-blu="$esc[34m"
-prp="$esc[35m"
-bprp="$esc[35;1m"
-gry="$esc[94m"
 rst="$esc[0m"
 
 git_status() {
-	if [[ -d .git ]]; then
-		git_status=$(git status 2>/dev/null)
-		on_branch=
-	fi
+    [[ -n "$(git rev-parse --is-inside-work-tree)" ]] ||
+        return
+
+    branch="$(git branch --show-current)"
+    [[ "$branch" == "" ]] && branch="$(git rev-parse --short HEAD)"
+    
+    [[ "$(git status --porcelain)" != "" ]] ||
+        clean=" *"
+
+    printf ' (%s%s)' "$branch" "$clean"
 }
 
 # first, set the rootornot part
@@ -31,6 +29,6 @@ fi
 
 # then, combine it all
 PS1="$ps1flag$cr
-$ps1flag$cyn$ps1flag\$PWD$ps1flag$rst$ps1flag
+$ps1flag$cyn$ps1flag\$PWD$rst$(git_status)$ps1flag$rst$ps1flag
 ▲$PS1 "
 PS2="> "

@@ -21,6 +21,7 @@ nick_prefix = off
 nick_prefix_empty = on
 signals_refresh = ""
 sort = "number,-active"
+use_items = 1
 
 [format]
 buffer = "${indent}${format_nick_prefix}${color_hotlist}${format_name}"

@@ -129,6 +129,7 @@ charset_message = message
 command = ""
 command_delay = 0
 connection_timeout = 60
+default_chantypes = "#&"
 ipv6 = on
 local_hostname = ""
 msg_kick = ""
@@ -201,6 +202,7 @@ rizon.msg_quit
 rizon.notify
 rizon.split_msg_max_length
 rizon.charset_message
+rizon.default_chantypes
 deavmi.addresses = "irc.icyphox.sh/6666"
 deavmi.proxy
 deavmi.ipv6
@@ -244,6 +246,7 @@ deavmi.msg_quit
 deavmi.notify
 deavmi.split_msg_max_length
 deavmi.charset_message
+deavmi.default_chantypes
 freenode.addresses = "irc.icyphox.sh/6666"
 freenode.proxy
 freenode.ipv6
@@ -287,3 +290,4 @@ freenode.msg_quit
 freenode.notify
 freenode.split_msg_max_length
 freenode.charset_message
+freenode.default_chantypes

@@ -12,9 +12,9 @@ 
 [crypt]
 cipher = aes256
 hash_algo = sha256
-passphrase_file = ""
+passphrase_command = ""
 salt = on
 
 [data]
 __passphrase__ = on
-znc = "322521FB3C64FE5D45CC4CF2714F63A73065545A7F108B47362487AE3136BD8F9E50A591CED64EF08B315732847FE40D8BC737"
+znc = "469B3B832FCAEF53F7E9E073062FE69757286C30CF0603ADB5D0E88C9B449DC15E15C66F33221155581ED05EB2BE12E1392F97"

@@ -72,6 +72,7 @@ hotlist_short_names = on
 hotlist_sort = group_time_asc
 hotlist_suffix = ""
 hotlist_unique_numbers = on
+hotlist_update_on_buffer_switch = on
 input_cursor_scroll = 20
 input_share = none
 input_share_overwrite = off
@@ -121,6 +122,7 @@ quote_time_format = "%H%M"
 read_marker = line
 read_marker_always_show = off
 read_marker_string = ""
+read_marker_update_on_buffer_switch = on
 save_config_on_exit = on
 save_config_with_fsync = off
 save_layout_on_exit = buffers
@@ -390,6 +392,14 @@ title.type = window
 
 [layout]
 default.buffer = "core;weechat;1"
+default.buffer = "irc;server.rizon;2"
+default.buffer = "irc;rizon.#anonops;3"
+default.buffer = "irc;rizon.#buddy;4"
+default.buffer = "irc;rizon.#bullshit;5"
+default.buffer = "irc;rizon.#homescreen;6"
+default.buffer = "irc;rizon.#rice;7"
+default.buffer = "irc;rizon.*mailnotify;8"
+default.buffer = "irc;rizon.*status;9"
 default.window = "1;0;0;0;irc;rizon.Carp"
 default.current = on