updated a bunch of configs, added some themes

11 files changed, 50 insertions, 42 deletions

diff --git a/.config/i3/config b/.config/i3/config
index dd6a9e6..d6d9449 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -54,13 +54,13 @@ workspace_auto_back_and_forth yes
 
 ## COLORS
 # base colors -- set by WPG
-set $coloract "#7b895c"
-set $colorin "#545e3f"
-set_from_resource $color0 i3wm.color0 "#12231e"
-set_from_resource $color15 i3wm.color15 "#fffff5"
-set_from_resource $color8 i3wm.color8 "#22443a"
-set_from_resource $coloru i3wm.color2 "#6C6E57"
-set_from_resource $split i3wm.color10 "#969b64"
+set $coloract "#5d60a7"
+set $colorin "#404273"
+set_from_resource $color0 i3wm.color0 "#0c0c0e"
+set_from_resource $color15 i3wm.color15 "#fef5ff"
+set_from_resource $color8 i3wm.color8 "#222229"
+set_from_resource $coloru i3wm.color2 "#738738"
+set_from_resource $split i3wm.color10 "#9bbb3c"
 
 # class                 border    backgr    text    indicator child_border
 client.background       $color0
@@ -120,7 +120,7 @@ bindsym $mod+shift+F1			exec firefox /usr/local/share/doc/freebsd/handbook/book.
 bindsym $mod+F2					exec firefox
 bindsym $mod+shift+F2			exec firefox --private-window
 bindsym $mod+F3					exec alacritty -e zsh -i -c "vifm ~ ~/downloads"
-bindsym $mod+F4 				exec alacritty -t "Reading Email" -e zsh -i -c mutt && mbsync -c ~/.config/mbsync/mbsyncrc -a && pkill -77 i3blocks
+bindsym $mod+F4 				exec alacritty -t "Reading Email" -e zsh -i -c "mutt" && mbsync -c ~/.config/mbsync/mbsyncrc -a && pkill -77 i3blocks
 bindsym $mod+F5 				exec alacritty -t "Reading News" -e zsh -i -c newsboat && pkill -78 i3blocks
 bindsym $mod+F6 				exec --no-startup-id url_handler.sh 
 bindsym $mod+F7 				exec --no-startup-id dict.sh
@@ -128,18 +128,18 @@ bindsym $mod+F8 				exec "pkill pwcview || exec pwcview -f 30 -s sif"
 bindsym $mod+shift+F8			exec --no-startup-id toggle-screencast.sh
 bindsym $mod+F9					exec --no-startup-id abraham-porter.sh
 bindsym $mod+shift+F9			exec --no-startup-id "killall picom || exec picom"
-#bindsym $mod+F10				exec 
-#bindsym $mod+F11				exec 
-bindsym $mod+shift+F11			exec xautolock -toggle
+bindsym $mod+F10				exec xautolock -toggle
+bindsym $mod+F11				exec dockd.sh dock
+bindsym $mod+shift+F11			exec dockd.sh undock
 bindsym $mod+shift+F12			exec alacritty -e zsh -i -c mixertui && pkill -75 i3blocks
 bindsym $mod+Return 			split horizontal; exec alacritty
 bindsym $mod+shift+Return		split vertical; exec alacritty
 bindsym $mod+shift+Insert		exec $locker
 bindsym $mod+a					exec rofi -show run
 bindsym $mod+shift+q			kill
-bindsym --release Print			exec scrot -z -e 'mkdir -p ~/pictures/screenshots && mv $f ~/pictures/screenshots/'
-bindsym --release shift+Print	exec scrot -sfz -e 'mkdir -p ~/pictures/screenshots && mv $f ~/pictures/screenshots/'
-bindsym --release $mod+Print	exec scrot -sfz -e 'mkdir -p ~/pictures/screenshots && mv $f ~/pictures/screenshots/'
+bindsym --release Print			exec import -window root ~/Nextcloud/InstantUpload/Screenshots/`date +"%Y-%m-%d-%H-%M-%S"`.png
+bindsym --release shift+Print	exec import ~/Nextcloud/InstantUpload/Screenshots/`date +"%Y-%m-%d-%H-%M-%S"`.png
+bindsym --release $mod+Print	exec import ~/Nextcloud/InstantUpload/Screenshots/`date +"%Y-%m-%d-%H-%M-%S"`.png
 bindsym Mod4+p					exec nvidia-settings
 bindsym XF86AudioLowerVolume	exec --no-startup-id mixer vol -5 && $sigaudio
 bindsym XF86AudioMute			exec --no-startup-id mixer vol 0 && $sigaudio
@@ -216,3 +216,4 @@ for_window [title = "sxiv"] floating enable
 
 ## STARTUP
 exec firefox
+exec nextcloud
diff --git a/.config/i3blocks/config b/.config/i3blocks/config
index 367681d..8791d17 100644
--- a/.config/i3blocks/config
+++ b/.config/i3blocks/config
@@ -13,17 +13,17 @@ separator_block_width=15
 
 [packages]
 interval=3600
-command=count=$(pkg upgrade -n | sed -n 's/^Number of packages to be upgraded:\(.*\)/\1/p') ; [ -n "$count" ] && [ "$count" -gt 0 ] && printf "󰏖%s" $count && return 33 || return 0
+command=[ "$BLOCK_BUTTON" == 3 ] && alacritty -e zsh -i -c "doas pkg upgrade" || count=$(pkg upgrade -n | sed -n 's/^Number of packages to be upgraded:\(.*\)/\1/p') ; [ -n "$count" ] && [ "$count" -gt 0 ] && printf "󰏖%s" $count && return 33 || return 0
 
 [mail]
 interval=1800
 signal=12
-command=unread=$(ls ~/.mail/gmail/Inbox/new/ | wc -l | cut -w -f2) ; [ $unread -gt 0 ] && printf "󰶋%s\n" $unread || echo
+command=unread=$(ls ~/.mail/gmail/Inbox/new/ | wc -l | cut -w -f2) ; [ $unread -gt 0 ] && printf "󰶋%s\n" $unread && return 33 || return 0
 
 [news]
 interval=1800
 signal=13
-command=unread=$(newsboat -x print-unread|cut -w -f1) ; [ "$unread" != 0 ] && [ "$unread" != Authentication ] && printf "󰎕A:%s\n" $unread
+command=unread=$(newsboat -x print-unread|cut -w -f1) && [ "$unread" != 0 ] && [ "$unread" != Authentication ] && printf "󰎕%s\n" $unread || return 0
 
 #[uptime]
 #interval=300
@@ -35,11 +35,12 @@ command=doas freebsd-update updatesready > /dev/null ; [ $? -ne 2 ] && printf "�
 
 [weather]
 interval=3600
-command=fetch -qo - "https://wttr.in/23435?format=2"
+#command=[ "$BLOCK_BUTTON" = 3 ] && alacritty -e zsh -i -c "fetch --user-agent=curl -qo - https://wttr.in/23435 && read line" || fetch -qo - "https://wttr.in/23435?format=%c+%f+%h+%w"
+command=weather.sh
 
 [net]
 interval=10
-command=inet=$(ifconfig lagg0 | grep inet\ | cut -w -f3 | tr '\n' ' ') ; [ "$(ifconfig em0|grep status|cut -d\: -f2)" = " active" ] && printf "󰈁%s\n" "$inet" || [ "$(ifconfig wlan0|grep status|cut -d\: -f2)" = " associated" ] && ssid=$(ifconfig wlan0|sed -n 's/^.*ssid \(.*\) channel.*$/\1/p') && [ -n "$ssid" ] && printf "󰖩%s %s\n" "$ssid" "$inet" || printf "󰈂Offline\n"
+command=[ "$BLOCK_BUTTON" = 3 ] && doas service netif restart || inet=$(ifconfig lagg0 | grep inet\ | cut -w -f3 | tr '\n' ' ') ; [ "$(ifconfig em0|grep status|cut -d\: -f2)" = " active" ] && printf "󰈁%s\n" "$inet" || [ "$(ifconfig wlan0|grep status|cut -d\: -f2)" = " associated" ] && ssid=$(ifconfig wlan0|sed -n 's/^.*ssid \(.*\) channel.*$/\1/p') && [ -n "$ssid" ] && printf "󰖩%s %s\n" "$ssid" "$inet" || printf "󰈂Offline\n"
 
 [screencast]
 interval=once
diff --git a/.config/mutt/mailcap b/.config/mutt/mailcap
index 8603537..dd41352 100644
--- a/.config/mutt/mailcap
+++ b/.config/mutt/mailcap
@@ -1 +1,3 @@
-text/html; w3m -I %{charset} -T text/html; copiousoutput;
+#text/html; w3m -I %{charset} -T text/html; copiousoutput;
+#text/html; firefox --new-tab %s; test=test -n "$DISPLAY"; nametemplate=%s.html; copiousoutput;
+text/html; firefox %s &; copiousoutput
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index 4e0e0ca..e750ef9 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -5,7 +5,7 @@
 source "cat ~/.config/mutt/mutt_smtp_pass |"
 
 #mailboxes = +INBOX
-auto_view text/html
+#auto_view text/html
 alternative_order text/plain text/html
 
 # Default list of header fields to weed when displaying.
diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc
index 30a82df..2275960 100644
--- a/.config/vifm/vifmrc
+++ b/.config/vifm/vifmrc
@@ -175,13 +175,12 @@ command! reload :write | restart
 " program.
 
 " Pdf
-filextype *.pdf mupdf %c %i &, apvlv %c, xpdf %c
+filextype *.pdf mupdf %c %i &
 fileviewer *.pdf mutool draw -F txt %c
 
 " Audio
 filetype *.wav,*.mp3,*.flac,*.m4a,*.wma,*.ape,*.ac3,*.og[agx],*.spx,*.opus
-	   \ {Play using mpv}
-	   \ mpv %f & 
+	   \ mpv --no-video %f 2>/dev/null
 fileviewer *.mp3 mp3info
 fileviewer *.flac soxi
 
@@ -189,8 +188,7 @@ fileviewer *.flac soxi
 filextype *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob,
          \*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.r[am],*.qt,*.divx,
          \*.as[fx]
-		\ {View using mpv}
-		\ mpv %f & 
+		\ mpv %f 2>/dev/null & 
 fileviewer *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob,
           \*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.r[am],*.qt,*.divx,
           \*.as[fx]
@@ -198,11 +196,7 @@ fileviewer *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob,
 
 " Web
 filextype *.html,*.htm
-		\ {Open with Qutebrowser}
-		\ qutebrowser %f &,
-        \ {Open with firefox}
         \ firefox %f &,
-filetype *.html,*.htm links, lynx
 
 " Object
 filetype *.o nm %f | less
diff --git a/.config/wpg/sequences b/.config/wpg/sequences
index 1c9fc09..6d2716a 100644
--- a/.config/wpg/sequences
+++ b/.config/wpg/sequences
@@ -1 +1 @@
-]4;0;#12231e\]4;1;#847C60\]4;2;#6C6E57\]4;3;#A19779\]4;4;#737A64\]4;5;#898B72\]4;6;#7B836E\]4;7;#c3c6bb\]4;8;#22443a\]4;9;#baa96e\]4;10;#969b64\]4;11;#e3cd8b\]4;12;#9aac73\]4;13;#bfc583\]4;14;#a3b97f\]4;15;#fffff5\]10;#fffff5\]11;[90]#12231e\]12;#fffff5\]13;#fffff5\]17;#fffff5\]19;#12231e\]4;232;#12231e\]4;256;#fffff5\]708;[90]#12231e\
\ No newline at end of file
+]4;0;#0c0c0e\]4;1;#A0999F\]4;2;#738738\]4;3;#AE9545\]4;4;#676995\]4;5;#8C75A7\]4;6;#6E909F\]4;7;#d4cddc\]4;8;#222229\]4;9;#e4b2dd\]4;10;#9bbb3c\]4;11;#f2c949\]4;12;#7579d2\]4;13;#b485eb\]4;14;#7dc1e0\]4;15;#fef5ff\]10;#fef5ff\]11;[90]#0c0c0e\]12;#fef5ff\]13;#fef5ff\]17;#fef5ff\]19;#0c0c0e\]4;232;#0c0c0e\]4;256;#fef5ff\]708;[90]#0c0c0e\
\ No newline at end of file
diff --git a/.config/wpg/templates/i3.base b/.config/wpg/templates/i3.base
index f38f203..79f0238 100644
--- a/.config/wpg/templates/i3.base
+++ b/.config/wpg/templates/i3.base
@@ -120,7 +120,7 @@ bindsym $mod+shift+F1			exec firefox /usr/local/share/doc/freebsd/handbook/book.
 bindsym $mod+F2					exec firefox
 bindsym $mod+shift+F2			exec firefox --private-window
 bindsym $mod+F3					exec alacritty -e zsh -i -c "vifm ~ ~/downloads"
-bindsym $mod+F4 				exec alacritty -t "Reading Email" -e zsh -i -c mutt && mbsync -c ~/.config/mbsync/mbsyncrc -a && pkill -77 i3blocks
+bindsym $mod+F4 				exec alacritty -t "Reading Email" -e zsh -i -c "mutt" && mbsync -c ~/.config/mbsync/mbsyncrc -a && pkill -77 i3blocks
 bindsym $mod+F5 				exec alacritty -t "Reading News" -e zsh -i -c newsboat && pkill -78 i3blocks
 bindsym $mod+F6 				exec --no-startup-id url_handler.sh 
 bindsym $mod+F7 				exec --no-startup-id dict.sh
@@ -128,18 +128,18 @@ bindsym $mod+F8 				exec "pkill pwcview || exec pwcview -f 30 -s sif"
 bindsym $mod+shift+F8			exec --no-startup-id toggle-screencast.sh
 bindsym $mod+F9					exec --no-startup-id abraham-porter.sh
 bindsym $mod+shift+F9			exec --no-startup-id "killall picom || exec picom"
-#bindsym $mod+F10				exec 
-#bindsym $mod+F11				exec 
-bindsym $mod+shift+F11			exec xautolock -toggle
+bindsym $mod+F10				exec xautolock -toggle
+bindsym $mod+F11				exec dockd.sh dock
+bindsym $mod+shift+F11			exec dockd.sh undock
 bindsym $mod+shift+F12			exec alacritty -e zsh -i -c mixertui && pkill -75 i3blocks
 bindsym $mod+Return 			split horizontal; exec alacritty
 bindsym $mod+shift+Return		split vertical; exec alacritty
 bindsym $mod+shift+Insert		exec $locker
 bindsym $mod+a					exec rofi -show run
 bindsym $mod+shift+q			kill
-bindsym --release Print			exec scrot -z -e 'mkdir -p ~/pictures/screenshots && mv $f ~/pictures/screenshots/'
-bindsym --release shift+Print	exec scrot -sfz -e 'mkdir -p ~/pictures/screenshots && mv $f ~/pictures/screenshots/'
-bindsym --release $mod+Print	exec scrot -sfz -e 'mkdir -p ~/pictures/screenshots && mv $f ~/pictures/screenshots/'
+bindsym --release Print			exec import -window root ~/Nextcloud/InstantUpload/Screenshots/`date +"%Y-%m-%d-%H-%M-%S"`.png
+bindsym --release shift+Print	exec import ~/Nextcloud/InstantUpload/Screenshots/`date +"%Y-%m-%d-%H-%M-%S"`.png
+bindsym --release $mod+Print	exec import ~/Nextcloud/InstantUpload/Screenshots/`date +"%Y-%m-%d-%H-%M-%S"`.png
 bindsym Mod4+p					exec nvidia-settings
 bindsym XF86AudioLowerVolume	exec --no-startup-id mixer vol -5 && $sigaudio
 bindsym XF86AudioMute			exec --no-startup-id mixer vol 0 && $sigaudio
@@ -216,3 +216,4 @@ for_window [title = "sxiv"] floating enable
 
 ## STARTUP
 exec firefox
+exec nextcloud
diff --git a/.vim/coc-settings.json b/.vim/coc-settings.json
index 443f5e6..3886f16 100644
--- a/.vim/coc-settings.json
+++ b/.vim/coc-settings.json
@@ -1,6 +1,6 @@
 {
   "coc.preferences.formatOnSaveFiletypes": [
-    "hbs",
+    "handlebars",
     "javascript",
     "css",
     "html",
@@ -12,9 +12,11 @@
     "xml"
   ],
   "rust-analyzer.checkOnSave.command": "clippy",
-  "rust-analyzer.serverPath": "/usr/local/bin/rust-analyzer",
+  "rust-analyzer.server.path": "/usr/local/bin/rust-analyzer",
   "diagnostic.warningSign": "󰀦",
   "diagnostic.errorSign": "󰚑",
   "prettier.trailingComma": "none",
-  "prettier.arrowParens": "avoid"
+  "prettier.arrowParens": "avoid",
+  "prettier.disableLanguages": ["handlebars"],
+  "prettier.proseWrap": "always"
 }
diff --git a/.vimrc b/.vimrc
index 098a45c..00b6631 100644
--- a/.vimrc
+++ b/.vimrc
@@ -21,6 +21,7 @@ syntax on 			" switch syntax highlighting on
 augroup html_vue_hbs
 	au!
 	autocmd BufNewFile,BufRead *.html|*.vue|*.hbs :inoremap <lt>/ </<C-x><C-o><Esc>==gi
+	autocmd BufNewFile,BufRead *.hbs set filetype=handlebars syntax=html
 augroup END
 
 " only do this if autocommands enabled
@@ -52,6 +53,8 @@ Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'}
 call plug#end()
 
 " COC.VIM
+let g:coc_global_extensions = ['coc-html', 'coc-rust-analyzer', 'coc-vetur', 'coc-prettier']
+
 inoremap <silent><expr> <TAB>
 \	pumvisible() ? "\<C-n>" :
 \	<SID>check_back_space() ? "\<TAB>" :
diff --git a/.zshrc b/.zshrc
index d31c8c0..2b522a0 100644
--- a/.zshrc
+++ b/.zshrc
@@ -36,7 +36,8 @@ zstyle ':completion:*' cache-path $HOME/.zsh/cache
 HISTFILE=$HOME/.zhistory
 HISTSIZE=10000
 SAVEHIST=10000
-WORDCHARS=${WORDCHARS//\/[&.;]}                                 # Don't consider certain characters part of the word
+#WORDCHARS=${WORDCHARS//\/[&.;]}                                 # Don't consider certain characters part of the word
+WORDCHARS=${WORDCHARS//[&.;]}                                 # Don't consider certain characters part of the word
 
 ## Keybindings section
 bindkey -v
diff --git a/package.json b/package.json
index e57ec2b..593e83e 100644
--- a/package.json
+++ b/package.json
@@ -4,5 +4,8 @@
     "htmlhint": "^0.14.0",
     "prettier": "^2.0.5",
     "vls": "^0.5.6"
+  },
+  "devDependencies": {
+    "ember-template-lint-plugin-prettier": "^2.0.0"
   }
 }