From 0c3d34486b1af4f497b36975443d6a41e6ff51eb Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Tue, 10 Oct 2017 17:24:36 -0400 Subject: [PATCH] Bunch of improvements --- git/gitconfig | 2 -- i3/config | 3 ++- i3/run.sh | 18 ++++++++++++------ shells/Xresources | 3 ++- shells/zshrc | 6 +++--- vim/vimrc | 2 +- vimperator/vimperatorrc | 2 +- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/git/gitconfig b/git/gitconfig index 33ec9c5..189af89 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -49,8 +49,6 @@ [color] ui = auto [gui] - recentrepo = /home/stonewareslord/git/sync - recentrepo = /home/stonewareslord/git/school/service-garage [filter "lfs"] required = true clean = git-lfs clean -- %f diff --git a/i3/config b/i3/config index 6e0b393..d237f70 100644 --- a/i3/config +++ b/i3/config @@ -77,7 +77,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 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 58beccd..b0274ff 100755 --- a/i3/run.sh +++ b/i3/run.sh @@ -1,4 +1,4 @@ -#!/bin/zsh +#!/usr/bin/env zsh if [ "$1" = "lock" ];then #!/bin/bash @@ -24,7 +24,7 @@ if [ "$1" = "wall" ];then #if [[ -d ~/.i3/wallOM ]];then feh --bg-scale "`shuf -n1 -e ~/.i3/wallOM/*`";else feh --bg-scale "`shuf -n1 -e ~/.i3/wall/*`";fi; #feh --bg-scale "$(shuf -n1 -e ~/.i3/wallOM/*)" #feh --bg-scale ~/.i3/image.png - feh --bg-scale $(shuf -n1 <(realpath /home/stonewareslord/sync/wallpaper/$(hostname))) + feh --bg-scale "$(shuf -n1 <(realpath /home/stonewareslord/sync/wallpaper/"$(hostname)"/*))" fi if [ "$1" = "swap" ];then python << EOF @@ -109,9 +109,12 @@ if [ "$1" = "copy" ]; then (printf '-chegg ';xsel | perl -pe 's/[^a-zA-Z ]//g;chomp()') | xsel && notify-send "Copied" || notify-send "Error" fi if [ "$1" = "screenshot" ]; then - rm ~/last-photo/*(N) - DISPLAY=:0.0 xfce4-screenshooter -r -s ~/last-photo - cp ~/last-photo/* ~/Pictures + \rm -f ~/last-photo/*(N) + #DISPLAY=:0.0 xfce4-screenshooter -r -s ~/last-photo + #DISPLAY=:0.0 import "$HOME/last-photo/$(date +'%Y-%m-%d_%T').png" + sleep .25 + DISPLAY=:0.0 scrot -s "$HOME/last-photo/$(date +'%Y-%m-%d_%T').png" + \cp ~/last-photo/* ~/Pictures fi if [ "$1" = "shutdownprompt" ]; then RESP=$(printf 'Sleep\nNMRestart\nShutdown\nRestart\nLogout\n' | rofi -i -dmenu 2>/dev/null) @@ -139,5 +142,8 @@ if [ "$1" = "shutdownprompt" ]; then fi fi if [ "$1" = "run" ]; then - PATH="$HOME/bin:$PATH" rofi -show run + PATH="$HOME/bin:/usr/games/bin:$PATH" rofi -show run +fi +if [ "$1" = "window" ]; then + rofi -show window fi diff --git a/shells/Xresources b/shells/Xresources index 46c5141..27fec2a 100644 --- a/shells/Xresources +++ b/shells/Xresources @@ -93,8 +93,9 @@ rofi.padding: 0 ! -bg #121212 -fg #8f8f8f -hlbg #5a5a5a -hlfg #000000 rofi.color-window: #000000, #ffffff, #000000 rofi.color-normal: #000000, #ffffff, #000000, #2e2e2e, #ffffff -rofi.color-active: #000000, #ffffff, #000000, #268bd2, #ffffff +rofi.color-active: #000000, #ffffff, #000000, #2e2e2e, #ffffff rofi.color-urgent: #ffffff, #ff0400, #ffffff, #ff0000, #ffffff +rofi.hide-scrollbar: true !rofi.bg: #121212 !rofi.fg: #8f8f8f !rofi.hlbg: #5a5a5a diff --git a/shells/zshrc b/shells/zshrc index 83d8654..5a05d47 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -319,9 +319,9 @@ if ex sudo; then fi alias -g PA='2>&1 | paste' if ex rsync; then - alias -g c='rsync --partial -ha --info=progress2 "$@"' - alias -g cfat='rsync --partial -hrlc --info=progress2 "$@"' - alias cp='rsync --partial -ha --info=progress2 "$@"' + alias -g c='rsync --no-inc-recursive --partial -ha --info=progress2 "$@"' + alias -g cfat='rsync --no-inc-recursive --partial -hrlc --info=progress2 "$@"' + alias cp='rsync --no-inc-recursive --partial -ha --info=progress2 "$@"' fi alias -g nify=" > /dev/null 2>&1 &" alias -g nifyd=" > /dev/null 2>&1 & disown" diff --git a/vim/vimrc b/vim/vimrc index 4050644..c422d9f 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -275,7 +275,7 @@ endif "Exchange two selections of text | https://github.com/tommcdo/vim-exchange Plug 'https://austenwares.com/gitea/vim/vim-repeat' "Repeat last tpope command with . | https://github.com/tpope/vim-repeat - "Plug 'https://austenwares.com/gitea/vim/vim-fugitive', { 'on': ['Gstatus','Gcommit', 'Gwrite', 'Git'] } + Plug 'https://austenwares.com/gitea/vim/vim-fugitive' "Great Vim-Git compatibility | https://github.com/tpope/vim-fugitive Plug 'https://austenwares.com/gitea/vim/ctrlp.vim' "Fuzzy file search | https://github.com/kien/ctrlp.vim diff --git a/vimperator/vimperatorrc b/vimperator/vimperatorrc index 67127f0..51d87a6 100644 --- a/vimperator/vimperatorrc +++ b/vimperator/vimperatorrc @@ -31,7 +31,7 @@ vnoremap H ^ noremap Y :js util.copyToClipboard(content.document.title, true) "set animations=true silent! colorscheme vimPgray -set defsearch=encryptedgoogle +set defsearch=startpage style -name ublick * #nav-bar * { visibility: visible; } set titlestring=Firefox set toolbars=noaddons,nobookmarks,nomenu,tabs,nonavigation