~pvsr/dotfiles

e22abde91154ee83065fd0e8c5b0cbf676462908 — Peter Rice 5 years ago f0bb379
colors, fonts, vim, etc.
7 files changed, 90 insertions(+), 47 deletions(-)

M X11/.Xresources
M i3/.config/i3/config
R i3blocks/{.config/i3blocks.conf => .i3blocks.conf}
M nvim/.config/nvim/init.vim
M tmux/.tmux.conf
M zsh/.zshenv
M zsh/.zshrc
M X11/.Xresources => X11/.Xresources +21 -14
@@ 1,9 1,9 @@
URxvt*font: xft:sourcecodepro:regular:size=9,xft:droidsansjapanese:size=9,xft:dejavusansmono:size=9
URxvt*boldFont: xft:sourcecodepro:bold:size=9,xft:droidsansjapanese:bold:size=9,xft:dejavusansmono:bold:size=9
URxvt*italicFont: xft:sourcecodepro:italic:size=9,xft:droidsansjapanese:italic:size=9,xft:dejavusansmono:italic:size=9
URxvt*boldItalicFont: xft:sourcecodepro:bold:italic:size=9,xft:droidsansjapanese:bold:italic:size=9,xft:dejavusansmono:bold:italic:size=9
URxvt*font: xft:Sauce Code Powerline:regular:size=9,xft:droidsansjapanese:size=9,xft:dejavusansmono:size=9
URxvt*boldFont: xft:Sauce Code Powerline:bold:size=9,xft:droidsansjapanese:bold:size=9,xft:dejavusansmono:bold:size=9
URxvt*italicFont: xft:Sauce Code Powerline:italic:size=9,xft:droidsansjapanese:italic:size=9,xft:dejavusansmono:italic:size=9
URxvt*boldItalicFont: xft:Sauce Code Powerline:bold:italic:size=9,xft:droidsansjapanese:bold:italic:size=9,xft:dejavusansmono:bold:italic:size=9

Emacs.font: xft:sourcecodepro:regular:size=9,xft:droidsansjapanese:size=9,xft:dejavusansmono:size=9
Emacs.font: xft:Sauce Code Powerline:regular:size=9,xft:droidsansjapanese:size=9,xft:dejavusansmono:size=9

URxvt*scrollBar: false
URxvt*intensityStyles: false


@@ 60,20 60,27 @@ URxvt*url-launcher: qutebrowser
*.highlightColor:         base02
*.highlightTextColor:     base04

*.color0:                 base01
*.color0:                 base00
*.color1:                 base08
*.color2:                 base0B
*.color3:                 base0A
*.color4:                 base0D
*.color5:                 base0F
*.color5:                 base0E
*.color6:                 base0C
*.color7:                 base06
*.color7:                 base05

*.color8:                 base00
*.color9:                 base09
*.color10:                base02
*.color11:                base03
*.color12:                base04
*.color8:                 base03
*.color9:                 base08
*.color10:                base0B
*.color11:                base0A
*.color12:                base0D
*.color13:                base0E
*.color14:                base05
*.color14:                base0C
*.color15:                base07

*.color16:                base09
*.color17:                base0F
*.color18:                base01
*.color19:                base02
*.color20:                base04
*.color21:                base06

M i3/.config/i3/config => i3/.config/i3/config +3 -3
@@ 1,10 1,10 @@
# super key
set $mod Mod4
font pango:sourcecodepro, fontawesome 9
font pango:sourcecodeproforpowerline, fontawesome 9
floating_modifier $mod
bindsym $mod+Return exec i3-sensible-terminal
bindsym $mod+Shift+q kill
bindsym $mod+d exec j4-dmenu-desktop --dmenu="dmenu -fn 'sourcecodepro-9' -i"
bindsym $mod+d exec j4-dmenu-desktop --dmenu="dmenu -fn 'sourcecodeproforpowerline-9' -i"

bindsym $mod+h focus left
bindsym $mod+j focus down


@@ 136,4 136,4 @@ for_window [class="qutebrowser"] border pixel 0
for_window [title="Google Chrome"] border pixel 0
for_window [class="Eclipse"] border pixel 0
for_window [class="Steam"] border pixel 0
for_window [instance="Steam.exe"] border pixel 0
\ No newline at end of file
for_window [instance="Steam.exe"] border pixel 0

R i3blocks/.config/i3blocks.conf => i3blocks/.i3blocks.conf +0 -0
M nvim/.config/nvim/init.vim => nvim/.config/nvim/init.vim +54 -24
@@ 1,9 1,28 @@
call plug#begin('~/.local/share/nvim/plugged')

Plug 'airblade/vim-gitgutter'
Plug 'chriskempson/base16-vim'
Plug 'junegunn/fzf.vim'
Plug 'justinmk/vim-sneak'
Plug 'tpope/vim-abolish'
Plug 'tpope/vim-commentary'
Plug 'tpope/vim-repeat'
Plug 'tpope/vim-sleuth'
Plug 'tpope/vim-surround'
Plug 'tpope/vim-unimpaired'
Plug 'vim-airline/vim-airline'
Plug 'vim-airline/vim-airline-themes'

call plug#end()
filetype plugin indent on
syntax on

let base16colorspace=256
colorscheme base16-eighties
set background=dark

set number
set relativenumber

set expandtab
set tabstop=4


@@ 16,7 35,7 @@ set nrformats+=alpha
set hidden
set ruler

set scrolloff=1
set scrolloff=2
set sidescrolloff=5

set shell=/usr/bin/zsh


@@ 30,7 49,7 @@ set splitright
set cursorline
set report=0

set autochdir
" set autochdir
set confirm
set undofile



@@ 55,48 74,59 @@ map Y y$

map Q <nop>

nnoremap p p=`]<C-o>
nnoremap P P=`]<C-o>
cnoremap <C-A> <Home>
cnoremap <C-E> <End>

vnoremap < <gv
vnoremap > >gv

let mapleader="\<Space>"
map <Leader>w :w<CR>
map <Leader>q :q<CR>
map <Leader>Q :q!<CR>
map <Leader>wq :wq<CR>
map <Leader>ee :e <c-r>=expand("%:p:h")<cr>/

map <Leader><Space> /
map <Leader><M-Space> ?
map <silent> <Leader>sc :nohlsearch<CR>

map <Leader>we :new 
map <Leader>wc :q<CR>
map <Leader>w- :split<CR>
map <Leader>w/ :vsplit<CR>
map <Leader>wj <C-W>j
map <Leader>wk <C-W>k
map <Leader>wh <C-W>h
map <Leader>wl <C-W>l
map <Leader>sc :q<CR>
map <Leader>s- :split<CR>
map <Leader>s/ :vsplit<CR>
map <Leader>sj <C-W>j
map <Leader>sk <C-W>k
map <Leader>sh <C-W>h
map <Leader>sl <C-W>l

map <Leader>bd :bdelete<CR>
map <Leader>bD :bdelete!<CR>
map <Leader>l :bnext<CR>
map <Leader>h :bprev<CR>
map <silent> <Leader>l :bnext<CR>
map <silent> <Leader>h :bprev<CR>

map <Leader>tn :tabnew<CR>
map <Leader>to :tabonly<CR>
map <Leader>td :tabclose<CR>
map <Leader>tl :tabnext<CR>
map <Leader>th :tabprev<CR>
map <Leader>te :e <c-r>=expand("%:p:h")<cr>/

map <silent> <C-j> :tabnext<CR>
map <silent> <C-k> :tabprev<CR>

let g:lasttab = 1
nmap <Leader>tt :exe "tabn ".g:lasttab<CR>
nmap <silent> <Leader>tt :exe "tabn ".g:lasttab<CR>
au TabLeave * let g:lasttab = tabpagenr()

map <Leader>cd :cd %:p:h<CR>:pwd<CR>

map <Leader>cc :botright cope<CR>
map <Leader>cn :cn<CR>
map <Leader>cp :cp<CR>

vnoremap <silent> * :call VisualSelection('f', '')<CR>
vnoremap <silent> # :call VisualSelection('b', '')<CR>

" fzf
map <Leader>ff :Files<CR>
map <Leader>bb :Buffers<CR>
map <Leader>sl :Lines<CR>
map <Leader>ww :Windows<CR>

" sneak
let g:sneak#streak = 1

" airline
let g:airline_powerline_fonts = 1
let g:airline#extensions#tabline#enabled = 1

M tmux/.tmux.conf => tmux/.tmux.conf +4 -4
@@ 1,5 1,5 @@
set -g prefix C-a
bind C-a send-prefix
set -g prefix C-Space
bind C-Space send-prefix
unbind C-b

set -g mouse on


@@ 27,7 27,7 @@ bind -t vi-copy 'Bspace' halfpage-up
bind C-c run "tmux save-buffer - | xclip -i -sel clipboard"
bind C-v run "tmux set-buffer \"$(xclip -o -sel clipboard)\"; tmux paste-buffer"

bind | split-window -h
bind / split-window -h
bind - split-window -v
unbind '"'
unbind %


@@ 43,4 43,4 @@ bind -r C-l select-window -t :+
bind -r H resize-pane -L 5
bind -r J resize-pane -D 5
bind -r K resize-pane -U 5
bind -r L resize-pane -R 5
\ No newline at end of file
bind -r L resize-pane -R 5

M zsh/.zshenv => zsh/.zshenv +4 -1
@@ 2,4 2,7 @@ typeset -U path
path=(~/bin ~/.cabal/bin $path[@])
ssh_auth_sock=/run/user/1000/ssh-agent.socket
browser="qutebrowser"
editor="et"
\ No newline at end of file
visual="nvim"
editor="nvim"
fzf_default_command='ag -fg ""'
fzf_ctrl_t_command='ag -fg ""'

M zsh/.zshrc => zsh/.zshrc +4 -1
@@ 16,5 16,8 @@ fi

source $ZSH/oh-my-zsh.sh

source $HOME/bin/base16-eighties.dark.sh

source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
source /usr/share/doc/pkgfile/command-not-found.zsh
\ No newline at end of file
source /usr/share/doc/pkgfile/command-not-found.zsh
source /etc/profile.d/fzf.zsh