diff --git a/i3/config b/i3/config index b578fc6..39096d4 100644 --- a/i3/config +++ b/i3/config @@ -26,7 +26,7 @@ floating_modifier $mod new_window pixel # focus follows mouse -focus_follows_mouse yes +focus_follows_mouse no ##border new_window pixel 3 @@ -208,14 +208,7 @@ set $WHITE #fdf6e3 client.background #ffffff -# Darkbrown colorscheme -# name #border #background #text #indicator #child_border -#client.focused $DARKBROWN $LIGHTBROWN $DARKBROWN $LIGHTBROWN $DARKBROWN -#client.unfocused $DARKBROWN $DARKBROWN $LIGHTBROWN $LIGHTBROWN $DARKBROWN -#client.focused_inactive $DARKBROWN $DARKBROWN $LIGHTBROWN $LIGHTBROWN $DARKBROWN -#client.urgent $DARKBROWN $DARKBROWN $LIGHTBROWN $LIGHTBROWN $DARKBROWN - -# Solarized colorscheme +# Solarized theme # name #border #background #text #indicator #child_border client.focused $FOREGROUND $MAGENTA $GREEN $GREEN $MAGENTA client.unfocused $BACKGROUND $BACKGROUND $GREEN $GREEN $BACKGROUND @@ -233,20 +226,7 @@ bar { status_command i3status -c ~/.i3/i3status.conf separator_symbol "" -# Darkbrown colorscheme -# colors { -# statusline $LIGHTBROWN -# background $DARKGREY -# separator $DARKRED -# -# # name #border #bg #text -# focused_workspace $LIGHTBROWN $DARKBROWN $LIGHTBROWN -# active_workspace $DARKBROWN $DARKBROWN $LIGHTBROWN -# inactive_workspace $DARKBROWN $DARKBROWN $LIGHTBROWN -# urgent_workspace $DARKBROWN $DARKBROWN $LIGHTBROWN -# } - - # Solarized colorscheme + # Solarized theme colors { statusline $LIGHTBLUE background $BACKGROUND diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 9b5b4ec..7a970af 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -16,11 +16,6 @@ set -g prefix ^a set -g status-keys vi setw -g mode-keys vi -# Shut up! -set -g bell-action none -set -g bell-on-alert off -set quiet off - # Fix terminal name issues set -s escape-time 1 @@ -33,7 +28,7 @@ bind r source-file ~/.tmux.conf # Panel splites and selection unbind % -bind g split-window -h +bind c split-window -h unbind '"' bind v split-window -v unbind o @@ -63,23 +58,44 @@ bind Q kill-session # Statusline # ################################# -set -g status-justify "left" -set -g status "on" -set -g status-left-style "none" -set -g message-command-style "fg=colour144,bg=colour237" -set -g status-right-style "none" -set -g pane-active-border-style "fg=colour27" -#set -g status-utf8 "on" -set -g status-style "bg=colour234,none" -set -g message-style "fg=colour144,bg=colour237" -set -g pane-border-style "fg=colour237" -set -g status-right-length "100" -set -g status-left-length "100" -setw -g window-status-activity-attr "none" -setw -g window-status-activity-style "fg=colour27,bg=colour234,none" -setw -g window-status-separator "" -setw -g window-status-style "fg=colour39,bg=colour234,none" -set -g status-left "#[fg=colour15,bg=colour27] #S #[fg=colour27,bg=colour234,nobold,nounderscore,noitalics]" -set -g status-right "#[fg=colour237,bg=colour234,nobold,nounderscore,noitalics]#[fg=colour144,bg=colour237] %d.%m.%Y  %H:%M #[fg=colour27,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour15,bg=colour27] #h " -setw -g window-status-format "#[fg=colour39,bg=colour234] #I #[fg=colour39,bg=colour234] #W " -setw -g window-status-current-format "#[fg=colour234,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour144,bg=colour237] #I #[fg=colour144,bg=colour237] #{pane_current_path} #[fg=colour144,bg=colour237] #W #[fg=colour237,bg=colour234,nobold,nounderscore,noitalics]" +# modes +setw -g clock-mode-colour colour5 +setw -g mode-attr bold +setw -g mode-fg colour1 +setw -g mode-bg colour18 + +## panes +#set -g pane-border-bg colour0 +#set -g pane-border-fg colour19 +#set -g pane-active-border-bg colour0 +#set -g pane-active-border-fg colour9 +# +## statusbar +#set -g status-position bottom +#set -g status-justify left +#set -g status-bg colour18 +#set -g status-fg colour137 +#set -g status-attr dim +#set -g status-left '' +#set -g status-right '#[fg=colour233,bg=colour19,bold] %d/%m #[fg=colour233,bg=colour8,bold] %H:%M:%S ' +#set -g status-right-length 50 +#set -g status-left-length 20 +# +#setw -g window-status-current-fg colour1 +#setw -g window-status-current-bg colour19 +#setw -g window-status-current-attr bold +#setw -g window-status-current-format ' #I#[fg=colour249]:#[fg=colour255]#W#[fg=colour249]#F ' +# +#setw -g window-status-fg colour9 +#setw -g window-status-bg colour18 +#setw -g window-status-attr none +#setw -g window-status-format ' #I#[fg=colour237]:#[fg=colour250]#W#[fg=colour244]#F ' +# +#setw -g window-status-bell-attr bold +#setw -g window-status-bell-fg colour255 +#setw -g window-status-bell-bg colour1 +# +## messages +#set -g message-attr bold +#set -g message-fg colour232 +#set -g message-bg colour16 diff --git a/zshrc b/zshrc index ded5da7..ebccd26 100644 --- a/zshrc +++ b/zshrc @@ -1,11 +1,19 @@ # If you come from bash you might have to change your $PATH. # export PATH=$HOME/bin:/usr/local/bin:$PATH -# Path to your oh-my-zsh installation. ZSH=/usr/share/oh-my-zsh/ +PATH=$PATH:~/.gem/ruby/2.5.0/bin:$HOME/bin + +# Path to your oh-my-zsh installation. +ZSH=/usr/share/oh-my-zsh/ # Set name of the theme to load. Optionally, if you set this to "random" # it'll load a random theme each time that oh-my-zsh is loaded. # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes -ZSH_THEME="agnoster" + +if [[ $TERM == "linux" ]] || [[ $TERM == "screen" ]] ; then + ZSH_THEME="gentoo" +else + ZSH_THEME="agnoster" +fi # Set list of themes to load # Setting this variable when ZSH_THEME=random @@ -60,22 +68,13 @@ plugins=( git last-working-dir fbterm + oc + ssh-agent + gpg-agent ) # User configuration -# ALT C and D -bindkey "[C" forward-word -bindkey "[D" backward-word - -# Start SSH-Agent alon with new terminal -#if ! pgrep -u "$USER" ssh-agent > /dev/null; then -# ssh-agent > ~/.ssh-agent-thing -#fi -#if [[ "$SSH_AGENT_PID" == "" ]]; then -# eval "$(<~/.ssh-agent-thing)" -#fi - # export MANPATH="/usr/local/man:$MANPATH" # You may need to manually set your language environment @@ -94,6 +93,17 @@ bindkey "[D" backward-word # ssh # export SSH_KEY_PATH="~/.ssh/rsa_id" +# AareGuru Autocompletion +#source <(aareguru --completion-script-zsh) + +# Golang +export GOPATH=$HOME/go + +# Cloudscale Terraform Shizzle ma whizzle +#export CLOUDSCALE_TOKEN="xmcb6t66var47voridvwkqjsfqcvuuef" +#export CLOUDSCALE_TOKEN="g3jw5o5zaewj5ctn5gyej633l6qlbm5v" +#export CLOUDSCALE_TOKEN="ktmj7q4h3ezpxzcunlitptgyerukwall" + # Set personal aliases, overriding those provided by oh-my-zsh libs, # plugins, and themes. Aliases can be placed here, though oh-my-zsh # users are encouraged to define aliases within the ZSH_CUSTOM folder. @@ -102,6 +112,10 @@ bindkey "[D" backward-word # Example aliases # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" +#alias cat="lolcat" +alias lsblk="lsblk -o +LABEL" +alias ip="ip -c" +alias showip="ip --brief a" ZSH_CACHE_DIR=$HOME/.cache/oh-my-zsh if [[ ! -d $ZSH_CACHE_DIR ]]; then