This commit is contained in:
Michael Zhang 2020-11-30 16:22:22 -06:00
parent 1ea138f280
commit 7ea51a30c0
Signed by: michael
GPG key ID: BDA47A31A3C8EE6B
5 changed files with 21 additions and 48 deletions

View file

@ -39,11 +39,11 @@ exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
# NetworkManager is the most popular way to manage wireless networks on Linux, # NetworkManager is the most popular way to manage wireless networks on Linux,
# and nm-applet is a desktop environment-independent system tray GUI for it. # and nm-applet is a desktop environment-independent system tray GUI for it.
exec --no-startup-id nm-applet exec --no-startup-id nm-applet
exec --no-startup-id picom -b exec --no-startup-id mpd
exec --no-startup-id feh --bg-fill $HOME/.config/i3/wallpaper.jpg exec --no-startup-id feh --bg-fill $HOME/.config/i3/wallpaper.jpg
exec --no-startup-id polybar -r michael # exec --no-startup-id polybar -r michael
exec --no-startup-id dunst exec --no-startup-id dunst
exec --no-startup-id i3-msg 'workspace 10; exec rocketchat-desktop; workspace_layout tabbed' exec --no-startup-id i3-msg 'workspace 10; exec rocketchat-desktop; exec electron-mail;'
# Use pactl to adjust volume in PulseAudio. # Use pactl to adjust volume in PulseAudio.
set $refresh_i3status killall -SIGUSR1 i3status set $refresh_i3status killall -SIGUSR1 i3status
@ -198,6 +198,6 @@ bindsym $mod+r mode "resize"
# Start i3bar to display a workspace bar (plus the system information i3status # Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available) # finds out, if available)
# bar { bar {
# status_command i3status status_command i3status
# } }

View file

@ -1,24 +1,6 @@
{ {
"python.jediEnabled": false, "python.jediEnabled": false,
"languageserver": { "languageserver": {
"python": {
"command": "python",
"args": [
"-mpyls",
"-vv"
],
"filetypes": [
"python"
],
"settings": {
"plugins": {
"pyls_mypy": {
"enabled": true,
"live_mode": false
}
}
}
},
"ocaml": { "ocaml": {
"command": "opam", "command": "opam",
"args": [ "args": [

View file

@ -28,6 +28,7 @@ nnoremap <silent> <space>s :<C-u>CocList -I symbols<cr>
nnoremap <silent> <space>j :<C-u>CocNext<CR> nnoremap <silent> <space>j :<C-u>CocNext<CR>
nnoremap <silent> <space>k :<C-u>CocPrev<CR> nnoremap <silent> <space>k :<C-u>CocPrev<CR>
nnoremap <silent> <space>p :<C-u>CocListResume<CR> nnoremap <silent> <space>p :<C-u>CocListResume<CR>
nnoremap <silent> <space>. <Plug>(coc-codeaction-selected)
nmap <silent> [g <Plug>(coc-diagnostic-prev) nmap <silent> [g <Plug>(coc-diagnostic-prev)
nmap <silent> ]g <Plug>(coc-diagnostic-next) nmap <silent> ]g <Plug>(coc-diagnostic-next)
@ -42,8 +43,11 @@ xmap <leader>f <Plug>(coc-format-selected)
inoremap <silent><expr> <c-space> coc#refresh() inoremap <silent><expr> <c-space> coc#refresh()
xmap <leader>a <Plug>(coc-codeaction-selected) function! s:cocActionsOpenFromSelected(type) abort
nmap <leader>a <Plug>(coc-codeaction-selected) execute 'CocCommand actions.open ' . a:type
endfunction
xmap <silent> <leader>a :<C-u>execute 'CocCommand actions.open ' . visualmode()<CR>
nmap <silent> <leader>a :<C-u>set operatorfunc=<SID>cocActionsOpenFromSelected<CR>g@
nmap <leader>ac <Plug>(coc-codeaction) nmap <leader>ac <Plug>(coc-codeaction)
nmap <leader>qf <Plug>(coc-fix-current) nmap <leader>qf <Plug>(coc-fix-current)

View file

@ -4,7 +4,6 @@ Plug 'vim-airline/vim-airline'
exe 'source' (stdpath('config') . '/airline.vim') exe 'source' (stdpath('config') . '/airline.vim')
Plug 'neoclide/coc.nvim', {'branch': 'release'} Plug 'neoclide/coc.nvim', {'branch': 'release'}
" Plug 'file:///home/michael/Projects/coc-nvim-rs', { 'do': 'cargo build --release' }
exe 'source' (stdpath('config') . '/coc.vim') exe 'source' (stdpath('config') . '/coc.vim')
" Plug 'file://'.expand('~/Projects/coc-nvim-rs/') " Plug 'file://'.expand('~/Projects/coc-nvim-rs/')
@ -14,20 +13,22 @@ exe 'source' (stdpath('config') . '/nerdtree.vim')
Plug 'ctrlpvim/ctrlp.vim' Plug 'ctrlpvim/ctrlp.vim'
let g:ctrlp_user_command = 'rg %s --files --color=never --glob ""' let g:ctrlp_user_command = 'rg %s --files --color=never --glob ""'
Plug 'jiangmiao/auto-pairs', { 'for': 'rust' }
Plug 'kovisoft/slimv', { 'for': 'lisp' } Plug 'kovisoft/slimv', { 'for': 'lisp' }
Plug 'leafOfTree/vim-svelte-plugin'
Plug 'mhinz/vim-startify' Plug 'mhinz/vim-startify'
Plug 'tomasiser/vim-code-dark' Plug 'tomasiser/vim-code-dark'
Plug 'tpope/vim-sleuth' Plug 'tpope/vim-sleuth'
Plug 'jiangmiao/auto-pairs'
Plug 'leafOfTree/vim-svelte-plugin'
Plug 'tpope/vim-sleuth'
" Language plugins " Language plugins
Plug 'kovisoft/slimv'
Plug 'leafOfTree/vim-svelte-plugin'
Plug 'vmchale/dhall-vim' Plug 'vmchale/dhall-vim'
Plug 'qnighy/lalrpop.vim'
Plug 'cespare/vim-toml' Plug 'cespare/vim-toml'
Plug 'GutenYe/json5.vim' Plug 'GutenYe/json5.vim'
Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' } Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
Plug 'pest-parser/pest.vim', { 'for': 'pest' }
Plug 'godlygeek/tabular' Plug 'godlygeek/tabular'
Plug 'plasticboy/vim-markdown' Plug 'plasticboy/vim-markdown'
@ -43,20 +44,6 @@ let g:vim_markdown_folding_disabled = 1
let g:vim_markdown_toml_frontmatter = 1 let g:vim_markdown_toml_frontmatter = 1
Plug 'editorconfig/editorconfig-vim' Plug 'editorconfig/editorconfig-vim'
" Plug 'dense-analysis/ale'
" Plug 'vim-syntastic/syntastic'
" Plug 'majutsushi/tagbar'
" Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
"
" Plug 'autozimu/LanguageClient-neovim', {
" \ 'branch': 'next',
" \ 'do': 'bash install.sh',
" \ }
"
" Plug 'rust-lang/rust.vim'
" " Plug 'racer-rust/vim-racer'
"
" Plug 'idris-hackers/idris-vim'
call plug#end() call plug#end()
" General config " General config
@ -86,10 +73,10 @@ let mapleader = ";"
nnoremap T :vsplit<BAR>vertical resize 54<BAR>terminal<CR>i nnoremap T :vsplit<BAR>vertical resize 54<BAR>terminal<CR>i
imap kj <Esc> imap kj <Esc>
imap ;; <Esc>:w<CR>i " imap ;; <Esc>:w<CR>i
nmap <F8> :TagbarToggle<CR> nmap <F8> :TagbarToggle<CR>
nmap ;; :w<CR> " nmap ;; :w<CR>
" let g:LanguageClient_serverCommands = { " let g:LanguageClient_serverCommands = {
" \ 'rust': ['rust-analyzer'], " \ 'rust': ['rust-analyzer'],

View file

@ -262,7 +262,7 @@ format-disconnected =
type = internal/date type = internal/date
interval = 5 interval = 5
date = date = " %m-%d"
date-alt = " %Y-%m-%d" date-alt = " %Y-%m-%d"
time = %H:%M time = %H:%M