From baccb69e82e7963753fbc201a9e037c94413cdf4 Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Thu, 19 Apr 2018 14:38:50 -0400 Subject: [PATCH] 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