Commit d41e6124 authored by PoroCYon's avatar PoroCYon

stuff

parent 78593525
......@@ -13,6 +13,7 @@
#define S_base02 #073642
#define S_base01 #586e75
#define S_base00 #657b83
#define hack_color #1c1c1c
!#define S_base03 0000/2b2b/3636/d800
!#define S_base02 0707/3636/4242/d800
......@@ -43,7 +44,7 @@ URxvt.keysym.Control-Shift-V: perl:clipboard:paste
URxvt.keysym.M-u: perl:url-select:select_next
URxvt.keysym.M-Escape: perl:keyboard-select:activate
URxvt.keysym.M-s: perl:keyboard-select:search
URxvt*background: rgba:0000/2b2b/3636/d800
URxvt*background: rgba:0000/2b2b/3636/e800
!URxvt.transparent: true
!URxvt.shading: 20
URxvt.url-select.launcher: iceweasel
......@@ -67,7 +68,8 @@ URxvt.urgentOnBell: true
*color5 : S_magenta
*color6 : S_cyan
*color7 : S_base2
*color8 : S_base03
!*color8 : S_base03
*color8 : hack_color
*color9 : S_orange
*color10: S_base01
*color11: S_base00
......
......@@ -4,5 +4,4 @@
[ -f ~/.profile ] && . ~/.profile
[ -f /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
[ -f ~/.fzf.bash ] && source ~/.fzf.bash
......@@ -34,6 +34,7 @@ floating_modifier $mod
bindsym $mod+B exec $term
bindsym $mod+T exec $termt
bindsym $mod+Y exec $termk
bindsym $mod+Shift+s exec passmenu
# kill focused window
bindsym $mod+Shift+q kill
......@@ -209,5 +210,5 @@ workspace U output VGA-1
exec --no-startup-id bash ~/.config/i3/putws.sh
exec --no-startup-id bash ~/.config/sway/changebg.sh
bindsym $mod+Shift+g exec --no-startup-id bash ~/.config/sway/changebg.sh
exec --no-startup-id setxkbmap -layout be -option ctrl:swapcaps
exec --no-startup-id setxkbmap -layout be -option ctrl:swapcaps -option compose:menu
exec --no-startup-id compton -bCG --config ~/.config/compton.conf
......@@ -96,7 +96,7 @@ let s:plug_src = 'https://github.com/junegunn/vim-plug.git'
let s:plug_tab = get(s:, 'plug_tab', -1)
let s:plug_buf = get(s:, 'plug_buf', -1)
let s:mac_gui = has('gui_macvim') && has('gui_running')
let s:is_win = has('win32') || has('win64')
let s:is_win = has('win32')
let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win)
let s:vim8 = has('patch-8.0.0039') && exists('*job_start')
let s:me = resolve(expand('<sfile>:p'))
......@@ -193,6 +193,14 @@ function! s:ask_no_interrupt(...)
endtry
endfunction
function! s:lazy(plug, opt)
return has_key(a:plug, a:opt) &&
\ (empty(s:to_a(a:plug[a:opt])) ||
\ !isdirectory(a:plug.dir) ||
\ len(s:glob(s:rtp(a:plug), 'plugin')) ||
\ len(s:glob(s:rtp(a:plug), 'after/plugin')))
endfunction
function! plug#end()
if !exists('g:plugs')
return s:err('Call plug#begin() first')
......@@ -214,7 +222,7 @@ function! plug#end()
continue
endif
let plug = g:plugs[name]
if get(s:loaded, name, 0) || !has_key(plug, 'on') && !has_key(plug, 'for')
if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for')
let s:loaded[name] = 1
continue
endif
......@@ -763,6 +771,9 @@ function! s:prepare(...)
execute 'silent! unmap <buffer>' k
endfor
setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell
if exists('+colorcolumn')
setlocal colorcolumn=
endif
setf vim-plug
if exists('g:syntax_on')
call s:syntax()
......@@ -799,7 +810,7 @@ function! s:bang(cmd, ...)
let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd
if s:is_win
let batchfile = tempname().'.bat'
call writefile(['@echo off', cmd], batchfile)
call writefile(["@echo off\r", cmd . "\r"], batchfile)
let cmd = batchfile
endif
let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
......@@ -1008,6 +1019,8 @@ function! s:update_impl(pull, force, args) abort
let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input'
endif
let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : ''
" Python version requirement (>= 2.7)
if python && !has('python3') && !ruby && !use_job && s:update.threads > 1
redir => pyv
......@@ -1099,7 +1112,7 @@ function! s:update_finish()
if !v:shell_error && filereadable(spec.dir.'/.gitmodules') &&
\ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir))
call s:log4(name, 'Updating submodules. This may take a while.')
let out .= s:bang('git submodule update --init --recursive 2>&1', spec.dir)
let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir)
endif
let msg = s:format_message(v:shell_error ? 'x': '-', name, out)
if v:shell_error
......@@ -1196,7 +1209,7 @@ function! s:spawn(name, cmd, opts)
let s:jobs[a:name] = job
let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd
if !empty(job.batchfile)
call writefile(['@echo off', cmd], job.batchfile)
call writefile(["@echo off\r", cmd . "\r"], job.batchfile)
let cmd = job.batchfile
endif
let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd)
......@@ -1318,7 +1331,7 @@ while 1 " Without TCO, Vim stack is bound to explode
let name = keys(s:update.todo)[0]
let spec = remove(s:update.todo, name)
let new = !isdirectory(spec.dir)
let new = empty(globpath(spec.dir, '.git', 1))
call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
redraw
......@@ -2023,7 +2036,7 @@ function! s:system(cmd, ...)
let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
if s:is_win
let batchfile = tempname().'.bat'
call writefile(['@echo off', cmd], batchfile)
call writefile(["@echo off\r", cmd . "\r"], batchfile)
let cmd = batchfile
endif
return system(s:is_win ? '('.cmd.')' : cmd)
......@@ -2357,7 +2370,7 @@ function! s:preview_commit()
let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
if s:is_win
let batchfile = tempname().'.bat'
call writefile(['@echo off', cmd], batchfile)
call writefile(["@echo off\r", cmd . "\r"], batchfile)
let cmd = batchfile
endif
execute 'silent %!' cmd
......@@ -2407,7 +2420,11 @@ function! s:diff()
call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
for [k, v] in plugs
let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
let diff = s:system_chomp('git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)')), v.dir)
let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)'))
if has_key(v, 'rtp')
let cmd .= ' -- '.s:shellesc(v.rtp)
endif
let diff = s:system_chomp(cmd, v.dir)
if !empty(diff)
let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : ''
call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)')))
......@@ -2426,8 +2443,13 @@ function! s:diff()
\ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : ''))
if cnts[0] || cnts[1]
nnoremap <silent> <buffer> <cr> :silent! call <SID>preview_commit()<cr>
nnoremap <silent> <buffer> o :silent! call <SID>preview_commit()<cr>
nnoremap <silent> <buffer> <plug>(plug-preview) :silent! call <SID>preview_commit()<cr>
if empty(maparg("\<cr>", 'n'))
nmap <buffer> <cr> <plug>(plug-preview)
endif
if empty(maparg('o', 'n'))
nmap <buffer> o <plug>(plug-preview)
endif
endif
if cnts[0]
nnoremap <silent> <buffer> X :call <SID>revert()<cr>
......
......@@ -6,42 +6,22 @@ syntax enable
call plug#begin('~/.config/nvim/plugged')
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
"Plug 'junegunn/fzf.vim'
Plug 'altercation/vim-colors-solarized'
"Plug 'PoroCYon/vim-comment'
Plug 'kongo2002/fsharp-vim'
Plug 'idris-hackers/idris-vim'
"Plug 'PProvost/vim-ps1'
"Plug 'wting/rust.vim'
"Plug 'cespare/vim-toml'
Plug 'kongo2002/fsharp-vim', { 'for': 'fsharp' }
"Plug 'idris-hackers/idris-vim', { 'for': 'idris,idr,lidr' }
Plug 'airblade/vim-gitgutter'
"Plug 'keith/swift.vim'
"Plug 'vim-scripts/ats-lang-vim'
"Plug 'jamessan/vim-gnupg'
Plug 'roxma/nvim-completion-manager'
Plug 'roxma/ncm-clang'
"Plug 'nsf/gocode'
Plug 'sheerun/vim-polyglot'
"Plug 'beyondmarc/hlsl.vim'
"Plug 'chr4/nginx.vim'
"Plug 'chr4/sslsecure.vim'
Plug 'scrooloose/nerdtree'
Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
Plug 'itchyny/lightline.vim'
"Plug 'majutsushi/tagbar'
"Plug 'junegunn/vim-easy-align'
"Plug 'lervag/vimtex'
"Plug 'lervag/vimtex', { 'for': 'tex,plaintex' }
Plug 'jiangmiao/auto-pairs'
"Plug 'OmniSharp/omnisharp-vim'
"Plug 'autozimu/LanguageClient-neovim', { 'do': ':UpdateRemotePlugins' }
"Plug 'tpope/vim-dispatch'
"Plug 'Valloric/YouCompleteMe'
Plug 'tpope/vim-obsession'
"Plug 'neovimhaskell/haskell-vim', { 'for': 'haskell' }
Plug 'Shougo/echodoc.vim'
Plug 'xtal8/traces.vim'
Plug 'tpope/vim-fugitive'
Plug 'sirtaj/vim-openscad'
Plug 'sirtaj/vim-openscad', { 'for': 'openscad' }
Plug 'ARM9/arm-syntax-vim', { 'for': 'asm' }
Plug 'gryf/kickass-syntax-vim', { 'for': 'asm' }
Plug 'Shirk/vim-gas', { 'for': 'asm' }
"Plug 'emdeeeks/vim-titansi'
call plug#end()
......@@ -106,6 +86,7 @@ set hlsearch
set incsearch
set magic
set mat=2
set colorcolumn=80
set history=0
......@@ -121,24 +102,8 @@ let maplocalleader=","
let g:maplocalleader=","
let g:airline_powerline_fonts=1
"let g:LanguageClient_autoStart=1
let g:OmniSharp_start_server = 1
let g:OmniSharp_selector_ui = 'fzf'
let g:OmniSharp_server_type = 'v1'
let g:haskell_enable_quantification=1
let g:haskell_enable_recursivedo=1
let g:haskell_enable_arrowsyntax=1
let g:haskell_enable_pattern_synonyms=1
let g:haskell_enable_typeroles=1
let g:haskell_enable_static_pointers=1
command! -nargs=1 Rename :call OmniSharp#RenameTo("<args>")
nnoremap <leader>th :OmniSharpHighlightTypes<cr>
set foldmethod=indent
set foldnestmax=5
set foldnestmax=10
set foldlevelstart=99
set foldcolumn=0
......@@ -172,7 +137,6 @@ noremap ,, ,
nnoremap ù :
nmap <leader>nt :NERDTreeToggle<cr>
nmap <leader>f :FZF<cr>
" AZERTY
" hjlk -> jklm ('m' is right next to 'l' and under 'p')
......@@ -190,22 +154,18 @@ nnoremap L <S-Up>
nnoremap K <S-Down>
nmap J <S-Left>
"nnoremap u z
nmap e <End>
nmap c <Home>
vmap e <End>
vmap c <Home>
"nmap e <Insert><Insert>
"nnoremap Q <nop>
inoremap df <Esc>
nnoremap ² <Esc>
nnoremap <silent> df <Ins>
nnoremap rt xp
"nnoremap rt xp
nnoremap <leader>v V`]
nnoremap <leader>ev :vsplit $MYVIMRC<cr>
......@@ -233,9 +193,6 @@ nmap <leader>sm :rightbelow vnew<cr>
nmap <leader>sk :leftabove new<cr>
map <leader>sl :rightbelow new<cr>
"map ; b
"map o w
nnoremap <leader>bp :bp<cr>
nnoremap <leader>bn :bn<cr>
noremap <leader>bd :Bd<cr>
......@@ -257,6 +214,12 @@ au BufNewFile,BufRead *.glsl set filetype=glsl
au BufNewFile,BufRead *.sspt set filetype=sh
" xbps-src packages
au BufNewFile,BufRead template
\ setlocal noet |
\ setlocal ts=4 |
\ setlocal ft=sh
" Indent .myr and .go files with tabs
autocmd FileType myr
\ setlocal noet |
......@@ -276,46 +239,5 @@ autocmd FileType arduino
\ setlocal ts=2 |
\ setlocal sw=2
xmap ga <Plug>(EasyAlign)
nmap ga <Plug>(EasyAlign)
"inoremap <expr> <CR> (pumvisible() ? "\<c-y>\<cr>" : "\<CR>")
inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
"augroup omnisharp_cmds
" autocmd!
"
" "autocmd FileType cs setlocal omnifunc=OmniSharp#Complete
" autocmd CursorHold *.cs call OmniSharp#TypeLookupWithoutDocumentation()
" autocmd CursorHold *.cs nnoremap <leader>gt call OmniSharp#TypeLookupWithoutDocumentation()
"
" autocmd FileType cs nnoremap gd :OmniSharpGotoDefinition<cr>
" autocmd FileType cs nnoremap <leader>fi :OmniSharpFindImplementations<cr>
" autocmd FileType cs nnoremap <leader>ft :OmniSharpFindType<cr>
" autocmd FileType cs nnoremap <leader>fs :OmniSharpFindSymbol<cr>
" autocmd FileType cs nnoremap <leader>fu :OmniSharpFindUsages<cr>
" "finds members in the current buffer
" autocmd FileType cs nnoremap <leader>fm :OmniSharpFindMembers<cr>
" " cursor can be anywhere on the line containing an issue
" autocmd FileType cs nnoremap <leader>x :OmniSharpFixIssue<cr>
" autocmd FileType cs nnoremap <leader>fx :OmniSharpFixUsings<cr>
" autocmd FileType cs nnoremap <leader>tt :OmniSharpTypeLookup<cr>
" autocmd FileType cs nnoremap <leader>dc :OmniSharpDocumentation<cr>
" "navigate up by method/property/field
" autocmd FileType cs nnoremap <C-L> :OmniSharpNavigateUp<cr>
" "navigate down by method/property/field
" autocmd FileType cs nnoremap <C-K> :OmniSharpNavigateDown<cr>
"
" autocmd FileType cs call cm#register_source({'name' : 'cm-csharp',
" \ 'priority': 9,
" \ 'scoping': 1,
" \ 'scopes': ['cs','csharp'],
" \ 'abbreviation': 'cs',
" \ 'word_pattern': '[\w]+',
" \ 'cm_refresh_patterns':['[\w]+\s*:\s+'],
" \ 'cm_refresh': {'omnifunc': 'OmniSharp#Complete'},
" \ })
"augroup END
"set shortmess+=c
......@@ -95,12 +95,18 @@ ext 1 = man "$1"
ext s[wmf]c, has zsnes, X = zsnes "$1"
ext s[wmf]c, has snes9x-gtk,X = snes9x-gtk "$1"
ext nes, has fceux, X = fceux "$1"
ext gba, has mgba-qt, X = mgba-qt "$1"
ext gba, has mgba, X = mgba "$1"
ext gba, has vbam, X = vbam "$1"
ext gba, has vba, X = vba "$1"
ext gba, has mgba-qt, X = mgba-qt "$1"
ext gba, has mgba, X = mgba "$1"
ext exe, has wine = wine "$1"
ext exe, has mono = mono "$1"
ext nds, has desmume-cli, X = desmume-cli "$1"
ext nds, has desmume, X = desmume "$1"
ext prg, has x64sc, X = x64sc "$1"
ext d64, has x64sc, X = x64sc "$1"
ext prg, has x64, X = x64 "$1"
ext d64, has x64, X = x64 "$1"
name ^(GNU|BSD)?[mM]akefile$ = make -f "$1"
#--------------------------------------------
......
config
\ No newline at end of file
......@@ -22,18 +22,20 @@ for_window [title="^xmessage$"] floating enable
#for_window [window_role="pop-up"] floating enable
for_window [class="^.*"] border pixel 3
gaps inner 5
gaps inner 2
gaps outer 2
floating_modifier $mod
default_border none
### Key bindings
#
# Basics:
#
bindsym $mod+B exec $term
bindsym $mod+Shift+f exec $term
bindsym $mod+T exec $termt
bindsym $mod+Y exec $termk
bindsym $mod+Shift+s exec passmenu
# kill focused window
bindsym $mod+Shift+q kill
......@@ -198,6 +200,11 @@ exec xrdb -merge ~/.Xresources
# Read sway-bar(5) for more information about this section.
include ~/.config/sway/conf.d/*
include ~/.config/sway/`hostname`/*
input * {
xkb_layout be
xkb_options ctrl:swapcaps,compose:menu
}
include ~/.config/sway/conf.d/*.conf
include ~/.config/sway/`hostname`/*.conf
set bell-style none
set enable-bracketed-paste on
......@@ -9,7 +9,7 @@ export LC_COLLATE='C'
export LC_TIME='nl_BE.UTF-8'
export XKB_DEFAULT_LAYOUT='be'
export XKB_DEFAULT_OPTIONS='ctrl:swapcaps'
export XKB_DEFAULT_OPTIONS='ctrl:swapcaps,combine:menu'
export WM='sway'
export EDITOR='nvim'
export SUDO_EDITOR='rvim'
......@@ -41,7 +41,7 @@ export _JAVA_AWT_WM_NONREPARENTING=1
export TERM_PROGRAM=$TERM
alias ping6="ping -6"
alias ld="ls -d"
#alias ld="ls -d"
alias ll="ls -l"
alias la="ls -A"
alias lla="ls -la"
......@@ -56,7 +56,7 @@ alias pstree="pstree -agpsu"
alias hl="highlight -O ansi -S"
alias fbv="fbv -c"
alias ls="ls --color=auto"
alias desmume='desmume --jit-size 100 --3d-render GL --jit-enable --3d-texture-upscale 4 --rigorous-timing'
alias desmume='desmume --jit-size 100 --jit-enable --3d-texture-upscale 1'
#git config --global alias.l "log --graph --oneline"
#git config --global alias.undo '!f() { \
......@@ -148,9 +148,13 @@ if [ "$HOSTNAME" == "" ]; then
export HOSTNAME=$(cat /etc/hostname)
fi
export PS1="\u@\h:\W$ "
# do machine-specific stuff
MDEPPR="$HOME/.profile-$HOSTNAME"
if [ -f "$MDEPPR" ]; then
. "$MDEPPR"
fi
# export PATH="$(echo $PATH | tr : '\n' | sort -u | tr '\n' :)"
......@@ -255,7 +255,7 @@ buffers.color_fg = default
buffers.conditions = ""
buffers.filling_left_right = vertical
buffers.filling_top_bottom = columns_vertical
buffers.hidden = off
buffers.hidden = on
buffers.items = "buffers"
buffers.position = top
buffers.priority = 0
......
......@@ -7,8 +7,8 @@ ls -dA1 \
~/.weechat/logs/*.weechatlog \
~/.*/*/history \
~/*_hist \
~/*/*/history \
~/.cache/rofi* \
2>/dev/null \
| xargs -tr shred -u
# ~/*/*/history \
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