From 74db1c0299e82190db70860e5e28a46f4a9f7e11 Mon Sep 17 00:00:00 2001 From: Henrik Bakken Date: Tue, 19 Jan 2021 17:21:59 +0100 Subject: [PATCH] updates --- conky/conky.conf | 59 ++++++++++++++++++++++++++ hjalmar-droneship/i3/config | 81 +++++++++++++----------------------- hjalmar-mothership/i3/config | 81 +++++++++++++----------------------- manjaro.md | 45 ++++++++------------ nvim/init.vim | 2 +- 5 files changed, 135 insertions(+), 133 deletions(-) create mode 100644 conky/conky.conf diff --git a/conky/conky.conf b/conky/conky.conf new file mode 100644 index 0000000..b33f410 --- /dev/null +++ b/conky/conky.conf @@ -0,0 +1,59 @@ +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 2e07e6b..6ea9c2c 100644 --- a/hjalmar-droneship/i3/config +++ b/hjalmar-droneship/i3/config @@ -18,8 +18,7 @@ default_floating_border normal hide_edge_borders none # change borders -bindsym $mod+u border none -bindsym $mod+y border pixel 1 +bindsym $mod+m border pixel 1 bindsym $mod+n border normal # configure some stuff @@ -45,16 +44,12 @@ bindsym $mod+d exec --no-startup-id rofi -show combi -combi-modi "run#drun" -lin exec --no-startup-id start-pulseaudio-x11 exec --no-startup-id pa-applet -bindsym $mod+Ctrl+m exec pavucontrol +bindsym $mod+Shift+m exec pavucontrol bindsym Pause exec pactl set-sink-volume @DEFAULT_SINK@ +10% bindsym Print exec pactl set-sink-volume @DEFAULT_SINK@ -10% bindsym Scroll_Lock exec pactl set-sink-mute @DEFAULT_SINK@ toggle -# Screen brightness controls -# bindsym XF86MonBrightnessUp exec "xbacklight -inc 10; notify-send 'brightness up'" -# bindsym XF86MonBrightnessDown exec "xbacklight -dec 10; notify-send 'brightness down'" - # enable / disable caps->escape bind 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'" @@ -68,11 +63,31 @@ 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+Shift+t exec --no-startup-id pkill picom -bindsym $mod+t exec --no-startup-id picom -b -bindsym $mod+Shift+d --release exec "killall dunst; exec notify-send 'restart dunst'" +bindsym $mod+Shift+F5 exec --no-startup-id pkill picom +bindsym $mod+F5 exec --no-startup-id picom -b +bindsym $mod+F6 --release exec "killall dunst; exec notify-send 'restart dunst'" bindsym $mod+Shift+s --release exec --no-startup-id flameshot gui -bindsym $mod+Ctrl+x --release exec --no-startup-id xkill +bindsym $mod+Shift+x --release exec --no-startup-id xkill + +# Autostart applications +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 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 --output DP-2 --mode 3840x2160 --output DP-0 --mode 2560x1440 --right-of DP-2 --primary # change focus bindsym $mod+h focus left @@ -86,10 +101,6 @@ bindsym $mod+Shift+j move down bindsym $mod+Shift+k move up bindsym $mod+Shift+l move right -# workspace back and forth (with/without active container) -bindsym $mod+b workspace back_and_forth -bindsym $mod+Shift+b move container to workspace back_and_forth; workspace back_and_forth - # split orientation bindsym $mod+q split toggle @@ -101,14 +112,10 @@ bindsym $mod+s layout stacking bindsym $mod+w layout tabbed bindsym $mod+e layout toggle split -# toggle tiling / floating -bindsym $mod+Shift+space floating toggle - -# change focus between tiling / floating windows +# tiling / floating bindsym $mod+space focus mode_toggle - -# toggle sticky -bindsym $mod+Shift+a sticky toggle +bindsym $mod+Shift+space floating toggle +bindsym $mod+Ctrl+space sticky toggle # focus the parent container bindsym $mod+a focus parent @@ -121,9 +128,6 @@ bindsym $mod+Shift+minus move scratchpad bindsym $mod+minus scratchpad show # Workspace names -# to display names or symbols instead of plain workspace numbers you can use -# something like: set $ws1 1:mail -# set $ws2 2: set $ws1 "1" set $ws2 "2" set $ws3 "3" @@ -218,9 +222,6 @@ for_window [class="Timeset-gui"] floating enable border normal for_window [class="(?i)virtualbox"] floating enable border normal for_window [class="Xfburn"] floating enable -# switch to workspace with urgent window automatically -for_window [urgent=latest] focus - # reload the configuration file bindsym $mod+Shift+c reload @@ -261,27 +262,6 @@ mode "resize" { bindsym Escape mode "default" } -# Autostart applications -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 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 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_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 --output DP-2 --mode 3840x2160 --output DP-0 --mode 2560x1440 --right-of DP-2 --primary - # Color palette used for the terminal ( ~/.Xresources file ) set_from_resource $term_background background set_from_resource $term_foreground foreground @@ -329,9 +309,6 @@ bar { } } -# hide/unhide i3status bar -bindsym $mod+m bar mode toggle - # Theme colors # class border backgr. text indic. child_border client.focused #556064 #f9ce5c #000000 #FDF6E3 diff --git a/hjalmar-mothership/i3/config b/hjalmar-mothership/i3/config index 5baa4ba..67815a3 100644 --- a/hjalmar-mothership/i3/config +++ b/hjalmar-mothership/i3/config @@ -18,8 +18,7 @@ default_floating_border normal hide_edge_borders none # change borders -bindsym $mod+u border none -bindsym $mod+y border pixel 1 +bindsym $mod+m border pixel 1 bindsym $mod+n border normal # configure some stuff @@ -45,16 +44,12 @@ bindsym $mod+d exec --no-startup-id rofi -show combi -combi-modi "run#drun" -lin exec --no-startup-id start-pulseaudio-x11 exec --no-startup-id pa-applet -bindsym $mod+Ctrl+m exec pavucontrol +bindsym $mod+Shift+m exec pavucontrol bindsym Pause exec pactl set-sink-volume @DEFAULT_SINK@ +10% bindsym Print exec pactl set-sink-volume @DEFAULT_SINK@ -10% bindsym Scroll_Lock exec pactl set-sink-mute @DEFAULT_SINK@ toggle -# Screen brightness controls -# bindsym XF86MonBrightnessUp exec "xbacklight -inc 10; notify-send 'brightness up'" -# bindsym XF86MonBrightnessDown exec "xbacklight -dec 10; notify-send 'brightness down'" - # enable / disable caps->escape bind 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'" @@ -68,11 +63,31 @@ 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+Shift+t exec --no-startup-id pkill picom -bindsym $mod+t exec --no-startup-id picom -b -bindsym $mod+Shift+d --release exec "killall dunst; exec notify-send 'restart dunst'" +bindsym $mod+Shift+F5 exec --no-startup-id pkill picom +bindsym $mod+F5 exec --no-startup-id picom -b +bindsym $mod+F6 --release exec "killall dunst; exec notify-send 'restart dunst'" bindsym $mod+Shift+s --release exec --no-startup-id flameshot gui -bindsym $mod+Ctrl+x --release exec --no-startup-id xkill +bindsym $mod+Shift+x --release exec --no-startup-id xkill + +# Autostart applications +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 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 # change focus bindsym $mod+h focus left @@ -86,10 +101,6 @@ bindsym $mod+Shift+j move down bindsym $mod+Shift+k move up bindsym $mod+Shift+l move right -# workspace back and forth (with/without active container) -bindsym $mod+b workspace back_and_forth -bindsym $mod+Shift+b move container to workspace back_and_forth; workspace back_and_forth - # split orientation bindsym $mod+q split toggle @@ -101,14 +112,10 @@ bindsym $mod+s layout stacking bindsym $mod+w layout tabbed bindsym $mod+e layout toggle split -# toggle tiling / floating -bindsym $mod+Shift+space floating toggle - -# change focus between tiling / floating windows +# tiling / floating bindsym $mod+space focus mode_toggle - -# toggle sticky -bindsym $mod+Shift+a sticky toggle +bindsym $mod+Shift+space floating toggle +bindsym $mod+Ctrl+space sticky toggle # focus the parent container bindsym $mod+a focus parent @@ -121,9 +128,6 @@ bindsym $mod+Shift+minus move scratchpad bindsym $mod+minus scratchpad show # Workspace names -# to display names or symbols instead of plain workspace numbers you can use -# something like: set $ws1 1:mail -# set $ws2 2: set $ws1 "1" set $ws2 "2" set $ws3 "3" @@ -218,9 +222,6 @@ for_window [class="Timeset-gui"] floating enable border normal for_window [class="(?i)virtualbox"] floating enable border normal for_window [class="Xfburn"] floating enable -# switch to workspace with urgent window automatically -for_window [urgent=latest] focus - # reload the configuration file bindsym $mod+Shift+c reload @@ -261,27 +262,6 @@ mode "resize" { bindsym Escape mode "default" } -# Autostart applications -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 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 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 --dpi 108 --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 -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 - # Color palette used for the terminal ( ~/.Xresources file ) set_from_resource $term_background background set_from_resource $term_foreground foreground @@ -329,9 +309,6 @@ bar { } } -# hide/unhide i3status bar -bindsym $mod+m bar mode toggle - # Theme colors # class border backgr. text indic. child_border client.focused #556064 #f9ce5c #000000 #FDF6E3 diff --git a/manjaro.md b/manjaro.md index 3d3607e..69cdd07 100644 --- a/manjaro.md +++ b/manjaro.md @@ -1,19 +1,22 @@ # linux -* basics - * AUR `sudo pacman -S yay` -* fonts - * `yay -S nerd-fonts-source-code-pro powerline-fonts-git libxft-bgra` -* applications - * `yay -S onedrive-abraunegg dropbox slack-desktop chromium zathura-pdf-mupdf trash-cli rofi redshift flameshot fish pavucontrol thunar drawio-desktop` -* gaming and media - + `yay -S steam-manjaro vlc libmicrodns protobuf ncspot-git mkchromecast` -* hardware - * `yay -S liquidctl glances pulseaudio-bluetooth asus-fan-control` +* 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` +* web `yay -S slack-desktop chromium` +* div applications `yay -S zathura-pdf-mupdf fish thunar drawio-desktop steam-manjaro` +* div utils `yay -S trash-cli rofi redshift flameshot asus-fan-control` # coding -* `yay -S cuda nvidia-container-toolkit` - `yay -S docker docker-compose dry-bin neovim tmux diff-so-fancy the_silver_searcher ripgrep bat npm nodejs yarn ninja ctags tig git-lfs` -* `git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm` +* essentials `yay -S neovim tmux` + * tmux plugins `git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm` + * base16 shell `git clone https://github.com/chriskempson/base16-shell.git ~/.config/base16-shell` +* cuda `yay -S cuda nvidia-container-toolkit` +* docker `yay -S docker docker-compose dry-bin` +* git `yay -S diff-so-fancy tig git-lfs` +* indexing `yay -S fsearch the_silver_searcher ripgrep ctags` +* java `yay -S npm nodejs` +* build `yay -S ninja` # python * `pip install ipython pytest neovim numpy scipy sympy flake8 ptvsd addict dill` @@ -24,17 +27,12 @@ # settings * bmenu for system config incl setting shell -* replace caps with esc `setxkbmap -option 'caps:escape'` * enable docker non-root daemon [link](https://docs.docker.com/engine/install/linux-postinstall) -* base16 shell `git clone https://github.com/chriskempson/base16-shell.git ~/.config/base16-shell` * ssh enable `sudo systemctl enable --now sshd.service` * jupyter `openssl req -x509 -nodes -days 365 -newkey rsa:1024 -keyout ~/.jupyter/mykey.key -out ~/.jupyter/mycert.pem` * start onedrive `systemctl enable --user onedrive --now` * ssd maintenance `sudo systemctl enable fstrim.timer --now` -* show log `journalctl --user-unit onedrive -f` -* nvim as default editor `xdg-mime default nvim.desktop application/octet-stream` -* change from alsa to pavu `install_pulse` -* manage `~/.config.mimeapps.list` associations +* urxvt ext install `https://github.com/simmel/urxvt-resize-font` # OMF * curl -L https://get.oh-my.fish | fish @@ -42,12 +40,3 @@ * omf install https://github.com/edc/bass * omf install https://github.com/jethrokuan/fzf -# ROUTER -* asus merlin - install conmon, skynet, scMerlin, FlexQOS - + maybe: Diversion + uiDivStats + yazFi -* 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 d6c6b36..558d42b 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -189,7 +189,7 @@ nmap w :cd %:p:h " ***************************** " REMAPPING -set langmap=å(,¨),Å{,^},Ø\\;,ø:,æ^ +set langmap=å(,¨),Å{,^},Ø\\;,ø:,æ^,+$ nnoremap æ " vnoremap æ " nnoremap Æ @