From 8facafa3e04ad7420e6a9f0e8d34fdd2f443e71f Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Sun, 14 Jan 2018 23:58:31 -0500
Subject: [PATCH 1/9] Use gitea

---
 scripts/sync.sh |  6 ++---
 shells/zshrc    | 26 +++++++++----------
 vim/vimrc       | 68 ++++++++++++++++++++++++-------------------------
 3 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/scripts/sync.sh b/scripts/sync.sh
index 50dc9d4..12b501d 100755
--- a/scripts/sync.sh
+++ b/scripts/sync.sh
@@ -26,12 +26,12 @@ sync_config() {
     if command -v zsh 2>&1 >/dev/null; then
       for i in lpr oh-my-git-themes omg zsh-syntax-highlighting; do
         if [ ! -d ~/.zsh-git/"$i" ]; then
-          git clone "https://austenwares.com/gitea/stonewareslord/$i.git" ~/.zsh-git/"$i"
+          git clone "https://gitea.austenwares.com/stonewareslord/$i.git" ~/.zsh-git/"$i"
         fi
       done
     fi
     if [ ! -d ~/.fzf ] ; then
-      git clone "https://austenwares.com/gitea/stonewareslord/fzf.git" ~/.fzf
+      git clone "https://gitea.austenwares.com/stonewareslord/fzf.git" ~/.fzf
       ~/.fzf/install --bin
     fi
   else
@@ -69,7 +69,7 @@ sync_custom() {
   fi
   if [[ ! -d ~/.zsh-git/custom-config ]]; then
     #TODO: Figure out if I should use ssh or https cloning
-    #git clone https://austenwares.com/gitea/stonewareslord/custom-config
+    #git clone https://gitea.austenwares.com/stonewareslord/custom-config
     git clone git@austenwares.com:stonewareslord/custom-config ~/.zsh-git/custom-config
   fi
   remove ~/.gitconfig
diff --git a/shells/zshrc b/shells/zshrc
index 27a1c19..4688820 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -50,7 +50,7 @@ sv () {
   while (( $# > 1 )); do
     if [[ "$command" == "i" ]]; then
       echo "Status of $1"
-      service "$1" status
+      rc-service "$1" status
       shift
       continue
     fi
@@ -61,15 +61,15 @@ sv () {
     fi
     if [[ "$command" == "r" ]]; then
       echo "Restarting $1"
-      sudo service "$1" restart
+      sudo rc-service "$1" restart
     elif [[ "$command" == "s" ]]; then
       echo "Starting $1"
-      sudo service "$1" start
+      sudo rc-service "$1" start
     elif [[ "$command" == "x" ]]; then
       echo "Stopping $1"
-      sudo service "$1" stop
+      sudo rc-service "$1" stop
     else
-      sudo service "$1" "$command"
+      sudo rc-service "$1" "$command"
     fi
     shift
   done
@@ -301,12 +301,12 @@ if test -f /etc/gentoo-release; then
   }
 elif test -f /etc/lsb-release; then
   # Ubuntu
-  alias install='sudo apt-get --show-progress install'
-  alias remove='sudo apt-get --show-progress remove'
-  alias update='sudo apt-get update'
-  alias upgrade='sudo apt-get --show-progress upgrade'
-  alias autoremove='sudo apt-get --show-progress autoremove'
-  alias updateall='sudo sh -c "apt-get update;apt-get upgrade -y;apt-get dist-upgrade -y;apt-get autoremove -y"'
+  alias install='sudo apt install'
+  alias remove='sudo apt remove'
+  alias update='sudo apt update'
+  alias upgrade='sudo apt upgrade'
+  alias autoremove='sudo apt autoremove'
+  alias updateall='sudo sh -c "apt update;apt full-upgrade -y"'
   alias search='apt-cache search'
 fi
 alias ..='k ..'
@@ -389,7 +389,7 @@ paste() {
 }
 linx() {
   if [[ -z "$1" ]]; then
-    curl -T- -H "Linx-Randomize: yes" -H "Linx-Expiry: 2592000" https://austenwares.com/linx/upload | perl -pe 's/https:\/\/austenwares.com\/linx\/(\w+)/https:\/\/austenwares.com\/linx\/selif\/\1/'
+    curl -T- -H "Linx-Randomize: yes" -H "Linx-Expiry: 2592000" https://linx.austenwares.com/upload | perl -pe 's/https:\/\/linx.austenwares.com\/(\w+)/https:\/\/linx.austenwares.com\/selif\/\1/'
   elif (( $# == 1 )) && [[ -f "$1" ]]; then
     linx < "$1"
   else
@@ -506,7 +506,7 @@ create-repo(){
   read username
   echo -n "Password: "
   read  -s password
-  curl --user "$username:$password" -d name="$1" -d private="$PRIVATE" https://austenwares.com/gitea/api/v1/user/repos
+  curl --user "$username:$password" -d name="$1" -d private="$PRIVATE" https://gitea.austenwares.com/api/v1/user/repos
 }
 hsh(){
   FILE="$1"
diff --git a/vim/vimrc b/vim/vimrc
index 1d3b2b1..f657d2e 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -259,81 +259,81 @@ else
   call plug#begin('~/.vim/plugged')
 endif
 " Code writing {
-  Plug 'https://austenwares.com/gitea/vim/vim-autoformat', { 'on': 'Autoformat'}
+  Plug 'https://gitea.austenwares.com/vim/vim-autoformat', { 'on': 'Autoformat'}
     "Adds autoformat command | https://github.com/Chiel92/vim-autoformat
-  Plug 'https://austenwares.com/gitea/vim/vim-surround'
+  Plug 'https://gitea.austenwares.com/vim/vim-surround'
     "Surround selection in ({\"' or HTML tags  | https://github.com/tpope/vim-surround
-  Plug 'https://austenwares.com/gitea/vim/syntastic'
+  Plug 'https://gitea.austenwares.com/vim/syntastic'
     "Syntax checker | https://github.com/scrooloose/syntastic
-  Plug 'https://austenwares.com/gitea/vim/nerdtree', { 'on':  'NERDTreeToggle' }
+  Plug 'https://gitea.austenwares.com/vim/nerdtree', { 'on':  'NERDTreeToggle' }
     "File browser | https://github.com/scrooloose/nerdtree
-  Plug 'https://austenwares.com/gitea/vim/vim-easymotion'
+  Plug 'https://gitea.austenwares.com/vim/vim-easymotion'
     "Move around quickly in a document | https://github.com/Lokaltog/vim-easymotion
-  "Plug 'https://austenwares.com/gitea/vim/gundo.vim', { 'on': 'GundoToggle' }
+  "Plug 'https://gitea.austenwares.com/vim/gundo.vim', { 'on': 'GundoToggle' }
     "Visual undo | https://github.com/sjl/gundo.vim
-  Plug 'https://austenwares.com/gitea/vim/vim-exchange'
+  Plug 'https://gitea.austenwares.com/vim/vim-exchange'
     "Exchange two selections of text | https://github.com/tommcdo/vim-exchange
-  Plug 'https://austenwares.com/gitea/vim/vim-repeat'
+  Plug 'https://gitea.austenwares.com/vim/vim-repeat'
     "Repeat last tpope command with . | https://github.com/tpope/vim-repeat
-  Plug 'https://austenwares.com/gitea/vim/vim-fugitive'
+  Plug 'https://gitea.austenwares.com/vim/vim-fugitive'
     "Great Vim-Git compatibility | https://github.com/tpope/vim-fugitive
-  Plug 'https://austenwares.com/gitea/vim/ctrlp.vim'
+  Plug 'https://gitea.austenwares.com/vim/ctrlp.vim'
     "Fuzzy file search | https://github.com/kien/ctrlp.vim
-  Plug 'https://austenwares.com/gitea/vim/tabular', { 'on': 'Tab' }
+  Plug 'https://gitea.austenwares.com/vim/tabular', { 'on': 'Tab' }
     "Quickly make tables in vim | https://github.com/godlygeek/tabular
-  Plug 'https://austenwares.com/gitea/vim/UltiSnips'
+  Plug 'https://gitea.austenwares.com/vim/UltiSnips'
     "Adds snippet support | https://github.com/sirver/UltiSnips
-  Plug 'https://austenwares.com/gitea/vim/vim-snippets'
+  Plug 'https://gitea.austenwares.com/vim/vim-snippets'
     "Add snippets | https://github.com/honza/vim-snippets
-  Plug 'https://austenwares.com/gitea/vim/eregex.vim'
+  Plug 'https://gitea.austenwares.com/vim/eregex.vim'
     "Real regexes in vim | https://github.com/othree/eregex.vim
-  Plug 'https://austenwares.com/gitea/vim/vim-signify'
+  Plug 'https://gitea.austenwares.com/vim/vim-signify'
     "Git information inline | https://github.com/mhinz/vim-signify
-  Plug 'https://austenwares.com/gitea/vim/auto-pairs'
+  Plug 'https://gitea.austenwares.com/vim/auto-pairs'
     "Automatic pairs | https://github.com/jiangmiao/auto-pairs
-  Plug 'https://austenwares.com/gitea/vim/YouCompleteMe'
+  Plug 'https://gitea.austenwares.com/vim/YouCompleteMe'
     "Autocompletion | https://github.com/Valloric/YouCompleteMe
-  "Plug 'https://austenwares.com/gitea/vim/vim-java-getset.git'
-    "Java getters and setters| https://austenwares.com/gitea/vim/vim-java-getset.git
-  Plug 'https://austenwares.com/gitea/vim/double-tap.git'
+  "Plug 'https://gitea.austenwares.com/vim/vim-java-getset.git'
+    "Java getters and setters| https://gitea.austenwares.com/vim/vim-java-getset.git
+  Plug 'https://gitea.austenwares.com/vim/double-tap.git'
     "Double tap for comments
   " }
 " Style {
-  "Plug 'https://austenwares.com/gitea/vim/vim-indent-guides'
+  "Plug 'https://gitea.austenwares.com/vim/vim-indent-guides'
     "Indentation guides | https://github.com/nathanaelkane/vim-indent-guides
-  "Plug 'https://austenwares.com/gitea/vim/vim-airline'
+  "Plug 'https://gitea.austenwares.com/vim/vim-airline'
     "Bottom status bar | https://github.com/bling/vim-airline
-  Plug 'https://austenwares.com/gitea/vim/vim-colors'
+  Plug 'https://gitea.austenwares.com/vim/vim-colors'
     "Theme pack | https://github.com/spf13/vim-colors
-  Plug 'https://austenwares.com/gitea/vim/csapprox'
+  Plug 'https://gitea.austenwares.com/vim/csapprox'
     "256 color vim in terminal | https://github.com/godlygeek/csapprox
   " }
 " Syntax {
-  Plug 'https://austenwares.com/gitea/vim/vimtex'
+  Plug 'https://gitea.austenwares.com/vim/vimtex'
     "Latex | https://github.com/lervag/vimtex
-  Plug 'https://austenwares.com/gitea/vim/vim-polyglot'
+  Plug 'https://gitea.austenwares.com/vim/vim-polyglot'
     "Many languages | https://github.com/sheerun/vim-polyglot
-  Plug 'https://austenwares.com/gitea/vim/vim-vimperator'
+  Plug 'https://gitea.austenwares.com/vim/vim-vimperator'
     "Vimperator for vim | https://github.com/superbrothers/vim-vimperator
-  Plug 'https://austenwares.com/gitea/vim/i3-vim-syntax'
+  Plug 'https://gitea.austenwares.com/vim/i3-vim-syntax'
     "i3 syntax | https://github.com/PotatoesMaster/i3-vim-syntax
   " }
 " Misc {
-  Plug 'https://austenwares.com/gitea/vim/flappyvird-vim', { 'on': [] }
+  Plug 'https://gitea.austenwares.com/vim/flappyvird-vim', { 'on': [] }
     "The amazing Flappy Bird game | https://github.com/mattn/flappyvird-vim
-  Plug 'https://austenwares.com/gitea/vim/vim-gnupg'
+  Plug 'https://gitea.austenwares.com/vim/vim-gnupg'
     "GPG support | https://github.com/jamessan/vim-gnupg
-  Plug 'https://austenwares.com/gitea/vim/vim-bracketed-paste'
+  Plug 'https://gitea.austenwares.com/vim/vim-bracketed-paste'
     "Automatic :set paste funcationality | https://github.com/ConradIrwin/vim-bracketed-paste
-  Plug 'https://austenwares.com/gitea/vim/HiCursorWords'
+  Plug 'https://gitea.austenwares.com/vim/HiCursorWords'
     "Highlight word under cursor automatically | http://www.vim.org/scripts/script.php?script_id=4306
 " }
 " Unused {
-  "Plug 'https://austenwares.com/gitea/vim/mirror.vim'
+  "Plug 'https://gitea.austenwares.com/vim/mirror.vim'
   "  "Edit files remotely | https://github.com/zenbro/mirror.vim
 " }
 " Staging {
-  "Plug 'https://austenwares.com/gitea/vim/vim-symfony'
+  "Plug 'https://gitea.austenwares.com/vim/vim-symfony'
   "Plug 'dracula/vim'
 
   "Plug 'idanarye/vim-vebugger'

From 38b3332eab1787bf1ef10742895144297027609a Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Tue, 13 Feb 2018 12:18:40 -0500
Subject: [PATCH 2/9] Modifications

---
 i3/config         | 9 ++++++---
 shells/Xresources | 3 ++-
 shells/zshrc      | 4 ----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/i3/config b/i3/config
index 5c1da54..9c8e37d 100644
--- a/i3/config
+++ b/i3/config
@@ -3,7 +3,7 @@ set $mod Mod4
 set $x_switch workspace
 
 # Assignments
-for_window [class=ownCloud] floating disable
+for_window [class=nextcloud] floating disable
 assign [class=Firefox] 2
 assign [class=google-chrome] 2
 assign [class=Google-chrome] 2
@@ -200,9 +200,12 @@ exec --no-startup-id /usr/bin/gpaste-client dr
 # Turn off numlock!
 exec --no-startup-id /usr/bin/numlockx
 # Run firefox/firefox-bin
-exec --no-startup-id firefox -p sync || firefox-bin -p sync
+exec --no-startup-id firefox -p a || firefox-bin -p a
 # Start syncthing if it hasn't already been started
-exec --no-startup-id /bin/zsh -c 'pidof syncthing||screen -dmS syncthing ~/bin/syncthing'
+#exec --no-startup-id /bin/zsh -c 'pidof syncthing||screen -dmS syncthing ~/bin/syncthing'
+exec --no-startup-id nextcloud
 # Start kdeconnect
 exec --no-startup-id "~/bin/indicator-kdeconnect"
+# riot
+exec --no-startup-id riot-web --hidden
 # vim: ts=2:sw=2:et
diff --git a/shells/Xresources b/shells/Xresources
index 27fec2a..3b15c6d 100644
--- a/shells/Xresources
+++ b/shells/Xresources
@@ -6,7 +6,8 @@
 !URxvt.font: xft:Terminus:size=12
 !URxvt.font: xft:Neep:size=13
 !URxvt.font: xft:Courier New:size=12
-URxvt.font: xft:Gohu GohuFont:size=12
+!URxvt.font: xft:Gohu GohuFont:size=12
+URxvt.font: xft:Misc Termsynu:size=13
 !URxvt.faceName: -*-*-*-*-*-*-10-*-*-*-*-*-*-*
 !URxvt.font: xft:Fixed:style=SemiCondensed:size=16
 
diff --git a/shells/zshrc b/shells/zshrc
index 4688820..32f6e40 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -284,10 +284,6 @@ if test -f /etc/gentoo-release; then
   }
   update(){
     # If this is a server computer
-    if [ "$(hostname)" = "SGen" ] ; then
-      echo "You're a server. Exiting"
-      return
-    fi
     sudo rm -f '/usr/portage/metadata/timestamp.chk'
     if ex eix-update; then
       sudo zsh -c "emaint sync -a&&eix-update"

From 74ee4b67063b2a84fcdcac60f4dc513334fe9e86 Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Fri, 16 Feb 2018 13:44:01 -0500
Subject: [PATCH 3/9] Add home

---
 zsh/borg.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zsh/borg.zsh b/zsh/borg.zsh
index 0361521..4793d16 100644
--- a/zsh/borg.zsh
+++ b/zsh/borg.zsh
@@ -24,7 +24,7 @@ b-create() {
   if [[ -f  "/home/stonewareslord/syncthing/me/backup/$(hostname)/mount" ]]; then
     "$SUDO" "/home/stonewareslord/syncthing/me/backup/$(hostname)/mount"
   fi
-  "$SUDO" borg create -vpsx --exclude-caches --compression lzma,7 --exclude-from "$IGNORE_FILE" $BORG_REPO::$(hostname)-$(uuidgen) / /boot
+  "$SUDO" borg create -vpsx --exclude-caches --compression lzma,7 --exclude-from "$IGNORE_FILE" $BORG_REPO::$(hostname)-$(uuidgen) / /boot /home
 }
 b-rename() {
   borg rename -v "$BORG_REPO::$1" "$2"

From e83f83b1a221ec0e89ca1f9c281b73b4faab66c5 Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Sun, 18 Feb 2018 12:22:37 -0500
Subject: [PATCH 4/9] Autosource from custom config

---
 shells/zshrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shells/zshrc b/shells/zshrc
index 32f6e40..2f2a361 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -635,8 +635,8 @@ source ~/.zsh-git/lpr/liquidprompt
 source ~/.zsh-git/omg/base.sh
 source ~/.zsh-git/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 source ~/.zsh-git/oh-my-git-themes/af-magic.zsh-theme
-if [[ -f ~/.zsh-git/zshrc ]]; then
-  source ~/.zsh-git/zshrc
+if [[ -f ~/.zsh-git/custom-config/zshrc ]]; then
+  source ~/.zsh-git/custom-config/zshrc
 fi
 echo -e '[##]'
 #zprof

From 5f54ec79d0d41ec706d01c93c8c24b79404376b1 Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Thu, 15 Mar 2018 10:42:18 -0400
Subject: [PATCH 5/9] Modifications

---
 i3/config | 4 ++--
 i3/run.sh | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/i3/config b/i3/config
index 9c8e37d..4417cf3 100644
--- a/i3/config
+++ b/i3/config
@@ -81,8 +81,8 @@ bindsym $mod+s layout stacking
 bindsym $mod+w layout tabbed
 bindsym $mod+e layout toggle split
 bindsym $mod+shift+space floating toggle
-#bindsym $mod+space focus mode_toggle
-bindsym $mod+space exec "~/.i3/run.sh window"
+bindsym $mod+space focus mode_toggle
+#bindsym $mod+space exec "~/.i3/run.sh window"
 bindsym $mod+1 $x_switch 1
 bindsym $mod+2 $x_switch 2
 bindsym $mod+3 $x_switch 3
diff --git a/i3/run.sh b/i3/run.sh
index bd5c25d..8fb49a1 100755
--- a/i3/run.sh
+++ b/i3/run.sh
@@ -112,7 +112,9 @@ if [ "$1" = "screenshot" ]; then
   \rm -f ~/last-photo/*(N)
   sleep .2
   #DISPLAY=:0.0 xfce4-screenshooter -r -s ~/last-photo
-  DISPLAY=:0.0 import "$HOME/last-photo/$(date +'%Y-%m-%d_%T').png"
+  local FNAME="$HOME/last-photo/$(date +'%Y-%m-%d_%T').png"
+  DISPLAY=:0.0 import "${FNAME}"
+  DISPLAY=:0.0 xclip -selection clipboard -t image/png -i "${FNAME}"
   #DISPLAY=:0.0 scrot -s "$HOME/last-photo/$(date +'%Y-%m-%d_%T').png"
   \cp ~/last-photo/* ~/Pictures
 fi

From 97e0b16cfe7fc784a74401bdb935411feccc0528 Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Thu, 22 Mar 2018 12:47:46 -0400
Subject: [PATCH 6/9] Disable compton (high cpu)

---
 i3/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i3/config b/i3/config
index 4417cf3..3829ba8 100644
--- a/i3/config
+++ b/i3/config
@@ -188,7 +188,7 @@ exec --no-startup-id xmodmap ~/.xmodmap
 #exec --no-startup-id ~/xmodmap.sh
 # Misc
 # Compositor
-exec --no-startup-id compton
+#exec --no-startup-id compton
 # Spawn a terminal
 #TODO: Currently the terminal will spawn in the current workspace
 exec --no-startup-id /usr/bin/urxvt

From 007eedce1f32101f9175be69ec68a3b6584fb2d1 Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Thu, 22 Mar 2018 12:47:59 -0400
Subject: [PATCH 7/9] Force pluginstall and plugupdate

---
 vim/vimrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vim/vimrc b/vim/vimrc
index f657d2e..7522173 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -395,8 +395,8 @@ function! Initialize()
     silent! so ~/.vimrc
   endif
   silent! PlugClean!
-  silent! PlugUpdate
-  silent! PlugInstall
+  silent! PlugInstall!
+  silent! PlugUpdate!
   q
 endfunction
   if !exists('g:ycm_semantic_triggers')

From b3da54fafa84a041de6d21cc512292470e7d2870 Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Thu, 22 Mar 2018 12:48:02 -0400
Subject: [PATCH 8/9] Add mktemp

---
 shells/zshrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shells/zshrc b/shells/zshrc
index 2f2a361..29bb189 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -347,6 +347,9 @@ fi
 alias -g nify=" > /dev/null 2>&1 &"
 alias -g nifyd=" > /dev/null 2>&1 & disown"
 alias -g L="2>&1|less"
+if ex mktemp; then
+  alias mtmp='pushd "$(mktemp -d)" >/dev/null'
+fi
 if ex rg; then
   alias -g G='|& rg'
   alias rg='rg -i'

From baccb69e82e7963753fbc201a9e037c94413cdf4 Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Thu, 19 Apr 2018 14:38:50 -0400
Subject: [PATCH 9/9] Many minor changes

---
 i3/G2-status.conf |  3 ++-
 i3/config         | 11 +++++++++--
 i3/run.sh         | 16 ++++++++++++++++
 shells/Xresources |  3 ++-
 shells/zshrc      |  2 +-
 vim/vimrc         |  8 ++++----
 6 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/i3/G2-status.conf b/i3/G2-status.conf
index e7a08d1..97fc00c 100644
--- a/i3/G2-status.conf
+++ b/i3/G2-status.conf
@@ -33,7 +33,8 @@ ethernet enp1s0 {
     format_down = "!E"
 }
 tztime local {
-    format = "%a %b%e %r"
+    #format = "%a %b%e %r"
+    format = "%a %e %b %F %r"
     #:%M:%S
 }
 load {
diff --git a/i3/config b/i3/config
index 3829ba8..f4e19db 100644
--- a/i3/config
+++ b/i3/config
@@ -53,6 +53,8 @@ bindsym XF86AudioLowerVolume exec "amixer set Master 7%- unmute"
 bindsym XF86AudioMute exec "amixer -D pulse set Master 1+ toggle;amixer set Master 0%"
 # Toggle toucpad
 bindsym $mod+backslash exec "synclient TouchpadOff=$(synclient -l | grep -c 'TouchpadOff.*=.*0')"
+# Toggle tap to click
+bindsym $mod+shift+backslash exec "synclient TapButton2=$(($(synclient -l | grep -c 'TapButton1.*=.*0') * 3));synclient TapButton1=$(synclient -l | grep -c 'TapButton1.*=.*0')"
 # Movement
 bindsym $mod+o workspace back_and_forth
 bindsym $mod+bracketleft workspace prev
@@ -73,6 +75,11 @@ bindsym $mod+shift+Left move left
 bindsym $mod+shift+Down move down
 bindsym $mod+shift+Up move up
 bindsym $mod+shift+Right move right
+# Moving to corners
+bindsym $mod+ctrl+h exec "~/.i3/run.sh move left"
+bindsym $mod+ctrl+j exec "~/.i3/run.sh move bottom"
+bindsym $mod+ctrl+k exec "~/.i3/run.sh move top"
+bindsym $mod+ctrl+l exec "~/.i3/run.sh move right"
 # Fullscreen
 bindsym $mod+f fullscreen
 bindsym $mod+shift+f fullscreen global
@@ -82,7 +89,7 @@ bindsym $mod+w layout tabbed
 bindsym $mod+e layout toggle split
 bindsym $mod+shift+space floating toggle
 bindsym $mod+space focus mode_toggle
-#bindsym $mod+space exec "~/.i3/run.sh window"
+bindsym $mod+comma exec "~/.i3/run.sh window"
 bindsym $mod+1 $x_switch 1
 bindsym $mod+2 $x_switch 2
 bindsym $mod+3 $x_switch 3
@@ -205,7 +212,7 @@ exec --no-startup-id firefox -p a || firefox-bin -p a
 #exec --no-startup-id /bin/zsh -c 'pidof syncthing||screen -dmS syncthing ~/bin/syncthing'
 exec --no-startup-id nextcloud
 # Start kdeconnect
-exec --no-startup-id "~/bin/indicator-kdeconnect"
+#exec --no-startup-id "~/bin/indicator-kdeconnect"
 # riot
 exec --no-startup-id riot-web --hidden
 # vim: ts=2:sw=2:et
diff --git a/i3/run.sh b/i3/run.sh
index 8fb49a1..cb21be0 100755
--- a/i3/run.sh
+++ b/i3/run.sh
@@ -1,4 +1,20 @@
 #!/usr/bin/env zsh
+if [ "$1" = "move" ]; then
+  shift
+  eval "$(xdotool getwindowfocus getwindowgeometry | grep Geometry: | perl -pe 's/^\s*Geometry: /WinH=/;s/x/\nWinW=/g')"
+  eval "$(xdotool getwindowfocus getwindowgeometry | grep Position: | perl -pe 's/^\s*Position: /WinY=/;s/,/\nWinX=/g;s/\s\(.+//')"
+  eval "$(xrandr | grep -w connected  | perl -pe 's/.+?(\d+x\d+)\+\d+\+\d+.*/\1/g;s/^/MonH=/;s/x/\nMonW=/;' | head -n2)"
+  if [ "$1" = "top" ]; then
+    echo $((WinY))
+    xdotool getwindowfocus windowmove $((WinY - 1)) 0
+  elif [ "$1" = "right" ]; then
+    xdotool getwindowfocus windowmove $((MonH - WinH)) $((WinX - 1))
+  elif [ "$1" = "left" ]; then
+    xdotool getwindowfocus windowmove 0 $((WinX - 1))
+  elif [ "$1" = "bottom" ]; then
+    xdotool getwindowfocus windowmove $((WinY - 1)) $((MonW - WinW))
+  fi
+fi
 if [ "$1" = "lock" ];then
   #!/bin/bash
 
diff --git a/shells/Xresources b/shells/Xresources
index 3b15c6d..890959f 100644
--- a/shells/Xresources
+++ b/shells/Xresources
@@ -7,7 +7,8 @@
 !URxvt.font: xft:Neep:size=13
 !URxvt.font: xft:Courier New:size=12
 !URxvt.font: xft:Gohu GohuFont:size=12
-URxvt.font: xft:Misc Termsynu:size=13
+!URxvt.font: xft:Misc Termsynu:size=13
+!URxvt.font: xft:Unifont:size=13
 !URxvt.faceName: -*-*-*-*-*-*-10-*-*-*-*-*-*-*
 !URxvt.font: xft:Fixed:style=SemiCondensed:size=16
 
diff --git a/shells/zshrc b/shells/zshrc
index 29bb189..cfd9e18 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -436,7 +436,7 @@ grename() {
     done
 }
 bp(){
-  echo '\a'
+  printf '\a'
 }
 ltar(){
   tar -cf - $@|pv -WcN tar|xz|pv -WcN lzma
diff --git a/vim/vimrc b/vim/vimrc
index 7522173..1cd1ea2 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -259,13 +259,13 @@ else
   call plug#begin('~/.vim/plugged')
 endif
 " Code writing {
-  Plug 'https://gitea.austenwares.com/vim/vim-autoformat', { 'on': 'Autoformat'}
+  "Plug 'https://gitea.austenwares.com/vim/vim-autoformat', { 'on': 'Autoformat'}
     "Adds autoformat command | https://github.com/Chiel92/vim-autoformat
   Plug 'https://gitea.austenwares.com/vim/vim-surround'
     "Surround selection in ({\"' or HTML tags  | https://github.com/tpope/vim-surround
   Plug 'https://gitea.austenwares.com/vim/syntastic'
     "Syntax checker | https://github.com/scrooloose/syntastic
-  Plug 'https://gitea.austenwares.com/vim/nerdtree', { 'on':  'NERDTreeToggle' }
+  "Plug 'https://gitea.austenwares.com/vim/nerdtree', { 'on':  'NERDTreeToggle' }
     "File browser | https://github.com/scrooloose/nerdtree
   Plug 'https://gitea.austenwares.com/vim/vim-easymotion'
     "Move around quickly in a document | https://github.com/Lokaltog/vim-easymotion
@@ -273,9 +273,9 @@ endif
     "Visual undo | https://github.com/sjl/gundo.vim
   Plug 'https://gitea.austenwares.com/vim/vim-exchange'
     "Exchange two selections of text | https://github.com/tommcdo/vim-exchange
-  Plug 'https://gitea.austenwares.com/vim/vim-repeat'
+  "Plug 'https://gitea.austenwares.com/vim/vim-repeat'
     "Repeat last tpope command with . | https://github.com/tpope/vim-repeat
-  Plug 'https://gitea.austenwares.com/vim/vim-fugitive'
+  "Plug 'https://gitea.austenwares.com/vim/vim-fugitive'
     "Great Vim-Git compatibility | https://github.com/tpope/vim-fugitive
   Plug 'https://gitea.austenwares.com/vim/ctrlp.vim'
     "Fuzzy file search | https://github.com/kien/ctrlp.vim