Commit 5bc58a08 authored by Oscar Brink's avatar Oscar Brink
Browse files

Some restructuring + excluding gitignore

parent cd41867e
#
# ~/.bashrc
#
# If not running interactively, don't do anything
[[ $- != *i* ]] && return
alias ls='ls --color=auto'
PS1='[\u@\h \W]\$ '
export PATH=$PATH:~/bin
alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
......@@ -9,15 +9,13 @@
#
# Please see http://i3wm.org/docs/userguide.html for a complete reference!
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.
font pango:monospace 8
#font pango:monospace 8
# 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
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
......@@ -26,7 +24,17 @@ font pango:monospace 8
# 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
# Set mod key to super.
set $mod Mod4
# use these keys for focus, movement, and resize directions when reaching for
# the arrows is not convenient
set $up h
set $down j
set $left k
set $right l
# use Mouse+$mod to drag floating windows to their wanted position
floating_modifier $mod
# start a terminal
......@@ -56,10 +64,10 @@ 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+odiaeresis move right
bindsym $mod+Shift+h move left
bindsym $mod+Shift+j move down
bindsym $mod+Shift+k move up
bindsym $mod+Shift+l move right
# alternatively, you can use the cursor keys:
bindsym $mod+Shift+Left move left
......@@ -132,10 +140,10 @@ mode "resize" {
# 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 odiaeresis resize grow width 10 px or 10 ppt
bindsym h resize shrink width 10 px or 10 ppt
bindsym j resize grow height 10 px or 10 ppt
bindsym k resize shrink height 10 px or 10 ppt
bindsym l 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
......
# Ignore all files
*
# Exceptions
!README.md
!.Xresources
!.vim/colors
!.vim/ftdetect
!.vim/ftplugin
!.vim/syntax
!.config/i3
!.config/i3status.conf
!.bashrc
!.gitignore
......@@ -32,8 +32,7 @@ hi Normal ctermfg=251
" Error message
" Color: Red1
" BgColor: Grey39
hi ErrorMsg ctermfg=203 ctermbg=241
hi Error ctermfg=203 ctermbg=232 cterm=none
hi ErrorMsg ctermfg=196 ctermbg=241
" Visual
......@@ -135,7 +134,7 @@ hi Comment ctermfg=244 cterm=none
" Constants (numbers)
" Color: MediumOrchid3
hi Constant ctermfg=98 cterm=none
hi Constant ctermfg=133 cterm=none
" Escape sequences
......@@ -184,7 +183,3 @@ hi Underlined cterm=underline
" Color: Chartreuse4
hi String ctermfg=64
" YCM highlighting stuff
hi YcmErrorSection ctermfg=203 cterm=underline
......@@ -6,12 +6,6 @@
" from the main file. To override, simply uncomment them.
" Python class methods
hi pythonBuiltinMethods ctermfg=90
" TODO temp:
hi pythonSelf ctermfg=132
" All Python keywords
" Color: Orange1
hi link pythonStatement pythonAllKeywords
......
......@@ -8,6 +8,7 @@ hi link rustType rustKeyword
hi link rustRepeat rustKeyword
hi link rustConditional rustKeyword
hi link rustEnumVariant rustKeyword
hi link rustStructure rustKeyword
hi rustKeyword ctermfg=124
......
......@@ -57,7 +57,8 @@ filetype plugin indent on " required
" see :h vundle for more details or wiki for FAQ
" Put your non-Plugin stuff after this line
" Syntastic -------------------
" Syntastic ----------------------------------
set statusline+=%#warningmsg#
set statusline+=%{SyntasticStatuslineFlag()}
set statusline+=%*
......@@ -66,11 +67,17 @@ let g:syntastic_always_populate_loc_list = 1
let g:syntastic_auto_loc_list = 1
let g:syntastic_check_on_open = 1
let g:syntastic_check_on_wq = 0
"let g:syntastic_c_checkers = ["make"]
let g:syntastic_c_checkers = ["make"]
" -------------------------------------------
"
" rust.vim ----------------------------------
let g:rustfmt_autosave = 1
" -------------------------------------------
" Show filename always
set statusline+=%F
filetype plugin indent on
" show existing tab with 4 spaces width
set tabstop=4
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment