modernize
This commit is contained in:
parent
0044f6a4f5
commit
81fd63bf11
6 changed files with 428 additions and 639 deletions
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"coc-json": ">=1.2.6",
|
||||
"coc-json": ">=1.3.2",
|
||||
"coc-python": ">=1.2.12",
|
||||
"coc-snippets": ">=2.1.28",
|
||||
"coc-snippets": ">=2.2.1",
|
||||
"coc-ultisnips": ">=1.2.3"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# This file has been auto-generated by i3-config-wizard(1).
|
||||
# This file has been auto-generated by i4-config-wizard(1).
|
||||
# It will not be overwritten, so edit it as you like.
|
||||
#
|
||||
# Should you change your keyboard layout some time, delete
|
||||
|
|
@ -38,6 +38,8 @@ client.urgent #2f343a #900000 #ffffff #900000
|
|||
# Use Mouse+$mod to drag floating windows to their wanted position
|
||||
floating_modifier $mod
|
||||
|
||||
gaps inner 10
|
||||
|
||||
|
||||
# start a terminal
|
||||
bindsym $mod+Shift+Return exec run_terminal
|
||||
|
|
@ -68,6 +70,7 @@ bindsym $mod+h focus left
|
|||
bindsym $mod+l focus right
|
||||
bindsym $mod+j exec --no-startup-id ~/.i3/i3-focus-next
|
||||
bindsym $mod+k exec --no-startup-id ~/.i3/i3-focus-next --reverse
|
||||
bindsym $mod+y move workspace to output left
|
||||
|
||||
# alternatively, you can use the cursor keys:
|
||||
#bindsym $mod+Left focus left
|
||||
|
|
@ -217,3 +220,4 @@ bindsym $mod+Shift+Control+r mode "goremote"
|
|||
#tray_output primary
|
||||
#}
|
||||
exec --no-startup-id xfce4-panel --disable-wm-check
|
||||
#exec polybar HDMI1
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
36
.vimrc
36
.vimrc
|
|
@ -56,6 +56,7 @@ set diffopt+=vertical
|
|||
set t_Co=256
|
||||
set t_Sf=ESC[3%dm
|
||||
set t_Sb=ESC[4%dm
|
||||
set t_ut=
|
||||
"set t_SH=
|
||||
"set t_kb=
|
||||
|
||||
|
|
@ -81,6 +82,11 @@ if exists('veonim')
|
|||
set guifont=Droid\ Sans\ Mono\ Dotted:h20
|
||||
" set linespace=10
|
||||
endif
|
||||
" * Polyglot
|
||||
|
||||
let g:tex_flavor = 'latex'
|
||||
let g:polyglot_disabled = ['latex']
|
||||
|
||||
|
||||
" Required:
|
||||
set runtimepath+=$HOME/.vim/bundle/repos/github.com/Shougo/dein.vim
|
||||
|
|
@ -107,7 +113,8 @@ Plug 'ambv/black'
|
|||
Plug 'kana/vim-textobj-user'
|
||||
|
||||
" Plugins I wish I used more
|
||||
Plug 'hsitz/VimOrganizer'
|
||||
"Plug 'hsitz/VimOrganizer'
|
||||
Plug 'jceb/vim-orgmode'
|
||||
Plug 'tpope/vim-fugitive'
|
||||
Plug 'tpope/vim-unimpaired'
|
||||
Plug 'b4winckler/vim-angry'
|
||||
|
|
@ -135,6 +142,7 @@ Plug 'tpope/vim-abolish'
|
|||
Plug 'sheerun/vim-polyglot'
|
||||
Plug 'Shougo/denite.nvim'
|
||||
Plug 'plytophogy/vim-virtualenv'
|
||||
Plug 'ervandew/supertab'
|
||||
|
||||
|
||||
" Plugins I NEEDED
|
||||
|
|
@ -161,6 +169,7 @@ Plug 'Shougo/context_filetype.vim'
|
|||
Plug 'idris-hackers/idris-vim', {'for': 'idris'}
|
||||
Plug 'derekwyatt/vim-scala', {'for': 'scala'}
|
||||
Plug 'hwayne/tla.vim'
|
||||
Plug 'zchee/vim-goasm'
|
||||
|
||||
" Plugins that autocomplete
|
||||
"Plug 'Shougo/deoplete.nvim'
|
||||
|
|
@ -176,7 +185,7 @@ Plug 'hwayne/tla.vim'
|
|||
"\ 'do': 'bash install.sh',
|
||||
"\ }
|
||||
"Plug 'ensime/ensime-vim', { 'do': ':UpdateRemotePlugins' }
|
||||
Plug 'neoclide/coc.nvim', {'tag': '*', 'do': './install.sh'}
|
||||
Plug 'neoclide/coc.nvim', {'branch': 'release'}
|
||||
|
||||
" Plugins that do specific things
|
||||
Plug 'Shougo/vimproc.vim'
|
||||
|
|
@ -192,6 +201,7 @@ Plug 'lervag/vimtex'
|
|||
" Unclear
|
||||
Plug 'ncm2/float-preview.nvim'
|
||||
Plug 'lambdalisue/gina.vim'
|
||||
Plug 'tomasiser/vim-code-dark'
|
||||
|
||||
call plug#end()
|
||||
|
||||
|
|
@ -199,6 +209,7 @@ nmap <silent> gd <Plug>(coc-definition)
|
|||
nmap <silent> gy <Plug>(coc-type-definition)
|
||||
nmap <silent> gi <Plug>(coc-implementation)
|
||||
nmap <silent> gr <Plug>(coc-references)
|
||||
imap <Leader>, <Plug>(coc-snippets-expand)
|
||||
|
||||
" Use K to show documentation in preview window
|
||||
nnoremap <silent> K :call <SID>show_documentation()<CR>
|
||||
|
|
@ -250,7 +261,9 @@ autocmd BufWritePre * :call AutoTrimWhitespace()
|
|||
" Set syntax and highlighting
|
||||
syntax on
|
||||
" baraknew is my own colorscheme. I used to use slate or dante.
|
||||
colorscheme baraknew
|
||||
"colorscheme baraknew
|
||||
"let g:codedark_conservative = 1
|
||||
colorscheme codedark
|
||||
"colorscheme slate
|
||||
"colorscheme dante
|
||||
|
||||
|
|
@ -264,7 +277,10 @@ setlocal cursorline
|
|||
|
||||
|
||||
" ** PLUGIN CONFIGURATION **
|
||||
"
|
||||
|
||||
" * SuperTab
|
||||
let g:SuperTabDefaultCompletionType = "<c-n>"
|
||||
|
||||
" Change the source rank
|
||||
"call deoplete#custom#option('sources', {
|
||||
"\ 'python': ['LanguageClient', 'jedi'],
|
||||
|
|
@ -386,7 +402,7 @@ let g:ycm_use_ultisnips_completer = 1
|
|||
" * UltiSnips
|
||||
let g:UltiSnipsSnippetDirectories=["UltiSnips", "usnips"]
|
||||
let g:UltiSnipsExpandTrigger="<Leader>,"
|
||||
let g:UltiSnipsJumpForwardTrigger="<Leader>,"
|
||||
"let g:UltiSnipsJumpForwardTrigger="<Leader>,"
|
||||
let g:UltiSnipsJumpBackwardTrigger="<Leader><s-,>"
|
||||
|
||||
" * MinBufExplorer
|
||||
|
|
@ -397,7 +413,7 @@ let g:UltiSnipsJumpBackwardTrigger="<Leader><s-,>"
|
|||
"let g:miniBufExplForceSyntaxEnable = 1
|
||||
|
||||
" Markdown
|
||||
let g:markdown_enable_folding = 1
|
||||
"let g:markdown_enable_folding = 1
|
||||
let g:markdown_enable_mappings = 0
|
||||
let g:markdown_enable_spell_checking = 0
|
||||
let g:markdown_enable_input_abbreviations = 0
|
||||
|
|
@ -470,6 +486,11 @@ let g:go_bin_path = $HOME . "/.go/bin"
|
|||
"let g:go_def_mode = 'gopls'
|
||||
"let g:go_info_mode = 'gopls'
|
||||
|
||||
let g:go_highlight_functions = 1
|
||||
let g:go_highlight_function_calls = 1
|
||||
let g:go_highlight_variable_declarations = 1
|
||||
let g:go_highlight_variable_assignments = 1
|
||||
|
||||
" ** STATUSLINE **
|
||||
set laststatus=2
|
||||
set statusline=%t "tail of the filename
|
||||
|
|
@ -791,6 +812,7 @@ nnoremap <silent> <Leader>o :CtrlPBuffer<CR>
|
|||
"nnoremap <Leader>p :PTW
|
||||
nnoremap <Leader>p :LustyJugglePrevious<CR>
|
||||
nnoremap <Leader>jd :YcmCompleter GoToDefinitionElseDeclaration<CR>
|
||||
nnoremap <Leader>mm :w<CR>:make!<CR>
|
||||
|
||||
" ** EXTRA INCLUDES **
|
||||
"
|
||||
|
|
@ -829,3 +851,5 @@ function! s:denite_my_settings() abort
|
|||
nnoremap <silent><buffer><expr> <Space>
|
||||
\ denite#do_map('toggle_select').'j'
|
||||
endfunction
|
||||
|
||||
map <F10> :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
|
||||
|
|
|
|||
6
.xinitrc
6
.xinitrc
|
|
@ -2,6 +2,8 @@
|
|||
|
||||
export PATH=$HOME/bin:$PATH
|
||||
systemctl --user import-environment DISPLAY XAUTHORITY
|
||||
systemctl --user start pulseaudio.socket
|
||||
systemctl --user start pulseaudio.service
|
||||
|
||||
if which dbus-update-activation-environment >/dev/null 2>&1; then
|
||||
dbus-update-activation-environment DISPLAY XAUTHORITY
|
||||
|
|
@ -19,7 +21,7 @@ xrdb -merge .Xdefaults &
|
|||
xscreensaver -no-splash &
|
||||
#kupfer --no-splash &
|
||||
rofi -key-run control-space -fuzzy -terminal run_terminal &
|
||||
nm-applet &
|
||||
#nm-applet &
|
||||
gnome-sound-applet &
|
||||
remmina -i &
|
||||
#setxkbmap -option ctrl:nocaps &
|
||||
|
|
@ -29,7 +31,7 @@ xmodmap ~/.Xmodmap &
|
|||
# Running a really minimal arch system? This helps:
|
||||
|
||||
/usr/lib/xfce4/notifyd/xfce4-notifyd &
|
||||
pulseaudio --start &
|
||||
#pulseaudio --start &
|
||||
blueman-applet &
|
||||
#wicd-gtk --tray &
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue