diff --git a/i3/config b/i3/config index 6c66cf6..78b52b3 100644 --- a/i3/config +++ b/i3/config @@ -4,6 +4,9 @@ # Set mod key (Mod1=, Mod4=) set $mod Mod4 +# set terminal +set $term st + # set default desktop layout (default is tiling) # workspace_layout tabbed @@ -33,7 +36,7 @@ font pango:Noto Sans 11 floating_modifier $mod # start a terminal -bindsym $mod+Return exec st +bindsym $mod+Return exec $term # kill focused window bindsym $mod+Shift+q kill @@ -47,7 +50,7 @@ bindsym $mod+d exec --no-startup-id rofi -show combi -combi-modi "run#drun" -lin ################################################################################################ exec --no-startup-id volumeicon -bindsym $mod+Ctrl+m exec terminal -e 'alsamixer' +bindsym $mod+Ctrl+m exec $term -e 'alsamixer' #exec --no-startup-id pulseaudio #exec --no-startup-id pa-applet #bindsym $mod+Ctrl+m exec pavucontrol @@ -70,13 +73,13 @@ bindsym $mod+F9 exec "xrandr --output DP-4 --primary --output DP-2 --auto --rota bindsym $mod+Shift+F9 exec "xrandr --output DP-4 --primary --output DP-2 --off --output DP-0 --off" # Start Applications -bindsym $mod+Ctrl+b exec terminal -e 'bmenu' +bindsym $mod+Ctrl+b exec $term -e 'bmenu' bindsym $mod+F1 exec glances -w bindsym $mod+F2 exec chromium bindsym $mod+F3 exec thunar -bindsym $mod+Shift+F3 exec terminal -e 'ranger' -bindsym $mod+F4 exec terminal -e 'mocp' -bindsym $mod++Shift+F4 exec terminal -e 'ncspot' +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+t exec --no-startup-id pkill picom bindsym $mod+Shift+t exec --no-startup-id picom -b bindsym $mod+Shift+d --release exec "killall dunst; exec notify-send 'restart dunst'" @@ -302,11 +305,12 @@ exec --no-startup-id xfce4-power-manager #exec --no-startup-id pamac-tray #exec --no-startup-id clipit #exec --no-startup-id start_conky_live_green -exec --no-startup-id xautolock -time 10 -locker blurlock +exec --no-startup-id xautolock -time 30 -locker blurlock exec_always --no-startup-id sbxkb #exec_always --no-startup-id ff-theme-util exec_always --no-startup-id fix_xcursor exec --no-startup-id xrandr --output $display2 --primary --output $display3 --auto --rotate left --right-of $display2 --output $display1 --auto --rotate left --left-of $display2 +exec_always for id in $(xinput list | grep "pointer" | cut -d '=' -f 2 | cut -f 1); do xinput --set-prop $id 'libinput Accel Profile Enabled' 0, 1; done # HB STARTUP ADDITIONS exec --no-startup-id setxkbmap -layout no -variant nodeadkeys -option "caps:escape" diff --git a/manjaro.md b/manjaro.md index 28d2a43..4abb4d3 100644 --- a/manjaro.md +++ b/manjaro.md @@ -11,6 +11,7 @@ * hardware * glances * liquidctl + * `sudo pacman -S pulseaudio-bluetooth` # coding * dry `yay dry-bin` @@ -46,8 +47,16 @@ # IP * hjalmar-droneship 88.89.64.249 10.0.0.2 -OMF +#OMF * curl -L https://get.oh-my.fish | fish * omf install https://github.com/FabioAntunes/fish-nvm * omf install https://github.com/edc/bass * omf install https://github.com/jethrokuan/fzf + +# ROUTER +* asus merlin - install Diversion, conmon, skynet, scMerlin, uiDivStats +* wifi adapter: kill bluetooth and background scans. tools: + * **rfkill** (=interact with wireless devices) see blocked `rfkill` + * **inxi** (=tool to show stuff) see network drivers `inxi -N` + * **iwconfig** (=wireless ifconfig) see signal strength, bit rate etc `iwconfig` + * **lsusb & lspci**: show info on usb & pci `sudo lsusb -vv -s [device]` and `sudo lspci -vv -s [device]` diff --git a/nvim/init.vim b/nvim/init.vim index a37804a..8017be2 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -13,7 +13,8 @@ let g:coc_global_extensions=[ \ 'coc-tsserver', \ 'coc-diagnostic', \ 'coc-yaml', - \ 'coc-explorer' + \ 'coc-explorer', + \ 'coc-markmap' \ ] call plug#begin('~/.config/nvim/plugged') @@ -73,6 +74,7 @@ endif " seoul256 theme config (dark 233-239, light 252-256) let g:seoul256_background=233 " colo seoul256 +" colo base16-tomorrow-night " statusline set cmdheight=2 @@ -80,8 +82,8 @@ let g:airline_powerline_fonts=1 "let g:airline_theme='molokai' "let g:airline_theme='qwq' "let g:airline_theme='badwolf' -"let g:airline_theme='silver' -let g:airline_theme='raven' +let g:airline_theme='silver' +" let g:airline_theme='raven' let g:airline#extensions#tabline#enabled=1 let g:airline#extensions#tabline#show_splits=0 let g:airline#extensions#tabline#show_tabs=0 @@ -176,6 +178,11 @@ nmap w :cd %:p:h " REMAPPING set langmap=å(,¨),Å{,^},Ø\\;,ø:,æ^ nnoremap æ " +vnoremap æ " +nnoremap Æ @ +vnoremap Æ @ +nnoremap ÆÆ @@ +vnoremap ÆÆ @@ vnoremap v nmap :noh @@ -220,8 +227,8 @@ let g:asterisk#keeppos=1 " ***************************** " CURSOR " stay visual when indenting -vnoremap >> >gv -vnoremap << >gv +vnoremap (coc-diagnostic-prev) nmap (coc-diagnostic-next) @@ -242,9 +249,9 @@ nmap :TmuxNavigateUp nmap :TmuxNavigateRight " make splits and tabs nnoremap :vsplit -nnoremap § :vnew +nnoremap :vnew nnoremap :split -nnoremap :new +nnoremap :new nnoremap :tabe % nnoremap :tabnew " buffers and tabs @@ -267,8 +274,9 @@ nmap :bpbd!# nmap :q " goyo let g:goyo_linenr=1 -let g:goyo_width=120 -nmap :Goyo +let g:goyo_width="140" +let g:goyo_height="100%" +nmap :Goyo " ***************************** " GIT @@ -281,30 +289,14 @@ vmap :CocCommand git.chunkUndo " ***************************** " EXPLORERS " coc-explorer -map :CocCommand explorer +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 " ***************************** " POPUPS -nmap :CocFzfList -nmap :CocFzfList symbols --kind Variable -nmap :CocFzfList symbols --kind Function -nmap :History -nmap :History/ -nmap :GFiles -nmap :Files -nmap :Buffers -map :Colors -map :Filetypes -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' -" fzf git -nmap :GFiles? -nmap :Commits -nmap :BCommits -" Grep +" Grep function function! RipgrepFzf(query, fullscreen) let command_fmt = 'rg --column --line-number --no-heading --color=always --smart-case -- %s || true' let initial_command = printf(command_fmt, shellescape(a:query)) @@ -314,7 +306,25 @@ function! RipgrepFzf(query, fullscreen) endfunction command! -nargs=* -bang RG call RipgrepFzf(, 0) "command! -bang -nargs=* Ag call fzf#vim#ag(, {'options': '--delimiter : --nth 4..'}, 0) -nmap :RG +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 +nmap :RG +nmap :GFiles? +nmap :History +nmap :History/ +nmap :Files +nmap :GFiles +map :Filetypes " ***************************** " COC CONFIGS @@ -347,7 +357,9 @@ endfunction " ***************************** " MARKDOWN " vim-markdown -let g:vim_markdown_new_list_item_indent=0 +nmap m (coc-markmap-create) +vmap m (coc-markmap-create-v) +let g:vim_markdown_new_list_item_indent=2 let g:vim_markdown_auto_insert_bullets=1 let g:vim_markdown_conceal=1 let g:vim_markdown_conceal_code_blocks=1 diff --git a/ranger/rifle.conf b/ranger/rifle.conf new file mode 100644 index 0000000..35f66a7 --- /dev/null +++ b/ranger/rifle.conf @@ -0,0 +1,284 @@ +# vim: ft=cfg +# +# This is the configuration file of "rifle", ranger's file executor/opener. +# Each line consists of conditions and a command. For each line the conditions +# are checked and if they are met, the respective command is run. +# +# Syntax: +# , , ... = command +# +# The command can contain these environment variables: +# $1-$9 | The n-th selected file +# $@ | All selected files +# +# If you use the special command "ask", rifle will ask you what program to run. +# +# Prefixing a condition with "!" will negate its result. +# These conditions are currently supported: +# match | The regexp matches $1 +# ext | The regexp matches the extension of $1 +# mime | The regexp matches the mime type of $1 +# name | The regexp matches the basename of $1 +# path | The regexp matches the absolute path of $1 +# has | The program is installed (i.e. located in $PATH) +# env | The environment variable "variable" is non-empty +# file | $1 is a file +# directory | $1 is a directory +# number | change the number of this command to n +# terminal | stdin, stderr and stdout are connected to a terminal +# X | A graphical environment is available (darwin, Xorg, or Wayland) +# +# There are also pseudo-conditions which have a "side effect": +# flag | Change how the program is run. See below. +# label