@@ -26,7 +26,7 @@ 
 complete -cf doas
 
 # z
-source ~/leet/z/z.sh
+# source ~/leet/z/z.sh
 
 for i in ~/.bashrc.d/[0-9]*; do
     . "$i"

@@ -1,6 +1,6 @@ 
 # export thingys
 export BROWSER=/usr/local/bin/vimb
-export EDITOR=/usr/bin/vim
+export EDITOR=/usr/bin/nvim
 export SSH_KEY_PATH="~/.ssh/id_rsa"
 export PATH=$HOME/bin:$PATH
 export GPG_TTY=$(tty)
@@ -13,6 +13,7 @@ export PATH=$PATH:/usr/local/pgsql/bin
 export PW_DIR=~/passwords
 export PW_KEY=x@icyphox.sh
 export _Z_CMD="j"
+export MOZ_ACCELERATED=1
 export CFLAGS="-O3 -pipe -march=native"
 export CXXFLAGS="-O3 -pipe -march=native"
 export MAKEFLAGS="-j4"

@@ -6,8 +6,8 @@ alias gst="git status --short"
 alias ga="git add"
 alias gd="git diff --minimal"
 alias gl="git log --oneline --decorate --graph"
-alias ls="ls --color"
-alias vim="vim"
+alias ls="colorls -G"
+alias vim="nvim"
 
 socks() {
     pkill ssh

@@ -9,31 +9,34 @@ gry="\e[94m"
 rst="\e[0m"
 
 git_branch() {
-    local git_status="$(git status 2> /dev/null)"
-    local on_branch="On branch ([^${IFS}]*)"
-    local on_commit="HEAD detached at ([^${IFS}]*)"
-    status="$(git status --porcelain 2> /dev/null)"
-    local exit="$?"
-    color=""
+    [[ -d "$PWD/.git" ]] && {
+        local git_status="$(git status 2> /dev/null)"
+        local on_branch="On branch ([^${IFS}]*)"
+        local on_commit="HEAD detached at ([^${IFS}]*)"
+        status="$(git status --porcelain 2> /dev/null)"
+        local exit="$?"
+        color=""
 
-    if [[ "$exit" -eq 0 ]]; then
-        if [[ "${#status}" -eq 0 ]]; then
-            color="${grn}"  
+        if [[ "$exit" -eq 0 ]]; then
+            if [[ "${#status}" -eq 0 ]]; then
+                color="${grn}"  
+            else
+                color="${red}"
+            fi
         else
-            color="${red}"
+            printf ''
         fi
-    else
-        printf ''
-    fi
 
 
-    if [[ $git_status =~ $on_branch ]]; then
-        local branch=${BASH_REMATCH[1]}
-        printf '%b'  "$color $branch $rst"
-    elif [[ $git_status =~ $on_commit ]]; then
-        local commit=${BASH_REMATCH[1]}
-        printf '%b' "$color $commit $rst"
-    fi
+        if [[ $git_status =~ $on_branch ]]; then
+            local branch=${BASH_REMATCH[1]}
+            printf '%b'  "$color $branch $rst"
+        elif [[ $git_status =~ $on_commit ]]; then
+            local commit=${BASH_REMATCH[1]}
+            printf '%b' "$color $commit $rst"
+        fi
+    
+    }
 }
 
 prompt_pwd() {

@@ -1,15 +1,16 @@ 
-backend = "xrender";
+backend = "glx";
 glx-no-stencil = true;
 glx-copy-from-front = false;
 
 # rounded corners
-corner-radius = 5;
+# corner-radius = 5;
 
 shadow = true;
-shadow-radius = 60;
-shadow-opacity = 0.25;
-shadow-offset-x = -60;
+shadow-radius = 40;
+shadow-opacity = 0.10;
+shadow-offset-x = -20;
 shadow-offset-y = -25;
+
 
 shadow-exclude = [
     "window_type = 'dock'",

@@ -59,7 +59,6 @@ set expandtab
 set softtabstop=4    " backspace through spaces
 set nocompatible
 set noshowmode
-set fillchars+=vert:│
 
 " wildcard ignores
 set wildignore+=.git,.hg,.svn

@@ -8,12 +8,12 @@ #(_)_/\_\_|_| |_|_|\__|_|  \___|
 #
 
 setxkbmap -option 'grp:alt_shift_toggle' -layout us,ru -variant ',phonetic' -option 'compose:caps'
-~/.fehbg &
+# ~/.fehbg &
 eval "$(gpg-agent --daemon --enable-ssh-support --write-env-file "${HOME}/.gpg-agent-info")"
-sxhkd &
+# sxhkd &
 xrdb -l ~/.Xresources
-st &
-date -s "$(date -u -I) $(date -u +%H:%M:%S)"
+# st &
 compton &
+urxvtd &
 xsetroot -cursor_name left_ptr
-exec 2bwm
+exec cwm

@@ -90,7 +90,6 @@ mouse = on
 mouse_timer_delay = 100
 nick_color_force = ""
 nick_color_hash = djb2
-nick_color_hash_salt = ""
 nick_color_stop_chars = "_|["
 nick_prefix = "  "
 nick_suffix = ""
@@ -98,7 +97,7 @@ paste_auto_add_newline = on
 paste_bracketed = on
 paste_bracketed_timer_delay = 10
 paste_max_lines = 1
-prefix_action = "· "
+prefix_action = "? "
 prefix_align = right
 prefix_align_max = 15
 prefix_align_min = 0
@@ -108,10 +107,10 @@ prefix_buffer_align = right
 prefix_buffer_align_max = 0
 prefix_buffer_align_more = " "
 prefix_buffer_align_more_after = on
-prefix_error = " × "
-prefix_join = " · "
+prefix_error = " ? "
+prefix_join = " ? "
 prefix_network = " - "
-prefix_quit = " · "
+prefix_quit = " ? "
 prefix_same_nick = " "
 prefix_same_nick_middle = ""
 prefix_suffix = ""
@@ -120,7 +119,7 @@ quote_nick_suffix = ">"
 quote_time_format = "%H%M"
 read_marker = line
 read_marker_always_show = off
-read_marker_string = "─"
+read_marker_string = "?"
 save_config_on_exit = on
 save_config_with_fsync = off
 save_layout_on_exit = buffers
@@ -315,7 +314,7 @@ input.conditions = ""
 input.filling_left_right = vertical
 input.filling_top_bottom = horizontal
 input.hidden = off
-input.items = "buffer_name ▲ ,input_text"
+input.items = "buffer_name  ,input_text"
 input.position = bottom
 input.priority = 1000
 input.separator = on
@@ -342,7 +341,7 @@ nicklist.color_fg = 8
 nicklist.conditions = "nicklist"
 nicklist.filling_left_right = vertical
 nicklist.filling_top_bottom = columns_vertical
-nicklist.hidden = off
+nicklist.hidden = on
 nicklist.items = "buffer_nicklist"
 nicklist.position = right
 nicklist.priority = 200
@@ -382,16 +381,17 @@ 
 [layout]
 default.buffer = "core;weechat;1"
 default.buffer = "irc;server.freenode;1"
-default.buffer = "irc;server.rizon;2"
-default.buffer = "irc;freenode.#kisslinux;3"
-default.buffer = "irc;rizon.#crimson;4"
-default.buffer = "irc;rizon.#rice;5"
-default.buffer = "irc;freenode.#lobsters;6"
-default.buffer = "irc;rizon.#homescreen;7"
-default.buffer = "irc;freenode.#cmpwn;8"
-default.buffer = "irc;freenode.#lobsters-boil;9"
-default.buffer = "irc;freenode.##russian;10"
-default.buffer = "irc;rizon.nosexrisk;11"
+default.buffer = "irc;server.rizon;1"
+default.buffer = "irc;freenode.#kisslinux;2"
+default.buffer = "irc;freenode.#lobsters;3"
+default.buffer = "irc;freenode.#cmpwn;4"
+default.buffer = "irc;freenode.#lobsters-boil;5"
+default.buffer = "irc;freenode.##russian;6"
+default.buffer = "irc;freenode.#hardenedbsd;7"
+default.buffer = "irc;freenode.#openbsd;8"
+default.buffer = "irc;rizon.#crimson;9"
+default.buffer = "irc;rizon.#rice;10"
+default.buffer = "irc;rizon.#homescreen;11"
 default.window = "1;0;0;0;irc;rizon.Carp"
 default.current = on