Update for i3 and nicer looking stuff. New vim colour scheme (Wut)
This commit is contained in:
parent
0e7878740d
commit
d74fcbf89e
7 changed files with 133 additions and 89 deletions
19
gtkrc-2.0/gtkrc-2.0.symlink
Normal file
19
gtkrc-2.0/gtkrc-2.0.symlink
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# DO NOT EDIT! This file will be overwritten by LXAppearance.
|
||||
# Any customization should be done in ~/.gtkrc-2.0.mine instead.
|
||||
|
||||
include "/home/max/.gtkrc-2.0.mine"
|
||||
gtk-theme-name="Clearlooks"
|
||||
gtk-icon-theme-name="hicolor"
|
||||
gtk-font-name="System San Francisco Text 18"
|
||||
gtk-cursor-theme-name="DMZ-White"
|
||||
gtk-cursor-theme-size=0
|
||||
gtk-toolbar-style=GTK_TOOLBAR_BOTH
|
||||
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
|
||||
gtk-button-images=1
|
||||
gtk-menu-images=1
|
||||
gtk-enable-event-sounds=1
|
||||
gtk-enable-input-feedback-sounds=1
|
||||
gtk-xft-antialias=1
|
||||
gtk-xft-hinting=1
|
||||
gtk-xft-hintstyle="hintslight"
|
||||
gtk-xft-rgba="rgb"
|
||||
|
|
@ -9,9 +9,7 @@
|
|||
# layout, use the i3-config-wizard
|
||||
#
|
||||
|
||||
# This font is widely installed, provides lots of unicode glyphs, right-to-left
|
||||
# text rendering and scalability on retina/hidpi displays (thanks to pango).
|
||||
font pango:DejaVu Sans Mono 16
|
||||
font pango:System San Francisco Text 18
|
||||
|
||||
# use these keys for focus, movement, and resize directions when reaching for
|
||||
# the arrows is not convenient
|
||||
|
|
@ -20,6 +18,62 @@ set $down j
|
|||
set $left h
|
||||
set $right l
|
||||
|
||||
# Colour, baby
|
||||
set $bg-color #2f343f
|
||||
set $inactive-bg-color #2f343f
|
||||
set $text-color #f3f4f5
|
||||
set $inactive-text-color #676e7d
|
||||
set $urgent-bg-color #e53935
|
||||
set $indicator-color #00ff00
|
||||
|
||||
# Window colours
|
||||
client.focused \
|
||||
$bg-color \
|
||||
$bg-color \
|
||||
$text-color \
|
||||
$indicator-color
|
||||
|
||||
client.unfocused \
|
||||
$inactive-bg-color \
|
||||
$inactive-bg-color \
|
||||
$inactive-text-color \
|
||||
$indicator-color
|
||||
|
||||
client.focused_inactive \
|
||||
$inactive-bg-color \
|
||||
$inactive-bg-color \
|
||||
$inactive-text-color \
|
||||
$indicator-color
|
||||
client.urgent \
|
||||
$urgent-bg-color \
|
||||
$urgent-bg-color \
|
||||
$text-color \
|
||||
$indicator-color
|
||||
|
||||
bar {
|
||||
status_command i3status
|
||||
colors {
|
||||
background $bg-color
|
||||
|
||||
focused_workspace \
|
||||
$bg-color \
|
||||
$bg-color \
|
||||
$text-color
|
||||
|
||||
inactive_workspace \
|
||||
$inactive-bg-color \
|
||||
$inactive-bg-color \
|
||||
$inactive-text-color
|
||||
|
||||
urgent_workspace \
|
||||
$urgent-bg-color \
|
||||
$urgent-bg-color \
|
||||
$text-color
|
||||
}
|
||||
}
|
||||
|
||||
bindsym Mod4+shift+slash exec i3lock --color "$bg-color"
|
||||
|
||||
# use Mouse+Mod4 to drag floating windows to their wanted position
|
||||
floating_modifier Mod4
|
||||
|
||||
|
|
@ -29,10 +83,7 @@ bindsym Mod4+Return exec i3-sensible-terminal
|
|||
# kill focused window
|
||||
bindsym Mod4+Shift+q kill
|
||||
|
||||
# There also is the (new) i3-dmenu-desktop which only displays applications
|
||||
# shipping a .desktop file. It is a wrapper around dmenu, so you need that
|
||||
# installed.
|
||||
bindsym Mod4+d exec --no-startup-id i3-dmenu-desktop
|
||||
bindsym Mod4+d exec rofi -show run -lines 3 -eh 2 -width 100 -padding 10 -opacity "85" -bw 0 -bc "$bg-color" -bg "$bg-color" -fg "$text-color" -hlbg "$bg-color" -hlfg "#9575cd" -font "System San Francisco Display 18"
|
||||
|
||||
# change focus
|
||||
bindsym Mod4+$left focus left
|
||||
|
|
@ -127,10 +178,10 @@ mode "resize" {
|
|||
|
||||
bindsym Mod4+r mode "resize"
|
||||
|
||||
# Start i3bar to display a workspace bar (plus the system information i3status
|
||||
# finds out, if available)
|
||||
bar {
|
||||
status_command i3status
|
||||
tray_output primary
|
||||
}
|
||||
|
||||
hide_edge_borders both
|
||||
focus_follows_mouse no
|
||||
|
||||
exec xmodmap ~/.xmodmap
|
||||
exec compton
|
||||
exec gnome-terminal
|
||||
|
|
|
|||
|
|
@ -25,39 +25,39 @@ endif
|
|||
let g:colors_name = "maxbucknell"
|
||||
|
||||
" Make everything white by default
|
||||
hi Normal cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi Type cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi Keyword cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi Operator cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi Special cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi Statement cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi Identifier cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi Constant cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi Define cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi Include cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi Macro cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi Normal cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
hi Type cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
hi Keyword cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
hi Operator cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
hi Special cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
hi Statement cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
hi Identifier cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
hi Constant cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
hi Define cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
hi Include cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
hi Macro cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
|
||||
" Residual Less colors
|
||||
hi lessFunction cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi lessCssAttribute cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi lessFunction cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
hi lessCssAttribute cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
|
||||
" Residual Vim colors
|
||||
hi VimSet cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi VimOption cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi VimHiAttrib cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi VimSet cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
hi VimOption cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
hi VimHiAttrib cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
|
||||
" Residual Zsh colors
|
||||
hi ZshDeref cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi ZshShortDeref cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi ZshSubstDelim cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi ZshDeref cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
hi ZshShortDeref cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
hi ZshSubstDelim cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
|
||||
" Residual XML colors
|
||||
hi xmlProcessingDelim cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi xmlAttribPunct cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi xmlProcessingDelim cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
hi xmlAttribPunct cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
|
||||
" Miscellaneous leftovers
|
||||
hi helpNote cterm=NONE ctermfg=7 ctermbg=NONE
|
||||
hi MatchParen cterm=NONE ctermfg=7 ctermbg=5
|
||||
hi helpNote cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
hi MatchParen cterm=NONE ctermfg=0 ctermbg=5
|
||||
|
||||
" Scalars are cyan
|
||||
hi String cterm=NONE ctermfg=6 ctermbg=NONE
|
||||
|
|
@ -78,7 +78,7 @@ hi jsDocTypeNoParam cterm=NONE ctermfg=2 ctermbg=NONE
|
|||
hi jsDocSeeTag cterm=NONE ctermfg=2 ctermbg=NONE
|
||||
|
||||
" Line numbers are grey
|
||||
hi LineNr cterm=NONE ctermfg=8 ctermbg=NONE
|
||||
hi LineNr cterm=NONE ctermfg=0 ctermbg=NONE
|
||||
|
||||
" Current search result yellow
|
||||
hi Search cterm=NONE ctermfg=3 ctermbg=0
|
||||
|
|
@ -87,14 +87,14 @@ hi MBSearchNext cterm=NONE ctermfg=3 ctermbg=0
|
|||
" Errors are red
|
||||
|
||||
" Make current line magenta
|
||||
hi CursorLine cterm=NONE ctermfg=5 ctermbg=NONE
|
||||
hi CursorLineNr cterm=NONE ctermfg=5 ctermbg=NONE
|
||||
hi CursorLine cterm=NONE ctermfg=4 ctermbg=NONE
|
||||
hi CursorLineNr cterm=NONE ctermfg=4 ctermbg=NONE
|
||||
|
||||
"""""""""""""
|
||||
" Status Line
|
||||
"""""""""""""
|
||||
|
||||
hi StatusLine cterm=NONE ctermfg=7 ctermbg=5
|
||||
hi StatusLine cterm=NONE ctermfg=0 ctermbg=4
|
||||
|
||||
"""""""
|
||||
" Signs
|
||||
|
|
@ -106,10 +106,10 @@ hi SignColumn cterm=NONE ctermbg=0 ctermfg=0
|
|||
" Vdebug
|
||||
""""""""
|
||||
|
||||
hi DbgBreakptLine cterm=NONE ctermfg=4 ctermbg=NONE
|
||||
hi DbgBreakptSign cterm=NONE ctermfg=4 ctermbg=4
|
||||
hi DbgCurrentLine cterm=NONE ctermfg=0 ctermbg=4
|
||||
hi DbgCurrentSign cterm=NONE ctermfg=4 ctermbg=4
|
||||
hi DbgBreakptLine cterm=NONE ctermfg=5 ctermbg=NONE
|
||||
hi DbgBreakptSign cterm=NONE ctermfg=5 ctermbg=5
|
||||
hi DbgCurrentLine cterm=NONE ctermfg=0 ctermbg=5
|
||||
hi DbgCurrentSign cterm=NONE ctermfg=5 ctermbg=5
|
||||
|
||||
"""""""""""
|
||||
" Syntastic
|
||||
|
|
|
|||
8
xmodmap/xmodmap.symlink
Normal file
8
xmodmap/xmodmap.symlink
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
! Remove caps lock
|
||||
remove Lock = Caps_Lock
|
||||
keysym Caps_Lock = Control_L
|
||||
add Control = Control_L
|
||||
|
||||
! Fix some lingering keyboard layout issues
|
||||
keycode 94 = grave asciitilde
|
||||
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 99cc7ea060637884293f38efb0d192828adcf8ff
|
||||
Subproject commit d170ef1363924eaa8f9183c98e5830eb3031d90c
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 683f4837a037e35e6a5236020e855fcd262ed48d
|
||||
Subproject commit b8fa1b9dc954d66748cc5b593f531687f24b8d48
|
||||
|
|
@ -7,18 +7,11 @@ PATH="/usr/bin:$PATH"
|
|||
PATH="/usr/local/sbin:$PATH"
|
||||
PATH="/usr/local/bin:$PATH"
|
||||
|
||||
# MacGPG
|
||||
PATH="/usr/local/MacGPG2/bin:$PATH"
|
||||
|
||||
# Ruby
|
||||
RUBY_VERSION="$(ruby --version | cut -d " " -f 2 | cut -d "p" -f 1)"
|
||||
PATH="/usr/local/Cellar/ruby/$RUBY_VERSION/bin$PATH"
|
||||
|
||||
# LaTeX!
|
||||
PATH="/usr/texbin:$PATH"
|
||||
|
||||
# Local path
|
||||
PATH="$HOME/Dropbox/dotfiles/bin:$PATH"
|
||||
PATH="$HOME/dotfiles/bin:$PATH"
|
||||
|
||||
# Composer (PHP)
|
||||
PATH="$HOME/.composer/vendor/bin:$PATH"
|
||||
|
|
@ -26,10 +19,6 @@ PATH="$HOME/.composer/vendor/bin:$PATH"
|
|||
# Python
|
||||
export PYTHONPATH="$PYTHONPATH:$HOME/Dropbox/dotfiles/lib/python"
|
||||
|
||||
## RVM
|
||||
|
||||
source /Users/maxbucknell/.rvm/scripts/rvm
|
||||
|
||||
## Completion
|
||||
|
||||
# Load up the extra Z Shell completions
|
||||
|
|
@ -90,15 +79,12 @@ FEATURE_COLORS=(
|
|||
kronecker green
|
||||
galois cyan
|
||||
dirac magenta
|
||||
hilbert blue
|
||||
)
|
||||
|
||||
COLOR_NAME="$FEATURE_COLORS[$(nice-hostname)]"
|
||||
COLOR="$fg[$COLOR_NAME]"
|
||||
|
||||
# Tmux
|
||||
|
||||
tmux set status-style "bg=$COLOR_NAME"
|
||||
|
||||
## Git
|
||||
|
||||
# Show the current Git branch.
|
||||
|
|
@ -138,43 +124,22 @@ autoload -U colors && colors
|
|||
# Start SSH Agent and set relevant variables
|
||||
function start-agent {
|
||||
echo "Initialising new SSH Agent..."
|
||||
ssh-agent -s | sed 's/^echo/# echo/' > "$SSH_ENV"
|
||||
rm ~/.ssh/redbox-docker-socket
|
||||
ssh-agent -s -a $HOME/.ssh/redbox-docker-socket | sed 's/^echo/# echo/' > "$SSH_ENV"
|
||||
echo "Success!"
|
||||
chmod 600 "$SSH_ENV"
|
||||
. $SSH_ENV > /dev/null
|
||||
ssh-add "$HOME/.ssh/id_$(nice-hostname)"
|
||||
}
|
||||
|
||||
# Add my SSH identity
|
||||
function test-identities {
|
||||
ssh-add -l | grep "The agent has no identities" > /dev/null
|
||||
if [[ $? -eq 0 ]]; then
|
||||
ssh-add "$HOME/.ssh/id_$(nice-hostname)"
|
||||
if [[ $? -eq 2 ]]; then
|
||||
start-agent
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
# Start SSH Agent if it's not already running.
|
||||
#
|
||||
# Also add the id_(nice-hostname) identity.
|
||||
export SSH_ENV="$HOME/.ssh/environment"
|
||||
if [[ -n $SSH_AGENT_PID ]]; then
|
||||
ps aux | grep "ssh-agent" | grep -v "grep"
|
||||
if [[ $? -eq 0 ]]; then
|
||||
test-identities
|
||||
fi
|
||||
if [[ -f $SSH_ENV ]]; then
|
||||
. $SSH_ENV > /dev/null
|
||||
else
|
||||
if [[ -f $SSH_ENV ]]; then
|
||||
. $SSH_ENV > /dev/null
|
||||
fi
|
||||
ps aux | grep "$SSH_AGENT_PID" | grep -v "grep" > /dev/null
|
||||
if [[ $? -eq 0 ]]; then
|
||||
test-identities
|
||||
else
|
||||
start-agent
|
||||
fi
|
||||
start-agent
|
||||
fi
|
||||
|
||||
## Line Editing
|
||||
|
|
@ -312,4 +277,5 @@ setopt hist_lex_words
|
|||
# because I think they are valuable.
|
||||
setopt share_history
|
||||
|
||||
|
||||
alias pbcopy='xclip -selection clipboard'
|
||||
alias pbpaste='xclip -selection clipboard -o'
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue