From 5c58aff9b792846e19bc56f2b8e0cec760dd9feb Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Sun, 13 Nov 2016 02:17:55 -0500 Subject: [PATCH] A ton of fixes --- applications/youcompleteme.sh | 5 ----- i3/config | 19 ++++++++++++++----- i3/run.sh | 3 +++ shells/zshrc | 14 ++++++++------ vimperator/vimperatorrc | 4 ++-- 5 files changed, 27 insertions(+), 18 deletions(-) diff --git a/applications/youcompleteme.sh b/applications/youcompleteme.sh index aa924a1..ffaf515 100755 --- a/applications/youcompleteme.sh +++ b/applications/youcompleteme.sh @@ -18,8 +18,3 @@ cmake --build . --target ycm_core #npm install --production cd - echo "It should be done." -if [ ! "$1" = "-y" ]; then - echo -n "Running vim to test for errors. Press enter to continue..." - read a - vim +q -fi diff --git a/i3/config b/i3/config index e1ea13c..3ffbc67 100644 --- a/i3/config +++ b/i3/config @@ -21,7 +21,7 @@ bindsym $mod+p exec rofi -font "Monospace 12" -show run bindsym $mod+shift+p exec "rofi-pass --last-used" # Misc shortcuts bindsym --release Num_Lock exec "xdotool key --clearmodifiers Shift+Insert;numlockx on" -bindsym Print exec "xfce4-screenshooter -s ~/Pictures -r" +bindsym Print exec "bash -c 'DISPLAY=:0.0 xfce4-screenshooter -r -s ~/Pictures'" # Split in vertical orientation bindsym $mod+v split h # Split in horizontal orientation @@ -97,6 +97,7 @@ bindsym $mod+shift+7 move container to workspace 7 bindsym $mod+shift+8 move container to workspace 8 bindsym $mod+shift+9 move container to workspace 9 bindsym $mod+shift+0 move container to workspace 10 +bindsym $mod+d exec "~/.i3/run.sh copy" bindsym $mod+grave exec "~/.i3/run.sh screen-lock" bindsym $mod+shift+grave exec "~/.i3/run.sh screen-lock" bindsym $mod+r mode "resize" @@ -168,18 +169,26 @@ mode "resize" { # Startup # Monitor setup -exec --no-startup-id "zsh -c 'xrandr --output LVDS1 --primary || xrandr --output HDMI3 --primary'" +exec --no-startup-id "zsh -c 'xrandr --output eDP1 --primary || xrandr --output HDMI3 --primary'" # Wallpaper exec --no-startup-id "~/.i3/run.sh wall" # Keyboard exec --no-startup-id xmodmap ~/.xmodmap -exec --no-startup-id ~/xmodmap.sh +#exec --no-startup-id ~/xmodmap.sh # Misc +# Compositor +exec --no-startup-id compton +# Spawn a terminal +#TODO: Currently the terminal will spawn in the current workspace exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/urxvt' -#exec --no-startup-id /usr/bin/shutter --min_at_startup +# Orange tint exec --no-startup-id /usr/bin/redshift -l 36.3:-80.3 -t 4000:2000 +# Sync x11 clipboards exec --no-startup-id /usr/bin/parcellite +# Turn off numlock! exec --no-startup-id /usr/bin/numlockx -exec --no-startup-id firefox || firefox-bin +# Run firefox/firefox-bin +exec --no-startup-id firefox -p sync || firefox-bin -p sync +# Start syncthing if it hasn't already been started exec --no-startup-id /bin/zsh -c 'pidof syncthing||screen -dmS syncthing ~/bin/syncthing' # vim: ts=2:sw=2:et diff --git a/i3/run.sh b/i3/run.sh index fd93f73..308a58a 100755 --- a/i3/run.sh +++ b/i3/run.sh @@ -88,3 +88,6 @@ if [ "$1" = "ip" ]; then fi echo $RET fi +if [ "$1" = "copy" ]; then + (printf '-chegg ';xsel | perl -pe 's/[^a-zA-Z ]//g;chomp()') | xsel && notify-send "Copied" || notify-send "Error" +fi diff --git a/shells/zshrc b/shells/zshrc index 9fd63f1..1190f3f 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -90,6 +90,7 @@ mt(){ case $1 in m) sudo multitail /var/log/messages;; xe) multitail ~/.xsession-errors;; + ef) sudo multitail /var/log/emerge-fetch.log;; gogs) sudo multitail /var/log/gogs.{err,log};; dm) dmesg -w;; syncthing) sudo multitail /var/log/syncthing.{err,log};; @@ -127,7 +128,7 @@ alias mouse2="xmodmap <(echo pointer = 3 2 1)" if ex ocp; then alias ocp="ocp -vs0 -dcurses" fi -alias con='git x php app/console' +alias con='git x php bin/console' alias srm='shred -uzv' alias disphost='export DISPLAY=:0.0' alias ll='ls -AlhF' @@ -164,13 +165,13 @@ if test -f /etc/gentoo-release; then # Sudo echo so we have immediate results on weather sudo worked sudo echo "Args: $*" # Beep, verbose, ask - sudo zsh -c "emerge --autounmask-write -Ava $*" + sudo emerge --autounmask-write -Ava $* echo "\a" } upgrade(){ # Sudo echo so we have immediate results on weather sudo worked sudo echo "Args: $*" - sudo emerge --update --newuse --deep --verbose --tree --keep-going=y --verbose-conflicts --alert --ask $* @world + sudo emerge --update --newuse --deep --verbose --tree --keep-going=y --verbose-conflicts --alert --ask --binpkg-respect-use=y --binpkg-changed-deps=y $* @world echo "\\a" } # For emerging with absolute paths @@ -198,9 +199,9 @@ if test -f /etc/gentoo-release; then fi sudo rm '/usr/portage/metadata/timestamp.chk' if ex eix-update; then - sudo emaint sync -a + sudo zsh -c "emaint sync -a&&eix-update" else - sudo zsh -c "echo Starting pull;emaint sync -a&&echo Done pulling&&eix-update&&echo Done with eix" + sudo emaint sync -a fi sudo -k echo '\a' @@ -243,7 +244,8 @@ fi alias stdns="sudo sh -c 'echo nameserver 8.8.8.8 > /etc/resolv.conf'" alias fvim="vim -u NONE +\"so ~/.vim/plugged/flappyvird-vim/plugin/flappyvird.vim\" +\"so ~/.vim/plugged/flappyvird-vim/autoload/flappyvird.vim\" +\":FlappyVird\" +\":q\"" alias fk='k `fzf --no-mouse -m -1 -x`' -alias susp="sudo true&&((slock;sleep 2;nmcli radio wifi off;nmcli radio wifi on)&echo mem | sudo tee /sys/power/state >/dev/null);sudo -k" +#alias susp="sudo true&&((slock;sleep 2;nmcli radio wifi off;nmcli radio wifi on)&echo mem | sudo tee /sys/power/state >/dev/null);sudo -k" +alias susp="sudo true&&((slock;sleep 2;nmcli radio wifi off;nmcli radio wifi on)&echo mem|sudo tee /sys/power/state>/dev/null)" if ex sudo; then alias s='sudo -Hu' fi diff --git a/vimperator/vimperatorrc b/vimperator/vimperatorrc index a3d7ca7..67127f0 100644 --- a/vimperator/vimperatorrc +++ b/vimperator/vimperatorrc @@ -31,10 +31,10 @@ vnoremap H ^ noremap Y :js util.copyToClipboard(content.document.title, true) "set animations=true silent! colorscheme vimPgray -set defsearch=google +set defsearch=encryptedgoogle style -name ublick * #nav-bar * { visibility: visible; } set titlestring=Firefox set toolbars=noaddons,nobookmarks,nomenu,tabs,nonavigation set newtab=all -set complete=slb +"set complete=lb set hintchars=HJKLASDFGYUIOPWERTNMZXCVB