diff --git a/hjalmar-droneship/i3/config b/hjalmar-droneship/i3/config index f469f66..63dd735 100644 --- a/hjalmar-droneship/i3/config +++ b/hjalmar-droneship/i3/config @@ -34,7 +34,7 @@ exec --no-startup-id start-pulseaudio-x11 exec --no-startup-id pa-applet exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec --no-startup-id nm-applet -exec --no-startup-id nitrogen --restore; sleep 1; compton -b +exec --no-startup-id nitrogen --restore; sleep 1; picom -b exec --no-startup-id xfce4-power-manager exec --no-startup-id pamac-tray exec --no-startup-id xautolock -time 30 -locker blurlock @@ -51,27 +51,27 @@ exec --no-startup-id xrandr --output DP-2 --mode 3840x2160 --output DP-0 --mode # div bindings bindsym $mod+Shift+q kill bindsym $mod+q split toggle -bindsym $mod+bar split h; exec notify-send 'tile horizontally' -bindsym $mod+minus split v; exec notify-send 'tile vertically' +bindsym $mod+s split h; exec notify-send 'tile horizontally' +bindsym $mod+v split v; exec notify-send 'tile vertically' bindsym $mod+f fullscreen toggle -bindsym $mod+s layout stacking -bindsym $mod+w layout tabbed +bindsym $mod+w layout stacking +bindsym $mod+t layout tabbed bindsym $mod+e layout toggle split bindsym $mod+a focus parent -bindsym $mod+Shift+c reload +bindsym $mod+r reload bindsym $mod+Shift+r restart bindsym $mod+space focus mode_toggle bindsym $mod+Shift+space floating toggle bindsym $mod+Ctrl+space sticky toggle -bindsym $mod+Shift+comma exec picom-trans -c -10 -bindsym $mod+comma exec picom-trans -c +10 +bindsym $mod+Shift+c exec picom-trans -c -10 +bindsym $mod+c exec picom-trans -c +10 -bindsym $mod+period scratchpad show -bindsym $mod+Shift+period move scratchpad +bindsym $mod+p scratchpad show +bindsym $mod+Shift+p move scratchpad bindsym $mod+h focus left bindsym $mod+j focus down @@ -92,23 +92,25 @@ bindsym $mod+d exec --no-startup-id rofi -show combi -combi-modi "run#drun" -lin bindsym $mod+Shift+s --release exec --no-startup-id flameshot gui bindsym $mod+Shift+x --release exec --no-startup-id xkill -bindsym $mod+F1 exec glances -w +bindsym $mod+F1 exec $term -e 'htop' +bindsym $mod+Shift+F1 exec $term -e 'glances' bindsym $mod+F2 exec "chromium --start-fullscreen https://www.inoreader.com" bindsym $mod+Shift+F2 exec "chromium --new-window --start-fullscreen https://www.inoreader.com" -bindsym $mod+F3 exec thunar -bindsym $mod+Shift+F3 exec $term -e 'ranger' -bindsym $mod+F4 exec $term -e 'mocp' -bindsym $mod++Shift+F4 exec $term -e 'ncspot' +bindsym $mod+F3 exec $term -e 'ranger' +bindsym $mod+Shift+F3 exec thunar +bindsym $mod+F4 exec pamac-manager bindsym $mod+F5 exec pavucontrol -bindsym $mod+F6 exec --no-startup-id picom -b -bindsym $mod+Shift+F6 exec --no-startup-id pkill picom -bindsym $mod+Shift+F7 --release exec "killall dunst; exec notify-send 'restart dunst'" -bindsym $mod+F10 exec "setxkbmap -layout no -model pc105 -variant nodeadkeys -option" -bindsym $mod+F11 exec "setxkbmap -layout no -model pc105 -variant nodeadkeys -option 'caps:backspace'" -bindsym $mod+F12 exec "setxkbmap -layout no -model pc105 -variant nodeadkeys -option 'caps:escape'" +bindsym $mod+F6 exec $term -e 'mocp' +bindsym $mod+Shift+F6 exec $term -e 'ncspot' +bindsym $mod+F9 exec --no-startup-id picom -b +bindsym $mod+Shift+F9 exec --no-startup-id pkill picom +bindsym $mod+Shift+F10 --release exec "killall dunst; exec notify-send 'restart dunst'" +# bindsym $mod+Shift+F10 exec "setxkbmap -layout no -model pc105 -variant nodeadkeys -option" +# bindsym $mod+Shift+F11 exec "setxkbmap -layout no -model pc105 -variant nodeadkeys -option 'caps:backspace'" +# bindsym $mod+Shift+F12 exec "setxkbmap -layout no -model pc105 -variant nodeadkeys -option 'caps:escape'" bindsym $mod+0 mode "$mode_system" -bindsym $mod+r mode "resize" +bindsym $mod+z mode "resize" bindsym $mod+g mode "$mode_gaps" # Workspace names @@ -183,7 +185,7 @@ for_window [class="Pavucontrol"] floating enable for_window [class="qt5ct"] floating enable sticky enable border normal # Set shut down, restart and locking features -set $mode_system (l)ock, (e)xit, switch_(u)ser, (r)eboot, (Shift+s)hutdown +set $mode_system (l)ock, (e)xit, switch_(u)ser, (r)eboot, (s)hutdown mode "$mode_system" { bindsym l exec --no-startup-id i3exit lock, mode "default" bindsym u exec --no-startup-id i3exit switch_user, mode "default" @@ -235,9 +237,7 @@ bar { status_command i3status position bottom -## please set your primary output first. Example: 'xrandr --output eDP1 --primary' - - tray_output primary + tray_output DP-2 bindsym button4 nop bindsym button5 nop strip_workspace_numbers yes diff --git a/hjalmar-droneship/onedrive/config b/hjalmar-droneship/onedrive/config index 5e1e9a5..b313ab6 100644 --- a/hjalmar-droneship/onedrive/config +++ b/hjalmar-droneship/onedrive/config @@ -6,7 +6,8 @@ # For explanations of all config options below see docs/USAGE.md or the man page. # sync_dir="/mnt/OneDrive" -skip_dir="Programming/logs|Bilder/Camera Roll|Backup|Datasets|Pictures|Videos" +skip_dir="Programming/logs|Bilder/Camera Roll|Backup|Datasets|Pictures|Videos|Music|Library|Research*|*/__pycache__|*/.ipynb_checkpoints" +skip_file="*.tmp|.~*|~*" # monitor_interval = "45" # skip_dir = "Videos" # log_dir = "/var/log/onedrive/" @@ -14,7 +15,7 @@ skip_dir="Programming/logs|Bilder/Camera Roll|Backup|Datasets|Pictures|Videos" # upload_only = "false" # check_nomount = "false" # check_nosync = "false" -download_only = "true" +# download_only = "false" # disable_notifications = "false" # disable_upload_validation = "false" # enable_logging = "false" diff --git a/hjalmar-mothership/i3/config b/hjalmar-mothership/i3/config index 2875915..12d2f0d 100644 --- a/hjalmar-mothership/i3/config +++ b/hjalmar-mothership/i3/config @@ -34,7 +34,7 @@ exec --no-startup-id start-pulseaudio-x11 exec --no-startup-id pa-applet exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec --no-startup-id nm-applet -exec --no-startup-id nitrogen --restore; sleep 1; compton -b +exec --no-startup-id nitrogen --restore; sleep 1; picom -b exec --no-startup-id xfce4-power-manager exec --no-startup-id pamac-tray exec --no-startup-id xautolock -time 30 -locker blurlock @@ -51,27 +51,27 @@ exec --no-startup-id xrandr --output DP-4 --mode 5120x1440 --primary # div bindings bindsym $mod+Shift+q kill bindsym $mod+q split toggle -bindsym $mod+bar split h; exec notify-send 'tile horizontally' -bindsym $mod+minus split v; exec notify-send 'tile vertically' +bindsym $mod+s split h; exec notify-send 'tile horizontally' +bindsym $mod+v split v; exec notify-send 'tile vertically' bindsym $mod+f fullscreen toggle -bindsym $mod+s layout stacking -bindsym $mod+w layout tabbed +bindsym $mod+w layout stacking +bindsym $mod+t layout tabbed bindsym $mod+e layout toggle split bindsym $mod+a focus parent -bindsym $mod+Shift+c reload +bindsym $mod+r reload bindsym $mod+Shift+r restart bindsym $mod+space focus mode_toggle bindsym $mod+Shift+space floating toggle bindsym $mod+Ctrl+space sticky toggle -bindsym $mod+Shift+comma exec picom-trans -c -10 -bindsym $mod+comma exec picom-trans -c +10 +bindsym $mod+Shift+c exec picom-trans -c -10 +bindsym $mod+c exec picom-trans -c +10 -bindsym $mod+period scratchpad show -bindsym $mod+Shift+period move scratchpad +bindsym $mod+p scratchpad show +bindsym $mod+Shift+p move scratchpad bindsym $mod+h focus left bindsym $mod+j focus down @@ -92,23 +92,25 @@ bindsym $mod+d exec --no-startup-id rofi -show combi -combi-modi "run#drun" -lin bindsym $mod+Shift+s --release exec --no-startup-id flameshot gui bindsym $mod+Shift+x --release exec --no-startup-id xkill -bindsym $mod+F1 exec glances -w +bindsym $mod+F1 exec $term -e 'htop' +bindsym $mod+Shift+F1 exec $term -e 'glances' bindsym $mod+F2 exec "chromium --start-fullscreen https://www.inoreader.com" bindsym $mod+Shift+F2 exec "chromium --new-window --start-fullscreen https://www.inoreader.com" -bindsym $mod+F3 exec thunar -bindsym $mod+Shift+F3 exec $term -e 'ranger' -bindsym $mod+F4 exec $term -e 'mocp' -bindsym $mod++Shift+F4 exec $term -e 'ncspot' +bindsym $mod+F3 exec $term -e 'ranger' +bindsym $mod+Shift+F3 exec thunar +bindsym $mod+F4 exec pamac-manager bindsym $mod+F5 exec pavucontrol -bindsym $mod+F6 exec --no-startup-id picom -b -bindsym $mod+Shift+F6 exec --no-startup-id pkill picom -bindsym $mod+Shift+F7 --release exec "killall dunst; exec notify-send 'restart dunst'" -bindsym $mod+F10 exec "setxkbmap -layout no -model pc105 -variant nodeadkeys -option" -bindsym $mod+F11 exec "setxkbmap -layout no -model pc105 -variant nodeadkeys -option 'caps:backspace'" -bindsym $mod+F12 exec "setxkbmap -layout no -model pc105 -variant nodeadkeys -option 'caps:escape'" +bindsym $mod+F6 exec $term -e 'mocp' +bindsym $mod+Shift+F6 exec $term -e 'ncspot' +bindsym $mod+F9 exec --no-startup-id picom -b +bindsym $mod+Shift+F9 exec --no-startup-id pkill picom +bindsym $mod+Shift+F10 --release exec "killall dunst; exec notify-send 'restart dunst'" +# bindsym $mod+Shift+F10 exec "setxkbmap -layout no -model pc105 -variant nodeadkeys -option" +# bindsym $mod+Shift+F11 exec "setxkbmap -layout no -model pc105 -variant nodeadkeys -option 'caps:backspace'" +# bindsym $mod+Shift+F12 exec "setxkbmap -layout no -model pc105 -variant nodeadkeys -option 'caps:escape'" bindsym $mod+0 mode "$mode_system" -bindsym $mod+r mode "resize" +bindsym $mod+z mode "resize" bindsym $mod+g mode "$mode_gaps" # Workspace names @@ -178,7 +180,7 @@ for_window [class="Pavucontrol"] floating enable for_window [class="qt5ct"] floating enable sticky enable border normal # Set shut down, restart and locking features -set $mode_system (l)ock, (e)xit, switch_(u)ser, (r)eboot, (Shift+s)hutdown +set $mode_system (l)ock, (e)xit, switch_(u)ser, (r)eboot, (s)hutdown mode "$mode_system" { bindsym l exec --no-startup-id i3exit lock, mode "default" bindsym u exec --no-startup-id i3exit switch_user, mode "default" @@ -230,9 +232,7 @@ bar { status_command i3status position bottom -## please set your primary output first. Example: 'xrandr --output eDP1 --primary' - - tray_output primary + tray_output DP-4 bindsym button4 nop bindsym button5 nop strip_workspace_numbers yes diff --git a/hjalmar-mothership/onedrive/config b/hjalmar-mothership/onedrive/config index 43ebd6b..4a0505c 100644 --- a/hjalmar-mothership/onedrive/config +++ b/hjalmar-mothership/onedrive/config @@ -5,8 +5,9 @@ # When changing a config option below, remove the '#' from the start of the line # For explanations of all config options below see docs/USAGE.md or the man page. # -sync_dir = "/mnt/OneDrive" -# skip_file = "~*|.~*|*.tmp" +sync_dir="/mnt/OneDrive" +skip_dir="Programming/logs|Bilder/Camera Roll|Backup|Datasets|Pictures|Videos|*/__pycache__|*/.ipynb_checkpoints" +skip_file="*.tmp|.~*|~*" # monitor_interval = "45" # skip_dir = "Videos" # log_dir = "/var/log/onedrive/" @@ -14,7 +15,7 @@ sync_dir = "/mnt/OneDrive" # upload_only = "false" # check_nomount = "false" # check_nosync = "false" -download_only = "false" +# download_only = "false" # disable_notifications = "false" # disable_upload_validation = "false" # enable_logging = "false" diff --git a/manjaro.md b/manjaro.md index 8eb6a3b..0427d9b 100644 --- a/manjaro.md +++ b/manjaro.md @@ -9,7 +9,7 @@ * curl -L https://get.oh-my.fish | fish * omf install https://github.com/edc/bass * omf install https://github.com/jethrokuan/fzf -* div applications `yay -S thunar drawio-desktop steam-manjaro` +* div applications `yay -S thunar ranger drawio-desktop steam-manjaro` * div utils `yay -S trash-cli rofi redshift flameshot asus-fan-control` # coding @@ -24,7 +24,7 @@ * build `yay -S ninja` # python -* `pip install ipython pytest neovim numpy scipy sympy flake8 ptvsd addict dill ipdb` +* `pip install ipython pytest neovim numpy scipy sympy flake8 ptvsd addict dill ipdb pudb web-pdb` * matplotlib stuff `pip install matplotlib seaborn matplotlib-label-lines ipympl qbstyles` * other plotting `pip install plotly ggplot` * install torch from [link](https://pytorch.org/) @@ -38,3 +38,6 @@ * start onedrive `systemctl enable --user onedrive --now` * ssd maintenance `sudo systemctl enable fstrim.timer --now` * urxvt ext install `https://github.com/simmel/urxvt-resize-font` + +# wsl +* sudo apt install fish neovim ranger tmux docker docker/compose tig git-lfs ctags ripgrep silversearcher-ag python3-pip diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json index e61610b..9ea3ddc 100644 --- a/nvim/coc-settings.json +++ b/nvim/coc-settings.json @@ -6,7 +6,7 @@ "python.linting.pylintEnabled": false, "python.linting.flake8Enabled": true, "python.linting.pylintArgs": ["--disable=all", "--enable=F,E,unreachable,duplicate-key,unnecessary-semicolon,global-variable-not-assigned,unused-variable,binary-op-exception,bad-format-string,anomalous-backslash-in-string,bad-open-mode"], - "python.linting.flake8Args": ["--ignore=E221,E226,E231,E241,E501,E701,E704"], + "python.linting.flake8Args": ["--ignore=E221,E226,E231,E241,E272,E501,E701,E704"], "python.linting.enabled": true, "git.enableGutters": true, "yaml.format.enable": true, diff --git a/nvim/init.vim b/nvim/init.vim index 9405d17..c2616d0 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -15,9 +15,7 @@ let g:coc_global_extensions=[ \ 'coc-diagnostic', \ 'coc-yaml', \ 'coc-explorer', - \ 'coc-markmap' \ ] -let g:polyglot_disabled = ['python'] call plug#begin('~/.config/nvim/plugged') " tools @@ -44,7 +42,6 @@ Plug 'tpope/vim-unimpaired' Plug 'tpope/vim-sensible' Plug 'dkarter/bullets.vim' " python -Plug 'numirias/semshi', {'do': ':UpdateRemotePlugins'} Plug 'tmhedberg/SimpylFold' Plug 'jeetsukumaran/vim-pythonsense' " tmux @@ -168,7 +165,8 @@ let g:BASH_Ctrl_j='off' " avoid 'C-j' being overridden to newline let g:BASH_Ctrl_l='off' " avoid 'C-l' being overridden to newline highlight clear SignColumn " SignColumn should match background set shortmess=atOI " No help Uganda information, and overwrite read messages to avoid PRESS ENTER prompts -set listchars=tab:→\ ,eol:↵,trail:·,extends:↷,precedes:↶,nbsp:+ +set listchars=tab:→\ ,trail:·,extends:↷,precedes:↶,nbsp:+ +" eol:↵ set fillchars=vert:│,stl:\ ,stlnc:\ set clipboard+=unnamedplus set list @@ -182,14 +180,14 @@ set list " MAPPING let mapleader="\" set pastetoggle= -nmap R :so ~/.config/nvim/init.vim -nmap V :tabe ~/OneDrive/dotfiles/nvim/init.vim -nmap L :tabe ~/OneDrive/Notes/libs.md -nmap U :tabe ~/OneDrive/Notes/urls.md -nmap N :tabe ~/OneDrive/Notes/names.md -nmap Ø :tabe ~/OneDrive/Notes/økonomi.md -nmap C :tabe ~/OneDrive/Notes/cheatsheet.md -nmap T :tabe ~/OneDrive/Notes/todos.md +nmap r :so ~/.config/nvim/init.vim +nmap e :tabe ~/OneDrive/dotfiles/nvim/init.vim +nmap l :tabe ~/OneDrive/Notes/libs.md +nmap u :tabe ~/OneDrive/Notes/urls.md +nmap c :tabe ~/OneDrive/Notes/cheatsheet.md +nmap t :tabe ~/OneDrive/Notes/todos.md +nmap n :Explore ~/OneDrive/Notes +nmap d :Explore ~/OneDrive/dotfiles nmap w :cd %:p:h " vim-surround: visual 'SA' to wrap in A. Surround 'csAB' to change from A to B, 'dsA' to remove A. Word 'ysiwA' to wrap with A @@ -220,7 +218,7 @@ nmap cf (coc-format-selected) " ***************************** " TERMINAL nmap t :terminal -tmap +tmap tmap " ***************************** @@ -256,9 +254,10 @@ nmap (coc-diagnostic-next) nmap (coc-git-prevchunk) nmap (coc-git-nextchunk) nmap gd (coc-definition) -nmap gy (coc-type-definition) -nmap gi (coc-implementation) nmap gr (coc-references) +" nmap gy (coc-type-definition) +" nmap gi (coc-implementation) +" nmap gD (coc-declaration) " ***************************** " WINDOWS / BUFFERS @@ -268,15 +267,13 @@ nmap :TmuxNavigateDown nmap :TmuxNavigateUp nmap :TmuxNavigateRight " make splits and tabs -nnoremap :vsplit -nnoremap :vnew -nnoremap :split -nnoremap - :new +nnoremap :vnew +nnoremap :new nnoremap :tabe % nnoremap :tabnew " buffers and tabs -nmap :bprev -nmap :bnext +nmap :bprev:call CleanEmptyBuffers() +nmap :bnext:call CleanEmptyBuffers() nmap :tabprev nmap :tabnext " resize windows with hjkl @@ -288,8 +285,8 @@ nnoremap > nmap :cp nmap :cn " remove buffer -nmap :bpbd# -nmap :bpbd!# +nmap :enew:bd# +nmap :enew:bd!# " close window nmap :q " goyo @@ -313,6 +310,7 @@ map :CocCommand explorer " vim-fugitive " g? for fugitive help. :Gdiff, :Gblame, :Gstats '=' expand, '-' add/reset changes, :Gcommit % to commit current file with messag map :vertical Git:vertical resize 60 +map :UndotreeToggle " ***************************** " POPUPS @@ -329,20 +327,20 @@ command! -nargs=* -bang RG call RipgrepFzf(, 0) let g:fzf_preview_command='bat --color=always --plain {-1}' " Installed bat let g:fzf_preview_grep_cmd='rg --smart-case --line-number --no-heading --color=never' " shortcuts -nmap :Buffers map :Colors nmap :CocFzfList nmap :CocFzfList symbols nmap :CocFzfList symbols --kind Variable nmap :CocFzfList symbols --kind Function nmap :CocFzfList symbols --kind Class -nmap :Commits -nmap :BCommits +" F9 reserved for exec in terminal +nmap :Commits +nmap :BCommits nmap :CocFzfList outline +nmap :Buffers nmap :RG nmap :GFiles? nmap :History -nmap :History/ nmap :Files nmap :GFiles map :Filetypes @@ -378,8 +376,6 @@ endfunction " ***************************** " MARKDOWN " vim-markdown -nmap m (coc-markmap-create) -vmap m (coc-markmap-create-v) let g:vim_markdown_new_list_item_indent=0 let g:vim_markdown_auto_insert_bullets=0 let g:vim_markdown_conceal=1 @@ -402,13 +398,19 @@ let g:mkdp_preview_options={ " ***************************** " autocmd +function! CleanEmptyBuffers() + let buffers = filter(range(1, bufnr('$')), 'buflisted(v:val) && empty(bufname(v:val)) && bufwinnr(v:val)<0 && !getbufvar(v:val, "&mod")') + if !empty(buffers) + exe 'bw ' . join(buffers, ' ') + endif +endfunction augroup myAu " A unique name for the group. DO NOT use the same name twice! autocmd! autocmd FileType python set tabstop=4 softtabstop=4 shiftwidth=4 autocmd FileType markdown,yaml set tabstop=2 softtabstop=2 shiftwidth=2 autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o " Disables automatic commenting on newline autocmd FileType * RainbowParentheses() - autocmd BufEnter * if &filetype == "" | setlocal ft=markdown | endif " default new file is markdown + autocmd BufEnter * if &filetype == "" | setlocal ft=none | endif " default new file is none autocmd BufWritePre * %s/\s\+$//e " Automatically deletes all trailing whitespace on save. autocmd BufReadPost quickfix nmap " quickfix autocmd CompleteDone * if pumvisible() == 0 | pclose | endif " bugfix