From 3f26f01d9fd3133574baa272ad17150981d11740 Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Tue, 14 Oct 2014 16:15:59 -0400 Subject: [PATCH] Changed tray_output for i3bar. Replaced dmenu with synapse. Fixed zsh_command_not_found error on Macs --- i3/config | 11 ++++++----- scripts/desktop.txt | 1 + scripts/server.txt | 2 ++ scripts/sync.sh | 2 +- shells/Xresources | 10 +++++----- shells/zshrc | 11 ++++++++--- 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/i3/config b/i3/config index 9b65232..36d2ea5 100644 --- a/i3/config +++ b/i3/config @@ -37,7 +37,7 @@ bar { status_command i3status --config ~/.i3/i3status.conf mode hide modifier Mod4 - tray_output primary + #tray_output primary colors { background $bg statusline $fg @@ -80,7 +80,7 @@ bindsym $mod+Shift+c kill bindsym $mod+c move absolute position center # 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' +#bindsym $mod+p exec dmenu_run -nb '#2c2c2c' -nf '#dcdccc' -sb '#3f3f3f' -sf '#9ab8d7' # There also is the (new) i3-dmenu-desktop which only displays applications # shipping a .desktop file. It is a wrapper around dmenu, so you need that # installed. @@ -129,7 +129,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+Shift+r reload -bindsym $mod+Shift+minus exec --no-startup-id banshee --restart-or-previous +bindsym $mod+Shift+minus exec --no-startup-id banshee --previous bindsym $mod+Shift+equal exec --no-startup-id banshee --next bindsym $mod+minus exec --no-startup-id banshee --pause bindsym $mod+equal exec --no-startup-id banshee --play @@ -160,14 +160,15 @@ exec --no-startup-id "~/.i3/wall.sh" #startup exec --no-startup-id xmodmap ~/.xmodmap 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 /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/xterm &' -exec --no-startup-id i3-msg 'workspace 10; exec /usr/bin/shutter --min_at_startup &' +exec --no-startup-id i3-msg /usr/bin/shutter --min_at_startup exec --no-startup-id /usr/bin/screen -dmS syncthing /home/stonewareslord/Applications/syncthing/syncthing exec --no-startup-id /usr/bin/owncloud exec --no-startup-id /usr/bin/nm-applet exec --no-startup-id /usr/bin/gtk-redshift -l 36.3:-80.3 -t 6500:4000 exec --no-startup-id /usr/bin/diodon exec --no-startup-id /usr/bin/numlockx +exec --no-startup-id /usr/bin/synapse # vim: ts=2:sw=2:et diff --git a/scripts/desktop.txt b/scripts/desktop.txt index dbc0fa8..ea14651 100644 --- a/scripts/desktop.txt +++ b/scripts/desktop.txt @@ -70,3 +70,4 @@ virtualbox x11vnc xvnc4viewer ntop +gnome-dictionary diff --git a/scripts/server.txt b/scripts/server.txt index 12218af..942581f 100644 --- a/scripts/server.txt +++ b/scripts/server.txt @@ -69,3 +69,5 @@ npm bsdgames sshuttle nethogs +w3m +aircrack-ng diff --git a/scripts/sync.sh b/scripts/sync.sh index 56e6a12..b627e06 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -35,7 +35,7 @@ while getopts ":hbsdclw" VALUE "$@"; do brew install brew-cask brew cask fi - brew cask install textexpander controlplane gimp inkscape adium vlc iterm2 steam + brew cask install gimp inkscape adium vlc iterm2 steam adobe-reader fi fi if [ "$VALUE" = "d" ] ; then diff --git a/shells/Xresources b/shells/Xresources index 786b808..2262660 100644 --- a/shells/Xresources +++ b/shells/Xresources @@ -97,16 +97,16 @@ URxvt*foreground : _foreground URxvt*background : _background URxvt*cursorColor : _cursorColor XTerm*color0 : _color0 -XTerm*color1 : _color1 -XTerm*color2 : _color2 -XTerm*color3 : _color3 +XTerm*color1 : #121212 +XTerm*color2 : #00ff00 +XTerm*color3 : _color2 XTerm*color4 : _color4 XTerm*color5 : _color5 XTerm*color6 : _color6 XTerm*color7 : _color7 XTerm*color8 : _color8 -XTerm*color9 : _color9 -XTerm*color10 : _color10 +XTerm*color9 : _color10 +XTerm*color10 : #00ff00 XTerm*color11 : _color11 XTerm*color12 : _color12 XTerm*color13 : _color13 diff --git a/shells/zshrc b/shells/zshrc index e17aad8..670dca1 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -12,7 +12,7 @@ HISTSIZE=12000 SAVEHIST=10000000 setopt HIST_EXPIRE_DUPS_FIRST setopt EXTENDED_HISTORY -export PAGER=/usr/local/bin/vimpager +export PAGER=/usr/bin/w3m alias less=$PAGER alias zless=$PAGER @@ -28,7 +28,9 @@ antigen apply #plugins=(git) DISABLE_AUTO_UPDATE="true" #source $ZSH/oh-my-zsh.sh -source /etc/zsh_command_not_found +if [ -f /etc/zsh_command_not_found ] ; then + source /etc/zsh_command_not_found +fi export PATH="/home/stonewareslord/.autojump/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games" export EDITOR='vim' alias ls='ls --color=always -F' @@ -44,7 +46,7 @@ alias fixsh='ssh-keygen -R' alias tmux='tmux -2' #alias less='less -r' alias tree='tree -C' -alias grep="egrep -i --color=auto" +#alias grep="egrep -i --color=auto" alias skim="(head -5; tail -5) <" alias cp="cp -v" alias mv="mv -v" @@ -88,6 +90,9 @@ alias fh='eval $(([ -n "$ZSH_NAME" ] && fc --no-mouse -m -1 -x -l 1 || history) alias fkill='ps -ef | sed 1d | fzf --no-mouse -m -1 -x | awk "{print $2}" | xargs kill -${1:-9}' alias -s html="firefox" alias -s log="less -MN" +alias -s odt="libreoffice" +alias -s doc="libreoffice" +alias -s docx="libreoffice" alias -g F='`fzf --no-mouse -m -1 -x`' alias -g nify=" > /dev/null 2>&1 &" alias -g nifyd=" > /dev/null 2>&1 & disown"