blargh

7 files changed, 8 insertions, 106 deletions

diff --git a/.aliases b/.aliases
deleted file mode 100644
index 3f94331..0000000
--- a/.aliases
+++ /dev/null
@@ -1,99 +0,0 @@
-# Aliases
-
-alias doasas=doas
-alias rclone='rclone --progress'
-alias mount_nextcloud='rclone mount Nextcloud:/ /mnt/nextcloud --vfs-cache-mode writes --daemon'
-alias monero-wallet-cli='monero-wallet-cli --config-file=/home/atc/.config/bitmonero/monero-wallet-cli.conf '
-alias cp="cp -i"
-alias dd="dd status=progress"
-alias define="dict -d gcide"
-alias df="df -h"
-alias du="du -h -c"
-alias e="$EDITOR"
-alias ffmpeg="ffmpeg -hide_banner"
-alias ffprobe="ffprobe -hide_banner"
-alias g="git status -s"
-alias gg="git add -A && git commit ; git push"
-alias grep="grep --color -i"
-alias l="ls"
-alias less="less --long-prompt --mouse --quit-if-one-screen --ignore-case --LINE-NUMBERS"
-alias lightgtk="GTK2_RC_FILES= GTK_DATA_PREFIX= GTK_THEME=Adwaita"
-alias ll="ls -lahGF"
-alias ln="ln -v"
-alias lr="ls -R"
-alias ls="ls -GF"
-alias noprompt="PROMPT= RPROMPT= "
-alias q="ls|grep"
-alias qq="find .|grep"
-alias sigil="crispy-doom -iwad ~/games/doom/DOOM.WAD -file ~/games/doom/SIGIL_v1_21/SIGIL_COMPAT_v1_21.wad"
-alias sudo="doas"
-alias synonym="dict -d moby-thesaurus"
-alias tar="tar -v"
-
-# Useful functions
-
-function i3-swallow() {
-	i3-msg -q "mark swallowed$$"
-	i3-msg -q "[con_mark=\"swallowed$$\"] split toggle"
-	i3-msg -q "[con_mark=\"swallowed$$\"] layout tabbed"
-}
-
-function i3-unswallow() {
-	i3-msg -q "[con_mark=\"swallowed$$\"] layout default"
-	i3-msg -q "[con_mark=\"swallowed$$\"] split toggle"
-	i3-msg -q "unmark swallowed$$"
-}
-
-function o() {
-	case "$@" in 
-		*.d64|*.prg)
-			i3-swallow && x64 "$1" && i3-unswallow
-			;;
-		*.wad|*.WAD)
-			i3-swallow && crispy-doom -iwad "$1" && i3-unswallow
-			;;
-		*.PDF|*.pdf|*.epub|*.xhtml|*.xps)
-			i3-swallow && mupdf "$@" && i3-unswallow
-			;;
-		*.jpg|*.png|*.bmp|*.gif|*.jpeg|*.JPG|*.JPEG|*.webp|*.tiff)
-			i3-swallow && sxiv -a "$@" "$(dirname $1)" && i3-unswallow
-			;;
-		*.xcf)
-			gimp "$@" 2>/dev/null &
-			;;
-		*.wav|*.mp3|*.flac|*.m4a|*.wma|*.ape|*.ac3|*.og|*.ogagx|*.spx|*.opus)
-			mpv --no-video "$@" 2>/dev/null
-			;;
-		*.avi|*.mp4|*.wmv|*.dat|*.3gp|*.ogv|*.mkv|*.mpg|*.mpeg|*.vob|*.m2v|*.mov|*.webm|*.ts|*.mts|*.m4v|*.qt|*.divx)
-			i3-swallow && mpv "$@" && i3-unswallow
-			;;
-		*.html|*.htm)
-			$BROWSER "$@" 2>/dev/null &
-			;;
-		*.zip|*.jar|*.war|*.7z|*.7zip|*.tar|*.tar.gz|*.tgz|*.tar.xz|*.xz|*.txz|*.iso)
-			tar -xvf "$1"
-			;;
-		*.xls|*.xlsx|*.csv)
-			sc-im "$1"
-			;;
-		*.lcd|*.ldr|*.mpd)
-			leocad "$@"
-			;;
-		*)
-			[ -f "$1" ] && less "$1" || echo Unsure what to do...
-			;;
-	esac
-}
-
-bak() {
-	mv -n "$1" "$1".bak
-}
-
-rename() {
-	# Reads filenames from args, uses vim to generate their new filenames, and then mv's them.
-	src="$(mktemp -t rename)"
-	dst="$(mktemp -t rename)"
-	printf '%s\n' "$@" | tee "$src" > "$dst"
-	$EDITOR "$dst"
-	diff -s "$src" "$dst" > /dev/null || paste "$src" "$dst" | sed -e "s/\t/' '/" -e "s/^/mv -i '/" -e "s/$/'/" | sh 
-}
diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
index a640e84..ffb3a76 100644
--- a/.config/gtk-3.0/settings.ini
+++ b/.config/gtk-3.0/settings.ini
@@ -1,3 +1,3 @@
 [Settings]
-gtk-theme-name=FlatColor
+gtk-theme-name=oomox-atc-solarized
 
diff --git a/.config/i3/config b/.config/i3/config
index 84a47a0..15db7a8 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -11,6 +11,7 @@ hide_edge_borders smart
 set $locker xautolock -locknow
 set $mod Mod1
 set $sigaudio pkill -75 i3blocks
+set $syncmail mbsync -c ~/.config/mbsync/mbsyncrc -a && pkill -77 i3blocks && notify-send 'Email updated'
 title_align center
 workspace_auto_back_and_forth yes
 
@@ -122,8 +123,8 @@ 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 url_handler.sh 
-bindsym $mod+F4 				exec alacritty -e zsh -i -c 'OLDPWD="$PWD" && cd ~/downloads/ && mutt && cd "$OLDPWD"' && mbsync -c ~/.config/mbsync/mbsyncrc -a && pkill -77 i3blocks && notify-send 'Email syncd'
-bindsym $mod+shift+F4 			exec mbsync -c ~/.config/mbsync/mbsyncrc -a && pkill -77 i3blocks && notify-send 'Email syncd'
+bindsym $mod+F4 				exec alacritty -e zsh -i -c 'cd ~/downloads && mutt && cd -' && $syncmail
+bindsym $mod+shift+F4 			exec $syncmail
 bindsym $mod+F5 				exec alacritty -e zsh -i -c 'newsboat && pkill -78 i3blocks'
 bindsym $mod+F6 				exec --no-startup-id dict.sh
 #bindsym $mod+F7 				exec 
diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add
index 91b56b4..4101caa 100644
--- a/.vim/spell/en.utf-8.add
+++ b/.vim/spell/en.utf-8.add
@@ -20,3 +20,5 @@ tarpits
 tarpit
 Angelshark
 Avaya
+Hudsonites
+StepDown
diff --git a/.vim/spell/en.utf-8.add.spl b/.vim/spell/en.utf-8.add.spl
index 8380d85..cc69fae 100644
--- a/.vim/spell/en.utf-8.add.spl
+++ b/.vim/spell/en.utf-8.add.spl
diff --git a/.zshenv b/.zshenv
index 26b8e34..d0a30b2 100644
--- a/.zshenv
+++ b/.zshenv
@@ -1,7 +1,7 @@
 export BROWSER=firefox
 export DOOMWADDIR=~/.local/share/crispy-doom/wads
 export EDITOR=vim
-export GTK2_RC_FILES=$HOME/.local/share/themes/FlatColor/gtk-2.0/gtkrc
+export GTK2_RC_FILES=$HOME/.local/share/themes/oomox-atc-solarized/gtk-2.0/gtkrc
 export PAGER=less
 export PATH=$HOME/.local/scripts:$HOME/.local/bin/:$HOME/.cargo/bin:$HOME/node_modules/.bin:$PATH
 export VISUAL=vim
diff --git a/.zshrc b/.zshrc
index 9fdd739..fd607c2 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,5 +1,3 @@
-## Theming section
-#(cat $HOME/.config/wpg/sequences &)
 autoload -U compinit colors zcalc
 compinit -d
 colors
@@ -41,7 +39,7 @@ WORDCHARS=${WORDCHARS//[&.;]}                                 # Don't consider c
 bindkey -v
 
 ## Aliases 
-source $HOME/.aliases
+. "$HOME/.config/aliasrc"
 
 ## Plugins
 source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh # syntax highlighting