summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/i3/config2
-rw-r--r--.config/i3blocks/config5
-rw-r--r--.config/mutt/mailcap2
-rw-r--r--.vim/coc-settings.json2
-rw-r--r--.vim/spell/en.utf-8.add2
-rw-r--r--.vim/spell/en.utf-8.add.splbin399 -> 431 bytes
-rw-r--r--.vimrc8
7 files changed, 12 insertions, 9 deletions
diff --git a/.config/i3/config b/.config/i3/config
index d3a268c..6ff56d5 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -126,7 +126,7 @@ bindsym $mod+shift+F2 exec firefox --private-window
bindsym $mod+F3 exec url_handler.sh
bindsym $mod+F4 exec $mail
bindsym $mod+shift+F4 exec $syncmail
-bindsym $mod+F5 exec alacritty -e zsh -i -c 'newsboat && pkill -78 i3blocks'
+#bindsym $mod+F5 exec alacritty -e zsh -i -c 'newsboat && pkill -78 i3blocks'
bindsym $mod+F6 exec --no-startup-id dict.sh
#bindsym $mod+F7 exec
#bindsym $mod+F8 exec "killall pwcview || exec pwcview -f 30 -s sif"
diff --git a/.config/i3blocks/config b/.config/i3blocks/config
index 0b22813..9d8a2cf 100644
--- a/.config/i3blocks/config
+++ b/.config/i3blocks/config
@@ -24,11 +24,6 @@ interval=once
signal=12
command=unread=$(ls ~/.mail/gmail/Inbox/new/ | wc -l | cut -w -f2) ; [ $unread -gt 0 ] && printf "󰶋 %s\n" $unread && return 33 || return 0
-[news]
-interval=once
-signal=13
-command=unread=$(newsboat -x print-unread|cut -w -f1) && [ "$unread" != 0 ] && [ "$unread" != Authentication ] && printf "󰎕 %s\n" $unread || return 0
-
[weather]
interval=300
command=weather.sh
diff --git a/.config/mutt/mailcap b/.config/mutt/mailcap
index 8603537..5be7302 100644
--- a/.config/mutt/mailcap
+++ b/.config/mutt/mailcap
@@ -1 +1 @@
-text/html; w3m -I %{charset} -T text/html; copiousoutput;
+text/html; w3m -s -I %{charset} -T text/html; copiousoutput;
diff --git a/.vim/coc-settings.json b/.vim/coc-settings.json
index c3d77a9..81f50e2 100644
--- a/.vim/coc-settings.json
+++ b/.vim/coc-settings.json
@@ -12,6 +12,8 @@
"php",
"xml"
],
+ "diagnostic.virtualText": true,
+ "codeLens.enable": true,
"rust-analyzer.checkOnSave.command": "clippy",
"rust-analyzer.server.path": "/usr/local/bin/rust-analyzer",
"rust-analyzer.completion.autoimport.enable": true,
diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add
index d506086..3239587 100644
--- a/.vim/spell/en.utf-8.add
+++ b/.vim/spell/en.utf-8.add
@@ -24,3 +24,5 @@ Hudsonites
StepDown
FreeBSD's
doas
+Wix
+tokenization
diff --git a/.vim/spell/en.utf-8.add.spl b/.vim/spell/en.utf-8.add.spl
index 1d95612..566eca2 100644
--- a/.vim/spell/en.utf-8.add.spl
+++ b/.vim/spell/en.utf-8.add.spl
Binary files differ
diff --git a/.vimrc b/.vimrc
index f9e4baf..cb375fd 100644
--- a/.vimrc
+++ b/.vimrc
@@ -13,7 +13,7 @@ set shiftwidth=4 " 4-space shiftwidth
set backspace=indent,eol,start " backspace over everything in insert
set directory=$HOME/.vim/swapfiles// " common swap directory
set fillchars+=vert:\
-syntax on " switch syntax highlighting on
+syntax enable " switch syntax highlighting on, used to be syntax on
" Matching and key mappings
":match ErrorMsg '\%>80v.\+' " right-hand drift warning
@@ -51,10 +51,14 @@ endif
call plug#begin('~/.vim/plugged')
Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'}
+Plug 'rust-lang/rust.vim'
call plug#end()
+" rust.vim
+let g:rustfmt_autosave = 1
+
" COC.VIM
-let g:coc_global_extensions = ['coc-rust-analyzer', 'coc-vetur', 'coc-prettier']
+"let g:coc_global_extensions = ['coc-rust-analyzer', 'coc-prettier']
inoremap <silent><expr> <TAB>
\ pumvisible() ? "\<C-n>" :