Skip to content

Commit

Permalink
Updated
Browse files Browse the repository at this point in the history
  • Loading branch information
heyjoakim committed Sep 30, 2019
1 parent a5ae1e6 commit 6de0886
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 80 deletions.
1 change: 1 addition & 0 deletions .Xresources
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
! Start
URxvt*scrollBar: false
URxvt*font: xft:Pragmata Pro:size=12
!URxvt*font: xft:LessPerfectDOSVGA:size=14
Expand Down
3 changes: 3 additions & 0 deletions .bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ alias cddiku="cd ~/Dropbox/diku"
alias mitlib="cd ~/Dropbox/diku/mitlib"
alias kal="firefox https://calendar.google.com/"

# tmux
alias tmuxkill="tmux tmuxkill-server"

# system
alias todo="kak ~/Documents/todo"
alias batt="cat /sys/class/power_supply/BAT0/status /sys/class/power_supply/BAT0/capacity | tr '\n' ' '; echo '% '"
Expand Down
35 changes: 35 additions & 0 deletions .tmux.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@

# remap prefix from 'C-b' to 'C-a'
unbind C-b
set-option -g prefix C-a
bind-key C-a send-prefix
bind-key n last-window

# Enable mouse mode (tmux 2.1 and above)
set -g mouse on

# Enable 256 colors
set -g default-terminal "screen-256color"

set -g status-position bottom
set -g status-bg colour234
set -g status-fg colour137
set -g status-attr dim
set -g status-left ''
set -g status-right '#[fg=colour233,bg=colour241,bold] %d/%m #[fg=colour233,bg=colour245,bold] %H:%M:%S '
set -g status-right-length 50
set -g status-left-length 20

setw -g window-status-current-fg colour81
setw -g window-status-current-bg colour238
setw -g window-status-current-attr bold
setw -g window-status-current-format ' #I#[fg=colour250]:#[fg=colour255]#W#[fg=colour50]#F '

setw -g window-status-fg colour138
setw -g window-status-bg colour235
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
116 changes: 36 additions & 80 deletions .vimrc
Original file line number Diff line number Diff line change
@@ -1,90 +1,46 @@
" Set compatibility to Vim only.
set nocompatible

" Helps force plug-ins to load correctly when it is turned back on below.
filetype off

" Turn on syntax highlighting.
syntax on
colo ron

" For plug-ins to load correctly.
filetype plugin indent on

" Turn off modelines
set modelines=0
colorscheme atom-dark-256

" Automatically wrap text that extends beyond the screen length.
set wrap
" Vim's auto indentation feature does not work properly with text copied from outisde of Vim. Press the <F2> key to toggle paste mode on/off.
nnoremap <F2> :set invpaste paste?<CR>
imap <F2> <C-O>:set invpaste paste?<CR>
set pastetoggle=<F2>

" Uncomment below to set the max textwidth. Use a value corresponding to the width of your screen.
" set textwidth=79
set formatoptions=tcqrn1
set tabstop=2
set shiftwidth=2
set softtabstop=2
set ruler
set hlsearch
set expandtab
set noshiftround

" Display 5 lines above/below the cursor when scrolling with a mouse.
set scrolloff=5
" Fixes common backspace problems
set backspace=indent,eol,start

" Speed up scrolling in Vim
set ttyfast

" Status bar
set laststatus=2

" Display options
set showmode
set showcmd

" Highlight matching pairs of brackets. Use the '%' character to jump between them.
set matchpairs+=<:>

" Display different types of white spaces.
set list
set listchars=tab:›\ ,trail:•,extends:#,nbsp:.

" Show line numbers
set number
filetype indent on
set autoindent
set shell=/bin/bash
set nocompatible
filetype off
map ; :Files<CR>
map <C-o> :NERDTreeToggle<CR>
map <C-l> :tabn<CR>
map <C-h> :tabp<CR>
map <C-n> :tabnew<CR>
" Set status line display
set statusline=%F%m%r%h%w\ [FORMAT=%{&ff}]\ [TYPE=%Y]\ [POS=%l,%v][%p%%]\ [BUFFER=%n]\ %{strftime('%c')}

" Encoding
set encoding=utf-8

" Highlight matching search patterns
set hlsearch
" Enable incremental search
set incsearch
" Include matching uppercase words with lowercase search term
set ignorecase
" Include only uppercase words with uppercase search term
set smartcase

" Store info from no more than 100 files at a time, 9999 lines of text, 100kb of data. Useful for copying large amounts of data between files.
set viminfo='100,<9999,s100

"vimrc colors to tmux
" use 256 colors in terminal
if !has("gui_running")
set t_Co=256
set term=screen-256color
endif
set rtp+=/usr/local/lib/python2.7/dist-packages/powerline/bindings/vim/

" fix cursor display in cygwin
if has("win32unix")
let &t_ti.="\e[1 q"
let &t_SI.="\e[5 q"
let &t_EI.="\e[1 q"
let &t_te.="\e[0 q"
endif
" Always show statusline
set laststatus=2

" Use 256 colours (Use this setting only if your terminal supports 256 colours)
set t_Co=256

set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin()
Plugin 'VundleVim/Vundle.vim'

" Add vundle plugins here "
Plugin 'powerline/powerline'
Plugin 'jiangmiao/auto-pairs'
Plugin 'tpope/vim-fugitive'
Plugin 'junegunn/fzf.vim'
Plugin 'scrooloose/nerdtree'
Plugin 'editorconfig/editorconfig-vim'
Plugin 'mattn/emmet-vim'
Plugin 'Valloric/YouCompleteMe'
Plugin 'scrooloose/syntastic'

call vundle#end()
filetype plugin indent on

0 comments on commit 6de0886

Please sign in to comment.