From 246f4416bc57abaa8653e43b319cc34036272166 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sat, 16 Nov 2019 16:06:59 +0000 Subject: Add tentative lsp configuration --- bin/.local/bin/keyboard | 7 ++++--- i3/.config/i3/config | 3 +++ vim/.vimrc | 32 +++++++++++++++++++++++++++----- zsh/.zshenv | 3 +++ 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/bin/.local/bin/keyboard b/bin/.local/bin/keyboard index b5d3900..b7f5e90 100755 --- a/bin/.local/bin/keyboard +++ b/bin/.local/bin/keyboard @@ -3,8 +3,9 @@ # Key repeat rate xset r rate 400 50 -# Xcape settings -killall -9 xcape +# Kill xcape +# ('pgrep -l xcape' can be used to list the processes) +pkill xcape # Compose key on left control # https://vi.stackexchange.com/questions/2254/what-is-the-easiest-way-to-insert-unicode-characters-into-a-document @@ -30,7 +31,7 @@ xcape -e 'Control_L=Escape' xmodmap -e "keysym Print = Print Caps_Lock" xmodmap -e "add Lock = Caps_Lock" -# Make Shift (Shift, :) +# Make Shift (Shift, :) (for vim) xcape -e 'Shift_L=Shift_L|semicolon' # Make Tab (Alt_L, Tab) diff --git a/i3/.config/i3/config b/i3/.config/i3/config index dc439fc..28fd656 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -215,4 +215,7 @@ gaps outer 5 # Launch compositor exec compton +# Kill xcape if bug +bindsym $mod+F3 exec --no-startup-id killall -9 xcape + # vim:filetype=i3 diff --git a/vim/.vimrc b/vim/.vimrc index 9e65bc0..b1af11e 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -74,7 +74,7 @@ endif if has("nvim") " Plug 'roxma/nvim-completion-manager' " Plug 'Shougo/deoplete.nvim', { 'do' : ':UpdateRemotePlugins', 'tag' : '4.1' } - Plug 'autozimu/LanguageClient-neovim', { 'do': 'bash install.sh', 'branch': 'next' } + " Plug 'autozimu/LanguageClient-neovim', { 'do': 'bash install.sh', 'branch': 'next' } " Plug 'zchee/deoplete-jedi' Plug 'hkupty/iron.nvim', { 'branch': 'legacy' } else @@ -91,6 +91,8 @@ Plug 'junegunn/seoul256.vim' Plug 'romainl/Apprentice' Plug 'joshdick/onedark.vim' " Plug 'josuegaleas/jay' + +" Plug 'neoclide/coc.nvim', {'branch': 'release'} call plug#end() "" Plugin configuration {{{1 @@ -101,7 +103,7 @@ nnoremap cpr :IronRepl nnoremap cpn :NERDTreeToggle nnoremap cpt :TagbarToggle nnoremap cpu :GundoToggle -nnoremap cp Remembrall('cp') +nnoremap cp Remembrall('cp') " Easy motion map gs (easymotion-prefix) @@ -161,8 +163,7 @@ nnoremap ,pc :PlugClean if &runtimepath =~ 'remembrall' let g:remembrall_auto_accept = 0 nnoremap ,p Remembrall(',p') - nnoremap ,, :call remembrall#remind('n', '') - nnoremap y :call remembrall#remind('n', 'y') + nnoremap ,, Remembrall('') augroup remembrall autocmd FileType tex nnoremap ,l Remembrall(',l') augroup END @@ -352,7 +353,7 @@ nnoremap ,th :-tabmove nnoremap ,t0 :tabmove 0 nnoremap ,t$ :tabmove -nnoremap c :!rm ~/.vim/swap/\%* +nnoremap c :call delete($HOME."/.vim/swap/".substitute(expand('%:p'), '/', '%', 'g').".swp") nnoremap r :Start %:p nnoremap R :Start! %:p @@ -575,3 +576,24 @@ function! FloatingFZF() call nvim_open_win(buf, v:true, opts) endfunction + +" if !exists('g:lsp_config_sourced') +" call lsp#add_filetype_config({ +" \ 'filetype': 'python', +" \ 'name': 'pyls', +" \ 'cmd': 'pyls', +" \ 'callbacks': {} +" \ }) +" autocmd Filetype python setl omnifunc=lsp#omnifunc +" let g:lsp_config_sourced = 1 +" endif + + +" inoremap :call remembrall#remind('i', '') +" nnoremap Remembrall('') +" nnoremap h :call lsp#text_document_hover() +" nnoremap a :call lsp#text_document_declaration() +" nnoremap d :call lsp#text_document_definition() +" nnoremap i :call lsp#text_document_implementation() +" nnoremap s :call lsp#text_document_signature_help() +" nnoremap t :call lsp#text_document_type_definition() diff --git a/zsh/.zshenv b/zsh/.zshenv index 7917e82..ae9fd6b 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -8,6 +8,9 @@ export -U PATH="/usr/local/sbin${PATH:+:}$PATH" export -U PATH="/usr/bin${PATH:+:}$PATH" export -U PATH="/usr/local/sbin:/usr/local/bin${PATH:+:}$PATH" +# Necessary for fenics to work +export PYTHONPATH="/usr/lib/python3.7/site-packages/:/usr/lib/python3.8/site-packages/" + if [[ -d "$HOME/.gem/ruby" ]]; then export -U PATH=$(echo "$HOME/.gem/ruby/"*"/bin")"${PATH:+:}$PATH" fi -- cgit v1.2.3 From db6b64e8a0429d1cdc15c0ccb56fa6d3b01be001 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sat, 16 Nov 2019 16:35:33 +0000 Subject: Update i3blocks --- i3/.config/i3blocks/config | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/i3/.config/i3blocks/config b/i3/.config/i3blocks/config index e736e7e..0f0c207 100644 --- a/i3/.config/i3blocks/config +++ b/i3/.config/i3blocks/config @@ -73,15 +73,16 @@ label= command=echo $(free | grep '^Mem' | awk '{ printf "%3.0f%\n", 100*$3/$2 }') interval=30 +# Requires i3blocks-contrib (AUR) [diskhome] label= -command=/usr/lib/i3blocks/disk +command=/usr/lib/i3blocks/disk/disk instance=/home/urbain interval=300 [diskroot] label= -command=/usr/lib/i3blocks/disk +command=/usr/lib/i3blocks/disk/disk instance=/ interval=300 -- cgit v1.2.3 From 804d60ef5fde79cd2dba942df4d4258af12a5499 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Fri, 22 Nov 2019 12:10:02 +0000 Subject: Change background color of floating window --- vim/.vimrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vim/.vimrc b/vim/.vimrc index b1af11e..b4e5cea 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -558,9 +558,10 @@ nnoremap ,e :e **/* let $FZF_DEFAULT_OPTS='--layout=reverse' let g:fzf_layout = { 'window': 'call FloatingFZF()' } +hi Pmenu ctermfg=3 ctermbg=239 function! FloatingFZF() let buf = nvim_create_buf(v:false, v:true) - call setbufvar(buf, '&signcolumn', 'no') + call setbufvar(buf, '&laststatus', '1') let height = &lines - 10 let width = float2nr(&columns - (&columns * 2 / 10)) @@ -577,6 +578,9 @@ function! FloatingFZF() call nvim_open_win(buf, v:true, opts) endfunction +" hi Pmenu ctermfg=3 ctermbg=239 +" let g:remembrall_window = 'call FloatingFZF()' + " if !exists('g:lsp_config_sourced') " call lsp#add_filetype_config({ " \ 'filetype': 'python', -- cgit v1.2.3 From 361b6cd44adf12a9f2f36e4ac00bb373a7a5aae7 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 11 Feb 2020 14:09:38 +0000 Subject: Use master branch for iron --- bin/.local/bin/keyboard | 8 +++--- vim/.vimrc | 66 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 63 insertions(+), 11 deletions(-) diff --git a/bin/.local/bin/keyboard b/bin/.local/bin/keyboard index b7f5e90..ee1cc61 100755 --- a/bin/.local/bin/keyboard +++ b/bin/.local/bin/keyboard @@ -46,10 +46,10 @@ xmodmap -e "keycode any = space" xcape -e 'Super_L=space' # Make return (Control_R, Return) -xmodmap -e "keysym Return = Control_R" -xmodmap -e "add Control = Control_R" -xmodmap -e "keycode any = Return" -xcape -e 'Control_R=Return' +# xmodmap -e "keysym Return = Control_R" +# xmodmap -e "add Control = Control_R" +# xmodmap -e "keycode any = Return" +# xcape -e 'Control_R=Return' # Make eject an Insert xmodmap -e "keysym XF86Eject = Insert" diff --git a/vim/.vimrc b/vim/.vimrc index b4e5cea..a8bce6a 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -66,9 +66,12 @@ Plug 'vim-scripts/gmsh.vim' Plug 'wellle/targets.vim' " Plug 'zchee/deoplete-clang' +Plug 'liuchengxu/vim-which-key' + if isdirectory($HOME."/dotfiles/plugins") Plug '~/dotfiles/plugins/vim-remembrall' Plug '~/dotfiles/plugins/vim-tmux-pilot' + Plug '~/dotfiles/plugins/darjeeling' endif if has("nvim") @@ -76,7 +79,9 @@ if has("nvim") " Plug 'Shougo/deoplete.nvim', { 'do' : ':UpdateRemotePlugins', 'tag' : '4.1' } " Plug 'autozimu/LanguageClient-neovim', { 'do': 'bash install.sh', 'branch': 'next' } " Plug 'zchee/deoplete-jedi' - Plug 'hkupty/iron.nvim', { 'branch': 'legacy' } + " Plug 'hkupty/iron.nvim', { 'branch': 'legacy' } + Plug 'hkupty/iron.nvim' + Plug 'neovim/nvim-lsp' else Plug 'Shougo/neocomplete.vim' endif @@ -139,11 +144,29 @@ nnoremap gh :set opfunc=Call_heytmuxg@ xnoremap gh :Heytmux! " Iron +if has("nvim") + let g:iron_map_defaults=0 + let g:iron_map_extended=0 + nmap yr (iron-send-motion) + xmap R (iron-send-motion) + nmap yrr VR + +lua << EOF +local iron = require("iron") + +local open_repl = function(buffer) + vim.api.nvim_command('vnew') +end + +iron.core.set_config{ + preferred = { + python = "ipython" + }, + repl_open_cmd = open_repl +} +EOF " let g:iron_repl_open_cmd = 'vsplit' -let g:iron_map_defaults=0 -nmap yr (iron-send-motion) -xmap R (iron-send-motion) -nmap yrr VR +endif " Easy align xmap ga (EasyAlign) @@ -168,6 +191,7 @@ if &runtimepath =~ 'remembrall' autocmd FileType tex nnoremap ,l Remembrall(',l') augroup END endif +let g:remembrall_suffixes = [""] " LanguageClient if executable('pyls') @@ -196,6 +220,8 @@ let g:neomake_gcc_args=[ \ '-I.', '-I..', '-I../..' \ ] +let g:neomake_python_enabled_makers = ['python', 'pylint'] + " Deoplete let g:deoplete#enable_at_startup = 1 let g:deoplete#sources#jedi#show_docstring = 1 @@ -303,6 +329,7 @@ set foldmethod=marker set hidden set ignorecase set lazyredraw +set laststatus=2 set mouse=a set nojoinspaces set nowrap @@ -576,10 +603,21 @@ function! FloatingFZF() \ } call nvim_open_win(buf, v:true, opts) + call setbufvar(buf, '&laststatus', '2') endfunction -" hi Pmenu ctermfg=3 ctermbg=239 -" let g:remembrall_window = 'call FloatingFZF()' +" highlight default link LspDiagnosticsError Delimiter +" highlight default link LspDiagnosticsWarning Delimiter +" lua << EOF +" require'nvim_lsp'.pyls.setup{} +" EOF + +" Default Values: +" cmd = { "pyls" } +" filetypes = { "python" } +" log_level = 2 +" root_dir = vim's starting directory +" settings = {} " if !exists('g:lsp_config_sourced') " call lsp#add_filetype_config({ @@ -592,6 +630,20 @@ endfunction " let g:lsp_config_sourced = 1 " endif +" lua < Remembrall('') +nnoremap h lua vim.lsp.buf.hover() +nnoremap a lua vim.lsp.buf.declaration() +nnoremap d lua vim.lsp.buf.definition() +nnoremap i lua vim.lsp.buf.implementation() +nnoremap s lua vim.lsp.buf.signature_help() +nnoremap t lua vim.lsp.buf.type_definition() " inoremap :call remembrall#remind('i', '') " nnoremap Remembrall('') -- cgit v1.2.3 From 7e8b21e8bf02f82dbf99c0c2ad2d7f04931a128e Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Fri, 22 Nov 2019 12:10:02 +0000 Subject: Change background color of floating window --- vim/.vimrc | 6 +++++- xinit/.xinitrc | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/vim/.vimrc b/vim/.vimrc index b1af11e..b4e5cea 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -558,9 +558,10 @@ nnoremap ,e :e **/* let $FZF_DEFAULT_OPTS='--layout=reverse' let g:fzf_layout = { 'window': 'call FloatingFZF()' } +hi Pmenu ctermfg=3 ctermbg=239 function! FloatingFZF() let buf = nvim_create_buf(v:false, v:true) - call setbufvar(buf, '&signcolumn', 'no') + call setbufvar(buf, '&laststatus', '1') let height = &lines - 10 let width = float2nr(&columns - (&columns * 2 / 10)) @@ -577,6 +578,9 @@ function! FloatingFZF() call nvim_open_win(buf, v:true, opts) endfunction +" hi Pmenu ctermfg=3 ctermbg=239 +" let g:remembrall_window = 'call FloatingFZF()' + " if !exists('g:lsp_config_sourced') " call lsp#add_filetype_config({ " \ 'filetype': 'python', diff --git a/xinit/.xinitrc b/xinit/.xinitrc index 20b5aee..c779d25 100755 --- a/xinit/.xinitrc +++ b/xinit/.xinitrc @@ -17,6 +17,9 @@ feh --bg-fill /home/urbain/Documents/wallpapers/pagoda.jpg xset -dpms xset s off +# Disable bell +xset -b + # SSH agent eval $(ssh-agent) -- cgit v1.2.3 From a0a27a3c403f880a3da52faf496e4bbc3fabe289 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 12 Feb 2020 14:07:02 +0000 Subject: Add mutt directories --- mutt/.gitignore | 3 +++ mutt/.mail/Misc/.gitkeep | 0 mutt/.mail/Personal/.gitkeep | 0 mutt/.mail/Work/.gitkeep | 0 4 files changed, 3 insertions(+) create mode 100644 mutt/.gitignore create mode 100644 mutt/.mail/Misc/.gitkeep create mode 100644 mutt/.mail/Personal/.gitkeep create mode 100644 mutt/.mail/Work/.gitkeep diff --git a/mutt/.gitignore b/mutt/.gitignore new file mode 100644 index 0000000..f2abc1a --- /dev/null +++ b/mutt/.gitignore @@ -0,0 +1,3 @@ +.mail/Work/* +.mail/Personal/* +.mail/Misc/* diff --git a/mutt/.mail/Misc/.gitkeep b/mutt/.mail/Misc/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/mutt/.mail/Personal/.gitkeep b/mutt/.mail/Personal/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/mutt/.mail/Work/.gitkeep b/mutt/.mail/Work/.gitkeep new file mode 100644 index 0000000..e69de29 -- cgit v1.2.3 From 20e67f471b69f90d48037efd2089cb9aa83a91dc Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 12 Feb 2020 14:19:22 +0000 Subject: Fix duplicate with mutt --- mutt/.mutt/id_personal | 2 ++ mutt/.mutt/id_work | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mutt/.mutt/id_personal b/mutt/.mutt/id_personal index 8c57cd6..feb81bd 100644 --- a/mutt/.mutt/id_personal +++ b/mutt/.mutt/id_personal @@ -9,3 +9,5 @@ set trash = "+Personal/Personal.bin" macro index,pager gs " $record" macro index,pager gd " $postponed" macro index,pager gb " $trash" + +# vim: ft=muttrc diff --git a/mutt/.mutt/id_work b/mutt/.mutt/id_work index 238cfcb..c6fea5b 100644 --- a/mutt/.mutt/id_work +++ b/mutt/.mutt/id_work @@ -2,10 +2,14 @@ set from = "u.vaes13@imperial.ac.uk" set sendmail="/usr/bin/msmtp -a imperial" set spoolfile = "+Work/Work" -set record = "+Work/Work.sent" set postponed = "+Work/Work.drafts" set trash = "+Work/Work.bin" +# Record not necessary because outlook saves messages +unset record + macro index,pager gs " $record" macro index,pager gd " $postponed" macro index,pager gb " $trash" + +# vim: ft=muttrc -- cgit v1.2.3 From 8a88e667c2cd1ac5ba333fbcaf355c044860b6df Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 12 Feb 2020 14:50:53 +0000 Subject: Fix gs mapping --- mutt/.mutt/id_work | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mutt/.mutt/id_work b/mutt/.mutt/id_work index c6fea5b..ac75a03 100644 --- a/mutt/.mutt/id_work +++ b/mutt/.mutt/id_work @@ -8,7 +8,7 @@ set trash = "+Work/Work.bin" # Record not necessary because outlook saves messages unset record -macro index,pager gs " $record" +macro index,pager gs " +Work/Work.sent" macro index,pager gd " $postponed" macro index,pager gb " $trash" -- cgit v1.2.3 From c4e82f7325a6ef5b6d1127d16afe2f0b0e3e7c36 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 12 Feb 2020 20:05:57 +0000 Subject: Fix battery script for new laptop --- i3/.config/i3blocks/bin/battery | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/i3/.config/i3blocks/bin/battery b/i3/.config/i3blocks/bin/battery index 378ee3f..0286809 100755 --- a/i3/.config/i3blocks/bin/battery +++ b/i3/.config/i3blocks/bin/battery @@ -5,7 +5,6 @@ if [ ! -d /sys/class/power_supply/BAT0 ]; then exit fi -current_now=$(cat /sys/class/power_supply/BAT0/current_now) charge_now=$(cat /sys/class/power_supply/BAT0/charge_now) charge_full=$(cat /sys/class/power_supply/BAT0/charge_full) bat_status=$(cat /sys/class/power_supply/BAT0/status) @@ -16,7 +15,7 @@ if [ "$bat_status" = "Full" ]; then fi if [ "$bat_status" = "Discharging" ]; then - tot_minutes_remaining=$(( charge_now*60/current_now )) + # tot_minutes_remaining=$(( charge_now*60/current_now )) if [[ $charge_percent -lt 20 ]]; then icon="" @@ -36,14 +35,16 @@ if [ "$bat_status" = "Discharging" ]; then fi elif [ "$bat_status" = "Charging" ]; then - tot_minutes_remaining=$(( (charge_full-charge_now)*60/current_now )) + # current_now=$(cat /sys/class/power_supply/BAT0/current_now) + # tot_minutes_remaining=$(( (charge_full-charge_now)*60/current_now )) icon= color="lightblue" fi -time_remaining=$(printf "%02d:%02d" \ - $(( tot_minutes_remaining/60 )) \ - $(( tot_minutes_remaining - (tot_minutes_remaining/60)*60 ))) +# time_remaining=$(printf "%02d:%02d" \ +# $(( tot_minutes_remaining/60 )) \ +# $(( tot_minutes_remaining - (tot_minutes_remaining/60)*60 ))) -echo "$icon $charge_percent% ($time_remaining)" +# echo "$icon $charge_percent% ($time_remaining)" +echo "$icon $charge_percent%" -- cgit v1.2.3 From 3c4b0332f59b016ad20f4dee4dea43369b0ab2f8 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Thu, 13 Feb 2020 10:32:16 +0000 Subject: Add keys for brightness --- i3/.config/i3/config | 4 +++- xinit/.xinitrc | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 28fd656..e51e8ac 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -1,7 +1,7 @@ # Modifier set $mod Mod4 -font pango:DejaVu Sans Mono, Awesome 8 +font pango:DejaVu Sans Mono, Awesome 9 # Use Mouse+$mod to drag floating windows to their wanted position floating_modifier $mod @@ -190,6 +190,8 @@ bindsym XF86AudioMute exec amixer -D pulse sset Master 0% # Display bindsym XF86MonBrightnessUp exec light -A 10 bindsym XF86MonBrightnessDown exec light -U 10 +bindsym Prior exec light -A 10 +bindsym Next exec light -U 10 bindsym Shift+XF86AudioRaiseVolume exec light -A 10 bindsym Shift+XF86AudioLowerVolume exec light -U 10 diff --git a/xinit/.xinitrc b/xinit/.xinitrc index c779d25..4a3c018 100755 --- a/xinit/.xinitrc +++ b/xinit/.xinitrc @@ -11,7 +11,7 @@ source $HOME/.local/colors.zsh xrdb $HOME/.Xresources/$COLORSCHEME # Background -feh --bg-fill /home/urbain/Documents/wallpapers/pagoda.jpg +feh --bg-fill /usr/share/backgrounds/Grand_Canyon_North_Rim_by_Rihards_Vilks.jpg # Disable screen going to sleep xset -dpms -- cgit v1.2.3 From 40cedc32101e1d33eca846ffd9add6aeb7745bbd Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Thu, 20 Feb 2020 12:51:25 +0000 Subject: Update things --- vim/.vimrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vim/.vimrc b/vim/.vimrc index a8bce6a..f58f6ee 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -104,7 +104,6 @@ call plug#end() " Toggles nnoremap cpg :GitGutterToggle -nnoremap cpr :IronRepl nnoremap cpn :NERDTreeToggle nnoremap cpt :TagbarToggle nnoremap cpu :GundoToggle @@ -147,6 +146,7 @@ xnoremap gh :Heytmux! if has("nvim") let g:iron_map_defaults=0 let g:iron_map_extended=0 + nnoremap cpr :IronRepl nmap yr (iron-send-motion) xmap R (iron-send-motion) nmap yrr VR @@ -273,6 +273,7 @@ let g:vimtex_syntax_enabled=1 " Pilot let g:pilot_boundary='ignore' let g:pilot_mode='wintab' +" let g:pilot_split_or_new='new' " let g:pilot_key_h='' " let g:pilot_key_j='' " let g:pilot_key_k='' -- cgit v1.2.3 From cc688055484c2e17d776c5e7254b33e3f4d7816d Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 25 Feb 2020 10:32:10 +0000 Subject: Update iron configuration --- vim/.vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vim/.vimrc b/vim/.vimrc index f58f6ee..4a3d951 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -149,6 +149,7 @@ if has("nvim") nnoremap cpr :IronRepl nmap yr (iron-send-motion) xmap R (iron-send-motion) + nmap yp (iron-repeat-cmd) nmap yrr VR lua << EOF @@ -437,6 +438,7 @@ nnoremap ,cl :set background=light:colorscheme solarized nnoremap ,cl :set background=dark:colorscheme solarized nnoremap ,cs :colorscheme seoul256 nnoremap ,cn :colorscheme nord +set notermguicolors colo seoul256 "" Autocommands {{{1 -- cgit v1.2.3 From fcac7f830ce833ad74298a88a07c77aad9277fb6 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sat, 29 Feb 2020 11:13:02 +0000 Subject: Minor changes --- Xresources/.Xresources/base | 2 +- vim/.vim/spell/en.utf-8.add | 1 + zsh/.zshrc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Xresources/.Xresources/base b/Xresources/.Xresources/base index b9ff079..ea87784 100644 --- a/Xresources/.Xresources/base +++ b/Xresources/.Xresources/base @@ -28,7 +28,7 @@ URxvt.resize-font.bigger: C-plus ! Appearance /* URxvt*font: xft:DejaVu Sans Mono:size=12 */ -URxvt*font: xft:monaco:size=11.5 +URxvt*font: xft:monaco:size=12 URxvt*scrollBar: false URxvt*internalBorder: 0 URxvt.fading: 35 diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add index 999f578..ddbe70a 100644 --- a/vim/.vim/spell/en.utf-8.add +++ b/vim/.vim/spell/en.utf-8.add @@ -61,3 +61,4 @@ unitarily multimodal Kalman i.e. +Stratonovich diff --git a/zsh/.zshrc b/zsh/.zshrc index cc2e1ad..e54be1c 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -172,9 +172,9 @@ alias mca='make clean-all' # Misc alias a='vifm . .' -alias ff='FreeFem++' alias m='cd ~/.mutt/attachments && mutt && cd -' alias e='nvim' +alias f='fzm' alias mux='tmuxinator' alias email='mbsync -a' alias renet='systemctl restart NetworkManager.service' -- cgit v1.2.3 From ebe9521c37b97959df974f8adeb4c7bfed0a527a Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sat, 29 Feb 2020 12:23:18 +0000 Subject: Fix i3 script --- bin/.local/bin/workspace | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/.local/bin/workspace b/bin/.local/bin/workspace index ad378ef..4f2ab67 100755 --- a/bin/.local/bin/workspace +++ b/bin/.local/bin/workspace @@ -1,13 +1,14 @@ #!/usr/bin/env bash -# List of workspaces +# List of workspaces: (id, number, name) workspaces=$(i3-msg -t get_workspaces | awk 'BEGIN { RS="(},{)|(\\[{)|(}\\])"; - FPAT="([^,:]+)|([^,]+{[^}]+})|(\"[^\"]+\")" + FPAT="([^,:\"]+)|([^,\"]+:[^,\"]+)|([^,]+{[^}]+})" } $0 !~ "^\\s*$" { gsub(/"/, "", $4) - print $2, $4, $8, $11 + print $4, $6 + }' | sort) act_on_container() { -- cgit v1.2.3