From e9c60f75c92a0e973e8ce5a258f2d64998041442 Mon Sep 17 00:00:00 2001 From: Tony Grosinger Date: Tue, 26 May 2015 13:06:01 -0700 Subject: [PATCH] Added a bunch of things - .vimrc updates to match newest workflow - .Xmodmap to remap capslock to tab - .i3 configuration updates - Add vpn alias to bashrc --- .Xmodmap | 2 + .bashrc | 4 ++ .gitconfig | 5 +- .i3/config | 172 +++++++++++++++++++++++++++++++++++++++++++++++++ .i3status.conf | 53 +++++++++++++++ .vimrc | 30 ++++++++- install.sh | 10 +++ 7 files changed, 272 insertions(+), 4 deletions(-) create mode 100644 .Xmodmap create mode 100644 .i3/config create mode 100644 .i3status.conf diff --git a/.Xmodmap b/.Xmodmap new file mode 100644 index 0000000..51f07bf --- /dev/null +++ b/.Xmodmap @@ -0,0 +1,2 @@ +clear Lock +keycode 66 = Tab ISO_Left_Tab Tab ISO_Left_Tab diff --git a/.bashrc b/.bashrc index eae7f94..fbe4689 100644 --- a/.bashrc +++ b/.bashrc @@ -14,6 +14,10 @@ alias tmux="tmux -2" alias grep="grep --color=auto" alias extract="tar xvf" +# VPN +alias connect="sudo openvpn --config $HOME/home.ovpn" +alias connect-noroute="sudo openvpn --config $HOME/home.ovpn --route-nopull && sudo ip route add 192.168.0.0/24 dev tun0" + # Adding applications to path if [[ -d ${HOME}/bin ]]; then diff --git a/.gitconfig b/.gitconfig index d7bf2bb..68d5d4d 100644 --- a/.gitconfig +++ b/.gitconfig @@ -5,13 +5,16 @@ ui = auto [alias] co = checkout + amend = commit --amend c = commit - s = status + s = status -sb + d = diff --color-words --minimal b = branch pp = log --color --graph --pretty=format:'%Cred%h%Creset %Cgreen(%cr) %Creset\t%s %C(bold blue)<%an> %C(yellow)%d%Creset' --abbrev-commit cr = difftool --dir-diff type = cat-file -t dump = cat-file -p + ff = merge --ff-only hist = log --pretty=format:\"%C(yellow)%h %C(blue)%ad %C(red)%d %C(reset)%s %C(green)[%an]\" --decorate --graph --date=short --all [push] default = simple diff --git a/.i3/config b/.i3/config new file mode 100644 index 0000000..6a85f63 --- /dev/null +++ b/.i3/config @@ -0,0 +1,172 @@ +# This file has been auto-generated by i3-config-wizard(1). +# It will not be overwritten, so edit it as you like. +# +# Should you change your keyboard layout some time, delete +# this file and re-run i3-config-wizard(1). +# + +# i3 config file (v4) +# +# Please see http://i3wm.org/docs/userguide.html for a complete reference! + +exec_always --no-startup-id ~/.config/monitors1.sh + +workspace 1 output DP-1 +workspace 2 output DVI-I-1 +workspace 3 output DVI-I-1 +workspace 9 output DVI-I-1 + +exec --no-startup-id i3-msg 'workspace 2; exec firefox' +exec --no-startup-id i3-msg 'workspace 3; exec google-chrome' +#exec --no-startup-id i3-msg 'workspace 9; exec virtualbox; exec gnome-terminal; workspace 2' +exec --no-startup-id i3-msg 'workspace 1; exec gnome-terminal' +exec --no-startup-id i3-msg 'exec workrave' + +set $mod Mod1 + +# Font for window titles. Will also be used by the bar unless a different font +# is used in the bar {} block below. +# 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 8 +# Before i3 v4.8, we used to recommend this one as the default: +# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 +# The font above is very space-efficient, that is, it looks good, sharp and +# clear in small sizes. However, its unicode glyph coverage is limited, the old +# X core fonts rendering does not support right-to-left and this being a bitmap +# font, it doesn’t scale on retina/hidpi displays. + +# Use Mouse+$mod to drag floating windows to their wanted position +floating_modifier $mod + +# lock the screen +bindsym $mod+i exec i3lock -d -c 000000 + +# Auto lock the screen +exec xautolock -time 15 -locker 'i3lock -d -c 000000' & + +# start a terminal +bindsym $mod+Return exec i3-sensible-terminal + +# kill focused window +bindsym $mod+Shift+q kill + +# start dmenu (a program launcher) +bindsym $mod+d exec dmenu_run +# 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 $mod+d exec --no-startup-id i3-dmenu-desktop + +# change focus +bindsym $mod+j focus left +bindsym $mod+k focus down +bindsym $mod+l focus up +bindsym $mod+semicolon focus right + +# alternatively, you can use the cursor keys: +bindsym $mod+Left focus left +bindsym $mod+Down focus down +bindsym $mod+Up focus up +bindsym $mod+Right focus right + +# move focused window +bindsym $mod+Shift+j move left +bindsym $mod+Shift+k move down +bindsym $mod+Shift+l move up +bindsym $mod+Shift+semicolon move right + +# alternatively, you can use the cursor keys: +bindsym $mod+Shift+Left move left +bindsym $mod+Shift+Down move down +bindsym $mod+Shift+Up move up +bindsym $mod+Shift+Right move right + +# split in horizontal orientation +bindsym $mod+h split h + +# split in vertical orientation +bindsym $mod+v split v + +# enter fullscreen mode for the focused container +bindsym $mod+f fullscreen + +# change container layout (stacked, tabbed, toggle split) +bindsym $mod+s layout stacking +bindsym $mod+w layout tabbed +bindsym $mod+e layout toggle split + +# toggle tiling / floating +bindsym $mod+Shift+space floating toggle + +# change focus between tiling / floating windows +bindsym $mod+space focus mode_toggle + +# focus the parent container +bindsym $mod+a focus parent + +# focus the child container +#bindsym $mod+d focus child + +# switch to workspace +bindsym $mod+1 workspace 1 +bindsym $mod+2 workspace 2 +bindsym $mod+3 workspace 3 +bindsym $mod+4 workspace 4 +bindsym $mod+5 workspace 5 +bindsym $mod+6 workspace 6 +bindsym $mod+7 workspace 7 +bindsym $mod+8 workspace 8 +bindsym $mod+9 workspace 9 +bindsym $mod+0 workspace 10 + +# move focused container to workspace +bindsym $mod+Shift+1 move container to workspace 1 +bindsym $mod+Shift+2 move container to workspace 2 +bindsym $mod+Shift+3 move container to workspace 3 +bindsym $mod+Shift+4 move container to workspace 4 +bindsym $mod+Shift+5 move container to workspace 5 +bindsym $mod+Shift+6 move container to workspace 6 +bindsym $mod+Shift+7 move container to workspace 7 +bindsym $mod+Shift+8 move container to workspace 8 +bindsym $mod+Shift+9 move container to workspace 9 +bindsym $mod+Shift+0 move container to workspace 10 + +# reload the configuration file +bindsym $mod+Shift+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-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" + +# resize window (you can also use the mouse for that) +mode "resize" { + # These bindings trigger as soon as you enter the resize mode + + # Pressing left will shrink the window’s width. + # Pressing right will grow the window’s width. + # Pressing up will shrink the window’s height. + # Pressing down will grow the window’s height. + bindsym j resize shrink width 10 px or 10 ppt + bindsym k resize grow height 10 px or 10 ppt + bindsym l resize shrink height 10 px or 10 ppt + bindsym semicolon resize grow width 10 px or 10 ppt + + # same bindings, but for the arrow keys + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt + + # back to normal: Enter or Escape + bindsym Return mode "default" + bindsym Escape mode "default" +} + +bindsym $mod+r mode "resize" + +# Start i3bar to display a workspace bar (plus the system information i3status +# finds out, if available) +bar { + status_command i3status +} diff --git a/.i3status.conf b/.i3status.conf new file mode 100644 index 0000000..106b427 --- /dev/null +++ b/.i3status.conf @@ -0,0 +1,53 @@ +# i3status configuration file. +# see "man i3status" for documentation. + +# It is important that this file is edited as UTF-8. +# The following line should contain a sharp s: +# ß +# If the above line is not correctly displayed, fix your editor first! + +general { + colors = true + interval = 5 +} + +order += "disk /" +order += "run_watch VPN" +order += "ethernet eth0" +order += "load" +order += "tztime local" + +wireless wlan0 { + format_up = "W: (%quality at %essid) %ip" + format_down = "W: down" +} + +ethernet eth0 { + # if you use %speed, i3status requires root privileges + format_up = "E: %ip (%speed)" + format_down = "E: down" +} + +battery 0 { + format = "%status %percentage %remaining" +} + +run_watch DHCP { + pidfile = "/var/run/dhclient*.pid" +} + +run_watch VPN { + pidfile = "/var/run/vpnc/pid" +} + +tztime local { + format = "%Y-%m-%d %H:%M:%S" +} + +load { + format = "%1min" +} + +disk "/" { + format = "%avail" +} diff --git a/.vimrc b/.vimrc index b4663c7..9894e1f 100644 --- a/.vimrc +++ b/.vimrc @@ -18,18 +18,32 @@ NeoBundleFetch 'Shougo/neobundle.vim' NeoBundle 'tpope/vim-surround' NeoBundle 'tpope/vim-commentary' NeoBundle 'tpope/vim-repeat' -NeoBundle 'tacahiroy/ctrlp-funky' NeoBundle 'reedes/vim-wordy' NeoBundle 'scrooloose/syntastic' NeoBundle 'tpope/vim-fugitive' +NeoBundle 'idanarye/vim-merginal' NeoBundle 'scrooloose/nerdcommenter' NeoBundle 'godlygeek/tabular' NeoBundle 'Valloric/YouCompleteMe' -NeoBundle 'sirver/ultisnips' NeoBundle 'tpope/vim-fugitive' NeoBundle 'airblade/vim-gitgutter' NeoBundle 'Raimondi/delimitMate' NeoBundle 'justinmk/vim-sneak' +NeoBundle 'blueyed/vim-diminactive' + +" Tab Completion +NeoBundle 'ervandew/supertab' +NeoBundle 'sirver/ultisnips' + +" make YCM compatible with UltiSnips (using supertab) +let g:ycm_key_list_select_completion = ['', ''] +let g:ycm_key_list_previous_completion = ['', ''] +let g:SuperTabDefaultCompletionType = '' + +" better key bindings for UltiSnipsExpandTrigger +let g:UltiSnipsExpandTrigger = "" +let g:UltiSnipsJumpForwardTrigger = "" +let g:UltiSnipsJumpBackwardTrigger = """ " Color Scheme NeoBundle 'altercation/vim-colors-solarized' @@ -86,6 +100,10 @@ let g:ctrlp_user_command = { \ 'fallback': 'find %s -type f' \ } +NeoBundle 'tacahiroy/ctrlp-funky' +nnoremap fu :CtrlPFunky +let g:ctrlp_funky_syntax_highlight = 1 + " Required: call neobundle#end() @@ -160,7 +178,7 @@ if filereadable(expand("~/.vim/bundle/vim-colors-solarized/colors/solarized.vim" let g:solarized_visibility="normal" color solarized endif -highlight ColorColumn ctermbg=24 +highlight ColorColumn ctermbg=0 guibg=#eee8d5 " Command line set wildmenu " Show a menu rather than auto-completing @@ -190,6 +208,12 @@ map tc :tabclose map tm :tabmove map tt :tabnext +" moving between splits +nnoremap +nnoremap +nnoremap +nnoremap + " backup set backup set backupdir=$HOME/.vim/backups diff --git a/install.sh b/install.sh index 23e8e79..54e68e1 100755 --- a/install.sh +++ b/install.sh @@ -74,6 +74,8 @@ function performSetup() { createDirectory ".vim" createDirectory ".vim/swaps" createDirectory ".vim/backups" + echo "You should install Neobundle to install your Vim plugins. Use this command:" + echo "curl https://raw.githubusercontent.com/Shougo/neobundle.vim/master/bin/install.sh | sh" echo "Linking Git..." linkFile ".gitconfig" @@ -88,6 +90,14 @@ function performSetup() { createDirectory ".config/peco" linkFile ".config/peco/config.json" + echo "Linking Xmodmap..." + linkFile ".Xmodmap" + + echo "Linking i3..." + createDirectory ".i3" + linkFile ".i3status.conf" + linkFile ".i3/config" + popd > /dev/null }