diff --git a/dot_config/i3/config b/dot_config/i3/config index b11743a..c7ee6c6 100644 --- a/dot_config/i3/config +++ b/dot_config/i3/config @@ -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, # and nm-applet is a desktop environment-independent system tray GUI for it. 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 polybar -r michael +# exec --no-startup-id polybar -r michael 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. 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 # finds out, if available) -# bar { -# status_command i3status -# } +bar { + status_command i3status +} diff --git a/dot_config/nvim/coc-settings.json b/dot_config/nvim/coc-settings.json index 9b604d5..ff61fa1 100644 --- a/dot_config/nvim/coc-settings.json +++ b/dot_config/nvim/coc-settings.json @@ -1,24 +1,6 @@ { "python.jediEnabled": false, "languageserver": { - "python": { - "command": "python", - "args": [ - "-mpyls", - "-vv" - ], - "filetypes": [ - "python" - ], - "settings": { - "plugins": { - "pyls_mypy": { - "enabled": true, - "live_mode": false - } - } - } - }, "ocaml": { "command": "opam", "args": [ diff --git a/dot_config/nvim/coc.vim b/dot_config/nvim/coc.vim index b5e2865..5886ec4 100644 --- a/dot_config/nvim/coc.vim +++ b/dot_config/nvim/coc.vim @@ -28,6 +28,7 @@ nnoremap s :CocList -I symbols nnoremap j :CocNext nnoremap k :CocPrev nnoremap p :CocListResume +nnoremap . (coc-codeaction-selected) nmap [g (coc-diagnostic-prev) nmap ]g (coc-diagnostic-next) @@ -42,8 +43,11 @@ xmap f (coc-format-selected) inoremap coc#refresh() -xmap a (coc-codeaction-selected) -nmap a (coc-codeaction-selected) +function! s:cocActionsOpenFromSelected(type) abort + execute 'CocCommand actions.open ' . a:type +endfunction +xmap a :execute 'CocCommand actions.open ' . visualmode() +nmap a :set operatorfunc=cocActionsOpenFromSelectedg@ nmap ac (coc-codeaction) nmap qf (coc-fix-current) diff --git a/dot_config/nvim/init.vim b/dot_config/nvim/init.vim index 3b66cff..20e2912 100644 --- a/dot_config/nvim/init.vim +++ b/dot_config/nvim/init.vim @@ -4,7 +4,6 @@ Plug 'vim-airline/vim-airline' exe 'source' (stdpath('config') . '/airline.vim') Plug 'neoclide/coc.nvim', {'branch': 'release'} -" Plug 'file:///home/michael/Projects/coc-nvim-rs', { 'do': 'cargo build --release' } exe 'source' (stdpath('config') . '/coc.vim') " Plug 'file://'.expand('~/Projects/coc-nvim-rs/') @@ -14,20 +13,22 @@ exe 'source' (stdpath('config') . '/nerdtree.vim') Plug 'ctrlpvim/ctrlp.vim' let g:ctrlp_user_command = 'rg %s --files --color=never --glob ""' +Plug 'jiangmiao/auto-pairs', { 'for': 'rust' } Plug 'kovisoft/slimv', { 'for': 'lisp' } - +Plug 'leafOfTree/vim-svelte-plugin' Plug 'mhinz/vim-startify' Plug 'tomasiser/vim-code-dark' Plug 'tpope/vim-sleuth' -Plug 'jiangmiao/auto-pairs' -Plug 'leafOfTree/vim-svelte-plugin' -Plug 'tpope/vim-sleuth' " Language plugins +Plug 'kovisoft/slimv' +Plug 'leafOfTree/vim-svelte-plugin' Plug 'vmchale/dhall-vim' +Plug 'qnighy/lalrpop.vim' Plug 'cespare/vim-toml' Plug 'GutenYe/json5.vim' Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' } +Plug 'pest-parser/pest.vim', { 'for': 'pest' } Plug 'godlygeek/tabular' Plug 'plasticboy/vim-markdown' @@ -43,20 +44,6 @@ let g:vim_markdown_folding_disabled = 1 let g:vim_markdown_toml_frontmatter = 1 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() " General config @@ -86,10 +73,10 @@ let mapleader = ";" nnoremap T :vsplitvertical resize 54terminali imap kj -imap ;; :wi +" imap ;; :wi nmap :TagbarToggle -nmap ;; :w +" nmap ;; :w " let g:LanguageClient_serverCommands = { " \ 'rust': ['rust-analyzer'], diff --git a/dot_config/polybar/config b/dot_config/polybar/config index 0d844b6..85ebb05 100644 --- a/dot_config/polybar/config +++ b/dot_config/polybar/config @@ -262,7 +262,7 @@ format-disconnected = type = internal/date interval = 5 -date = +date = " %m-%d" date-alt = " %Y-%m-%d" time = %H:%M