Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: adimit/config
base: eff449a171
...
head fork: adimit/config
compare: 57b928d2d7
  • 14 commits
  • 8 files changed
  • 0 commit comments
  • 1 contributor
View
5 Xdefaults
@@ -1,8 +1,9 @@
urxvt.scrollBar: false
-urxvt.font: xft:Droid Sans Mono:size=9
+urxvt.font: xft:Droid Sans Mono:size=10
+urxvt.depth: 32
urxvt.foreground: #ffffff
-urxvt.background: #202020
+urxvt.background: rgba:1000/1000/1000/DDDD
!-- Tango color scheme
! Black
View
8 gitconfig
@@ -18,3 +18,11 @@
added = yellow
changed = green
untracked = cyan
+[alias]
+ co = checkout
+ ci = commit
+ st = status
+ br = branch
+ hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
+ type = cat-file -t
+ dump = cat-file -p
View
2  hvim.conf
@@ -0,0 +1,2 @@
+source-file ~/.tmux.conf
+bind g select-pane -l\; send-keys ':r' C-m\; select-pane -l
View
3  texmf/tex/latex/aleks/aleks.sty
@@ -15,3 +15,6 @@
% in text, follow them with an escaped space \ : lorem \to\ ipsum.
\newcommand{\from}{\ensuremath{\leftarrow}}
\renewcommand{\to}{\ensuremath{\rightarrow}}
+
+% Working with vectors
+\newcommand{\Vlength}[1]{\ensuremath{\left\|#1\right\|}}
View
59 tmux.conf
@@ -0,0 +1,59 @@
+# remove ESC delay
+set -sg escape-time 1
+
+# change base indices
+set -g base-index 1
+setw -g pane-base-index 1
+
+# source new configuration
+bind R source-file ~/.tmux.conf; display "Reloaded configuration."
+
+# easier splitting
+bind - split-window -v
+bind v split-window -h
+
+set-window-option -g mode-keys vi
+
+# pseudio hjkl for dvorak with an additional right-shift
+
+bind h select-pane -L
+bind t select-pane -D
+bind n select-pane -U
+bind s select-pane -R
+
+bind H resize-pane -L 5
+bind T resize-pane -D 5
+bind N resize-pane -U 5
+bind S resize-pane -R 5
+
+# use mouse, for the few times where this is actually useful
+setw -g mode-mouse on
+set -g mouse-select-pane on
+set -g mouse-resize-pane on
+set -g mouse-select-window on
+
+# colours
+set -g default-terminal "screen-256color"
+
+set -g status-fg white
+set -g status-bg black
+
+setw -g window-status-fg colour61
+setw -g window-status-bg default
+setw -g window-status-attr dim
+
+setw -g window-status-current-fg colour148
+setw -g window-status-current-bg default
+setw -g window-status-current-attr bright
+
+set -g pane-border-fg colour59
+set -g pane-active-border-fg colour148
+
+set -g message-fg colour202
+set -g message-bg black
+set -g message-attr bright
+
+# status bar
+set -g status-left "#[fg=colour214][#S#F]"
+setw -g monitor-activity on
+set -g visual-activity on
View
40 vimrc
@@ -17,6 +17,13 @@ map <leader>ee :e <C-R>=expand("%:p:h") . "/" <CR>
map <leader>es :sp <C-R>=expand("%:p:h") . "/" <CR>
map <leader>et :tabe <C-R>=expand("%:p:h") . "/" <CR>
+" easier use of fugitive
+map <leader>gd :Gdiff<CR>
+map <leader>gc :Gcommit<CR>
+map <leader>gs :Gstatus<CR>
+map <leader>gw :Gwrite<CR>
+map <leader>gl :Glog<CR>
+
""" Environment
"""""""""""""""
@@ -44,6 +51,12 @@ if &term =~ "rxvt-unicode"
endif
endif
+" better command line editing
+cnoremap <C-j> <t_kd>
+cnoremap <C-k> <t_ku>
+cnoremap <C-a> <Home>
+cnoremap <C-e> <End>
+
set showtabline=1
" Scroll with context"
@@ -93,7 +106,7 @@ endif
set mouse="a"
-colorscheme default
+colorscheme lucius
set background=dark
set showcmd
@@ -164,6 +177,9 @@ imap <C-z>p <Esc>:tabprev<cr>
" Insert a single character and go back to command mode
noremap S i<Space><Esc>r
+" Make Y behave like other capitals
+map Y y$
+
""" General Abbreviations
" Command Typos
cabbrev Wq wq
@@ -211,6 +227,10 @@ endfunction
nmap <F3> :syn sync fromstart<cr>
autocmd BufEnter * syntax sync fromstart
+" Save and return to normal mode on FocusLost
+au FocusLost * :silent! wall " save
+au FocusLost * call feedkeys("\<C-\>\<C-n>") " return to normal mode
+
""" Tags & Tagbar
set showfulltag
set tags=tags;/
@@ -222,6 +242,19 @@ let g:tagbar_compact=1
""" Vim Help Files: make [Return] follow a link
autocmd FileType help nmap <buffer> <Return> <C-]>
+""" JSON
+
+au! BufRead,BufNewFile *.json set filetype=json
+augroup json_autocmd
+ autocmd!
+ autocmd FileType json set autoindent
+ autocmd FileType json set formatoptions=tcq2l
+ autocmd FileType json set textwidth=78 shiftwidth=2
+ autocmd FileType json set softtabstop=2 tabstop=8
+ autocmd FileType json set expandtab
+ autocmd FileType json set foldmethod=syntax
+augroup END
+
""" Java
""autocmd filetype java nmap <F9> :Ant<cr>
let java_highlight_all = 1
@@ -259,8 +292,7 @@ autocmd BufEnter *.ssi set ft=html
" WARNING: this seems to fail in Haskell code when you move around the string
" (\()
au FileType haskell au CursorMoved * exe 'match ModeMsg /\V\<'.escape(expand('<cword>'), '/').'\>/'
-au BufEnter *.cabal set expandtab shiftwidth=4
-au BufEnter *.hs set expandtab shiftwidth=4
+au BufEnter *.cabal,*.hs set expandtab shiftwidth=4
"" Fruit salad is tasty.
let hs_highlight_all_types = 1
@@ -285,6 +317,8 @@ let perl_extended_vars=1 " highlight advanced perl vars inside strings
autocmd BufEnter *.c,*.h abbr FOR for (i = 0; i < 3; ++i)<CR>{<CR>}<Esc>O
autocmd BufLeave *.c,*.h unabbr FOR
+au BufEnter *.c,*.h set shiftwidth=5 tabstop=5
+
""" PHP
autocmd FileType php let php_folding=1
View
11 xmonad.hs
@@ -104,11 +104,11 @@ myKeys XConfig { modMask = mask } = M.fromList $
, ((mask , xK_s ), windowGo R True)
, ((mask , xK_n ), windowGo U True)
, ((mask , xK_t ), windowGo D True)
- -- Swap adjacent windows
- , ((mask .|. shiftMask, xK_h ), windowGo R True)
- , ((mask .|. shiftMask, xK_s ), windowGo L True)
- , ((mask .|. shiftMask, xK_n ), windowGo U True)
- , ((mask .|. shiftMask, xK_t ), windowGo D True)
+ -- Resize
+ , ((mask .|. shiftMask, xK_h ), sendMessage Shrink)
+ , ((mask .|. shiftMask, xK_s ), sendMessage Expand)
+ , ((mask .|. shiftMask, xK_n ), sendMessage MirrorExpand)
+ , ((mask .|. shiftMask, xK_t ), sendMessage MirrorShrink)
]
myWS :: [String]
@@ -121,6 +121,7 @@ myConfig = gnomeConfig { terminal = myTerminal
, workspaces = myWS
, manageHook = composeAll [ manageHook gnomeConfig
, manageSpawn
+ , className =? "Conky" --> doIgnore
, className =? "Wine" --> doFloat
, isFullscreen --> doFullFloat ]
, normalBorderColor = myBG
View
10 zshrc
@@ -156,7 +156,7 @@ hvim() {
tmux has-session -t $(hvim_session_name $next_session) 2&>> /dev/null \
&& ((next_session=next_session+1))
done
- if [[ -z $1 ]]; then # no file was given, attach
+ if [[ -z $1 ]]; then # no file was given, attach to latest session
((current_session=next_session-1))
if [[ $current_session -eq -1 ]]; then
echo "hvim: FATAL: no session to attach to, but no file given."
@@ -164,6 +164,14 @@ hvim() {
else
tmux attach -t $(hvim_session_name $current_session)
fi
+ elif [[ $1 -eq "-t" ]]; then # attach to specific session
+ if [[ -z $2 ]]; then
+ echo "hvim: FATAL: no session given with -t."
+ return 2
+ else
+ sess=$(hvim_session_name $2)
+ tmux attach -t $sess
+ fi
else # we're opening a new session
sess=$(hvim_session_name $next_session)
tmux -f ~/config/hvim.conf new-session -s \

No commit comments for this range

Something went wrong with that request. Please try again.