From fc8c11d360baab6b9dfe6195f0ce2639452967a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= Date: Fri, 18 Sep 2015 02:14:17 +0200 Subject: [PATCH] New config --- .dockerignore | 1 + .gitignore | 1 - .gitmodules | 9 +- Xresources_old | 38 -- Xresources_solarized | 96 ----- Xresources => Xsession/.Xresources | 4 +- profile => Xsession/.profile | 0 xinitrc => Xsession/.xinitrc | 0 xprofile => Xsession/.xprofile | 2 +- bash_logout => bash/.bash_logout | 0 bash_profile => bash/.bash_profile | 0 bashrc => bash/.bashrc | 0 bin/bashrc | 125 ------ bin/i3-wm-scripts | 1 - compton/.compton.conf | 89 ++++ emacs.d/.gitignore | 4 - emacs.d/config/config-dired.el | 25 -- emacs.d/config/config-ein.el | 55 --- emacs.d/config/config-evil.el | 69 ---- emacs.d/config/config-helm.el | 80 ---- emacs.d/config/config-latex.el | 38 -- emacs.d/config/config-org.el | 40 -- emacs.d/config/config-python.el | 24 -- emacs/.emacs.d/init.el | 379 ++++++++++++++++++ gitconfig => git/.gitconfig | 5 +- gitignore_global => git/.gitignore_global | 0 i3/{ => .config/i3}/config | 120 +++--- i3/{ => .config/i3}/config.bak | 0 i3/{ => .config/i3}/conky.sh | 2 +- i3/{ => .config/i3}/conkyrc | 33 +- i3/.config/i3/i3blocks.conf | 160 ++++++++ i3/.config/i3/status.sh | 2 + i3/.dmenurc | 3 + lightdm/etc/lightdm/lightdm-gtk-greeter.conf | 62 +++ noserc | 3 - not_dots/zshrc.orig | 73 ---- not_dots/zshrc.pre-oh-my-zsh | 73 ---- oh-my-zsh | 1 - pythonrc.py | 137 ------- {bin => scripts/.bin}/README | 0 {bin => scripts/.bin}/change-xfce4-alt-tab.sh | 0 {bin => scripts/.bin}/changedisplay.sh | 0 {bin => scripts/.bin}/cpcuevana.sh | 0 {bin => scripts/.bin}/dmenu.sh | 0 {bin => scripts/.bin}/dual-monitor.sputnik | 0 {bin => scripts/.bin}/elecciones.sh | 0 {bin => scripts/.bin}/flasher.sh | 0 {bin => scripts/.bin}/gnome-terminal | 0 {bin => scripts/.bin}/goear.sh | 0 {bin => scripts/.bin}/i3-exit.sh | 0 {bin => scripts/.bin}/i3-one-instance | 0 {bin => scripts/.bin}/i3-one-tmux | 0 {bin => scripts/.bin}/i3-secondary-to-primary | 0 {bin => scripts/.bin}/i3-winmenu.py | 0 {bin => scripts/.bin}/icon_spotify.png | Bin {bin => scripts/.bin}/monitors | 0 {bin => scripts/.bin}/myemacs | 2 +- {bin => scripts/.bin}/one-instance | 0 {bin => scripts/.bin}/one-instance (copy) | 0 {bin => scripts/.bin}/one-terminator.sh | 0 {bin => scripts/.bin}/one-tmux | 0 {bin => scripts/.bin}/passmenu | 0 {bin => scripts/.bin}/play-europa.sh | 0 {bin => scripts/.bin}/play-hitfm.sh | 0 {bin => scripts/.bin}/play-kiss.sh | 0 {bin => scripts/.bin}/play-m80.sh | 0 {bin => scripts/.bin}/playlist-radios.xml | 0 {bin => scripts/.bin}/replace-accented.sh | 0 {bin => scripts/.bin}/single-monitor.sputnik | 0 {bin => scripts/.bin}/spotify-notify.py | 0 {bin => scripts/.bin}/spotify-remote.py | 5 +- {bin => scripts/.bin}/spotify-remote.sh | 0 {bin => scripts/.bin}/start-eclipse.sh | 0 {bin => scripts/.bin}/terminator | 0 {bin => scripts/.bin}/tmux-zoom.sh | 0 {bin => scripts/.bin}/unlock-livebox.py | 0 {bin => scripts/.bin}/volume-down.sh | 0 {bin => scripts/.bin}/volume-toggle-mute.sh | 0 {bin => scripts/.bin}/volume-up.sh | 0 {bin => scripts/.bin}/winfuncs.sh | 0 {bin => scripts/.bin}/zotero | 0 stalonetray/.stalonetrayrc | 139 +++++++ starttmux | 17 - sxhkd/.config/sxhkd/sxhkdrc | 158 ++++++++ tmux.conf => tmux/.tmux.conf | 6 +- vim/.vim/.gitignore | 1 + vim/{ => .vim}/bundle/vundle | 0 vim/{ => .vim}/colors/Tomorrow-Night-Blue.vim | 0 .../colors/Tomorrow-Night-Bright.vim | 0 .../colors/Tomorrow-Night-Eighties.vim | 0 vim/{ => .vim}/colors/Tomorrow-Night.vim | 0 vim/{ => .vim}/colors/Tomorrow.vim | 0 vim/{ => .vim}/colors/codeschool.vim | 0 vim/{ => .vim}/colors/ir_black.vim | 0 vim/{ => .vim}/colors/matrix.vim | 0 vim/{ => .vim}/colors/pychimp.vim | 0 vim/{ => .vim}/colors/reloaded.vim | 0 vim/{ => .vim}/colors/revolutions.vim | 0 vim/{ => .vim}/colors/solarized.vim | 0 vim/{ => .vim}/colors/vividchalk.vim | 0 vim/{ => .vim}/colors/wombat.vim | 0 vim/{ => .vim}/ftplugin/tex.vim | 0 vim/{ => .vim}/syntax/javascript.vim | 0 vim/{ => .vim}/syntax/n3.vim | 0 vimrc => vim/.vimrc | 0 vim/bundle/.gitignore | 2 - vimperatorrc => vimperator/.vimperatorrc | 0 zsh/.zlogin | 1 + zsh/.zlogout | 1 + zsh/.zprezto | 1 + zsh/.zpreztorc | 175 ++++++++ zsh/.zprofile | 99 +++++ zsh/.zsh-custom/prompt_balkian_setup | 154 +++++++ zsh/.zshenv | 1 + zsh/.zshrc | 1 + zshenv | 10 - zshrc | 89 ---- 117 files changed, 1533 insertions(+), 1083 deletions(-) create mode 100644 .dockerignore delete mode 100644 Xresources_old delete mode 100644 Xresources_solarized rename Xresources => Xsession/.Xresources (99%) rename profile => Xsession/.profile (100%) rename xinitrc => Xsession/.xinitrc (100%) rename xprofile => Xsession/.xprofile (65%) rename bash_logout => bash/.bash_logout (100%) rename bash_profile => bash/.bash_profile (100%) rename bashrc => bash/.bashrc (100%) delete mode 100644 bin/bashrc delete mode 160000 bin/i3-wm-scripts create mode 100644 compton/.compton.conf delete mode 100644 emacs.d/.gitignore delete mode 100644 emacs.d/config/config-dired.el delete mode 100644 emacs.d/config/config-ein.el delete mode 100644 emacs.d/config/config-evil.el delete mode 100644 emacs.d/config/config-helm.el delete mode 100644 emacs.d/config/config-latex.el delete mode 100644 emacs.d/config/config-org.el delete mode 100644 emacs.d/config/config-python.el create mode 100644 emacs/.emacs.d/init.el rename gitconfig => git/.gitconfig (86%) rename gitignore_global => git/.gitignore_global (100%) rename i3/{ => .config/i3}/config (67%) rename i3/{ => .config/i3}/config.bak (100%) rename i3/{ => .config/i3}/conky.sh (60%) rename i3/{ => .config/i3}/conkyrc (59%) create mode 100644 i3/.config/i3/i3blocks.conf create mode 100755 i3/.config/i3/status.sh create mode 100644 i3/.dmenurc create mode 100644 lightdm/etc/lightdm/lightdm-gtk-greeter.conf delete mode 100644 noserc delete mode 100644 not_dots/zshrc.orig delete mode 100644 not_dots/zshrc.pre-oh-my-zsh delete mode 160000 oh-my-zsh delete mode 100644 pythonrc.py rename {bin => scripts/.bin}/README (100%) rename {bin => scripts/.bin}/change-xfce4-alt-tab.sh (100%) rename {bin => scripts/.bin}/changedisplay.sh (100%) rename {bin => scripts/.bin}/cpcuevana.sh (100%) rename {bin => scripts/.bin}/dmenu.sh (100%) rename {bin => scripts/.bin}/dual-monitor.sputnik (100%) rename {bin => scripts/.bin}/elecciones.sh (100%) rename {bin => scripts/.bin}/flasher.sh (100%) rename {bin => scripts/.bin}/gnome-terminal (100%) rename {bin => scripts/.bin}/goear.sh (100%) rename {bin => scripts/.bin}/i3-exit.sh (100%) rename {bin => scripts/.bin}/i3-one-instance (100%) rename {bin => scripts/.bin}/i3-one-tmux (100%) rename {bin => scripts/.bin}/i3-secondary-to-primary (100%) rename {bin => scripts/.bin}/i3-winmenu.py (100%) rename {bin => scripts/.bin}/icon_spotify.png (100%) rename {bin => scripts/.bin}/monitors (100%) rename {bin => scripts/.bin}/myemacs (89%) rename {bin => scripts/.bin}/one-instance (100%) rename {bin => scripts/.bin}/one-instance (copy) (100%) rename {bin => scripts/.bin}/one-terminator.sh (100%) rename {bin => scripts/.bin}/one-tmux (100%) rename {bin => scripts/.bin}/passmenu (100%) rename {bin => scripts/.bin}/play-europa.sh (100%) rename {bin => scripts/.bin}/play-hitfm.sh (100%) rename {bin => scripts/.bin}/play-kiss.sh (100%) rename {bin => scripts/.bin}/play-m80.sh (100%) rename {bin => scripts/.bin}/playlist-radios.xml (100%) rename {bin => scripts/.bin}/replace-accented.sh (100%) rename {bin => scripts/.bin}/single-monitor.sputnik (100%) rename {bin => scripts/.bin}/spotify-notify.py (100%) rename {bin => scripts/.bin}/spotify-remote.py (99%) rename {bin => scripts/.bin}/spotify-remote.sh (100%) rename {bin => scripts/.bin}/start-eclipse.sh (100%) rename {bin => scripts/.bin}/terminator (100%) rename {bin => scripts/.bin}/tmux-zoom.sh (100%) rename {bin => scripts/.bin}/unlock-livebox.py (100%) rename {bin => scripts/.bin}/volume-down.sh (100%) rename {bin => scripts/.bin}/volume-toggle-mute.sh (100%) rename {bin => scripts/.bin}/volume-up.sh (100%) rename {bin => scripts/.bin}/winfuncs.sh (100%) rename {bin => scripts/.bin}/zotero (100%) create mode 100644 stalonetray/.stalonetrayrc delete mode 100755 starttmux create mode 100644 sxhkd/.config/sxhkd/sxhkdrc rename tmux.conf => tmux/.tmux.conf (95%) create mode 100644 vim/.vim/.gitignore rename vim/{ => .vim}/bundle/vundle (100%) rename vim/{ => .vim}/colors/Tomorrow-Night-Blue.vim (100%) rename vim/{ => .vim}/colors/Tomorrow-Night-Bright.vim (100%) rename vim/{ => .vim}/colors/Tomorrow-Night-Eighties.vim (100%) rename vim/{ => .vim}/colors/Tomorrow-Night.vim (100%) rename vim/{ => .vim}/colors/Tomorrow.vim (100%) rename vim/{ => .vim}/colors/codeschool.vim (100%) rename vim/{ => .vim}/colors/ir_black.vim (100%) rename vim/{ => .vim}/colors/matrix.vim (100%) rename vim/{ => .vim}/colors/pychimp.vim (100%) rename vim/{ => .vim}/colors/reloaded.vim (100%) rename vim/{ => .vim}/colors/revolutions.vim (100%) rename vim/{ => .vim}/colors/solarized.vim (100%) rename vim/{ => .vim}/colors/vividchalk.vim (100%) rename vim/{ => .vim}/colors/wombat.vim (100%) rename vim/{ => .vim}/ftplugin/tex.vim (100%) rename vim/{ => .vim}/syntax/javascript.vim (100%) rename vim/{ => .vim}/syntax/n3.vim (100%) rename vimrc => vim/.vimrc (100%) delete mode 100644 vim/bundle/.gitignore rename vimperatorrc => vimperator/.vimperatorrc (100%) create mode 120000 zsh/.zlogin create mode 120000 zsh/.zlogout create mode 160000 zsh/.zprezto create mode 100644 zsh/.zpreztorc create mode 100644 zsh/.zprofile create mode 100644 zsh/.zsh-custom/prompt_balkian_setup create mode 120000 zsh/.zshenv create mode 120000 zsh/.zshrc delete mode 100644 zshenv delete mode 100644 zshrc diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +* diff --git a/.gitignore b/.gitignore index 04d3364..cd398a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -.* vim/Session.vim diff --git a/.gitmodules b/.gitmodules index b2e3d3b..d60e51a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,7 @@ -[submodule "vim/bundle/vundle"] - path = vim/bundle/vundle +[submodule "vim/.vim/bundle/vundle"] + path = vim/.vim/bundle/vundle url = https://github.com/gmarik/vundle.git ignore = dirty [submodule "oh-my-zsh"] - path = oh-my-zsh + path = zsh/.oh-my-zsh url = https://github.com/balkian/oh-my-zsh.git -[submodule "i3-wm-scripts"] - path = bin/i3-wm-scripts - url = https://github.com/yiuin/i3-wm-scripts.git diff --git a/Xresources_old b/Xresources_old deleted file mode 100644 index 1ac4968..0000000 --- a/Xresources_old +++ /dev/null @@ -1,38 +0,0 @@ -URxvt*termName:screen-256color -URxvt*loginShell:true -URxvt.iconFile: /usr/share/icons/HighContrast/scalable/apps/utilities-terminal.svg -URxvt.scrollBar: false -URxvt.scrollstyle: rxvt -URxvt*scrollTtyOutput: false -URxvt*scrollWithBuffer: true -URxvt*scrollTtyKeypress: true -URxvt.depth: 32 -URxvt.saveLines: 50000 - -URxvt.font: xft:DejaVu Sans Mono:size=10 -Xft.antialias: rgba -Xft.hinting: true -Xft.hintstyle: hintslight -Xft.rgba: rgb -Xft.dpi: 96 -URxvt.letterSpace: -2 - - -URxvt.foreground: #FFFFFF -URxvt.background: #111111 -URxvt.color0: #2E3436 -URxvt.color1: #CC0000 -URxvt.color2: #4E9A06 -URxvt.color3: #C4A000 -URxvt.color4: #3465A4 -URxvt.color5: #75507B -URxvt.color6: #06989A -URxvt.color7: #D3D7CF -URxvt.color8: #555753 -URxvt.color9: #EF2929 -URxvt.color10: #8AE234 -URxvt.color11: #FCE94F -URxvt.color12: #729FCF -URxvt.color13: #AD7FA8 -URxvt.color14: #34E2E2 -URxvt.color15: #EEEEEC diff --git a/Xresources_solarized b/Xresources_solarized deleted file mode 100644 index 6cac00b..0000000 --- a/Xresources_solarized +++ /dev/null @@ -1,96 +0,0 @@ -!------------------------------------------------------------------------------- -! Xft settings -!------------------------------------------------------------------------------- - -Xft.dpi: 96 -Xft.antialias: false -Xft.rgba: rgb -Xft.hinting: true -Xft.hintstyle: hintslight - -!------------------------------------------------------------------------------- -! URxvt settings -! Colours lifted from Solarized (http://ethanschoonover.com/solarized) -! More info at: -! http://pod.tst.eu/http://cvs.schmorp.de/rxvt-unicode/doc/rxvt.1.pod -!------------------------------------------------------------------------------- - -URxvt.depth: 32 -URxvt.geometry: 90x30 -URxvt.transparent: false -URxvt.fading: 0 -! URxvt.urgentOnBell: true -! URxvt.visualBell: true -URxvt.loginShell: true -URxvt.saveLines: 50 -URxvt.internalBorder: 3 -URxvt.lineSpace: 0 -URxvt.letterSpace: -2 - -! Fonts -URxvt.allow_bold: true -/* URxvt.font: -*-terminus-medium-r-normal-*-12-120-72-72-c-60-iso8859-1 */ -URxvt*font: xft:DejaVu Sans Mono:pixelsize=14 -URxvt*boldFont: xft:DejaVu Sans Mono:pixelsize=14 - -! Fix font space -URxvt*letterSpace: -1 - -! Scrollbar -URxvt.scrollStyle: rxvt -URxvt.scrollBar: false - -! Perl extensions -URxvt.perl-ext-common: default,matcher -URxvt.matcher.button: 1 -URxvt.urlLauncher: google-chrome - -! Cursor -URxvt.cursorBlink: true -URxvt.cursorColor: #657b83 -URxvt.cursorUnderline: false - -! Pointer -URxvt.pointerBlank: true - -!!Source http://github.com/altercation/solarized - -*background: #002b36 -*foreground: #657b83 -!!*fading: 40 -*fadeColor: #002b36 -*cursorColor: #93a1a1 -*pointerColorBackground: #586e75 -*pointerColorForeground: #93a1a1 - -!! black dark/light -*color0: #073642 -*color8: #002b36 - -!! red dark/light -*color1: #dc322f -*color9: #cb4b16 - -!! green dark/light -*color2: #859900 -*color10: #586e75 - -!! yellow dark/light -*color3: #b58900 -*color11: #657b83 - -!! blue dark/light -*color4: #268bd2 -*color12: #839496 - -!! magenta dark/light -*color5: #d33682 -*color13: #6c71c4 - -!! cyan dark/light -*color6: #2aa198 -*color14: #93a1a1 - -!! white dark/light -*color7: #eee8d5 -*color15: #fdf6e3 diff --git a/Xresources b/Xsession/.Xresources similarity index 99% rename from Xresources rename to Xsession/.Xresources index 86ea908..cd9f119 100644 --- a/Xresources +++ b/Xsession/.Xresources @@ -6,7 +6,7 @@ Xft.dpi: 96 Xft.antialias: true Xft.rgba: rgb Xft.hinting: true -Xft.hintstyle: hintfull +Xft.hintstyle: hintslight !------------------------------------------------------------------------------- ! Emacs settings @@ -38,7 +38,7 @@ URxvt*font: xft:DejaVu\ Sans\ Mono:pixelsize=14 URxvt*boldFont: xft:DejaVu\ Sans\ Mono:pixelsize=14:style=bold ! Fix font space -URxvt*letterSpace: -1 +!URxvt*letterSpace: -1 ! Scrollbar URxvt.scrollStyle: rxvt diff --git a/profile b/Xsession/.profile similarity index 100% rename from profile rename to Xsession/.profile diff --git a/xinitrc b/Xsession/.xinitrc similarity index 100% rename from xinitrc rename to Xsession/.xinitrc diff --git a/xprofile b/Xsession/.xprofile similarity index 65% rename from xprofile rename to Xsession/.xprofile index f059248..3fc63a3 100755 --- a/xprofile +++ b/Xsession/.xprofile @@ -1,4 +1,4 @@ # echo "pasado(xprofile)" $(date) >> /tmp/LOG -setxkbmap -option ctrl:nocaps +setxkbmap us altgr-intl -option ctrl:nocaps #xmodmap ~/.Xmodmap #source ~/.xinitrc diff --git a/bash_logout b/bash/.bash_logout similarity index 100% rename from bash_logout rename to bash/.bash_logout diff --git a/bash_profile b/bash/.bash_profile similarity index 100% rename from bash_profile rename to bash/.bash_profile diff --git a/bashrc b/bash/.bashrc similarity index 100% rename from bashrc rename to bash/.bashrc diff --git a/bin/bashrc b/bin/bashrc deleted file mode 100644 index ed83f3d..0000000 --- a/bin/bashrc +++ /dev/null @@ -1,125 +0,0 @@ -# ~/.bashrc: executed by bash(1) for non-login shells. -# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) -# for examples - -# If not running interactively, don't do anything -[ -z "$PS1" ] && return - -# don't put duplicate lines in the history. See bash(1) for more options -# ... or force ignoredups and ignorespace -HISTCONTROL=ignoredups:ignorespace - -# append to the history file, don't overwrite it -shopt -s histappend - -# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) -HISTSIZE=1000 -HISTFILESIZE=2000 - -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize - -# make less more friendly for non-text input files, see lesspipe(1) -[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" - -# set variable identifying the chroot you work in (used in the prompt below) -if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi - -# set a fancy prompt (non-color, unless we know we "want" color) -case "$TERM" in - xterm-color) color_prompt=yes;; - xterm) color_prompt=yes;; -esac - -# uncomment for a colored prompt, if the terminal has the capability; turned -# off by default to not distract the user: the focus in a terminal window -# should be on the output of commands, not on the prompt -force_color_prompt=yes - -if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - # We have color support; assume it's compliant with Ecma-48 - # (ISO/IEC-6429). (Lack of such support is extremely rare, and such - # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= - fi -fi - -if [ "$color_prompt" = yes ]; then - export PROMPT_COMMAND='PS1="\\[\033[1;\`if [[ \$? = "0" ]]; then echo "32m\\]"; else echo "31m\\]"; fi\`[\!]\\[\033[0m\]\u@\h \W: "' -else - PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' -fi - -unset color_prompt force_color_prompt - -# If this is an xterm set the title to user@host:dir -case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" - ;; -*) - ;; -esac - -# enable color support of ls and also add handy aliases -if [ -x /usr/bin/dircolors ]; then - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - #alias dir='dir --color=auto' - #alias vdir='vdir --color=auto' - - alias grep='grep --color=auto' - alias fgrep='fgrep --color=auto' - alias egrep='egrep --color=auto' -fi - -# some more ls aliases -alias ll='ls -alhF' -alias la='ls -A' -alias l='ls -CF' - -# Add an "alert" alias for long running commands. Use like so: -# sleep 10; alert -alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' - -# Alias definitions. -# You may want to put all your additions into a separate file like -# ~/.bash_aliases, instead of adding them here directly. -# See /usr/share/doc/bash-doc/examples in the bash-doc package. - -if [ -f ~/.bash_aliases ]; then - . ~/.bash_aliases -fi - -# enable programmable completion features (you don't need to enable -# this, if it's already enabled in /etc/bash.bashrc and /etc/profile -# sources /etc/bash.bashrc). -if [ -f /etc/bash_completion ] && ! shopt -oq posix; then - . /etc/bash_completion -fi -export CDPATH=~:/media/Datos:/home/balkian - -if [ "$TERM" = "linux" ]; then - alias logout="clear && logout && exit" -else - alias logout="exit 0" -fi -export PYTHONSTARTUP=/home/$USER/.pythonrc -export PATH=$PATH:/var/lib/gems/1.8/bin - -setWindowTitle() { - echo -ne "\e]2;$*\a" -} -updateWindowTitle() { - setWindowTitle "${HOSTNAME%%.*}:${PWD/$HOME/~}" -} -PROMPT_COMMAND=$PROMPT_COMMAND updateWindowTitle - -function findHere() { ex=$1; shift; grep -R $* $ex .;} - diff --git a/bin/i3-wm-scripts b/bin/i3-wm-scripts deleted file mode 160000 index 4773352..0000000 --- a/bin/i3-wm-scripts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 477335215dd1fff4f23b82afbb92e7ad1bd4552e diff --git a/compton/.compton.conf b/compton/.compton.conf new file mode 100644 index 0000000..6d02147 --- /dev/null +++ b/compton/.compton.conf @@ -0,0 +1,89 @@ +# Shadow +shadow = true; +no-dnd-shadow = true; +no-dock-shadow = true; +clear-shadow = true; +shadow-radius = 7; +shadow-offset-x = -7; +shadow-offset-y = -7; +# shadow-opacity = 0.7; +# shadow-red = 0.0; +# shadow-green = 0.0; +# shadow-blue = 0.0; +shadow-exclude = [ + "name = 'Notification'", + "class_g = 'Conky'", + "class_g ?= 'Notify-osd'", + "class_g = 'Cairo-clock'", + "_GTK_FRAME_EXTENTS@:c" +]; +# shadow-exclude = "n:e:Notification"; +# shadow-exclude-reg = "x10+0+0"; +# xinerama-shadow-crop = true; + +# Opacity +menu-opacity = 0.8; +inactive-opacity = 0.8; +# active-opacity = 0.8; +frame-opacity = 0.7; +inactive-opacity-override = false; +alpha-step = 0.06; +# inactive-dim = 0.2; +# inactive-dim-fixed = true; +# blur-background = true; +# blur-background-frame = true; +blur-kern = "3x3box" +# blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1" +# blur-background-fixed = true; +blur-background-exclude = [ + "window_type = 'dock'", + "window_type = 'desktop'", + "_GTK_FRAME_EXTENTS@:c" +]; +# opacity-rule = [ "80:class_g = 'URxvt'" ]; + +# Fading +fading = true; +# fade-delta = 30; +fade-in-step = 0.03; +fade-out-step = 0.03; +# no-fading-openclose = true; +# no-fading-destroyed-argb = true; +fade-exclude = [ ]; + +# Other +backend = "xrender" +mark-wmwin-focused = true; +mark-ovredir-focused = true; +# use-ewmh-active-win = true; +detect-rounded-corners = true; +detect-client-opacity = true; +refresh-rate = 0; +vsync = "none"; +dbe = false; +paint-on-overlay = true; +# sw-opti = true; +# unredir-if-possible = true; +# unredir-if-possible-delay = 5000; +# unredir-if-possible-exclude = [ ]; +focus-exclude = [ "class_g = 'Cairo-clock'" ]; +detect-transient = true; +detect-client-leader = true; +invert-color-include = [ ]; +# resize-damage = 1; + +# GLX backend +# glx-no-stencil = true; +glx-copy-from-front = false; +# glx-use-copysubbuffermesa = true; +# glx-no-rebind-pixmap = true; +glx-swap-method = "undefined"; +# glx-use-gpushader4 = true; +# xrender-sync = true; +# xrender-sync-fence = true; + +# Window type settings +wintypes: +{ + tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; }; +}; diff --git a/emacs.d/.gitignore b/emacs.d/.gitignore deleted file mode 100644 index 2a0ca7b..0000000 --- a/emacs.d/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -* -!init.el -!config/ -!config/config-*.el diff --git a/emacs.d/config/config-dired.el b/emacs.d/config/config-dired.el deleted file mode 100644 index cac68d8..0000000 --- a/emacs.d/config/config-dired.el +++ /dev/null @@ -1,25 +0,0 @@ -(defun ergoemacs-open-in-external-app () - "Open the current file or dired marked files in external app." - (interactive) - (let ( doIt - (myFileList - (cond - ((string-equal major-mode "dired-mode") (dired-get-marked-files)) - (t (list (buffer-file-name))) ) ) ) - - (setq doIt (if (<= (length myFileList) 5) - t - (y-or-n-p "Open more than 5 files?") ) ) - - (when doIt - (cond - ((string-equal system-type "windows-nt") - (mapc (lambda (fPath) (w32-shell-execute "open" (replace-regexp-in-string "/" "\\" fPath t t)) ) myFileList) - ) - ((string-equal system-type "darwin") - (mapc (lambda (fPath) (shell-command (format "open \"%s\"" fPath)) ) myFileList) ) - ((string-equal system-type "gnu/linux") - (mapc (lambda (fPath) (let ((process-connection-type nil)) (start-process "" nil "xdg-open" fPath)) ) myFileList) ) ) ) ) ) - -(define-key dired-mode-map (kbd "e") 'ergoemacs-open-in-external-app) -(provide 'config-dired) diff --git a/emacs.d/config/config-ein.el b/emacs.d/config/config-ein.el deleted file mode 100644 index b19de0b..0000000 --- a/emacs.d/config/config-ein.el +++ /dev/null @@ -1,55 +0,0 @@ -(evil-define-key 'normal ein:notebooklist-mode-map - "r" 'ein:notebooklist-reload - "q" 'bury-buffer) - -(evil-define-key 'normal ein:notebook-mode-map - ",w" 'ein:notebook-save-notebook-command - ",cc" 'ein:worksheet-execute-cell - ",e" 'ein:worksheet-clear-output - ",v" 'ein:worksheet-set-output-visibility-all - ",l" 'ein:worksheet-clear-output - ",L" 'ein:worksheet-clear-all-output - ",d" 'ein:worksheet-kill-cell - ",y" 'ein:worksheet-copy-cell - ",p" 'ein:worksheet-yank-cell - ",O" 'ein:worksheet-insert-cell-above - ",o" 'ein:worksheet-insert-cell-below - "]e" 'ein:notebook-worksheet-move-next - "[e" 'ein:notebook-worksheet-move-rev - ",t" 'ein:worksheet-toggle-cell-type - ",u" 'ein:worksheet-change-cell-type - ",s" 'ein:worksheet-split-cell-at-point - ",m" 'ein:worksheet-merge-cell - "\C-n" 'ein:worksheet-goto-next-input - "\C-p" 'ein:worksheet-goto-prev-input - (kbd "") 'ein:worksheet-execute-cell) - -(evil-define-key 'insert ein:notebook-mode-map - (kbd "") 'ein:worksheet-execute-cell) - -(defun ipybackground () - (interactive) - ;(setq prevfg (face-attribute 'default :foreground)) - (face-remap-add-relative 'ein:cell-input-area :background (face-attribute 'default :background)) - ;(face-remap-add-relative 'default :background "#ffffff") - (setq buffer-face-mode-face '(:background "#343434")) - (buffer-face-mode)) - - -(add-hook - 'ein:notebook-mode-hook 'ipybackground) - -;; (add-hook -;; 'ein:notebook-mode-hook '(linum-mode 0)) - -(setq ein:notebook-modes '(ein:notebook-mumamo-mode ein:notebook-plain-mode)) - -(setq mumamo-background-colors nil) - -(when (and (>= emacs-major-version 24) - (>= emacs-minor-version 2)) - (eval-after-load "mumamo" - '(setq mumamo-per-buffer-local-vars - (delq 'buffer-file-name mumamo-per-buffer-local-vars)))) - -(provide 'config-ein) diff --git a/emacs.d/config/config-evil.el b/emacs.d/config/config-evil.el deleted file mode 100644 index 42263f3..0000000 --- a/emacs.d/config/config-evil.el +++ /dev/null @@ -1,69 +0,0 @@ -;;; config-evil.el --- Configuration for evil and its keybindings -;;; Commentary: -;;; Code: -(evil-mode) -(require 'evil-leader) -(require 'evil-matchit) -(require 'evil-nerd-commenter) -(require 'evil-surround) - -;; Evil global modes config -(evilnc-default-hotkeys) -(setq evil-default-cursor t) - -;; Evil global modes -(global-evil-matchit-mode 1) -(global-evil-surround-mode 1) -(global-evil-jumper-mode) -(global-evil-leader-mode) - -;; exclude modes from evil mode -(add-to-list 'evil-emacs-state-modes 'git-rebase-mode) -(add-to-list 'evil-emacs-state-modes 'undo-tree-visualizer-mode) -(add-to-list 'evil-emacs-state-modes 'dired-mode) - -(defun next-code-buffer () - ;;; Avoid special buffers when cycling through windows - ;;; http://stackoverflow.com/questions/14323516/make-emacs-next-buffer-skip-messages-buffer - (interactive) - (let (( bread-crumb (buffer-name) )) - (next-buffer) - (while - (and - (string-match-p "^\*" (buffer-name)) - (not ( equal bread-crumb (buffer-name) )) ) - (next-buffer)))) - -(defun previous-code-buffer () - (interactive) - (let (( bread-crumb (buffer-name) )) - (previous-buffer) - (while - (and - (string-match-p "^\*" (buffer-name)) - (not ( equal bread-crumb (buffer-name) )) ) - (previous-buffer)))) -;; -;; Evil keys -(evil-leader/set-leader "") - -(define-key evil-normal-state-map (kbd "[q") 'previous-error) -(define-key evil-normal-state-map (kbd "]q") 'next-error) -(define-key evil-normal-state-map (kbd "[b") 'previous-code-buffer) -(define-key evil-normal-state-map (kbd "]b") 'next-code-buffer) -(define-key evil-normal-state-map (kbd "s") 'evil-ace-jump-char-mode) -(define-key evil-normal-state-map (kbd ",d") 'neotree-toggle) -(define-key evil-normal-state-map (kbd ",u") 'undo-tree-visualize) - -(define-key evil-normal-state-map (kbd "C-c +") 'evil-numbers/inc-at-pt) -(define-key evil-normal-state-map (kbd "C-c -") 'evil-numbers/dec-at-pt) - -(add-hook 'neotree-mode-hook - (lambda () - (define-key evil-normal-state-local-map (kbd "TAB") 'neotree-enter) - (define-key evil-normal-state-local-map (kbd "SPC") 'neotree-enter) - (define-key evil-normal-state-local-map (kbd "q") 'neotree-hide) - (define-key evil-normal-state-local-map (kbd "RET") 'neotree-enter))) - -(provide 'config-evil) -;;; config-evil.el ends here diff --git a/emacs.d/config/config-helm.el b/emacs.d/config/config-helm.el deleted file mode 100644 index c2cab47..0000000 --- a/emacs.d/config/config-helm.el +++ /dev/null @@ -1,80 +0,0 @@ -;;; config-file -- Helm configuration -;;; Commentary: -;;; The slowest part is actually loading helm-projectile -;;; Code: - -(require 'helm) -(require 'helm-config) -(require 'helm-grep) -(require 'helm-locate) -(require 'helm-misc) -(require 'projectile) -(require 'helm-projectile) -(setq helm-quick-update t) -(setq helm-bookmark-show-location t) -(setq helm-buffers-fuzzy-matching t) - -;;; Save current position to mark ring -(add-hook 'helm-goto-line-before-hook 'helm-save-current-pos-to-mark-ring) - -;; Better helm fonts -(set-face-attribute 'helm-selection nil :background "gold" :foreground "black") - -;;; Keyboard mappings -(define-key helm-map (kbd "") 'helm-execute-persistent-action) ; rebihnd tab to do persistent action -(define-key helm-map (kbd "C-i") 'helm-execute-persistent-action) ; make TAB works in terminal -(define-key helm-map (kbd "C-z") 'helm-select-action) ; list actions using C-z -(define-key helm-grep-mode-map (kbd "") 'helm-grep-mode-jump-other-window) -(define-key helm-grep-mode-map (kbd "n") 'helm-grep-mode-jump-other-window-forward) -(define-key helm-grep-mode-map (kbd "p") 'helm-grep-mode-jump-other-window-backward) -(global-set-key (kbd "M-y") 'helm-show-kill-ring) -(global-set-key (kbd "C-x b") 'helm-mini) -(global-set-key (kbd "C-x C-f") 'helm-find-files) -(global-set-key (kbd "C-h SPC") 'helm-all-mark-rings) -(global-set-key (kbd "C-c h o") 'helm-occur) - -(define-key helm-grep-mode-map (kbd "") 'helm-grep-mode-jump-other-window) -(define-key helm-grep-mode-map (kbd "n") 'helm-grep-mode-jump-other-window-forward) -(define-key helm-grep-mode-map (kbd "p") 'helm-grep-mode-jump-other-window-backward) - -;;; Evil helm -(define-key evil-normal-state-map (kbd "C-p") 'helm-mini) -(evil-leader/set-key "" 'helm-M-x) -(define-key evil-normal-state-map (kbd ",f") 'helm-swoop) -(define-key evil-normal-state-map (kbd ",a") 'helm-ag) -(define-key evil-normal-state-map (kbd ",y") 'helm-show-kill-ring) - -;;; Keyboard -(global-set-key (kbd "M-x") 'helm-M-x) -(define-key helm-map (kbd "C-w") 'backward-kill-word) - -;; use helm to list eshell history -(add-hook 'eshell-mode-hook - #'(lambda () - (define-key eshell-mode-map (kbd "M-l") 'helm-eshell-history))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; PACKAGE: helm-swoop ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Locate the helm-swoop folder to your path -(require 'helm-swoop) -;; Change the keybinds to whatever you like :) -(global-set-key (kbd "C-c h o") 'helm-swoop) -(global-set-key (kbd "C-c s") 'helm-multi-swoop-all) -;; When doing isearch, hand the word over to helm-swoop -(define-key isearch-mode-map (kbd "M-i") 'helm-swoop-from-isearch) -;; From helm-swoop to helm-multi-swoop-all -(define-key helm-swoop-map (kbd "M-i") 'helm-multi-swoop-all-from-helm-swoop) -;; Save buffer when helm-multi-swoop-edit complete -(setq helm-multi-swoop-edit-save t) -;; If this value is t, split window inside the current window -(setq helm-swoop-split-with-multiple-windows t) -;; Split direcion. 'split-window-vertically or 'split-window-horizontally -(setq helm-swoop-split-direction 'split-window-vertically) -;; If nil, you can slightly boost invoke speed in exchange for text color -(setq helm-swoop-speed-or-color t) - -(helm-mode 1) -(provide 'config-helm) - -;;; config-helm.el ends here diff --git a/emacs.d/config/config-latex.el b/emacs.d/config/config-latex.el deleted file mode 100644 index 1df8070..0000000 --- a/emacs.d/config/config-latex.el +++ /dev/null @@ -1,38 +0,0 @@ -(setq TeX-auto-save t) -(setq TeX-parse-self t) - -(setq-default TeX-master nil) - -(setq TeX-view-program-list '( -;; ("Evince" "evince --page-index=%(outpage) %o"), - ("Okular" "okular --noraise --unique %o#src:%n%a") -)) -;; (setq TeX-view-program-selection '((output-pdf "Evince"))) -(setq TeX-view-program-selection '((output-pdf "Okular"))) - -(setq LaTeX-command "latex -synctex=1") - -(setq TeX-source-correlate-method 'synctex) -;(setq TeX-one-master "") ;; If you don't want emacs to write the variables to the file -(setq-default TeX-master nil) ; - -;; Avoid questions :) -(defun build-view () - (interactive) - (let ((TeX-save-query nil)) - (TeX-save-document (TeX-master-file))) - (setq build-proc (TeX-command "LaTeX" 'TeX-master-file -1)) - (set-process-sentinel build-proc 'build-sentinel) -) - -(defun build-sentinel (process event) - (if (string= event "finished\n") - (TeX-view) - (message "Errors! Check with C-`"))) - -(add-hook 'LaTeX-mode-hook '(lambda () (local-set-key (kbd "\C-c\C-c") 'build-view))) - -(add-hook 'LaTeX-mode-hook 'TeX-source-correlate-mode) -(add-hook 'LaTeX-mode-hook 'reftex-mode) - -(provide 'config-latex) diff --git a/emacs.d/config/config-org.el b/emacs.d/config/config-org.el deleted file mode 100644 index 9ceb6c9..0000000 --- a/emacs.d/config/config-org.el +++ /dev/null @@ -1,40 +0,0 @@ -(require 'org) -(require 'evil-org) -(define-key global-map "\C-cl" 'org-store-link) -(define-key global-map "\C-ca" 'org-agenda) -(evil-leader/set-key "a" 'org-agenda) - -(setq org-log-done t) - -(setq org-directory "~/Dropbox/org") -(setq org-mobile-inbox-for-pull "~/Dropbox/org/inbox.org") -(setq org-mobile-directory "~/Dropbox/Apps/MobileOrg") -(setq org-mobile-files '("~/Dropbox/org")) -(setq org-default-notes-file (concat org-directory "/notes.org")) -(setq org-agenda-files (list org-directory)) - -(define-key global-map "\C-cc" 'org-capture) - -(setq org-clock-persist 'history) - -;; Set syntax highlight in org-mode babel -(setq org-src-fontify-natively t) - -;don't prompt me to confirm everytime I want to evaluate a block -(setq org-confirm-babel-evaluate nil) - -;;; display/update images in the buffer after I evaluate -(add-hook 'org-babel-after-execute-hook 'org-display-inline-images 'append) - -;;; -(setq org-tag-alist '( - (:startgroup . nil) - ("@phd" . ?p) ("@home" . ?h) - (:endgroup . nil) - (:startgroup . nil) - ("reading" . ?r) ("coding" . ?c) ("writing" . "w") - (:endgroup . nil) - ) - ) - -(provide 'config-org) diff --git a/emacs.d/config/config-python.el b/emacs.d/config/config-python.el deleted file mode 100644 index f72e5ec..0000000 --- a/emacs.d/config/config-python.el +++ /dev/null @@ -1,24 +0,0 @@ -(require 'python) -(setq - python-shell-interpreter "ipython" - python-shell-interpreter-args "--pylab" - python-shell-prompt-regexp "In \\[[0-9]+\\]: " - python-shell-prompt-output-regexp "Out\\[[0-9]+\\]: " - python-shell-completion-setup-code - "from IPython.core.completerlib import module_completion" - python-shell-completion-module-string-code - "';'.join(module_completion('''%s'''))\n" - python-shell-completion-string-code - "';'.join(get_ipython().Completer.all_completions('''%s'''))\n") - -(add-hook 'python-mode-hook 'auto-complete-mode) -(add-hook 'python-mode-hook '(lambda () (require 'nose))) -(add-hook 'python-mode-hook 'jedi:setup) - -(eval-after-load "python" - '(progn - (define-key python-mode-map (kbd "C-c C-d") 'helm-pydoc))) - -(setq jedi:complete-on-dot t) - -(provide 'config-python) diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el new file mode 100644 index 0000000..7cb5b76 --- /dev/null +++ b/emacs/.emacs.d/init.el @@ -0,0 +1,379 @@ +;;; BalkEmacs --- My emacs configuration +;;; Commentary: + +(setq custom-file "~/.emacs.d/custom.el") +(load custom-file 'noerror) + +(package-initialize) + +(require 'package) +(add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/") t) +(add-to-list 'package-archives '("org" . "http://orgmode.org/elpa/") t) + +(unless (require 'quelpa nil t) + (with-temp-buffer + (url-insert-file-contents "https://raw.github.com/quelpa/quelpa/master/bootstrap.el") + (eval-buffer))) + +(quelpa 'use-package) + ;'(use-package + ;:fetcher github + ;:repo "quelpa/quelpa-use-package")) +(require 'use-package) +(quelpa + '(quelpa-use-package + :fetcher github + :repo "quelpa/quelpa-use-package")) +(require 'quelpa-use-package) + +(use-package evil + :ensure + :init (progn + (setq evil-want-C-u-scroll t) + ) + :config (progn + + (evil-mode) + (use-package evil-leader :ensure) + (use-package evil-matchit :ensure) + (use-package evil-nerd-commenter + :ensure + :config (progn + (evilnc-default-hotkeys) + ) + ) + (use-package evil-surround :ensure) + (use-package evil-jumper :ensure) + (use-package ace-jump-mode :ensure + :config (progn + (eval-after-load "ace-jump-mode" + '(ace-jump-mode-enable-mark-sync)) + (define-key global-map (kbd "C-x SPC") 'ace-jump-mode-pop-mark) + )) + + ;; Evil global modes config + (evilnc-default-hotkeys) + (setq evil-default-cursor t) + + ;; Evil global modes + (global-evil-surround-mode 1) + (global-evil-jumper-mode) + (global-evil-leader-mode) + (global-evil-matchit-mode 1) + + ;; exclude modes from evil mode + (add-to-list 'evil-emacs-state-modes 'git-rebase-mode) + (add-to-list 'evil-emacs-state-modes 'undo-tree-visualizer-mode) + (add-to-list 'evil-emacs-state-modes 'dired-mode) + + (defun next-code-buffer () + ;;; Avoid special buffers when cycling through windows + ;;; http://stackoverflow.com/questions/14323516/make-emacs-next-buffer-skip-messages-buffer + (interactive) + (let (( bread-crumb (buffer-name) )) + (next-buffer) + (while + (and + (string-match-p "^\*" (buffer-name)) + (not ( equal bread-crumb (buffer-name) )) ) + (next-buffer)))) + + (defun previous-code-buffer () + (interactive) + (let (( bread-crumb (buffer-name) )) + (previous-buffer) + (while + (and + (string-match-p "^\*" (buffer-name)) + (not ( equal bread-crumb (buffer-name) )) ) + (previous-buffer)))) + ;; + ;; Evil keys + (evil-leader/set-leader "") + + (define-key evil-normal-state-map (kbd "[q") 'previous-error) + (define-key evil-normal-state-map (kbd "]q") 'next-error) + (define-key evil-normal-state-map (kbd "[b") 'previous-code-buffer) + (define-key evil-normal-state-map (kbd "]b") 'next-code-buffer) + (define-key evil-normal-state-map (kbd "s") 'evil-ace-jump-char-mode) + (define-key evil-normal-state-map (kbd "S") 'evil-ace-jump-word-mode) + (define-key evil-normal-state-map (kbd ",d") 'neotree-toggle) + (define-key evil-normal-state-map (kbd ",u") 'undo-tree-visualize) + + (define-key evil-normal-state-map (kbd "C-c +") 'evil-numbers/inc-at-pt) + (define-key evil-normal-state-map (kbd "C-c -") 'evil-numbers/dec-at-pt) + + (add-hook 'neotree-mode-hook + (lambda () + (define-key evil-normal-state-local-map (kbd "TAB") 'neotree-enter) + (define-key evil-normal-state-local-map (kbd "SPC") 'neotree-enter) + (define-key evil-normal-state-local-map (kbd "q") 'neotree-hide) + (define-key evil-normal-state-local-map (kbd "RET") 'neotree-enter))) + + ) + + ) + +(use-package guide-key + :ensure + :config (progn + (setq guide-key/guide-key-sequence t) + (guide-key-mode 1) + )) + +(use-package projectile :ensure) + +(use-package helm + :ensure t + :config (progn + (use-package helm-config) + (use-package helm-grep) + (use-package helm-locate) + (use-package helm-misc) + (use-package helm-projectile :ensure) + (use-package helm-ag :ensure) + + (setq helm-quick-update t) + (setq helm-bookmark-show-location t) + (setq helm-buffers-fuzzy-matching t) + + ;;; Save current position to mark ring + (add-hook 'helm-goto-line-before-hook 'helm-save-current-pos-to-mark-ring) + + ;; Better helm fonts + (set-face-attribute 'helm-selection nil :background "gold" :foreground "black") + + ;;; Keyboard mappings + (define-key helm-map (kbd "") 'helm-execute-persistent-action) ; rebihnd tab to do persistent action + (define-key helm-map (kbd "C-i") 'helm-execute-persistent-action) ; make TAB works in terminal + (define-key helm-map (kbd "C-z") 'helm-select-action) ; list actions using C-z + (define-key helm-grep-mode-map (kbd "") 'helm-grep-mode-jump-other-window) + (define-key helm-grep-mode-map (kbd "n") 'helm-grep-mode-jump-other-window-forward) + (define-key helm-grep-mode-map (kbd "p") 'helm-grep-mode-jump-other-window-backward) + (global-set-key (kbd "M-y") 'helm-show-kill-ring) + (global-set-key (kbd "C-x b") 'helm-mini) + (global-set-key (kbd "C-x C-f") 'helm-find-files) + (global-set-key (kbd "C-h SPC") 'helm-all-mark-rings) + (global-set-key (kbd "C-c h o") 'helm-occur) + + (define-key helm-grep-mode-map (kbd "") 'helm-grep-mode-jump-other-window) + (define-key helm-grep-mode-map (kbd "n") 'helm-grep-mode-jump-other-window-forward) + (define-key helm-grep-mode-map (kbd "p") 'helm-grep-mode-jump-other-window-backward) + + ;;; Evil helm + (define-key evil-normal-state-map (kbd "C-p") 'helm-mini) + (evil-leader/set-key "" 'helm-M-x) + (define-key evil-normal-state-map (kbd ",f") 'helm-swoop) + (define-key evil-normal-state-map (kbd ",a") 'helm-ag) + (define-key evil-normal-state-map (kbd ",y") 'helm-show-kill-ring) + + ;;; Keyboard + (global-set-key (kbd "M-x") 'helm-M-x) + (define-key helm-map (kbd "C-w") 'backward-kill-word) + + ;; use helm to list eshell history + (add-hook 'eshell-mode-hook + #'(lambda () + (define-key eshell-mode-map (kbd "M-l") 'helm-eshell-history))) + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;; PACKAGE: helm-swoop ;; + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;; Locate the helm-swoop folder to your path + (use-package helm-swoop + :ensure + :config (progn + ;; Change the keybinds to whatever you like :) + (global-set-key (kbd "C-c h o") 'helm-swoop) + (global-set-key (kbd "C-c s") 'helm-multi-swoop-all) + ;; When doing isearch, hand the word over to helm-swoop + (define-key isearch-mode-map (kbd "M-i") 'helm-swoop-from-isearch) + ;; From helm-swoop to helm-multi-swoop-all + (define-key helm-swoop-map (kbd "M-i") 'helm-multi-swoop-all-from-helm-swoop) + ;; Save buffer when helm-multi-swoop-edit complete + (setq helm-multi-swoop-edit-save t) + ;; If this value is t, split window inside the current window + (setq helm-swoop-split-with-multiple-windows t) + ;; Split direcion. 'split-window-vertically or 'split-window-horizontally + (setq helm-swoop-split-direction 'split-window-vertically) + ;; If nil, you can slightly boost invoke speed in exchange for text color + (setq helm-swoop-speed-or-color t) + )) + (helm-mode 1) + ) + ) + +(use-package auto-complete + :ensure t + :config (progn + (ac-config-default) + ) + + ) + +(use-package flycheck + :ensure t + :config (progn + (add-hook 'after-init-hook #'global-flycheck-mode) + ) + ) + +(use-package popwin + :ensure + :config (progn + (popwin-mode) + )) + + +(use-package linum + :config (progn + (add-hook 'prog-mode-hook 'linum-mode) + ) + ) + +(use-package monokai-theme + :ensure t + :config (progn + (load-theme 'monokai) + ) + ) + +(use-package python + :config (progn + (setq + python-shell-interpreter "ipython" + python-shell-interpreter-args "--pylab" + python-shell-prompt-regexp "In \\[[0-9]+\\]: " + python-shell-prompt-output-regexp "Out\\[[0-9]+\\]: " + python-shell-completion-setup-code + "from IPython.core.completerlib import module_completion" + python-shell-completion-module-string-code + "';'.join(module_completion('''%s'''))\n" + python-shell-completion-string-code + "';'.join(get_ipython().Completer.all_completions('''%s'''))\n") + + (add-hook 'python-mode-hook 'auto-complete-mode) + (add-hook 'python-mode-hook '(lambda () (require 'nose))) + + (eval-after-load "python" + '(progn + (define-key python-mode-map (kbd "C-c C-d") 'helm-pydoc))) + + (use-package jedi + :config (progn + (setq jedi:complete-on-dot t) + (add-hook 'python-mode-hook 'jedi:setup) + ) + + ) + ) + ) + +(use-package org + :ensure t + :config (progn + (use-package evil-org :ensure t) + (define-key global-map "\C-cl" 'org-store-link) + (define-key global-map "\C-ca" 'org-agenda) + (evil-leader/set-key "a" 'org-agenda) + (evil-org-mode) + + (setq org-log-done t) + + (setq org-directory "~/Dropbox/org") + (setq org-mobile-inbox-for-pull "~/Dropbox/org/inbox.org") + (setq org-mobile-directory "~/Dropbox/Apps/MobileOrg") + (setq org-mobile-files '("~/Dropbox/org")) + (setq org-default-notes-file (concat org-directory "/notes.org")) + (setq org-agenda-files (list org-directory)) + + (define-key global-map "\C-cc" 'org-capture) + + (setq org-clock-persist 'history) + + ;; Set syntax highlight in org-mode babel + (setq org-src-fontify-natively t) + + ;don't prompt me to confirm everytime I want to evaluate a block + (setq org-confirm-babel-evaluate nil) + + ;;; display/update images in the buffer after I evaluate + (add-hook 'org-babel-after-execute-hook 'org-display-inline-images 'append) + + ;;; + (setq org-tag-alist '( + (:startgroup . nil) + ("@phd" . ?p) ("@home" . ?h) + (:endgroup . nil) + (:startgroup . nil) + ("reading" . ?r) ("coding" . ?c) ("writing" . "w") + (:endgroup . nil) + ) + ) + ) + ) + +(use-package magit + :ensure + :config (progn + ) + ) + + +;;; Global emacs settings +;; disable splash screen +(setq inhibit-splash-screen t) +(setq truncate-partial-width-windows nil) +(set-default 'truncate-lines nil) +;;; Highlight line +(global-hl-line-mode) + ;(set-face-background 'hl-line 'highlight-color) +(setq-default indent-tabs-mode nil) +(setq tab-width 4) +(setq default-tab-width 4); + +(toggle-indicate-empty-lines) + +;;; Global modes +(scroll-bar-mode 0) +(tool-bar-mode 0) +(savehist-mode 1) +(show-paren-mode t) +(column-number-mode) + + +;; set a default font +(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-10")) +;; emacs doesn't actually save undo history with revert-buffer +;; see http://lists.gnu.org/archive/html/bug-gnu-emacs/2011-04/msg00151.html +;; fix that. +(defun revert-buffer-keep-history (&optional IGNORE-AUTO NOCONFIRM PRESERVE-MODES) + (interactive) + + (setq tmp (point)) + ;; tell Emacs the modtime is fine, so we can edit the buffer + (clear-visited-file-modtime) + + ;; insert the current contents of the file on disk + (widen) + (delete-region (point-min) (point-max)) + (insert-file-contents (buffer-file-name)) + + ;; mark the buffer as not modified + (not-modified) + (set-visited-file-modtime) + (goto-char tmp) + ) + +(setq revert-buffer-function 'revert-buffer-keep-history) + +(require 'recentf) +(recentf-mode 1) +(setq recentf-max-saved-items 300) +(setq recentf-max-menu-items 20) + + +(eval-after-load 'tramp '(setenv "SHELL" "/bin/bash")) +(setq tramp-default-method "ssh") + +(provide '.emacs) diff --git a/gitconfig b/git/.gitconfig similarity index 86% rename from gitconfig rename to git/.gitconfig index de88d11..e7715e9 100644 --- a/gitconfig +++ b/git/.gitconfig @@ -16,7 +16,4 @@ lg1 = log --graph --all --format=format:'%C(yellow)%h%C(reset) - %C(green)(%ad)% lg2 = log --graph --all --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(bold white)— %an%C(reset)' --abbrev-commit lg = !"git lg1" [core] - excludesfile = /home/jfernando/.gitignore_global - -[include] - path = ~/.gitconfig_secret \ No newline at end of file + excludesfile = ~/.gitignore_global diff --git a/gitignore_global b/git/.gitignore_global similarity index 100% rename from gitignore_global rename to git/.gitignore_global diff --git a/i3/config b/i3/.config/i3/config similarity index 67% rename from i3/config rename to i3/.config/i3/config index 3189b70..c6d186e 100644 --- a/i3/config +++ b/i3/.config/i3/config @@ -20,45 +20,45 @@ font xft:Deja Vu Sans 8 floating_modifier $mod #/exec # start a terminal -#bindsym $mod+Return exec i3-one-tmux -bindsym $mod+Return [instance="tmux"] scratchpad show -bindsym Control+Mod1+t exec urxvt +#bindsym $mod+Return exec --no-startup-id i3-one-tmux +bindsym $mod+Return [title="^tmux$"] scratchpad show +bindsym Control+Mod1+t exec --no-startup-id urxvt # start lock -bindsym Control+Mod1+l exec i3-exit.sh lock +bindsym Control+Mod1+l exec --no-startup-id i3-exit.sh lock -bindsym Control+Mod1+w exec i3-one-instance firefox -bindsym Control+Mod1+g exec i3-one-instance gvim -bindsym Control+Mod1+e exec myemacs -bindsym $mod+o exec i3-winmenu.py -bindsym Control+Mod1+f exec pcmanfm +bindsym Control+Mod1+w exec --no-startup-id i3-one-instance firefox +bindsym Control+Mod1+g exec --no-startup-id i3-one-instance gvim +bindsym Control+Mod1+e exec --no-startup-id myemacs -c +bindsym $mod+o exec --no-startup-id i3-winmenu.py +bindsym $mod+p [instance="pcmanfm"] scratchpad show # Spotify -bindsym XF86AudioPlay exec spotify-remote.py -a playPause -bindsym XF86AudioNext exec spotify-remote.py -a next -bindsym XF86AudioPrev exec spotify-remote.py -a previous +bindsym XF86AudioPlay exec --no-startup-id spotify-remote.py -a playPause +bindsym XF86AudioNext exec --no-startup-id spotify-remote.py -a next +bindsym XF86AudioPrev exec --no-startup-id spotify-remote.py -a previous # Volume -bindsym XF86AudioRaiseVolume exec volume-up.sh -bindsym XF86AudioLowerVolume exec volume-down.sh -bindsym XF86AudioMute exec volume-toggle-mute.sh +bindsym XF86AudioRaiseVolume exec --no-startup-id volume-up.sh +bindsym XF86AudioLowerVolume exec --no-startup-id volume-down.sh +bindsym XF86AudioMute exec --no-startup-id volume-toggle-mute.sh # Brightness -#bindsym XF86MonBrightnessUp exec xbacklight +5 -#bindsym XF86MonBrightnessDown exec xbacklight -5 +#bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight +5 +#bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -5 # kill focused window bindsym $mod+q kill # start dmenu (a program launcher) -#bindsym Mod1+F2 exec dmenu_run -bindsym Mod1+F2 exec dmenu_run -fn "-*-cure-medium-*-*-*-11-*-*-*-*-*-*-*" -nb "#101010" -nf "#5f5f5f" -sb "#191919" -sf "#b72f62" -b +#bindsym $mod+Space exec --no-startup-id dmenu_run +bindsym $mod+space exec --no-startup-id dmenu_run -fn "-*-cure-medium-*-*-*-11-*-*-*-*-*-*-*" -nb "#101010" -nf "#5f5f5f" -sb "#191919" -sf "#b72f62" -b # Arandr magic -bindsym Mod1+F5 exec monitors single -bindsym Mod1+F6 exec monitors dual -bindsym Mod1+F7 exec monitors dual home -bindsym Mod1+F8 exec i3-secondary-to-primary +bindsym Mod1+F5 exec --no-startup-id monitors single +bindsym Mod1+F6 exec --no-startup-id monitors dual +bindsym Mod1+F7 exec --no-startup-id monitors dual home +bindsym Mod1+F8 exec --no-startup-id i3-secondary-to-primary # Move to displays bindsym $mod+Mod1+j move workspace to output down @@ -66,6 +66,12 @@ bindsym $mod+Mod1+k move workspace to output up bindsym $mod+Mod1+l move workspace to output right bindsym $mod+Mod1+h move workspace to output left +# Move windows in tiled mode +bindsym $mod+Shift+H move left 100px +bindsym $mod+Shift+J move down 100px +bindsym $mod+Shift+K move up 100px +bindsym $mod+Shift+L move right 100px + # change focus bindsym $mod+h focus left bindsym $mod+j focus down @@ -79,11 +85,7 @@ 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 - +bindsym $mod+m mode "move" # alternatively, you can use the cursor keys: bindsym $mod+Shift+Left move left bindsym $mod+Shift+Down move down @@ -110,7 +112,7 @@ bindsym $mod+v layout splitv bindsym $mod+Shift+space floating toggle # change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle +bindsym $mod+i focus mode_toggle # Make the currently focused window a scratchpad bindsym $mod+Shift+minus move scratchpad @@ -155,11 +157,26 @@ bindsym $mod+Shift+C reload # restart i3 inplace (preserves your layout/session, can be used to upgrade i3) bindsym $mod+Shift+R restart # exit i3 (logs you out of your X session) -bindsym $mod+Shift+E exec i3-exit.sh logout -bindsym $mod+Mod1+s exec i3-exit.sh suspend +bindsym $mod+Shift+E exec --no-startup-id i3-exit.sh logout +bindsym $mod+Mod1+s exec --no-startup-id i3-exit.sh suspend bindsym $mod+Shift+p exec passmenu +# move with finer grain +mode "move" { + bindsym H move left 100px + bindsym J move down 100px + bindsym K move up 100px + bindsym L move right 100px + bindsym Shift+H move left 10 px + bindsym Shift+J move down 10px + bindsym Shift+K move up 10 px + bindsym Shift+L move right 10 px + # back to normal: Enter or Escape + bindsym Return mode "default" + bindsym Escape mode "default" +} + # resize window (you can also use the mouse for that) mode "resize" { # These bindings trigger as soon as you enter the resize mode @@ -168,16 +185,15 @@ mode "resize" { # 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 h resize shrink width 10 px or 10 ppt - bindsym j resize grow height 10 px or 10 ppt - bindsym k resize shrink height 10 px or 10 ppt - bindsym l resize grow width 10 px or 10 ppt + bindsym H resize shrink width 100 px or 100 ppt + bindsym J resize grow height 100 px or 100 ppt + bindsym K resize shrink height 100 px or 100 ppt + bindsym L resize grow width 100 px or 100 ppt - # same bindings, but for the arrow keys - bindsym 113 resize shrink width 10 px or 10 ppt - bindsym 116 resize grow height 10 px or 10 ppt - bindsym 111 resize shrink height 10 px or 10 ppt - bindsym 114 resize grow width 10 px or 10 ppt + bindsym Shift+H resize shrink width 10 px or 10 ppt + bindsym Shift+J resize grow height 10 px or 10 ppt + bindsym Shift+K resize shrink height 10 px or 10 ppt + bindsym Shift+L resize grow width 10 px or 10 ppt # back to normal: Enter or Escape bindsym Return mode "default" @@ -198,8 +214,9 @@ bindsym $mod+n exec i3-input -F 'rename workspace to %s' -P 'New name: ' bar { mode dock position top + font pango:DejaVu Sans 10 workspace_buttons yes - status_command ~/.i3/conky.sh + status_command ~/.config/i3/status.sh colors { background #101010 statusline #101010 @@ -215,13 +232,16 @@ client.focused_inactive #4c7899 #101010 #93a1a1 #484e50 client.unfocused #333333 #101010 #93a1a1 #292d2e client.urgent #2f343a #101010 #93a1a1 #900000 +new_window 1pixel + for_window [class="^Google-chrome$"] border none assign [class="Google-chrome" window_role="browser"] 2: Web for_window [class="^Firefox$"] border none assign [class="Firefox" window_role="browser"] 2: Web -for_window [class="Xfce4-notifyd"] floating enable; border none; focus mode_toggle +for_window [class="^Xfce4-notifyd$"] floating enable; border none; focus mode_toggle for_window [class="^URxvt$"] border 1px for_window [title="^tmux$"] move to scratchpad; +for_window [title="^pcmanfm$"] move to scratchpad; #KDE for_window [class="Plasma-desktop"] border none for_window [class="krunner"] border none @@ -247,13 +267,16 @@ workspace "9: Misc Small" output eDP1 exec --no-startup-id nm-applet exec --no-startup-id dropbox start +exec --no-startup-id xfce4-power-manager exec --no-startup-id volti exec --no-startup-id clipit exec --no-startup-id syndaemon -i 0.5 -d exec --no-startup-id synapse -s -exec xautolock -time 10 -corners "----" -locker 'i3lock -t -c 000000 -i ~/Pictures/Wallpapers/Game\ Over\ Hacker.png' & +exec --no-startup-id xautolock -time 10 -corners "----" -locker 'dm-tool lock' +#exec xautolock -time 10 -corners "----" -locker 'i3lock -t -c 000000 -i ~/Pictures/Wallpapers/Game\ Over\ Hacker.png' & #exec --no-startup-id xautolock -corners '----' -time 10 -locker 'dm-tool lock' # lightdm -exec urxvt -name tmux -e tmux attach +exec --no-startup-id pcmanfm +exec --no-startup-id urxvt -name tmux -e tmux attach set $mode_system System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown mode "$mode_system" { @@ -269,7 +292,10 @@ mode "$mode_system" { bindsym Escape mode "default" } bindsym $mod+Delete mode "$mode_system" -exec --no-startup-id nitrogen --restore & +bindsym $mod+Escape exec xfce4-session-logout +exec --no-startup-id dunst -conf ~/.config/dunst/dunst.conf exec --no-startup-id xfce4-power-manager -#exec --no-startup-id compton -b --config ~/.compton.conf -# +exec --no-startup-id pasystray +exec --no-startup-id dropbox start +exec --no-startup-id nitrogen --restore +exec --no-startup-id compton -b --config ~/.compton.conf diff --git a/i3/config.bak b/i3/.config/i3/config.bak similarity index 100% rename from i3/config.bak rename to i3/.config/i3/config.bak diff --git a/i3/conky.sh b/i3/.config/i3/conky.sh similarity index 60% rename from i3/conky.sh rename to i3/.config/i3/conky.sh index 2bb0daa..1242e4b 100755 --- a/i3/conky.sh +++ b/i3/.config/i3/conky.sh @@ -1,4 +1,4 @@ #!/bin/sh echo "{\"version\":1}" echo "[[] ," -conky -c ~/.i3/conkyrc +conky -c ~/.config/i3/conkyrc diff --git a/i3/conkyrc b/i3/.config/i3/conkyrc similarity index 59% rename from i3/conkyrc rename to i3/.config/i3/conkyrc index 21e7416..cae9c82 100644 --- a/i3/conkyrc +++ b/i3/.config/i3/conkyrc @@ -1,18 +1,20 @@ -out_to_x no -own_window no -out_to_console yes -background no -max_text_width 0 -# Update interval in seconds -update_interval 2.0 -total_run_times 0 -override_utf8_locale yes +conky.config = { +out_to_x=no, +own_window=no, +out_to_console=yes, +background=no, +max_text_width=0, +--Update interval in seconds +update_interval=2.0, +total_run_times=0, +override_utf8_locale=yes +} -TEXT - -# [{ "full_text" : "MPD" , "color" : "\#b58900" } , -# { "full_text" : "${if_mpd_playing}${mpd_smart 50} ${mpd_elapsed}/${mpd_length}${else}${mpd_status}${endif}" , "color" :"\#93a1a1" } , - [ +conky.text = [[ + { "full_text" : "Phys" , "color" : "\#b58900" } , + { "full_text" : "${execi 10 sensors | grep 'Phys' | cut -d" " -f 5}", "color" :"\#93a1a1" } , + { "full_text" : "ACPI" , "color" : "\#b58900" } , + { "full_text" : "${execi 10 sensors | grep 'temp1' | cut -d" " -f 9}", "color" :"\#93a1a1" } , { "full_text" : "HD" , "color" : "\#b58900" } , { "full_text" : "home: ${fs_free /home}/${fs_size /home} root: ${fs_free /}/${fs_size /}" , "color" :"\#93a1a1" } , { "full_text" : "Ram" , "color" : "\#b58900" } , @@ -23,4 +25,5 @@ TEXT { "full_text" : "${battery BAT0}" , "color" : ${if_match ${battery_percent BAT0}<20}"\#b95670"${else}"\#5f5f5f"${endif} } , { "full_text" : "Date" , "color" : "\#b58900" } , - { "full_text" : "${time %b %d %Y %I:%M%P}", "color" :"\#93a1a1" }] , + { "full_text" : "${time %b %d %Y %I:%M%P}", "color" :"\#93a1a1" } + ]] diff --git a/i3/.config/i3/i3blocks.conf b/i3/.config/i3/i3blocks.conf new file mode 100644 index 0000000..1c520b4 --- /dev/null +++ b/i3/.config/i3/i3blocks.conf @@ -0,0 +1,160 @@ +# i3blocks config file +# +# Please see man i3blocks for a complete reference! +# The man page is also hosted at http://vivien.github.io/i3blocks +# +# List of valid properties: +# +# align +# color +# command +# full_text +# instance +# interval +# label +# min_width +# name +# separator +# separator_block_width +# short_text +# signal +# urgent + +# Global properties +# +# The top properties below are applied to every block, but can be overridden. +# Each block command defaults to the script name to avoid boilerplate. +command=$SCRIPT_DIR/$BLOCK_NAME +separator_block_width=15 +markup=none +color=#FFFFFF + +# Volume indicator +# +# The first parameter sets the step (and units to display) +# The second parameter overrides the mixer selection +# See the script for details. +#[volume 1 pulse] +##label=VOL +#label=♪ +#instance=Main +##instance=PCM +#interval=once +#signal=10 + +# Temperature +# +# Support multiple chips, though lm-sensors. +# The script may be called with -w and -c switches to specify thresholds, +# see the script for details. +[temperature temp1] +label=TEMP +interval=10 + +# Memory usage +# +# The type defaults to "mem" if the instance is not specified. +[memory] +label=Mem +separator=true +interval=30 +instance=MemFree: + +#[memory] +#label=SWAP +#instance=swap +#separator=false +#interval=30 + +# Disk usage +# +# The directory defaults to $HOME if the instance is not specified. +# The script may be called with a optional argument to set the alert +# (defaults to 10 for 10%). +[disk 1] +label=/home +#instance=/mnt/data +interval=30 +separator=false + +[disk] +label=/ +instance=/ +interval=30 + +# Network interface monitoring +# +# If the instance is not specified, use the interface used for default route. +# The address can be forced to IPv4 or IPv6 with -4 or -6 switches. +[iface] +instance=wlp1s0 +interval=10 +separator=false + +[wifi] +instance=wlp1s0 +interval=10 +separator=false + +[bandwidth] +#instance=eth0 +interval=5 + +# CPU usage +# +# The script may be called with -w and -c switches to specify thresholds, +# see the script for details. +[cpu_usage] +label=CPU +interval=10 +min_width=CPU: 100.00% +#separator=false + +#[load_average] +#interval=10 + +# Battery indicator +# +# The battery instance defaults to 0. +[battery] +#label=BAT +label=⚡ +instance=0 +interval=30 + +# Date Time +# +[time] +command=date '+%Y-%m-%d %H:%M:%S' +interval=5 + +# Generic media player support +# +# This displays "ARTIST - SONG" if a music is playing. +# Supported players are: spotify, vlc, audacious, xmms2, mplayer, and others. +#[mediaplayer] +#instance=spotify +#interval=5 +#signal=10 + +# OpenVPN support +# +# Support multiple VPN, with colors. +#[openvpn] +#interval=20 + +# Key indicators +# +# Add the following bindings to i3 config file: +# +# bindsym --release Caps_Lock exec pkill -SIGRTMIN+11 i3blocks +# bindsym --release Num_Lock exec pkill -SIGRTMIN+11 i3blocks +#[keyindicator] +#instance=CAPS +#interval=once +#signal=11 + +#[keyindicator] +#instance=NUM +#interval=once +#signal=11 diff --git a/i3/.config/i3/status.sh b/i3/.config/i3/status.sh new file mode 100755 index 0000000..a3ffa19 --- /dev/null +++ b/i3/.config/i3/status.sh @@ -0,0 +1,2 @@ +#1/bin/sh +SCRIPT_DIR=/usr/lib/i3blocks i3blocks -c $HOME/.config/i3/i3blocks.conf diff --git a/i3/.dmenurc b/i3/.dmenurc new file mode 100644 index 0000000..f6f79e4 --- /dev/null +++ b/i3/.dmenurc @@ -0,0 +1,3 @@ +DMENU_FONT='-*-*-medium-r-*-*-18-*-*-*-*-*-*-*' +DMENU="dmenu -i -fn $DMENU_FONT -nb #1E2320 -nf #DBDBDB -sb #3f3f3f -sf #ffffff" + diff --git a/lightdm/etc/lightdm/lightdm-gtk-greeter.conf b/lightdm/etc/lightdm/lightdm-gtk-greeter.conf new file mode 100644 index 0000000..1ac1bb0 --- /dev/null +++ b/lightdm/etc/lightdm/lightdm-gtk-greeter.conf @@ -0,0 +1,62 @@ +# LightDM GTK+ Configuration +# Available configuration options listed below. +# +# Appearance: +# theme-name = GTK+ theme to use +# icon-theme-name = Icon theme to use +# background = Background file to use, either an image path or a color (e.g. #772953) +# user-background = false|true ("true" by default) Display user background (if available) +# transition-duration = Length of time (in milliseconds) to transition between background images ("500" by default) +# transition-type = ease-in-out|linear|none ("ease-in-out" by default) +# +# Fonts: +# font-name = Font to use +# xft-antialias = false|true Whether to antialias Xft fonts +# xft-dpi = Resolution for Xft in dots per inch (e.g. 96) +# xft-hintstyle = none|slight|medium|hintfull What degree of hinting to use +# xft-rgba = none|rgb|bgr|vrgb|vbgr Type of subpixel antialiasing +# +# Login window: +# active-monitor = Monitor to display greeter window (name or number). Use #cursor value to display greeter at monitor with cursor. Can be a semicolon separated list +# position = x y ("50% 50%" by default) Login window position +# default-user-image = Image used as default user icon, path or #icon-name +# hide-user-image = false|true ("false" by default) +# +# Panel: +# panel-position = top|bottom ("top" by default) +# clock-format = strftime-format string, e.g. %H:%M +# indicators = semi-colon ";" separated list of allowed indicator modules. Built-in indicators include "~a11y", "~language", "~session", "~power", "~clock", "~host", "~spacer". Unity indicators can be represented by short name (e.g. "sound", "power"), service file name, or absolute path +# +# Accessibility: +# a11y-states = states of accessibility features: "name" - save state on exit, "-name" - disabled at start (default value for unlisted), "+name" - enabled at start. Allowed names: contrast, font, keyboard, reader. +# keyboard = command to launch on-screen keyboard (e.g. "onboard") +# keyboard-position = x y[;width height] ("50%,center -0;50% 25%" by default) Works only for "onboard" +# reader = command to launch screen reader (e.g. "orca") +# +# Security: +# allow-debugging = false|true ("false" by default) +# screensaver-timeout = Timeout (in seconds) until the screen blanks when the greeter is called as lockscreen +# +# Template for per-monitor configuration: +# [monitor: name] +# background = overrides default value +# user-background = overrides default value +# laptop = false|true ("false" by default) Marks monitor as laptop display +# transition-duration = overrides default value +# +[greeter] +background=/etc/lightdm/wallpaper.jpg +#user-background= +#theme-name= +#icon-theme-name= +#font-name= +#xft-antialias= +#xft-dpi= +#xft-hintstyle= +#xft-rgba= +#indicators= +#clock-format= +#keyboard= +#reader= +#position= +#screensaver-timeout= diff --git a/noserc b/noserc deleted file mode 100644 index 2275480..0000000 --- a/noserc +++ /dev/null @@ -1,3 +0,0 @@ -[nosetests] -verbosity=3 -detailed-errors=1 diff --git a/not_dots/zshrc.orig b/not_dots/zshrc.orig deleted file mode 100644 index 9d4284b..0000000 --- a/not_dots/zshrc.orig +++ /dev/null @@ -1,73 +0,0 @@ -# Lines configured by zsh-newuser-install -HISTFILE=~/.histfile -HISTSIZE=1000 -SAVEHIST=1000 -setopt appendhistory autocd extendedglob nomatch notify share_history -bindkey -v -# End of lines configured by zsh-newuser-install -# The following lines were added by compinstall -zstyle :compinstall filename '/home/balkian/.zshrc' - -autoload -Uz compinit -compinit -# End of lines added by compinstall - -autoload -U colors -colors -setopt prompt_subst - -local smiley="%B%(?,%{$fg[green]%}☠%{$reset_color%},%{$fg[red]%}☠%{$reset_color%})%b" -PS0='${debian_chroot:+($debian_chroot)}%n@%M' - -parse_git_branch() -{ -git name-rev HEAD 2> /dev/null | sed 's#HEAD\ \(.*\)#(git::\1)#' -} - -if ( dircolors --help && ls --color ) &> /dev/null; then -# For some reason, the unixs machines need me to use $HOME instead of ~ -# List files from highest priority to lowest. As soon as the loop finds one that works, it will exit. -function precmd { -PROMPT="$PS0:%~ %{$fg[green]%}%B$(parse_git_branch)%b%{$reset_color%} -${smiley} "; -RPROMPT="%T"; -} - -for POSSIBLE_DIR_COLORS in "$HOME/.dir_colors" "/etc/DIR_COLORS"; do - [[ -f "$POSSIBLE_DIR_COLORS" ]] && [[ -r "$POSSIBLE_DIR_COLORS" ]] && eval `dircolors -b "$POSSIBLE_DIR_COLORS"` && break -done - -alias ls="ls --color=auto" -alias ll="ls --color=auto -l" -alias grep='grep --color=auto' -alias fgrep='fgrep --color=auto' -alias egrep='egrep --color=auto' -else -# No color, so put a slash at the end of directory names, etc. to differentiate. -alias ll="ls -lF" -fi -## Completions -#autoload -U compinit -#compinit -C -# -### case-insensitive (all),partial-word and then substring completion -zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' \ - 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' - -bindkey -M vicmd 'r' history-incremental-search-backward - -export PATH=$PATH:"/home/balkian/code/personal-scripts/" -#export CDPATH=$CDPATH:"/media/Data/" - -# TMUX -# if [[ -z "$KONSOLE_DBUS_SERVICE" & `which tmux` ]]; then - # if no session is started, start a new session - if [[ -z "$KONSOLE_DBUS_SERVICE" && -n $(which tmux) ]]; then - stty -ixon - test -z ${TMUX} && tmux attach - # when quitting tmux, try to attach - if [[ -z ${TMUX} ]]; then - exit; - fi - fi - diff --git a/not_dots/zshrc.pre-oh-my-zsh b/not_dots/zshrc.pre-oh-my-zsh deleted file mode 100644 index 9d4284b..0000000 --- a/not_dots/zshrc.pre-oh-my-zsh +++ /dev/null @@ -1,73 +0,0 @@ -# Lines configured by zsh-newuser-install -HISTFILE=~/.histfile -HISTSIZE=1000 -SAVEHIST=1000 -setopt appendhistory autocd extendedglob nomatch notify share_history -bindkey -v -# End of lines configured by zsh-newuser-install -# The following lines were added by compinstall -zstyle :compinstall filename '/home/balkian/.zshrc' - -autoload -Uz compinit -compinit -# End of lines added by compinstall - -autoload -U colors -colors -setopt prompt_subst - -local smiley="%B%(?,%{$fg[green]%}☠%{$reset_color%},%{$fg[red]%}☠%{$reset_color%})%b" -PS0='${debian_chroot:+($debian_chroot)}%n@%M' - -parse_git_branch() -{ -git name-rev HEAD 2> /dev/null | sed 's#HEAD\ \(.*\)#(git::\1)#' -} - -if ( dircolors --help && ls --color ) &> /dev/null; then -# For some reason, the unixs machines need me to use $HOME instead of ~ -# List files from highest priority to lowest. As soon as the loop finds one that works, it will exit. -function precmd { -PROMPT="$PS0:%~ %{$fg[green]%}%B$(parse_git_branch)%b%{$reset_color%} -${smiley} "; -RPROMPT="%T"; -} - -for POSSIBLE_DIR_COLORS in "$HOME/.dir_colors" "/etc/DIR_COLORS"; do - [[ -f "$POSSIBLE_DIR_COLORS" ]] && [[ -r "$POSSIBLE_DIR_COLORS" ]] && eval `dircolors -b "$POSSIBLE_DIR_COLORS"` && break -done - -alias ls="ls --color=auto" -alias ll="ls --color=auto -l" -alias grep='grep --color=auto' -alias fgrep='fgrep --color=auto' -alias egrep='egrep --color=auto' -else -# No color, so put a slash at the end of directory names, etc. to differentiate. -alias ll="ls -lF" -fi -## Completions -#autoload -U compinit -#compinit -C -# -### case-insensitive (all),partial-word and then substring completion -zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' \ - 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' - -bindkey -M vicmd 'r' history-incremental-search-backward - -export PATH=$PATH:"/home/balkian/code/personal-scripts/" -#export CDPATH=$CDPATH:"/media/Data/" - -# TMUX -# if [[ -z "$KONSOLE_DBUS_SERVICE" & `which tmux` ]]; then - # if no session is started, start a new session - if [[ -z "$KONSOLE_DBUS_SERVICE" && -n $(which tmux) ]]; then - stty -ixon - test -z ${TMUX} && tmux attach - # when quitting tmux, try to attach - if [[ -z ${TMUX} ]]; then - exit; - fi - fi - diff --git a/oh-my-zsh b/oh-my-zsh deleted file mode 160000 index 6701c46..0000000 --- a/oh-my-zsh +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6701c46bca7347c9de92d37d64957db978927623 diff --git a/pythonrc.py b/pythonrc.py deleted file mode 100644 index 6663ff9..0000000 --- a/pythonrc.py +++ /dev/null @@ -1,137 +0,0 @@ -""" -This file is executed when the Python interactive shell is started if -$PYTHONSTARTUP is in your environment and points to this file. It's just -regular Python commands, so do what you will. Your ~/.inputrc file can greatly -complement this file. - -""" -import os - -try: - import readline - import rlcompleter - import atexit -except ImportError: - print("You need readline, rlcompleter, and atexit") - -readline.parse_and_bind("tab: complete") -#readline.parse_and_bind ("bind ^I rl_complete") - -class Completer(object): - def __init__(self): - # Enable a History - self.HISTFILE=os.path.expanduser("%s/.pyhistory" % os.environ["HOME"]) - - # Read the existing history if there is one - if os.path.exists(self.HISTFILE): - readline.read_history_file(self.HISTFILE) - - # Set maximum number of items that will be written to the history file - readline.set_history_length(300) - atexit.register(self.savehist) - - def savehist(self): - import readline - readline.write_history_file(self.HISTFILE) - - -c = Completer() - -WELCOME='' -# Color Support -class TermColors(dict): - """Gives easy access to ANSI color codes. Attempts to fall back to no color - for certain TERM values. (Mostly stolen from IPython.)""" - - COLOR_TEMPLATES = ( - ("Black" , "0;30"), - ("Red" , "0;31"), - ("Green" , "0;32"), - ("Brown" , "0;33"), - ("Blue" , "0;34"), - ("Purple" , "0;35"), - ("Cyan" , "0;36"), - ("LightGray" , "0;37"), - ("DarkGray" , "1;30"), ("LightRed" , "1;31"), - ("LightGreen" , "1;32"), - ("Yellow" , "1;33"), - ("LightBlue" , "1;34"), - ("LightPurple" , "1;35"), - ("LightCyan" , "1;36"), - ("White" , "1;37"), - ("Normal" , "0"), - ) - - NoColor = '' - _base = '\001\033[%sm\002' - - def __init__(self): - if os.environ.get('TERM') in ('xterm-color', 'xterm-256color', 'linux', - 'screen', 'screen-256color', 'screen-bce'): - self.update(dict([(k, self._base % v) for k,v in self.COLOR_TEMPLATES])) - else: - self.update(dict([(k, self.NoColor) for k,v in self.COLOR_TEMPLATES])) -_c = TermColors() - - - -import sys -# Enable Color Prompts -sys.ps1 = '%s>>> %s' % (_c['Green'], _c['Normal']) -sys.ps2 = '%s... %s' % (_c['Red'], _c['Normal']) - -# Enable Pretty Printing for stdout -def my_displayhook(value): - if value is not None: - try: - import __builtin__ - __builtin__._ = value - except ImportError: - __builtins__._ = value - - import pprint - pprint.pprint(value) - del pprint - -sys.displayhook = my_displayhook - -EDITOR = os.environ.get('EDITOR', 'vim') -EDIT_CMD = '\e' - -from tempfile import mkstemp -from code import InteractiveConsole - -class EditableBufferInteractiveConsole(InteractiveConsole): - def __init__(self, *args, **kwargs): - self.last_buffer = [] # This holds the last executed statement - InteractiveConsole.__init__(self, *args, **kwargs) - - def runsource(self, source, *args): - self.last_buffer = [ source.encode('latin-1') ] - return InteractiveConsole.runsource(self, source, *args) - - def raw_input(self, *args): - line = InteractiveConsole.raw_input(self, *args) - if line == EDIT_CMD: - fd, tmpfl = mkstemp('.py') - os.write(fd, b'\n'.join(self.last_buffer)) - os.close(fd) - os.system('%s %s' % (EDITOR, tmpfl)) - line = open(tmpfl).read() - os.unlink(tmpfl) - tmpfl = '' - lines = line.split( '\n' ) - for i in range(len(lines) - 1): self.push( lines[i] ) - line = lines[-1] - return line - -# clean up namespace -del sys - -if __name__ == "__main__": - c = EditableBufferInteractiveConsole(locals=locals()) - c.interact(banner=WELCOME) - -# Exit the Python shell on exiting the InteractiveConsole - import sys - sys.exit() diff --git a/bin/README b/scripts/.bin/README similarity index 100% rename from bin/README rename to scripts/.bin/README diff --git a/bin/change-xfce4-alt-tab.sh b/scripts/.bin/change-xfce4-alt-tab.sh similarity index 100% rename from bin/change-xfce4-alt-tab.sh rename to scripts/.bin/change-xfce4-alt-tab.sh diff --git a/bin/changedisplay.sh b/scripts/.bin/changedisplay.sh similarity index 100% rename from bin/changedisplay.sh rename to scripts/.bin/changedisplay.sh diff --git a/bin/cpcuevana.sh b/scripts/.bin/cpcuevana.sh similarity index 100% rename from bin/cpcuevana.sh rename to scripts/.bin/cpcuevana.sh diff --git a/bin/dmenu.sh b/scripts/.bin/dmenu.sh similarity index 100% rename from bin/dmenu.sh rename to scripts/.bin/dmenu.sh diff --git a/bin/dual-monitor.sputnik b/scripts/.bin/dual-monitor.sputnik similarity index 100% rename from bin/dual-monitor.sputnik rename to scripts/.bin/dual-monitor.sputnik diff --git a/bin/elecciones.sh b/scripts/.bin/elecciones.sh similarity index 100% rename from bin/elecciones.sh rename to scripts/.bin/elecciones.sh diff --git a/bin/flasher.sh b/scripts/.bin/flasher.sh similarity index 100% rename from bin/flasher.sh rename to scripts/.bin/flasher.sh diff --git a/bin/gnome-terminal b/scripts/.bin/gnome-terminal similarity index 100% rename from bin/gnome-terminal rename to scripts/.bin/gnome-terminal diff --git a/bin/goear.sh b/scripts/.bin/goear.sh similarity index 100% rename from bin/goear.sh rename to scripts/.bin/goear.sh diff --git a/bin/i3-exit.sh b/scripts/.bin/i3-exit.sh similarity index 100% rename from bin/i3-exit.sh rename to scripts/.bin/i3-exit.sh diff --git a/bin/i3-one-instance b/scripts/.bin/i3-one-instance similarity index 100% rename from bin/i3-one-instance rename to scripts/.bin/i3-one-instance diff --git a/bin/i3-one-tmux b/scripts/.bin/i3-one-tmux similarity index 100% rename from bin/i3-one-tmux rename to scripts/.bin/i3-one-tmux diff --git a/bin/i3-secondary-to-primary b/scripts/.bin/i3-secondary-to-primary similarity index 100% rename from bin/i3-secondary-to-primary rename to scripts/.bin/i3-secondary-to-primary diff --git a/bin/i3-winmenu.py b/scripts/.bin/i3-winmenu.py similarity index 100% rename from bin/i3-winmenu.py rename to scripts/.bin/i3-winmenu.py diff --git a/bin/icon_spotify.png b/scripts/.bin/icon_spotify.png similarity index 100% rename from bin/icon_spotify.png rename to scripts/.bin/icon_spotify.png diff --git a/bin/monitors b/scripts/.bin/monitors similarity index 100% rename from bin/monitors rename to scripts/.bin/monitors diff --git a/bin/myemacs b/scripts/.bin/myemacs similarity index 89% rename from bin/myemacs rename to scripts/.bin/myemacs index 454e388..ddc0421 100755 --- a/bin/myemacs +++ b/scripts/.bin/myemacs @@ -1,2 +1,2 @@ #!/bin/sh -emacsclient --alternate-editor="" -s "$HOME/.emacs.d/HIGHLANDER" -c "$@" +emacsclient --alternate-editor="" -s "$HOME/.emacs.d/HIGHLANDER" $@ diff --git a/bin/one-instance b/scripts/.bin/one-instance similarity index 100% rename from bin/one-instance rename to scripts/.bin/one-instance diff --git a/bin/one-instance (copy) b/scripts/.bin/one-instance (copy) similarity index 100% rename from bin/one-instance (copy) rename to scripts/.bin/one-instance (copy) diff --git a/bin/one-terminator.sh b/scripts/.bin/one-terminator.sh similarity index 100% rename from bin/one-terminator.sh rename to scripts/.bin/one-terminator.sh diff --git a/bin/one-tmux b/scripts/.bin/one-tmux similarity index 100% rename from bin/one-tmux rename to scripts/.bin/one-tmux diff --git a/bin/passmenu b/scripts/.bin/passmenu similarity index 100% rename from bin/passmenu rename to scripts/.bin/passmenu diff --git a/bin/play-europa.sh b/scripts/.bin/play-europa.sh similarity index 100% rename from bin/play-europa.sh rename to scripts/.bin/play-europa.sh diff --git a/bin/play-hitfm.sh b/scripts/.bin/play-hitfm.sh similarity index 100% rename from bin/play-hitfm.sh rename to scripts/.bin/play-hitfm.sh diff --git a/bin/play-kiss.sh b/scripts/.bin/play-kiss.sh similarity index 100% rename from bin/play-kiss.sh rename to scripts/.bin/play-kiss.sh diff --git a/bin/play-m80.sh b/scripts/.bin/play-m80.sh similarity index 100% rename from bin/play-m80.sh rename to scripts/.bin/play-m80.sh diff --git a/bin/playlist-radios.xml b/scripts/.bin/playlist-radios.xml similarity index 100% rename from bin/playlist-radios.xml rename to scripts/.bin/playlist-radios.xml diff --git a/bin/replace-accented.sh b/scripts/.bin/replace-accented.sh similarity index 100% rename from bin/replace-accented.sh rename to scripts/.bin/replace-accented.sh diff --git a/bin/single-monitor.sputnik b/scripts/.bin/single-monitor.sputnik similarity index 100% rename from bin/single-monitor.sputnik rename to scripts/.bin/single-monitor.sputnik diff --git a/bin/spotify-notify.py b/scripts/.bin/spotify-notify.py similarity index 100% rename from bin/spotify-notify.py rename to scripts/.bin/spotify-notify.py diff --git a/bin/spotify-remote.py b/scripts/.bin/spotify-remote.py similarity index 99% rename from bin/spotify-remote.py rename to scripts/.bin/spotify-remote.py index b1c5ab2..0b59ac9 100755 --- a/bin/spotify-remote.py +++ b/scripts/.bin/spotify-remote.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # -*- coding: utf-8 -*- ''' @@ -16,7 +16,7 @@ import dbus -import gobject, gtk, os, tempfile, sys, time, re, indicate, urllib2 +import gobject, gtk, os, tempfile, sys, time, re, urllib2 from optparse import OptionParser from subprocess import * @@ -409,6 +409,7 @@ if __name__ == "__main__": SpotifyNotify.preventDuplicate(Debug) try: + import indicate indicateserver = indicate.indicate_server_ref_default() indicateserver.set_type("music.spotify") indicateserver.set_desktop_file("/usr/share/applications/spotify.desktop") diff --git a/bin/spotify-remote.sh b/scripts/.bin/spotify-remote.sh similarity index 100% rename from bin/spotify-remote.sh rename to scripts/.bin/spotify-remote.sh diff --git a/bin/start-eclipse.sh b/scripts/.bin/start-eclipse.sh similarity index 100% rename from bin/start-eclipse.sh rename to scripts/.bin/start-eclipse.sh diff --git a/bin/terminator b/scripts/.bin/terminator similarity index 100% rename from bin/terminator rename to scripts/.bin/terminator diff --git a/bin/tmux-zoom.sh b/scripts/.bin/tmux-zoom.sh similarity index 100% rename from bin/tmux-zoom.sh rename to scripts/.bin/tmux-zoom.sh diff --git a/bin/unlock-livebox.py b/scripts/.bin/unlock-livebox.py similarity index 100% rename from bin/unlock-livebox.py rename to scripts/.bin/unlock-livebox.py diff --git a/bin/volume-down.sh b/scripts/.bin/volume-down.sh similarity index 100% rename from bin/volume-down.sh rename to scripts/.bin/volume-down.sh diff --git a/bin/volume-toggle-mute.sh b/scripts/.bin/volume-toggle-mute.sh similarity index 100% rename from bin/volume-toggle-mute.sh rename to scripts/.bin/volume-toggle-mute.sh diff --git a/bin/volume-up.sh b/scripts/.bin/volume-up.sh similarity index 100% rename from bin/volume-up.sh rename to scripts/.bin/volume-up.sh diff --git a/bin/winfuncs.sh b/scripts/.bin/winfuncs.sh similarity index 100% rename from bin/winfuncs.sh rename to scripts/.bin/winfuncs.sh diff --git a/bin/zotero b/scripts/.bin/zotero similarity index 100% rename from bin/zotero rename to scripts/.bin/zotero diff --git a/stalonetray/.stalonetrayrc b/stalonetray/.stalonetrayrc new file mode 100644 index 0000000..0194377 --- /dev/null +++ b/stalonetray/.stalonetrayrc @@ -0,0 +1,139 @@ +# vim:filetype=config:tw=80:et +# +# This is sample ~/.stalonetrayrc, resembling default configuration. +# Remember: command line parameters take precedence. +# +# Directives introduced in 0.8 are marked with "NEW in 0.8" +# +#################################################################### +# +# stalonetray understands following directives +# +#################################################################### + +# background # color can be specified as an HTML hex triplet or + # as a name from rgb.txt, note that '#' must be quoted +# background "#051525" +background "#051525" + +# decorations # set trays window decorations; possible values for + # decspec are: all, title, border, none +decorations none + +# display # as usual + +# dockapp_mode # set dockapp mode, which can be either simple (for + # e.g. OpenBox, wmaker for WindowMaker, or none + # (default). NEW in 0.8. +dockapp_mode simple + +# fuzzy_edges [] # enable fuzzy edges and set fuzziness level. level + # can be from 0 (disabled) to 3; this setting works + # with tinting and/or transparent and/or pixmap + # backgrounds +fuzzy_edges 0 + +# geometry # tray's geometry in standard X notation; width and + # height are specified in slot_size multiples +geometry 1x1-250+2 + +# grow_gravity # one of N, S, E, W, NW, NE, SW, SE; tray will grow + # in the direction opposite to one specified by + # grow_gravity; if horizontal or vertical + # direction is not specified, tray will not grow in + # that direction +grow_gravity NE + +# icon_gravity # icon placement gravity, one of NW, NE, SW, SE +icon_gravity SW + +# icon_size # specifies dimensions of typical icon slot +icon_size 21 + +# log_level # controls the amount of logging output, level can + # be err (default), info, or trace (enabled only + # when stalonetray configured with --enable-debug) + # NEW in 0.8. +log_level err + +# kludges kludge[,kludge] # enable specific kludges to work around + # non-conforming WMs and/or stalonetray bugs. + # NEW in 0.8. Argument is a + # comma-separated list of + # * fix_window_pos - fix tray window position on + # erroneous moves by WM + # * force_icons_size - ignore resize events on all + # icons; force their size to be equal to + # icon_size + # * use_icon_hints - use icon window hints to + # dtermine icon size + +kludges force_icons_size,fix_window_pos + +# max_geometry # maximal tray dimensions; 0 in width/height means + # no limit +max_geometry 0x0 + +# no_shrink [] # disables shrink-back mode +no_shrink false + +# parent_bg [] # whether to use pseudo-transparency + # (looks better when reparented into smth like FvwmButtons) +parent_bg false + +# pixmap_bg # use pixmap from specified xpm file for (tiled) background +# pixmap_bg /home/user/.stalonetraybg.xpm + +# scrollbars # enable/disable scrollbars; mode is either + # vertical, horizontal, all or none (default) + # NEW in 0.8. +scrollbars none + +# scrollbars-size # scrollbars step in pixels; default is slot_size / 4 +# scrollbars-step 8 + +# scrollbars-step # scrollbars step in pixels; default is slot_size / 2 +# scrollbars-step 32 + +# slot_size # specifies size of icon slot, defaults to + # icon_size NEW in 0.8. + +# skip_taskbar [] # hide tray`s window from the taskbar +skip_taskbar true + +# sticky [] # make a tray`s window sticky across the + # desktops/pages +sticky true + +# tint_color # set tinting color +tint_color white + +# tint_level # set tinting level; level ranges from 0 (disabled) + # to 255 +tint_level 0 + +# transparent [] # whether to use root-transparency (background + # image must be set with Esetroot or compatible utility) +transparent false + +# vertical [] # whether to use vertical layout (horisontal layout + # is used by default) +vertical false + +# window_layer # set the EWMH-compatible window layer; one of: + # bottom, normal, top +window_layer normal + +# window_strut # enable/disable window struts for tray window (to + # avoid converting of tray window by maximized + # windows); mode defines to which screen border tray + # will be attached; it can be either top, bottom, + # left, right, none or auto (default) +window_strut top + +# window_type # set the EWMH-compatible window type; one of: + # desktop, dock, normal, toolbar, utility +window_type dock + +# xsync [] # whether to operate on X server synchronously (SLOOOOW) +xsync false diff --git a/starttmux b/starttmux deleted file mode 100755 index 021e3ce..0000000 --- a/starttmux +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/zsh -# TMUX -# if [[ -z "$KONSOLE_DBUS_SERVICE" & `which tmux` ]]; then -# if no session is started, start a new session -if [[ -n $(which tmux) ]]; then - stty -ixon - if [ ! -z "$SSH_AUTH_SOCK" -a "$SSH_AUTH_SOCK" != "$HOME/.ssh/ssh_auth_sock" ] ; then - unlink "$HOME/.ssh/ssh_auth_sock" 2>/dev/null - ln -s "$SSH_AUTH_SOCK" "$HOME/.ssh/ssh_auth_sock" - export SSH_AUTH_SOCK="$HOME/.ssh/ssh_auth_sock" - fi - test -z ${TMUX} && tmux attach - # when quitting tmux, try to attach - if [[ -z ${TMUX} ]]; then - exit; - fi -fi diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc new file mode 100644 index 0000000..77e49e3 --- /dev/null +++ b/sxhkd/.config/sxhkd/sxhkdrc @@ -0,0 +1,158 @@ +# +# bspwm hotkeys +# + +super + alt + Escape + pkill -x panel; bspc quit + +super + shift + Escape + pkill -x panel; ~/.config/bspwm/panel + +super + w + bspc window -c + +super + t + bspc desktop -l next + +super + b + bspc desktop -B + +super + {a,s,d} + bspc window -t {pseudo_tiled,floating,sticky} + +super + m + bspc desktop -l {monocle,tiled} + +super + {cedilla,Tab} + bspc {window,desktop} -f last + +super + apostrophe + bspc window -s last; \ + bspc window -f last + +super + {o,i} + bspc control --record-history off; \ + bspc window {older,newer} -f; \ + bspc control --record-history on + +super + y + bspc window -w last.manual + +super + m + bspc window -s biggest + +super + {_,shift + }{h,j,k,l} + bspc window -{f,s} {left,down,up,right} + +super + {_,shift + }c + bspc window -f {next,prev} + +super + {comma,period} + bspc desktop -C {backward,forward} + +super + bracket{left,right} + bspc desktop -f {prev,next} + +super + ctrl + {h,j,k,l} + bspc window -p {left,down,up,right} + +super + ctrl + {_,shift + }space + bspc {window -p cancel,desktop -c} + +super + alt + {h,j,k,l} + bspc window -e {left -100,down +100,up -100,right +100} + +super + alt + shift + {h,j,k,l} + bspc window -e {right -100,up +100,down -100,left +100} + +super + ctrl + {1-9} + bspc window -r 0.{1-9} + +super + {_,shift + }{1-9,0} + bspc {desktop -f,window -d} ^{1-9,100} + +super + ctrl + {y,x} + PADDING=$(bspc config -m DVI-D-0 left_padding); \ + NEW_PADDING=$(echo "$PADDING {-,+} 5" | bc); \ + bspc config left_padding $NEW_PADDING; \ + bspc config right_padding $NEW_PADDING; + +super + shift + {y,x} + PADDING=$(bspc config -m DVI-D-0 bottom_padding); \ + NEW_PADDING=$(echo "$PADDING {-,+} 5" | bc); \ + TOP_PADDING=$(echo "$NEW_PADDING + 30" | bc); \ + bspc config top_padding $TOP_PADDING; \ + bspc config bottom_padding $NEW_PADDING; + +~button1 + bspc pointer -g focus + +super + button{1-3} + ; bspc pointer -g {move,resize_side,resize_corner} + +super + @button{1-3} + bspc pointer -u +# +# wm independent hotkeys +# +super + Return + one-instance URxvtQuake urxvt -name URxvtQuake -geometry 220x20+160+25 -e tmux a + +super + space + dmenu_run -q -h 25 -fn "DejaVu Sans-12:normal" -nb "#333333" -nf "#f3f3f3" -sb "#000000" -sf "#f3f3f3" -dim .5 -o .9 -p ">" + +super + p + ~/.bin/dmenu_session.sh + +super + ctrl + BackSpace + bspc desktop -R 90 + +super + alt + Return + {pkill -x panel; bspc config top_padding 0; bspc config bottom_padding 0; bspc config left_padding 0; bspc config right_padding 0, ~/.config/bspwm/panel} + +ctrl + alt + w + one-instance firefox + +super + f + one-instance pcmanfm + +XF86AudioLowerVolume + pamixer -d 10 + +XF86AudioRaiseVolume + pamixer -i 10 + +XF86AudioMute + pamixer -t + +XF86AudioPrev + playerctl previous + +XF86AudioNext + playerctl next + +XF86AudioPlay + playerctl play-pause + +XF86AudioStop + playerctl stop + +XF86HomePage + urxvt -e ranger + +XF86Mail + thunderbird + +super + q; {w,f,e} + {firefox,thunar,$editor} +} + +#XF86MonBrightnessUp +# light -A 5 + +#XF86MonBrightnessDown +# light -U 5 + +# make sxhkd reload its configuration files: +super + Escape + pkill -USR1 -x sxhkd diff --git a/tmux.conf b/tmux/.tmux.conf similarity index 95% rename from tmux.conf rename to tmux/.tmux.conf index 9b3f1da..348215e 100644 --- a/tmux.conf +++ b/tmux/.tmux.conf @@ -10,8 +10,8 @@ bind-key C-a last-window unbind % # use "v" and "s" to do vertical/horizontal splits, like vim -bind s split-window -v -bind v split-window -h +bind s split-window -v -c '#{pane_current_path}' +bind v split-window -h -c '#{pane_current_path}' # use the vim motion keys to move between panes bind h select-pane -L @@ -47,7 +47,7 @@ setw -g monitor-activity on set -g visual-activity on # Automatically set window title -setw -g automatic-rename off +set -g automatic-rename off # Mouse and panes setw -g mode-mouse on diff --git a/vim/.vim/.gitignore b/vim/.vim/.gitignore new file mode 100644 index 0000000..d992b6f --- /dev/null +++ b/vim/.vim/.gitignore @@ -0,0 +1 @@ +Session.vim diff --git a/vim/bundle/vundle b/vim/.vim/bundle/vundle similarity index 100% rename from vim/bundle/vundle rename to vim/.vim/bundle/vundle diff --git a/vim/colors/Tomorrow-Night-Blue.vim b/vim/.vim/colors/Tomorrow-Night-Blue.vim similarity index 100% rename from vim/colors/Tomorrow-Night-Blue.vim rename to vim/.vim/colors/Tomorrow-Night-Blue.vim diff --git a/vim/colors/Tomorrow-Night-Bright.vim b/vim/.vim/colors/Tomorrow-Night-Bright.vim similarity index 100% rename from vim/colors/Tomorrow-Night-Bright.vim rename to vim/.vim/colors/Tomorrow-Night-Bright.vim diff --git a/vim/colors/Tomorrow-Night-Eighties.vim b/vim/.vim/colors/Tomorrow-Night-Eighties.vim similarity index 100% rename from vim/colors/Tomorrow-Night-Eighties.vim rename to vim/.vim/colors/Tomorrow-Night-Eighties.vim diff --git a/vim/colors/Tomorrow-Night.vim b/vim/.vim/colors/Tomorrow-Night.vim similarity index 100% rename from vim/colors/Tomorrow-Night.vim rename to vim/.vim/colors/Tomorrow-Night.vim diff --git a/vim/colors/Tomorrow.vim b/vim/.vim/colors/Tomorrow.vim similarity index 100% rename from vim/colors/Tomorrow.vim rename to vim/.vim/colors/Tomorrow.vim diff --git a/vim/colors/codeschool.vim b/vim/.vim/colors/codeschool.vim similarity index 100% rename from vim/colors/codeschool.vim rename to vim/.vim/colors/codeschool.vim diff --git a/vim/colors/ir_black.vim b/vim/.vim/colors/ir_black.vim similarity index 100% rename from vim/colors/ir_black.vim rename to vim/.vim/colors/ir_black.vim diff --git a/vim/colors/matrix.vim b/vim/.vim/colors/matrix.vim similarity index 100% rename from vim/colors/matrix.vim rename to vim/.vim/colors/matrix.vim diff --git a/vim/colors/pychimp.vim b/vim/.vim/colors/pychimp.vim similarity index 100% rename from vim/colors/pychimp.vim rename to vim/.vim/colors/pychimp.vim diff --git a/vim/colors/reloaded.vim b/vim/.vim/colors/reloaded.vim similarity index 100% rename from vim/colors/reloaded.vim rename to vim/.vim/colors/reloaded.vim diff --git a/vim/colors/revolutions.vim b/vim/.vim/colors/revolutions.vim similarity index 100% rename from vim/colors/revolutions.vim rename to vim/.vim/colors/revolutions.vim diff --git a/vim/colors/solarized.vim b/vim/.vim/colors/solarized.vim similarity index 100% rename from vim/colors/solarized.vim rename to vim/.vim/colors/solarized.vim diff --git a/vim/colors/vividchalk.vim b/vim/.vim/colors/vividchalk.vim similarity index 100% rename from vim/colors/vividchalk.vim rename to vim/.vim/colors/vividchalk.vim diff --git a/vim/colors/wombat.vim b/vim/.vim/colors/wombat.vim similarity index 100% rename from vim/colors/wombat.vim rename to vim/.vim/colors/wombat.vim diff --git a/vim/ftplugin/tex.vim b/vim/.vim/ftplugin/tex.vim similarity index 100% rename from vim/ftplugin/tex.vim rename to vim/.vim/ftplugin/tex.vim diff --git a/vim/syntax/javascript.vim b/vim/.vim/syntax/javascript.vim similarity index 100% rename from vim/syntax/javascript.vim rename to vim/.vim/syntax/javascript.vim diff --git a/vim/syntax/n3.vim b/vim/.vim/syntax/n3.vim similarity index 100% rename from vim/syntax/n3.vim rename to vim/.vim/syntax/n3.vim diff --git a/vimrc b/vim/.vimrc similarity index 100% rename from vimrc rename to vim/.vimrc diff --git a/vim/bundle/.gitignore b/vim/bundle/.gitignore deleted file mode 100644 index 87361c1..0000000 --- a/vim/bundle/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!vundle diff --git a/vimperatorrc b/vimperator/.vimperatorrc similarity index 100% rename from vimperatorrc rename to vimperator/.vimperatorrc diff --git a/zsh/.zlogin b/zsh/.zlogin new file mode 120000 index 0000000..5765ab0 --- /dev/null +++ b/zsh/.zlogin @@ -0,0 +1 @@ +.zprezto/runcoms/zlogin \ No newline at end of file diff --git a/zsh/.zlogout b/zsh/.zlogout new file mode 120000 index 0000000..8f76c74 --- /dev/null +++ b/zsh/.zlogout @@ -0,0 +1 @@ +.zprezto/runcoms/zlogout \ No newline at end of file diff --git a/zsh/.zprezto b/zsh/.zprezto new file mode 160000 index 0000000..f2a826e --- /dev/null +++ b/zsh/.zprezto @@ -0,0 +1 @@ +Subproject commit f2a826e963f06a204dc0e09c05fc3e5419799f52 diff --git a/zsh/.zpreztorc b/zsh/.zpreztorc new file mode 100644 index 0000000..3f79041 --- /dev/null +++ b/zsh/.zpreztorc @@ -0,0 +1,175 @@ +# +# Sets Prezto options. +# +# Authors: +# Sorin Ionescu +# + +# +# General +# + +fpath=($HOME/.zsh-custom $fpath) + +# Set case-sensitivity for completion, history lookup, etc. +# zstyle ':prezto:*:*' case-sensitive 'yes' + +# Color output (auto set to 'no' on dumb terminals). +zstyle ':prezto:*:*' color 'yes' + +# Set the Zsh modules to load (man zshmodules). +# zstyle ':prezto:load' zmodule 'attr' 'stat' + +# Set the Zsh functions to load (man zshcontrib). +# zstyle ':prezto:load' zfunction 'zargs' 'zmv' + +# Set the Prezto modules to load (browse modules). +# The order matters. +zstyle ':prezto:load' pmodule \ + 'environment' \ + 'terminal' \ + 'editor' \ + 'history' \ + 'directory' \ + 'spectrum' \ + 'utility' \ + 'completion' \ + 'fasd' \ + 'pacman' \ + 'git' \ + 'ssh' \ + 'syntax-highlighting' \ + 'prompt' + + +zstyle ':prezto:module:syntax-highlighting' highlighters \ + 'main' \ + 'brackets' \ + 'pattern' \ + 'cursor' \ + 'root' + +zstyle ':prezto:module:syntax-highlighting' color 'yes' + +# +# Editor +# + +# Set the key mapping style to 'emacs' or 'vi'. +zstyle ':prezto:module:editor' key-bindings 'emacs' + +# Auto convert .... to ../.. +# zstyle ':prezto:module:editor' dot-expansion 'yes' + +# +# Git +# + +# Ignore submodules when they are 'dirty', 'untracked', 'all', or 'none'. +# zstyle ':prezto:module:git:status:ignore' submodules 'all' + +# +# GNU Utility +# + +# Set the command prefix on non-GNU systems. +# zstyle ':prezto:module:gnu-utility' prefix 'g' + +# +# History Substring Search +# + +# Set the query found color. +# zstyle ':prezto:module:history-substring-search:color' found '' + +# Set the query not found color. +# zstyle ':prezto:module:history-substring-search:color' not-found '' + +# Set the search globbing flags. +# zstyle ':prezto:module:history-substring-search' globbing-flags '' + +# +# Pacman +# + +# Set the Pacman frontend. +zstyle ':prezto:module:pacman' frontend 'yaourt' + +# +# Prompt +# + +# Set the prompt theme to load. +# Setting it to 'random' loads a random theme. +# Auto set to 'off' on dumb terminals. +zstyle ':prezto:module:prompt' theme 'balkian' + +# +# Ruby +# + +# Auto switch the Ruby version on directory change. +# zstyle ':prezto:module:ruby:chruby' auto-switch 'yes' + +# +# Screen +# + +# Auto start a session when Zsh is launched in a local terminal. +# zstyle ':prezto:module:screen:auto-start' local 'yes' + +# Auto start a session when Zsh is launched in a SSH connection. +# zstyle ':prezto:module:screen:auto-start' remote 'yes' + +# +# SSH +# + +# Set the SSH identities to load into the agent. +zstyle ':prezto:module:ssh:load' identities 'id_rsa' +# 'id_rsa2' 'id_github' + +# +# Syntax Highlighting +# + +# Set syntax highlighters. +# By default, only the main highlighter is enabled. +zstyle ':prezto:module:syntax-highlighting' highlighters \ + 'main' \ + 'brackets' \ + 'pattern' \ + 'cursor' \ + 'root' +# +# Set syntax highlighting styles. +# zstyle ':prezto:module:syntax-highlighting' styles \ +# 'builtin' 'bg=blue' \ +# 'command' 'bg=blue' \ +# 'function' 'bg=blue' + +# +# Terminal +# + +# Auto set the tab and window titles. +zstyle ':prezto:module:terminal' auto-title 'yes' + +# Set the window title format. +# zstyle ':prezto:module:terminal:window-title' format '%n@%m: %s' + +# Set the tab title format. +# zstyle ':prezto:module:terminal:tab-title' format '%m: %s' + +# +# Tmux +# + +# Auto start a session when Zsh is launched in a local terminal. +# zstyle ':prezto:module:tmux:auto-start' local 'yes' + +# Auto start a session when Zsh is launched in a SSH connection. +zstyle ':prezto:module:tmux:auto-start' remote 'yes' + +# Integrate with iTerm2. +# zstyle ':prezto:module:tmux:iterm' integrate 'yes' diff --git a/zsh/.zprofile b/zsh/.zprofile new file mode 100644 index 0000000..816c9c3 --- /dev/null +++ b/zsh/.zprofile @@ -0,0 +1,99 @@ +# +# Executes commands at login pre-zshrc. +# +# Authors: +# Sorin Ionescu +# + +# +# Browser +# + +if [[ "$OSTYPE" == darwin* ]]; then + export BROWSER='open' +fi + +# +# Editors +# + +export EDITOR='vi' +export VISUAL="myemcs" +export ALTERNATE_EDITOR="" +export PAGER='less' + +# +# Language +# + +if [[ -z "$LANG" ]]; then + export LANG='en_US.UTF-8' +fi + +# +# Paths +# + +# Ensure path arrays do not contain duplicates. +typeset -gU cdpath fpath mailpath path + +# Set the the list of directories that cd searches. +# cdpath=( +# $cdpath +# ) + +# Set the list of directories that Zsh searches for programs. +path=( + /usr/local/{bin,sbin} + ~/.bin + $path +) + +# +# Less +# + +# Set the default Less options. +# Mouse-wheel scrolling has been disabled by -X (disable screen clearing). +# Remove -X and -F (exit if the content fits on one screen) to enable it. +export LESS='-F -g -i -M -R -S -w -X -z-4' + +# Set the Less input preprocessor. +# Try both `lesspipe` and `lesspipe.sh` as either might exist on a system. +if (( $#commands[(i)lesspipe(|.sh)] )); then + export LESSOPEN="| /usr/bin/env $commands[(i)lesspipe(|.sh)] %s 2>&-" +fi + +# +# Temporary Files +# + +if [[ ! -d "$TMPDIR" ]]; then + export TMPDIR="/tmp/$LOGNAME" + mkdir -p -m 700 "$TMPDIR" +fi + +alias sudo="sudo " + +# Docker goodies +alias drm="docker rm" +alias drun="docker run" +alias drmi="docker rmi" +alias dps="docker ps" +alias dpi="docker images" +function da () { + docker start $1 && docker attach $1 +} +function drmia () { + docker rmi $(docker images | grep "^" | awk '{print $3}') +} +function dca () { + cmd=$1 + shift + docker $cmd $(docker ps -q $*) +} +function newdev () { + docker run -v $PWD:/usr/src/app -t -i --name $1 -h $1 balkian/devmachine +} + +TMPPREFIX="${TMPDIR%/}/zsh" diff --git a/zsh/.zsh-custom/prompt_balkian_setup b/zsh/.zsh-custom/prompt_balkian_setup new file mode 100644 index 0000000..36c5541 --- /dev/null +++ b/zsh/.zsh-custom/prompt_balkian_setup @@ -0,0 +1,154 @@ +# +# A two-line, Powerline-inspired theme that displays contextual information. +# +# This theme requires a patched Powerline font, get them from +# https://github.com/Lokaltog/powerline-fonts. +# +# Authors: +# Isaac Wolkerstorfer +# Jeff Sandberg +# Sorin Ionescu +# +# Screenshots: +# http://i.imgur.com/0XIWX.png +# + +# Load dependencies. +pmodload 'helper' + +# Define variables. +_prompt_balkian_current_bg='NONE' +_prompt_balkian_segment_separator=' ' +_prompt_balkian_start_time=$SECONDS + +function prompt_balkian_start_segment { + local bg fg + [[ -n "$1" ]] && bg="%K{$1}" || bg="%k" + [[ -n "$2" ]] && fg="%F{$2}" || fg="%f" + if [[ "$_prompt_balkian_current_bg" != 'NONE' && "$1" != "$_prompt_balkian_current_bg" ]]; then + print -n " $bg%F{$_prompt_balkian_current_bg}$_prompt_balkian_segment_separator$fg " + else + print -n "$bg$fg " + fi + _prompt_balkian_current_bg="$1" + [[ -n "$3" ]] && print -n "$3" +} + +function prompt_balkian_end_segment { + if [[ -n "$_prompt_balkian_current_bg" ]]; then + print -n " %k%F{$_prompt_balkian_current_bg}$_prompt_balkian_segment_separator" + else + print -n "%k" + fi + print -n "%f" + _prompt_balkian_current_bg='' +} + +function prompt_balkian_build_prompt { + prompt_balkian_start_segment black default '%(?::%F{red}✘ )%(!:%F{yellow}⚡ :)%(1j:%F{cyan}⚙ :)%F{green}%n%F{white}@%F{green}%m%f' + prompt_balkian_start_segment black default '$_prompt_balkian_pwd' + + if [[ -n "$git_info" ]]; then + prompt_balkian_start_segment black yellow '${(e)git_info[ref]}${(e)git_info[status]}' + fi + + prompt_balkian_end_segment +} + +function prompt_balkian_pwd { + local pwd="${PWD/#$HOME/~}" + + if [[ "$pwd" == (#m)[/~] ]]; then + _prompt_balkian_pwd="$MATCH" + unset MATCH + else + _prompt_balkian_pwd="${${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}//\%/%%}/${${pwd:t}//\%/%%}" + fi +} + +function prompt_balkian_print_elapsed_time { + local end_time=$(( SECONDS - _prompt_balkian_start_time )) + local hours minutes seconds remainder + + if (( end_time >= 3600 )); then + hours=$(( end_time / 3600 )) + remainder=$(( end_time % 3600 )) + minutes=$(( remainder / 60 )) + seconds=$(( remainder % 60 )) + print -P "%B%F{red}>>> elapsed time ${hours}h${minutes}m${seconds}s%b" + elif (( end_time >= 60 )); then + minutes=$(( end_time / 60 )) + seconds=$(( end_time % 60 )) + print -P "%B%F{yellow}>>> elapsed time ${minutes}m${seconds}s%b" + elif (( end_time > 10 )); then + print -P "%B%F{green}>>> elapsed time ${end_time}s%b" + fi +} + +function prompt_balkian_precmd { + setopt LOCAL_OPTIONS + unsetopt XTRACE KSH_ARRAYS + + # Format PWD. + prompt_balkian_pwd + + # Get Git repository information. + if (( $+functions[git-info] )); then + git-info + fi + + # Calculate and print the elapsed time. + prompt_balkian_print_elapsed_time +} + +function prompt_balkian_preexec { + _prompt_balkian_start_time="$SECONDS" +} + +function prompt_balkian_setup { + setopt LOCAL_OPTIONS + unsetopt XTRACE KSH_ARRAYS + prompt_opts=(cr percent subst) + + # Load required functions. + autoload -Uz add-zsh-hook + + # Add hook for calling git-info before each command. + add-zsh-hook preexec prompt_balkian_preexec + add-zsh-hook precmd prompt_balkian_precmd + + # Set editor-info parameters. + zstyle ':prezto:module:editor:info:completing' format '%B%F{red}...%f%b' + zstyle ':prezto:module:editor:info:keymap:primary' format '%B%F{blue}❯%f%b' + zstyle ':prezto:module:editor:info:keymap:primary:overwrite' format '%F{red}♺%f' + zstyle ':prezto:module:editor:info:keymap:alternate' format '%B%F{red}❮%f%b' + + # Set git-info parameters. + zstyle ':prezto:module:git:info' verbose 'yes' + zstyle ':prezto:module:git:info:action' format ' ⁝ %s' + zstyle ':prezto:module:git:info:added' format ' ✚' + zstyle ':prezto:module:git:info:ahead' format ' ⬆' + zstyle ':prezto:module:git:info:behind' format ' ⬇' + zstyle ':prezto:module:git:info:branch' format ' %b' + zstyle ':prezto:module:git:info:commit' format '➦ %.7c' + zstyle ':prezto:module:git:info:deleted' format ' ✖' + zstyle ':prezto:module:git:info:dirty' format ' ⁝' + zstyle ':prezto:module:git:info:modified' format ' ✱' + zstyle ':prezto:module:git:info:position' format '%p' + zstyle ':prezto:module:git:info:renamed' format ' ➙' + zstyle ':prezto:module:git:info:stashed' format ' S' + zstyle ':prezto:module:git:info:unmerged' format ' ═' + zstyle ':prezto:module:git:info:untracked' format ' ?' + zstyle ':prezto:module:git:info:keys' format \ + 'ref' '$(coalesce "%b" "%p" "%c")' \ + 'status' '%s%D%A%B%S%a%d%m%r%U%u' + + # Define prompts. + PROMPT=' +${(e)$(prompt_balkian_build_prompt)} + ${editor_info[keymap]} ' + RPROMPT='%F{blue}[%F{green}%D{%H:%M:%S}%F{blue}]%f' + SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? ' +} + +prompt_balkian_setup "$@" diff --git a/zsh/.zshenv b/zsh/.zshenv new file mode 120000 index 0000000..2ffffef --- /dev/null +++ b/zsh/.zshenv @@ -0,0 +1 @@ +.zprezto/runcoms/zshenv \ No newline at end of file diff --git a/zsh/.zshrc b/zsh/.zshrc new file mode 120000 index 0000000..ff7ceae --- /dev/null +++ b/zsh/.zshrc @@ -0,0 +1 @@ +.zprezto/runcoms/zshrc \ No newline at end of file diff --git a/zshenv b/zshenv deleted file mode 100644 index b7540a1..0000000 --- a/zshenv +++ /dev/null @@ -1,10 +0,0 @@ -### Added by the Heroku Toolbelt -export PATH="$PATH:/usr/local/heroku/bin:$HOME/.cabal/bin" - -### Virtualenvwrapper -export WORKON_HOME=~/.virtualenvs - - -#export PYENV_ROOT="$HOME/.pyenv" -#export PATH="$PYENV_ROOT/bin:$PATH" -#eval "$(pyenv init -)" diff --git a/zshrc b/zshrc deleted file mode 100644 index 14ae964..0000000 --- a/zshrc +++ /dev/null @@ -1,89 +0,0 @@ -export PATH="$PATH:$HOME/.bin/" - -# Only update the path if not running interactively -[ -z "$PS1" ] && return -#source ~/.starttmux -# Path to your oh-my-zsh configuration. -ZSH=$HOME/.oh-my-zsh - -# Set name of the theme to load. -# Look in ~/.oh-my-zsh/themes/ -# Optionally, if you set this to "random", it'll load a random theme each -# time that oh-my-zsh is loaded. -ZSH_THEME="balkian" - -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" - -# Set to this to use case-sensitive completion -CASE_SENSITIVE="true" - -# Comment this out to disable weekly auto-update checks -DISABLE_AUTO_UPDATE="true" - -# Change this value to set how frequently ZSH updates¬ -export UPDATE_ZSH_DAYS=13 - -# Uncomment following line if you want to disable colors in ls -# DISABLE_LS_COLORS="true" - -# Uncomment following line if you want to disable autosetting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment following line if you want red dots to be displayed while waiting for completion -COMPLETION_WAITING_DOTS="true" - -# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) -# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -plugins=(git gitfast colored-man virtualenvwrapper cp python wd systemadmin pass) - -source $ZSH/oh-my-zsh.sh - -#bindkey "^R" history-incremental-search-backward - -# Customize to your needs... -autoload -U zmv -alias mmv='noglob zmv -W' -alias e='myemacs -nw' -alias ew='myemacs -n' -export ALTERNATE_EDITOR=/usr/bin/vim EDITOR="vim" VISUAL="vim" - -# Docker goodies -alias drm="docker rm" -alias drun="docker run" -alias drmi="docker rmi" -alias dps="docker ps" -alias dpi="docker images" -function da () { - docker start $1 && docker attach $1 -} -function drmia () { - docker rmi $(docker images | grep "^" | awk '{print $3}') -} -function drma () { - docker rm $(docker ps -q $*) -} -function newdev () { - docker run -v $PWD:/usr/src/app -t -i --name $1 -h $1 balkian/devmachine -} - -_docker # Force the load of autocompletion for docker -compdef __docker_containers da -compdef __ps drma - -PYTHONSTARTUP=~/.pythonrc.py -export PYTHONSTARTUP - -ssh-add -l > /dev/null 2>&1 || alias ssh='ssh-add -l >/dev/null || ssh-add && unalias ssh; ssh'; alias mosh='ssh-add -l >/dev/null || ssh-add && unalias mosh; mosh' - -setopt extended_glob -setopt menu_complete - -### Agent forwarding in tmux too -if [ ! -z "$SSH_AUTH_SOCK" -a "$SSH_AUTH_SOCK" != "$HOME/.ssh/ssh_auth_sock" ] ; then - unlink "$HOME/.ssh/ssh_auth_sock" 2>/dev/null - ln -s "$SSH_AUTH_SOCK" "$HOME/.ssh/ssh_auth_sock" - export SSH_AUTH_SOCK="$HOME/.ssh/ssh_auth_sock" -fi