diff --git a/git/gitconfig b/git/gitconfig index faadcc5..5442c3b 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -11,7 +11,7 @@ st = status br = branch -av hist = log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit - dt = difftool + d = difftool cbranch = !sh -c 'git commit -m \"$2\"&&git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' - nbranch = !sh -c 'git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' - size = "!git diff --cached --binary | wc -c | numfmt --to=iec-i" diff --git a/i3/config b/i3/config index 19b3c04..d2a88c2 100644 --- a/i3/config +++ b/i3/config @@ -1,3 +1,4 @@ +set $mod Mod4 bindsym $mod+d exec i3-input -F 'rename workspace to "%s"' -P 'Rename to: ' #exec xrandr --output HDMI3 --left-of HDMI1 & #exec xmodmap ~/.Xmodmap & @@ -8,32 +9,21 @@ bindsym XF86AudioLowerVolume exec "amixer set Master 5%- unmute" bindsym XF86AudioMute exec "amixer -D pulse set Master 1+ toggle" #screensaver -exec --no-startup-id xautolock -time 3 -locker 'i3lock -di `shuf -n1 -e ~/.i3/wall/*`; sleep 60; pgrep i3lock && xset dpms force off' & +exec --no-startup-id xautolock -time 3 -locker 'i3lock -di `shuf -n1 -e ~/.i3/wall/*`' & -#startup -#exec --no-startup-id i3-msg 'workspace 10; exec /home/stonewareslord/xmodmap.sh&/usr/bin/owncloud&/usr/bin/redshift t -l 36.3:-80.3 -t 6500:4000&wicd-gtk&' -exec --no-startup-id i3-msg 'workspace 10; exec /home/stonewareslord/xmodmap.sh&/usr/bin/redshift t -l 36.3:-80.3 -t 6500:4000&wicd-gtk&' -#exec --no-startup-id i3-msg 'workspace 10; exec /home/stonewareslord/applications/Telegram/Telegram&' -exec --no-startup-id i3-msg 'workspace 2; exec /usr/bin/firefox &' -#exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/konsole -e wemux&' -exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/konsole &' -exec --no-startup-id i3-msg 'nitrogen --restore' +set $bg #2c2c2e +set $fg #9f9f9f +set $hi #efef8f +set $ac #a0afa0 +set $tx #040404 +set $ia #8f8f8f +set $be #8faf9f +set $yw #ccdc90 +set $gn #88b090 +set $rd #e89393 -#colors -# color defines for zenburn styled i3 -set $bg #2c2c2e -set $fg #9f9f9f -set $hi #efef8f -set $ac #a0afa0 -set $tx #040404 -set $ia #8f8f8f -set $be #8faf9f -set $yw #ccdc90 -set $gn #88b090 -set $rd #e89393 - -# set some nice colors border background text -client.focused $ac $ac $tx +## set some nice colors border background text +client.focused #ff0000 #ff0000 $tx client.unfocused $bg $bg $ia client.focused_inactive $bg $bg $ac client.urgent $rd $rd $tx @@ -41,18 +31,16 @@ client.urgent $rd $rd $tx # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) bar { - status_command i3status - # --config ~/.i3/i3status.conf - - colors { - background $bg - statusline $fg - separator $hi - focused_workspace $gn $bg $ac - active_workspace $gn $ac $tx - inactive_workspace $bg $bg $ia - urgent_workspace $rd $bg $ac - } + status_command i3status --config ~/.i3/i3status.conf + colors { + background $bg + statusline $fg + separator $hi + focused_workspace $gn $bg $ac + active_workspace $gn $ac $tx + inactive_workspace $bg $bg $ia + urgent_workspace $rd $bg $ac + } } new_window pixel 1 @@ -65,59 +53,24 @@ bindsym $mod+Shift+v split v # resize window (you can also use the mouse for that) mode "resize" { - # These bindings trigger as soon as you enter the resize mode - - # Pressing left will shrink the window’s width. - # Pressing right will grow the window’s width. - # Pressing up will shrink the window’s height. - # Pressing down will grow the window’s height. - bindsym $mod+h resize shrink width 10 px or 10 ppt - bindsym $mod+j resize grow height 10 px or 10 ppt - bindsym $mod+k resize shrink height 10 px or 10 ppt - bindsym $mod+l resize grow width 10 px or 10 ppt - - # same bindings, but for the arrow keys - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt - - # back to normal: Enter or Escape - bindsym Return mode "default" - bindsym Escape mode "default" + # These bindings trigger as soon as you enter the resize mode + bindsym $mod+h resize shrink width 10 px or 10 ppt + bindsym $mod+j resize grow height 10 px or 10 ppt + bindsym $mod+k resize shrink height 10 px or 10 ppt + bindsym $mod+l resize grow width 10 px or 10 ppt + # same bindings, but for the arrow keys + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt + # back to normal: Enter or Escape + bindsym Return mode "default" + bindsym Escape mode "default" } -# This file has been auto-generated by i3-config-wizard(1). -# It will not be overwritten, so edit it as you like. -# -# Should you change your keyboard layout somewhen, delete -# this file and re-run i3-config-wizard(1). -# - -# i3 config file (v4) -# -# Please see http://i3wm.org/docs/userguide.html for a complete reference! - -set $mod Mod4 - -# Font for window titles. Will also be used by the bar unless a different font -# is used in the bar {} block below. ISO 10646 = Unicode font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 -# The font above is very space-efficient, that is, it looks good, sharp and -# clear in small sizes. However, if you need a lot of unicode glyphs or -# right-to-left text rendering, you should instead use pango for rendering and -# chose a FreeType font, such as: -# font pango:DejaVu Sans Mono 10 - -# Use Mouse+$mod to drag floating windows to their wanted position floating_modifier $mod - -# start a terminal bindsym $mod+Return exec konsole - -# kill focused window bindsym $mod+Shift+c kill - -# start dmenu (a program launcher) # dmenu_run -nb '#000000' -nf '#ffffff' -sb '#474747' -sf '#ffffff' # dmenu_run -nb '#2c2c2c' -nf '#dcdccc' -sb '#3f3f3f' -sf '#9ab8d7' bindsym $mod+p exec dmenu_run -nb '#2c2c2c' -nf '#dcdccc' -sb '#3f3f3f' -sf '#9ab8d7' @@ -125,52 +78,29 @@ bindsym $mod+p exec dmenu_run -nb '#2c2c2c' -nf '#dcdccc' -sb '#3f3f3f' -sf '#9a # shipping a .desktop file. It is a wrapper around dmenu, so you need that # installed. # bindsym $mod+d exec --no-startup-id i3-dmenu-desktop - -# change focus bindsym $mod+h focus left bindsym $mod+j focus down bindsym $mod+k focus up bindsym $mod+l focus right - -# alternatively, you can use the cursor keys: bindsym $mod+Left focus left bindsym $mod+Down focus down bindsym $mod+Up focus up bindsym $mod+Right focus right - -# move focused window bindsym $mod+Shift+h move left bindsym $mod+Shift+j move down bindsym $mod+Shift+k move up bindsym $mod+Shift+l move right - -# alternatively, you can use the cursor keys: bindsym $mod+Shift+Left move left bindsym $mod+Shift+Down move down bindsym $mod+Shift+Up move up bindsym $mod+Shift+Right move right - -# enter fullscreen mode for the focused container bindsym $mod+f fullscreen - -# change container layout (stacked, tabbed, toggle split) bindsym $mod+s layout stacking bindsym $mod+w layout tabbed bindsym $mod+e layout toggle split - -# toggle tiling / floating bindsym $mod+Shift+space floating toggle - -# change focus between tiling / floating windows bindsym $mod+space focus mode_toggle - -# focus the parent container bindsym $mod+a focus parent - -# focus the child container -#bindsym $mod+d focus child - -# switch to workspace bindsym $mod+1 workspace 1 bindsym $mod+2 workspace 2 bindsym $mod+3 workspace 3 @@ -181,8 +111,6 @@ bindsym $mod+7 workspace 7 bindsym $mod+8 workspace 8 bindsym $mod+9 workspace 9 bindsym $mod+0 workspace 10 - -# move focused container to workspace bindsym $mod+Shift+1 move container to workspace 1 bindsym $mod+Shift+2 move container to workspace 2 bindsym $mod+Shift+3 move container to workspace 3 @@ -193,8 +121,6 @@ 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 - -# reload the configuration file bindsym $mod+Shift+r reload # To initialize wallpapers, run: # export DISPLAY=:0.0;mkdir -p ~/.i3/wall;cp ~/ownCloud/wallpaper/std/* ~/.i3/wall;cd ~/.i3/wall;rename -v 's/(.* )+//' *;mogrify -resize `xrandr -q|perl -F'\s|,' -lane "/^Sc/&&print join '',@F[8..10]"`^ -verbose -gravity center -format png *;rm *.jpg;rm *.jpeg @@ -212,11 +138,20 @@ bindsym $mod+r mode "resize" bindsym $mod+u focus parent bindsym $mod+shift+u focus child bindsym $mod+m focus mode_toggle +# wallOM initialization: +# echo -n "Resolution: ";read a;mkdir -p ~/.i3/wallOM;cp ~/ownCloud/wallpaper/std/* ~/.i3/wallOM;cd ~/.i3/wallOM;rename -v 's/(.* )+//' *;mogrify -resize $a^ -verbose -gravity center -format png *;rm *.jpg;rm *.jpeg +# feh doesn't work with 2 monitors, so the wallOM folder exists for computers with 2 monitors -# Start i3bar to display a workspace bar (plus the system information i3status -# finds out, if available) -#bar { -# #status_command i3status -#} -exec --no-startup-id feh --bg-scale "`shuf -n1 -e ~/.i3/wall/*`" +#wallpaper +bindsym $mod+Shift+w exec "~/.i3/wall.sh" +exec --no-startup-id "~/.i3/wall.sh" +#startup +exec --no-startup-id /home/stonewareslord/xmodmap.sh +exec --no-startup-id i3-msg '/usr/bin/redshift t -l 36.3:-80.3 -t 6500:4000&' +exec --no-startup-id i3-msg 'workspace 2; exec /usr/bin/firefox &' +exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/konsole &' +exec --no-startup-id i3-msg 'workspace 10; exec /usr/bin/shutter --min_at_startup &' exec --no-startup-id screen -dmS syncthing /home/stonewareslord/Applications/syncthing/syncthing +exec --no-startup-id /usr/bin/owncloud +exec --no-startup-id /usr/bin/nm-applet +# vim: ts=2:sw=2:et diff --git a/i3/wall.sh b/i3/wall.sh new file mode 100755 index 0000000..e7c0114 --- /dev/null +++ b/i3/wall.sh @@ -0,0 +1,2 @@ +#!/bin/bash +if [[ -d ~/.i3/wallOM ]];then feh --bg-scale "`shuf -n1 -e ~/.i3/wallOM/*`";else feh --bg-scale "`shuf -n1 -e ~/.i3/wall/*`";fi; diff --git a/scripts/desktop.txt b/scripts/desktop.txt index 07961dc..7a9d74e 100644 --- a/scripts/desktop.txt +++ b/scripts/desktop.txt @@ -30,7 +30,6 @@ wireshark shutter gtk-redshift unetbootin -cairo-dock owncloud-client exiv2 xdotool diff --git a/scripts/server.txt b/scripts/server.txt index f9bd5bb..7e71926 100644 --- a/scripts/server.txt +++ b/scripts/server.txt @@ -54,3 +54,4 @@ fdupes libssl-dev libavahi-client-dev libasound2-dev +libpam-google-authenticator diff --git a/scripts/sync.sh b/scripts/sync.sh index 8d988ec..167ea56 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -55,9 +55,9 @@ while getopts ":hbsdtclw" VALUE "$@"; do if [ "$VALUE" = "c" ] ; then echo "Syncing config files" if which trash >/dev/null; then - trash ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.vimperator/info/sync/quickmarks ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config ~/.i3/sleep.sh ~/.Xmodmap ~/.xsession ~/.oh-my-zsh/themes/af-magic.zsh-theme + trash ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.vimperator/info/sync/quickmarks ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.Xmodmap ~/.xsession ~/.oh-my-zsh/themes/af-magic.zsh-theme else - rm ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.vimperator/info/sync/quickmarks ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config ~/.i3/sleep.sh ~/.Xmodmap ~/.xsession ~/.oh-my-zsh/themes/af-magic.zsh-theme + rm ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.vimperator/info/sync/quickmarks ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.Xmodmap ~/.xsession ~/.oh-my-zsh/themes/af-magic.zsh-theme fi ln -s $ABSPATH/python/pylintrc ~/.pylintrc ln -s $ABSPATH/vim/vimrc ~/.vimrc @@ -75,6 +75,7 @@ while getopts ":hbsdtclw" VALUE "$@"; do ln -s $ABSPATH/shells/af-magic.zsh-theme ~/.oh-my-zsh/themes/af-magic.zsh-theme mkdir -p ~/.i3 ln -s $ABSPATH/i3/config ~/.i3/config + ln -s $ABSPATH/i3/wall.sh ~/.i3/wall.sh ln -s $ABSPATH/i3/sleep.sh ~/.i3/sleep.sh ln -s $ABSPATH/i3/Xmodmap ~/.Xmodmap ln -s $ABSPATH/i3/xsession ~/.xsession diff --git a/shells/af-magic.zsh-theme b/shells/af-magic.zsh-theme index f7657d8..6294de1 100644 --- a/shells/af-magic.zsh-theme +++ b/shells/af-magic.zsh-theme @@ -12,10 +12,10 @@ fi # primary prompt PROMPT='$FG[032]%~\ $(git_prompt_info) \ -$FG[105]%(!.#.»)%{$reset_color%} ' +$FG[105]%(!.#.$)%{$reset_color%} ' PROMPT2='%{$fg[red]%}\ %{$reset_color%}' RPS1='${return_code}' - +# » # color vars eval my_gray='$FG[237]' diff --git a/shells/zshrc b/shells/zshrc index f73f219..38d9b1c 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -1,7 +1,7 @@ export ZSH=$HOME/.oh-my-zsh ZSH_THEME="af-magic" # Uncomment the following line to enable command auto-correction. -ENABLE_CORRECTION="false" +# ENABLE_CORRECTION="true" COMPLETION_WAITING_DOTS="true" # Uncomment the following line if you want to change the command execution time # stamp shown in the history command output. @@ -18,7 +18,7 @@ alias zless=$PAGER # Would you like to use another custom folder than $ZSH/custom? # ZSH_CUSTOM=/path/to/new-custom-folder -plugins=(git) +#plugins=(git) source $ZSH/oh-my-zsh.sh source /etc/zsh_command_not_found export PATH="/home/stonewareslord/.autojump/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games" @@ -73,17 +73,19 @@ alias g="git $@" alias echip="curl ifconfig.me" alias vpn="cd ~/.openvpn;sudo openvpn config.ovpn;cd -" alias to="~/.todo/todo.sh" -alias stick="stikkit -b https://austenwares.com/paste" -alias flappyvim="vim -u NONE +\"so ~/.vim/bundle/flappyvird-vim/plugin/flappyvird.vim\" +\"so ~/.vim/bundle/flappyvird-vim/autoload/flappyvird.vim\" +\":FlappyVird\" +\":q\"" +alias stdns="sudo sh -c 'echo \"nameserver 8.8.8.8\\nnameserver 8.8.4.4\" > /etc/resolv.conf'" alias -s html="firefox" alias -s log="less -MN" alias -g nify=" > /dev/null 2>&1 &" alias -g G='|& egrep -i' +alias -g AW='austenwares.com' function dnstest(){ echo "Testing ping:" ping -c 3 8.8.8.8 echo "Testing IP curl:" curl -k https://98.26.78.121/b/ + echo "resolv.conf:" + cat /etc/resolv.conf echo "Testing DNS" curl -k https://austenwares.com/b/ } diff --git a/vim/vimrc b/vim/vimrc index d449a70..6554d5a 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -307,6 +307,8 @@ Bundle 'vim-scripts/sessionman.vim' " |https://github.com/vim-scripts/sessionman.vim Bundle 'mattn/flappyvird-vim' " |https://github.com/mattn/flappyvird-vim +Bundle 'morhetz/gruvbox' + " |https://github.com/morhetz/gruvbox " | "DO NOT DELETE LINE ABOVE OR \bun WILL BREAK filetype plugin indent on @@ -340,5 +342,5 @@ else endif "colorscheme torte endif -silent! colorscheme fruity +silent! colorscheme gruvbox nnoremap W :%s/\s\+$//:let @/='' diff --git a/vimperator/vimperatorrc b/vimperator/vimperatorrc index 4cacaa5..21eff46 100644 --- a/vimperator/vimperatorrc +++ b/vimperator/vimperatorrc @@ -1,28 +1,3 @@ -silent! nunmap j -silent! nunmap k -silent! unmap J -silent! unmap K -silent! unmap -silent! unmap -silent! unmap gH -silent! unmap gt -silent! unmap gT -silent! unmap Y -silent! unmap !! -silent! unmap -silent! unmap -silent! unmap G -silent! unmap gg -silent! unmap / -silent! unmap a -silent! unmap A -silent! iunmap -silent! iunmap -silent! iunmap -silent! iunmap -silent! vunmap L -silent! vunmap H - nnoremap j 6j nnoremap k 6k nnoremap J gt @@ -43,6 +18,7 @@ nnoremap a A nnoremap A a nnoremap \"a :open https://austenwares.com/ nnoremap \"A :tabopen https://austenwares.com/ +nnoremap inoremap inoremap inoremap @@ -51,7 +27,7 @@ inoremap inoremap vnoremap L $ vnoremap H ^ -set animations=true +"set animations=true colorscheme vimPgray set titlestring= set newtab=all