From 21f37cbc6b981ac805c641fe8e7ae4a4aff5e6da Mon Sep 17 00:00:00 2001 From: Henrik Bakken Date: Wed, 27 Jan 2021 00:07:32 +0100 Subject: [PATCH] updates --- conky/conky.conf | 59 ------------------------- hjalmar-droneship/i3/config | 29 +++++------- hjalmar-mothership/i3/config | 86 ++++++++++++++++-------------------- manjaro.md | 17 ++++--- modprobe.d/iwlwifi.conf | 4 +- nvim/init.vim | 26 ++++++----- 6 files changed, 75 insertions(+), 146 deletions(-) delete mode 100644 conky/conky.conf diff --git a/conky/conky.conf b/conky/conky.conf deleted file mode 100644 index b33f410..0000000 --- a/conky/conky.conf +++ /dev/null @@ -1,59 +0,0 @@ -conky.config = { - alignment = 'top_left', - background = false, - border_width = 1, - cpu_avg_samples = 2, - default_color = 'white', - default_outline_color = 'white', - default_shade_color = 'white', - double_buffer = true, - draw_borders = false, - draw_graph_borders = true, - draw_outline = false, - draw_shades = false, - extra_newline = false, - font = 'DejaVu Sans Mono:size=12', - gap_x = 60, - gap_y = 60, - minimum_height = 5, - minimum_width = 5, - net_avg_samples = 2, - no_buffers = true, - out_to_console = false, - out_to_ncurses = false, - out_to_stderr = false, - out_to_x = true, - own_window = true, - own_window_class = 'Conky', - own_window_type = 'desktop', - show_graph_range = false, - show_graph_scale = false, - stippled_borders = 0, - update_interval = 1.0, - uppercase = false, - use_spacer = 'none', - use_xft = true, -} - -conky.text = [[ -${color grey}Info:$color ${scroll 32 Conky $conky_version - $sysname $nodename $kernel $machine} -$hr -${color grey}Uptime:$color $uptime -${color grey}Frequency (in MHz):$color $freq -${color grey}Frequency (in GHz):$color $freq_g -${color grey}RAM Usage:$color $mem/$memmax - $memperc% ${membar 4} -${color grey}Swap Usage:$color $swap/$swapmax - $swapperc% ${swapbar 4} -${color grey}CPU Usage:$color $cpu% ${cpubar 4} -${color grey}Processes:$color $processes ${color grey}Running:$color $running_processes -$hr -${color grey}File systems: - / $color${fs_used /}/${fs_size /} ${fs_bar 6 /} -${color grey}Networking: -Up:$color ${upspeed} ${color grey} - Down:$color ${downspeed} -$hr -${color grey}Name PID CPU% MEM% -${color lightgrey} ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1} -${color lightgrey} ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2} -${color lightgrey} ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3} -${color lightgrey} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4} -]] diff --git a/hjalmar-droneship/i3/config b/hjalmar-droneship/i3/config index 5a81eb2..f469f66 100644 --- a/hjalmar-droneship/i3/config +++ b/hjalmar-droneship/i3/config @@ -34,15 +34,12 @@ 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 +exec --no-startup-id nitrogen --restore; sleep 1; compton -b exec --no-startup-id xfce4-power-manager -exec --no-startup-id clipit exec --no-startup-id pamac-tray -exec --no-startup-id start_conky_live_green exec --no-startup-id xautolock -time 30 -locker blurlock exec_always --no-startup-id sbxkb exec_always --no-startup-id fix_xcursor -# 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 -model pc105 -variant nodeadkeys -option "caps:escape" @@ -54,10 +51,10 @@ 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+f fullscreen toggle -bindsym $mod+q split toggle -bindsym $mod+f fullscreen toggle bindsym $mod+s layout stacking bindsym $mod+w layout tabbed bindsym $mod+e layout toggle split @@ -66,15 +63,15 @@ bindsym $mod+a focus parent bindsym $mod+Shift+c reload bindsym $mod+Shift+r restart -bindsym $mod+m border pixel 1 -bindsym $mod+n border normal - bindsym $mod+space focus mode_toggle bindsym $mod+Shift+space floating toggle bindsym $mod+Ctrl+space sticky toggle -bindsym $mod+Shift+minus move scratchpad -bindsym $mod+minus scratchpad show +bindsym $mod+Shift+comma exec picom-trans -c -10 +bindsym $mod+comma exec picom-trans -c +10 + +bindsym $mod+period scratchpad show +bindsym $mod+Shift+period move scratchpad bindsym $mod+h focus left bindsym $mod+j focus down @@ -96,7 +93,8 @@ 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+F2 exec chromium +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' @@ -174,7 +172,6 @@ bindsym $mod+Shift+End move container to workspace $ws9; workspace $ws9 bindsym $mod+Shift+Next move container to workspace $ws0; workspace $ws0 # Open specific applications in floating mode -for_window [class="calamares"] floating enable border normal for_window [class="GParted"] floating enable border normal for_window [class="Lightdm-settings"] floating enable for_window [class="Lxappearance"] floating enable sticky enable border normal @@ -186,15 +183,13 @@ 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, (s)uspend, (h)ibernate, (r)eboot, (Shift+s)hutdown +set $mode_system (l)ock, (e)xit, switch_(u)ser, (r)eboot, (Shift+s)hutdown mode "$mode_system" { bindsym l exec --no-startup-id i3exit lock, mode "default" - bindsym s exec --no-startup-id i3exit suspend, mode "default" bindsym u exec --no-startup-id i3exit switch_user, mode "default" bindsym e exec --no-startup-id i3exit logout, mode "default" - bindsym h exec --no-startup-id i3exit hibernate, mode "default" bindsym r exec --no-startup-id i3exit reboot, mode "default" - bindsym Shift+s exec --no-startup-id i3exit shutdown, mode "default" + bindsym s exec --no-startup-id i3exit shutdown, mode "default" # exit system mode: "Enter" or "Escape" bindsym Return mode "default" diff --git a/hjalmar-mothership/i3/config b/hjalmar-mothership/i3/config index 7bb2203..2875915 100644 --- a/hjalmar-mothership/i3/config +++ b/hjalmar-mothership/i3/config @@ -34,30 +34,27 @@ 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 +exec --no-startup-id nitrogen --restore; sleep 1; compton -b exec --no-startup-id xfce4-power-manager -exec --no-startup-id clipit exec --no-startup-id pamac-tray -exec --no-startup-id start_conky_live_green exec --no-startup-id xautolock -time 30 -locker blurlock exec_always --no-startup-id sbxkb exec_always --no-startup-id fix_xcursor -# 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 -model pc105 -variant nodeadkeys -option "caps:escape" exec --no-startup-id redshift-gtk exec --no-startup-id dropbox start & exec --no-startup-id nvidia-settings -a GPUFanControlState=1 -a GPUTargetFanSpeed=60 -exec --no-startup-id xrandr --dpi 108 --output $display2 --primary --output $display3 --auto --rotate left --right-of $display2 --output $display1 --auto --rotate left --left-of $display2 +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+f fullscreen toggle -bindsym $mod+q split toggle -bindsym $mod+f fullscreen toggle bindsym $mod+s layout stacking bindsym $mod+w layout tabbed bindsym $mod+e layout toggle split @@ -66,15 +63,15 @@ bindsym $mod+a focus parent bindsym $mod+Shift+c reload bindsym $mod+Shift+r restart -bindsym $mod+m border pixel 1 -bindsym $mod+n border normal - bindsym $mod+space focus mode_toggle bindsym $mod+Shift+space floating toggle bindsym $mod+Ctrl+space sticky toggle -bindsym $mod+Shift+minus move scratchpad -bindsym $mod+minus scratchpad show +bindsym $mod+Shift+comma exec picom-trans -c -10 +bindsym $mod+comma exec picom-trans -c +10 + +bindsym $mod+period scratchpad show +bindsym $mod+Shift+period move scratchpad bindsym $mod+h focus left bindsym $mod+j focus down @@ -96,7 +93,8 @@ 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+F2 exec chromium +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' @@ -118,63 +116,57 @@ set $ws1 "1" set $ws2 "2" set $ws3 "3" set $ws4 "4" -set $ws5 "Ins" -set $ws6 "Home" -set $ws7 "PgUp" -set $ws8 "Del" -set $ws9 "End" -set $ws0 "PgDn" +set $ws5 "5" +set $ws6 "6" +set $ws7 "7" +set $ws8 "8" +set $ws9 "9" # switch to workspace -workspace $ws1 output DP-0 +workspace $ws1 output DP-4 workspace $ws2 output DP-4 -workspace $ws3 output DP-0 +workspace $ws3 output DP-4 workspace $ws4 output DP-4 -workspace $ws5 output DP-0 -workspace $ws6 output DP-0 -workspace $ws7 output DP-0 +workspace $ws5 output DP-4 +workspace $ws6 output DP-4 +workspace $ws7 output DP-4 workspace $ws8 output DP-4 workspace $ws9 output DP-4 -workspace $ws0 output DP-4 # switch to workspace bindsym $mod+1 workspace $ws1 bindsym $mod+2 workspace $ws2 bindsym $mod+3 workspace $ws3 bindsym $mod+4 workspace $ws4 -bindsym $mod+Insert workspace $ws5 -bindsym $mod+Home workspace $ws6 -bindsym $mod+Prior workspace $ws7 -bindsym $mod+Delete workspace $ws8 -bindsym $mod+End workspace $ws9 -bindsym $mod+Next workspace $ws0 +bindsym $mod+5 workspace $ws5 +bindsym $mod+6 workspace $ws6 +bindsym $mod+7 workspace $ws7 +bindsym $mod+8 workspace $ws8 +bindsym $mod+9 workspace $ws9 # Move focused container to workspace bindsym $mod+Ctrl+1 move container to workspace $ws1 bindsym $mod+Ctrl+2 move container to workspace $ws2 bindsym $mod+Ctrl+3 move container to workspace $ws3 bindsym $mod+Ctrl+4 move container to workspace $ws4 -bindsym $mod+Ctrl+Insert move container to workspace $ws5 -bindsym $mod+Ctrl+Home move container to workspace $ws6 -bindsym $mod+Ctrl+Prior move container to workspace $ws7 -bindsym $mod+Ctrl+Delete move container to workspace $ws8 -bindsym $mod+Ctrl+End move container to workspace $ws9 -bindsym $mod+Ctrl+Next move container to workspace $ws0 +bindsym $mod+Ctrl+5 move container to workspace $ws5 +bindsym $mod+Ctrl+6 move container to workspace $ws6 +bindsym $mod+Ctrl+7 move container to workspace $ws7 +bindsym $mod+Ctrl+8 move container to workspace $ws8 +bindsym $mod+Ctrl+9 move container to workspace $ws9 # Move to workspace with focused container bindsym $mod+Shift+1 move container to workspace $ws1; workspace $ws1 bindsym $mod+Shift+2 move container to workspace $ws2; workspace $ws2 bindsym $mod+Shift+3 move container to workspace $ws3; workspace $ws3 bindsym $mod+Shift+4 move container to workspace $ws4; workspace $ws4 -bindsym $mod+Shift+Insert move container to workspace $ws5; workspace $ws5 -bindsym $mod+Shift+Home move container to workspace $ws5; workspace $ws6 -bindsym $mod+Shift+Prior move container to workspace $ws7; workspace $ws7 -bindsym $mod+Shift+Delete move container to workspace $ws8; workspace $ws8 -bindsym $mod+Shift+End move container to workspace $ws9; workspace $ws9 -bindsym $mod+Shift+Next move container to workspace $ws0; workspace $ws0 +bindsym $mod+Shift+5 move container to workspace $ws5; workspace $ws5 +bindsym $mod+Shift+6 move container to workspace $ws5; workspace $ws6 +bindsym $mod+Shift+7 move container to workspace $ws7; workspace $ws7 +bindsym $mod+Shift+8 move container to workspace $ws8; workspace $ws8 +bindsym $mod+Shift+9 move container to workspace $ws9; workspace $ws9 # Open specific applications in floating mode -for_window [class="calamares"] floating enable border normal for_window [class="GParted"] floating enable border normal for_window [class="Lightdm-settings"] floating enable for_window [class="Lxappearance"] floating enable sticky enable border normal @@ -186,15 +178,13 @@ 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, (s)uspend, (h)ibernate, (r)eboot, (Shift+s)hutdown +set $mode_system (l)ock, (e)xit, switch_(u)ser, (r)eboot, (Shift+s)hutdown mode "$mode_system" { bindsym l exec --no-startup-id i3exit lock, mode "default" - bindsym s exec --no-startup-id i3exit suspend, mode "default" bindsym u exec --no-startup-id i3exit switch_user, mode "default" bindsym e exec --no-startup-id i3exit logout, mode "default" - bindsym h exec --no-startup-id i3exit hibernate, mode "default" bindsym r exec --no-startup-id i3exit reboot, mode "default" - bindsym Shift+s exec --no-startup-id i3exit shutdown, mode "default" + bindsym s exec --no-startup-id i3exit shutdown, mode "default" # exit system mode: "Enter" or "Escape" bindsym Return mode "default" diff --git a/manjaro.md b/manjaro.md index 0c6f692..8eb6a3b 100644 --- a/manjaro.md +++ b/manjaro.md @@ -2,9 +2,14 @@ * AUR package manager `sudo pacman -S yay` * fonts `yay -S nerd-fonts-source-code-pro powerline-fonts-git libxft-bgra` * cloud storage `yay -S onedrive-abraunegg dropbox` -* multimedia `yay -S ncspot-git pavucontrol manjaro-pulse pa-applet pavucontrol pulseaudio-bluetooth` +* multimedia `yay -S ncspot-git pavucontrol manjaro-pulse pa-applet pavucontrol pulseaudio-bluetooth xwininfo` * web `yay -S slack-desktop chromium` -* div applications `yay -S zathura-pdf-mupdf fish thunar drawio-desktop steam-manjaro` +* pdf reader `yay -S zathura zathura-pdf-mupdf zathura zathura-djvu zathura-ps` +* shell `yay -S fish` + * 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 utils `yay -S trash-cli rofi redshift flameshot asus-fan-control` # coding @@ -19,7 +24,7 @@ * build `yay -S ninja` # python -* `pip install ipython pytest neovim numpy scipy sympy flake8 ptvsd addict dill` +* `pip install ipython pytest neovim numpy scipy sympy flake8 ptvsd addict dill ipdb` * matplotlib stuff `pip install matplotlib seaborn matplotlib-label-lines ipympl qbstyles` * other plotting `pip install plotly ggplot` * install torch from [link](https://pytorch.org/) @@ -33,9 +38,3 @@ * 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` - -# OMF -* curl -L https://get.oh-my.fish | fish -* omf install https://github.com/edc/bass -* omf install https://github.com/jethrokuan/fzf - diff --git a/modprobe.d/iwlwifi.conf b/modprobe.d/iwlwifi.conf index c0b4c87..bc9a852 100644 --- a/modprobe.d/iwlwifi.conf +++ b/modprobe.d/iwlwifi.conf @@ -1,3 +1,3 @@ -options iwlwifi bt_coex_active=N -#options iwlwifi disable_11ax=1 +options iwlwifi bt_coex_active=true +options iwlwifi disable_11ax=true options iwlmvm power_scheme=1 diff --git a/nvim/init.vim b/nvim/init.vim index 558d42b..9405d17 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -77,14 +77,14 @@ else endif " Transparent Background (For i3 and compton) -"highlight Normal guibg=NONE ctermbg=NONE -"highlight LineNr guibg=NONE ctermbg=NONE +highlight Normal guibg=NONE ctermbg=NONE +highlight LineNr guibg=NONE ctermbg=NONE " seoul256 theme config (dark 233-239, light 252-256) let g:seoul256_background=233 " colo seoul256 " colo base16-tomorrow-night -colo gruvbox-material +" colo gruvbox-material " statusline set cmdheight=2 @@ -92,8 +92,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_theme='base16_gruvbox_dark_hard' let g:airline#extensions#tabline#enabled=1 let g:airline#extensions#tabline#show_splits=0 @@ -183,7 +183,13 @@ set list let mapleader="\" set pastetoggle= nmap R :so ~/.config/nvim/init.vim -nmap E :tabe ~/OneDrive/dotfiles/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 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 @@ -213,7 +219,7 @@ nmap cf (coc-format-selected) " ***************************** " TERMINAL -nmap T :terminal +nmap t :terminal tmap tmap @@ -263,11 +269,9 @@ nmap :TmuxNavigateUp nmap :TmuxNavigateRight " make splits and tabs nnoremap :vsplit -nnoremap :vsplit -nnoremap § :vnew +nnoremap :vnew nnoremap :split -nnoremap - :split -nnoremap _ :new +nnoremap - :new nnoremap :tabe % nnoremap :tabnew " buffers and tabs