1
0
mirror of https://github.com/frebib/dotfiles.git synced 2024-06-14 12:57:23 +00:00

Merge branch 'master' into surface-docked

This commit is contained in:
Joe Groocock 2018-03-31 21:57:02 +01:00
commit 2733f214eb
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86
5 changed files with 62 additions and 28 deletions

View File

@ -38,7 +38,7 @@ urxvt.iso14755_52: false
urxvt.perl-ext-common: default,clipboard,vtwheel,font-size urxvt.perl-ext-common: default,clipboard,vtwheel,font-size
urxvt.keysym.Shift-Control-C: perl:clipboard:copy urxvt.keysym.Shift-Control-C: perl:clipboard:copy
urxvt.keysym.Shift-Control-V: perl:clipboard:paste urxvt.keysym.Shift-Control-V: perl:clipboard:paste
urxvt.url-launcher: /usr/bin/google-chrome-stable urxvt.url-launcher: /usr/bin/chromium
urxvt.matcher.button: 1 urxvt.matcher.button: 1
urxvt.keysym.C-Up: font-size:increase urxvt.keysym.C-Up: font-size:increase
@ -94,25 +94,3 @@ urxvt*colorMode: on
*.color6: #10aeba *.color6: #10aeba
*.color14: #5ddae2 *.color14: #5ddae2
!-----------------------------
! Rofi config
! State: 'bg', 'fg', 'bgalt' 'hlbg', 'hlfg'
rofi.color-window: #F2383C4A, #2F343F
rofi.color-normal: #00383C4A, #D3DAE3, #00383C4A, #5294E2, #ECEFF1
rofi.bc: #CC383C4A
rofi.bw: 5
rofi.padding: 8
rofi.lines: 12
rofi.width: 40
rofi.font: Noto Sans 14
rofi.line-margin: 6
rofi.sep: |
rofi.prompt: >
rofi.ssh-command: {terminal} -e "{ssh-client} {host}"
rofi.separator-style: solid
rofi.matching: glob
rofi.tokenize: true
rofi.normal-window: true

26
.config/rofi/config Normal file
View File

@ -0,0 +1,26 @@
!-----------------------------
! Rofi config
!-----------------------------
! State: 'bg', 'fg', 'bgalt' 'hlbg', 'hlfg'
rofi.color-window: #F2383C4A, #2F343F
rofi.color-normal: #00383C4A, #D3DAE3, #00383C4A, #5294E2, #ECEFF1
rofi.bc: #CC383C4A
rofi.bw: 5
rofi.padding: 8
rofi.lines: 12
rofi.width: 40
rofi.font: Noto Sans 14
rofi.line-margin: 6
rofi.sep: |
rofi.prompt: >
rofi.ssh-command: {terminal} -e "{ssh-client} {host}"
rofi.separator-style: solid
rofi.kb-row-tab: Shift+Tab
rofi.kb-row-select: Tab
rofi.matching: glob
rofi.tokenize: true
rofi.normal-window: true
! vim: ft=xdefaults

View File

@ -35,22 +35,32 @@ set scrolloff=6
set nojoinspaces set nojoinspaces
set updatetime=500 " reduce delay from 4s default set updatetime=500 " reduce delay from 4s default
" te seems like the correct shorthand, not tabe
cmap te tabedit
let mapleader="\<space>"
" Autosave settings " Autosave settings
function! SaveIfExist() function! SaveIfExist()
if @% != "" && filereadable(@%) && !&readonly if @% != "" && filereadable(@%) && !&readonly && &modified
write write
endif endif
endfunction endfunction
set autowrite set autowrite
autocmd CursorHold,CursorHoldI,InsertLeave,FocusLost * call SaveIfExist() autocmd CursorHold,CursorHoldI,InsertLeave,FocusGained,FocusLost * call SaveIfExist()
" Search options " Search options
set hlsearch set hlsearch
set ignorecase set ignorecase
set smartcase set smartcase
set magic
" More natural splits
set splitbelow " Horizontal split below current.
set splitright " Vertical split to right of current.
" GVim settings " GVim settings
set guifont=Sauce\ Code\ Pro\ 10.5 set guifont=Sauce\ Code\ Pro\ 9
set guioptions= set guioptions=
" Whitespace highlight settings " Whitespace highlight settings
@ -64,6 +74,10 @@ if exists('+colorcolumn')
autocmd filetype c,h,cpp,hpp match ErrorMsg '\%>80v.\+' autocmd filetype c,h,cpp,hpp match ErrorMsg '\%>80v.\+'
endif endif
" Highlight line and column of cursor
set cul cuc
highlight CursorLine cterm=NONE ctermbg=8
highlight CursorColumn cterm=NONE ctermbg=8
" set the runtime path to include Vundle and initialize " set the runtime path to include Vundle and initialize
set rtp+=~/.config/vim/bundle/Vundle.vim set rtp+=~/.config/vim/bundle/Vundle.vim
@ -90,6 +104,7 @@ Plugin 'chr4/nginx.vim'
Plugin 'PotatoesMaster/i3-vim-syntax' Plugin 'PotatoesMaster/i3-vim-syntax'
Plugin 'lervag/vimtex' Plugin 'lervag/vimtex'
Plugin 'JamshedVesuna/vim-markdown-preview' Plugin 'JamshedVesuna/vim-markdown-preview'
Plugin 'junegunn/fzf.vim'
call vundle#end() call vundle#end()
@ -135,6 +150,12 @@ let g:tagbar_show_linenumbers = 1
let g:tagbar_singleclick = 1 let g:tagbar_singleclick = 1
let g:tagbar_autopreview = 1 let g:tagbar_autopreview = 1
" NERDTree configuration
map <leader><space> :NERDTreeToggle<CR>
" FZF configurationn
map <leader><tab> :Files<CR>
" Disable mouse " Disable mouse
set mouse=nicr set mouse=nicr
nnoremap <LeftMouse> <nop> nnoremap <LeftMouse> <nop>
@ -144,7 +165,6 @@ nnoremap <RightMouse> <nop>
inoremap <C-Space> <C-x><C-o> inoremap <C-Space> <C-x><C-o>
inoremap <C-@> <C-Space> inoremap <C-@> <C-Space>
let mapleader="\<space>"
" Unbind arrow keys " Unbind arrow keys
for prefix in ['n', 'v'] for prefix in ['n', 'v']
for key in ['<Up>', '<Down>', '<Left>', '<Right>'] for key in ['<Up>', '<Down>', '<Left>', '<Right>']
@ -232,14 +252,18 @@ if (exists("g:use_dvorak") && g:use_dvorak == 1)
\ 'x': ['tsd', 'tsD'], \ 'x': ['tsd', 'tsD'],
\} \}
let NERDTreeMapOpenInTab='\t'
endif endif
" Save aliases. " Save aliases.
noremap <Leader>q :wq<CR>
com! W w com! W w
com! Q q com! Q q
com! Wq wq com! Wq wq
com! WQ wq com! WQ wq
com! Wqa wqa
com! WQa wqa
com! WQA wqa
" Write with sudo " Write with sudo
cmap w!! w !sudo tee > /dev/null % cmap w!! w !sudo tee > /dev/null %

View File

@ -58,6 +58,8 @@ alias make="make -j$(nproc)"
alias dd='dd status=progress' alias dd='dd status=progress'
alias env='env | sort' alias env='env | sort'
alias ssh="ssh -tt" alias ssh="ssh -tt"
alias vim="vim --servername vim -p"
alias vi=vim
alias grip='grip --user=frebib --pass=$GRIP_API_KEY' alias grip='grip --user=frebib --pass=$GRIP_API_KEY'
alias acme.sh='$XDG_CONFIG_HOME/acme.sh/acme.sh --home $XDG_CONFIG_HOME/acme.sh --config-home $XDG_CONFIG_HOME/acme.sh --log $XDG_CONFIG_HOME/acme.sh/acme.sh.log' alias acme.sh='$XDG_CONFIG_HOME/acme.sh/acme.sh --home $XDG_CONFIG_HOME/acme.sh --config-home $XDG_CONFIG_HOME/acme.sh --log $XDG_CONFIG_HOME/acme.sh/acme.sh.log'
alias acmesh='$XDG_CONFIG_HOME/acme.sh/acme.sh --home $XDG_CONFIG_HOME/acme.sh --config-home $XDG_CONFIG_HOME/acme.sh --log $XDG_CONFIG_HOME/acme.sh/acme.sh.log' alias acmesh='$XDG_CONFIG_HOME/acme.sh/acme.sh --home $XDG_CONFIG_HOME/acme.sh --config-home $XDG_CONFIG_HOME/acme.sh --log $XDG_CONFIG_HOME/acme.sh/acme.sh.log'

View File

@ -15,3 +15,7 @@ MODENAME=${MODELINE%% *}
xrandr --newmode $MODELINE 2>/dev/null || true xrandr --newmode $MODELINE 2>/dev/null || true
xrandr --addmode $OUTPUT $MODENAME 2>/dev/null || true xrandr --addmode $OUTPUT $MODENAME 2>/dev/null || true
xrandr --output $OUTPUT --mode $MODENAME xrandr --output $OUTPUT --mode $MODENAME
if [ -f ~/.fehbg -a -x ~/.fehbg ]; then
~/.fehbg
fi