From ad10da983cdcd9f2a640a71eaaf5772eca602964 Mon Sep 17 00:00:00 2001 From: kageru Date: Wed, 29 May 2019 19:15:49 +0200 Subject: [PATCH] updated way too many things --- .Xresources | 2 ++ .config/compton.conf | 4 +-- .config/htop/htoprc | 10 ++++---- .config/mpv/mpv.conf | 2 +- .config/polybar/config | 55 +++++++++++++++--------------------------- .config/zsh/aliases.sh | 17 +++++++++---- .extend.Xresources | 2 +- .i3/config | 20 +++++++-------- .ncmpcpp/bindings | 2 ++ bin/autostart | 6 +++-- bin/restart_polybar | 2 +- 11 files changed, 59 insertions(+), 63 deletions(-) diff --git a/.Xresources b/.Xresources index b12de8f..a455ea3 100644 --- a/.Xresources +++ b/.Xresources @@ -15,6 +15,8 @@ Xft.rgba: rgb Xft.autohint: false Xft.hintstyle: hintslight Xft.lcdfilter: lcddefault +xft.family: Hack +Xft.size: 13 XTerm*background: #2b2b2b XTerm*foreground: #e7e7e7 diff --git a/.config/compton.conf b/.config/compton.conf index 3d12568..b24e8c4 100644 --- a/.config/compton.conf +++ b/.config/compton.conf @@ -35,11 +35,11 @@ glx-copy-from-front = false; glx-swap-method = "undefined"; opacity-rule = [ "100:class_g = 'polybar'", - "90:class_g = 'St' && focused", + "94:class_g = 'St' && focused", "100:name *?= 'chromium'", "100:class_g = 'Firefox'", "100:class_g *?= 'mpv'", - "80:class_g = 'St' && !focused", + "86:class_g = 'St' && !focused", "70:class_g *?= 'rofi'" ]; wintypes : diff --git a/.config/htop/htoprc b/.config/htop/htoprc index c04c09e..081688d 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -2,7 +2,7 @@ # The parser is also very primitive, and not human-friendly. fields=48 38 39 46 47 111 1 sort_key=46 -sort_direction=1 +sort_direction=-1 hide_threads=0 hide_kernel_threads=1 hide_userland_threads=0 @@ -20,7 +20,7 @@ update_process_names=0 account_guest_in_cpu_meter=0 color_scheme=5 delay=15 -left_meters=AllCPUs2 CPU -left_meter_modes=1 3 -right_meters=LoadAverage CPU Tasks Uptime Blank Memory Memory -right_meter_modes=2 2 2 2 2 2 3 +left_meters=AllCPUs2 Memory CPU Tasks +left_meter_modes=1 1 2 2 +right_meters=CPU Memory Blank LoadAverage Uptime +right_meter_modes=3 3 2 2 2 diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index 4ddac54..cb55ec0 100755 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -1,7 +1,7 @@ #Allgemein vo=gpu #gpu-context=open-gl -gpu-api=vulkan +gpu-api=opengl profile=gpu-hq #hwdec=auto-copy spirv-compiler=shaderc diff --git a/.config/polybar/config b/.config/polybar/config index 4a8849b..12d0748 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -8,19 +8,18 @@ ;===================================================== [colors] -background = #00303031 -background-alt = #00303031 -foreground = #fafbfb -foreground-alt = #dddddd -primary = #fafbfb -secondary = #dddddd -green = #8dd151 -alert = #9b3331 +background = #002d2a2e +background-alt = #002d2a2e +foreground = #555555 +foreground-alt = #555555 +primary = #fcfcfa +secondary = #dcdcda +green = #a9dc76 +alert = #ff6188 [bar/custom] override-redirect = true -wm-restack = i3 [bar/right] monitor = ${env:MONITOR:HDMI-0} @@ -48,17 +47,15 @@ module-margin-left = 2 module-margin-right = 2 ; I’m a weeb who also listens to weeb music, so I needed a font with Kanji -font-0 = "Noto Sans CJK JP Regular:size=11;1" -font-1 = "Wuncon Siji:size=11;1" -font-2 = "Noto Sans CJK JP Regular:size=11;1" +font-0 = "Noto Sans CJK JP:bold:size=11" +font-1 = "Wuncon Siji:size=11" +font-2 = "Noto Sans CJK JP:bold:size=11" modules-left = i3 mpd modules-center = ; add battery here when using a mobile device modules-right = cpu memory filesystem date -;wm-restack = bspwm -wm-restack = i3 ;override-redirect = true @@ -69,9 +66,6 @@ scroll-up = i3wm-wsnext scroll-down = i3wm-wsprev cursor-click = pointer -cursor-scroll = ns-normal - - [bar/left] monitor = ${env:MONITOR:DVI-D-0} @@ -98,17 +92,14 @@ padding-right = 2 module-margin-left = 1 module-margin-right = 2 -font-0 = "Noto Sans CJK JP Regular:size=11;1" -font-1 = "Noto Sans CJK JP Regular:size=11;1" -font-2 = "Noto Sans CJK JP Regular:size=11;1" +font-0 = "Noto Sans CJK JP:size=11;1" +font-1 = "Wuncon Siji:size=11;1" +font-2 = "Noto Sans CJK JP:size=11;1" modules-left = i3 mpd modules-center = modules-right = cpu memory filesystem date -;wm-restack = bspwm -wm-restack = i3 - ;override-redirect = true ;scroll-up = bspwm-desknext @@ -118,8 +109,6 @@ scroll-up = i3wm-wsnext scroll-down = i3wm-wsprev cursor-click = pointer -cursor-scroll = ns-normal - [bar/main] monitor = ${env:MONITOR:DP-0} @@ -146,21 +135,17 @@ padding-right = 2 module-margin-left = 1 module-margin-right = 2 -font-0 = "Noto Sans CJK JP Regular:size=11;1" -font-1 = "Noto Sans CJK JP Regular:size=11;1" -font-2 = "Noto Sans CJK JP Regular:size=11;1" +font-0 = "Noto Sans CJK JP:size=11;1" +font-1 = "Wuncon Siji:size=11;1" +font-2 = "Noto Sans CJK JP:size=11;1" modules-left = i3 mpd modules-center = modules-right = cpu memory filesystem date -tray-position = center +tray-position = none tray-padding = 2 -tray-transparent = true -tray-background = #80303031 - -;wm-restack = bspwm -wm-restack = i3 +tray-background = #00303031 ;override-redirect = true @@ -171,7 +156,6 @@ scroll-up = i3wm-wsnext scroll-down = i3wm-wsprev cursor-click = pointer -cursor-scroll = ns-normal [module/xwindow] type = internal/xwindow @@ -198,6 +182,7 @@ type = internal/fs interval = 25 mount-0 = / +mount-1 = /home label-mounted = %free% label-unmounted = %mountpoint% not mounted diff --git a/.config/zsh/aliases.sh b/.config/zsh/aliases.sh index d343359..c1acae3 100644 --- a/.config/zsh/aliases.sh +++ b/.config/zsh/aliases.sh @@ -7,12 +7,11 @@ alias ls='exa' alias up='sudo pacman -Syu' alias in='sudo pacman -S' alias feg=feh # don’t ask -alias exat='exa --tree -L 3' +alias tree='exa --tree' alias animesync='python /home/kageru/programming/animesync-personal/animesync.py' #alias autoremove='sudo pacman -R $(pacaur -Qdtq)' -export EDITOR=/usr/bin/vim -#alias nt='alacritty --working-directory $PWD &' -alias nt='urxvtc -cd $PWD &' +alias nt='alacritty --working-directory $PWD &' +#alias nt='urxvtc -cd $PWD &' alias ej='udisksctl power-off -b' alias monitor_on='pactl load-module module-loopback' alias monitor_off='pactl unload-module module-loopback' @@ -31,17 +30,25 @@ alias sv='systemctl' alias xo='xdg-open' alias resetgamma='xrandr --output DVI-D-0 --gamma 1:1:1 --output HDMI-1 --gamma 1:1:1 --output HDMI-0 --gamma 1:1:1 --output DP-0 --gamma 1:1:1' alias texbuild='pdflatex -interaction=nonstopmode' -alias weather='curl wttr.in/karlsruhe -s | head -n 7 -' +alias weather='curl wttr.in/hamburg -s | head -n 7 -' alias weathertoday='curl wttr.in/karlsruhe -s | head -n 17 -' alias playdir='for f in ./*; do; mpv $f; done;' alias mntusb='sudo mount /dev/sdi1 ~/usb' alias mntphone='simple-mtpfs --device 1 ~/usb' alias umubs='sudo umount ~/usb' +alias gst='git status' +alias gco='git checkout' +alias blps='~/.steam/steam/steamapps/common/BorderlandsPreSequel/BorderlandsPreSequel' +alias dir2flac='for f in *.wav; do; ffmpeg -i "$f" -compression_level 12 "`basename "$f" .wav`.flac"; done;' +alias vpnon='sudo systemctl start openvpn-client@client.service' +alias vpnoff='sudo systemctl stop openvpn-client@client.service' alias config='/usr/bin/git --git-dir=/home/kageru/dotfiles/ --work-tree=/home/kageru' alias -g ...='../../' #cd ... alias -g ....='../../../' #cd .... alias -g .....='../../../../' #cd ..... +alias :q='exit' +alias :wq='exit' alias sprunge="curl -F 'sprunge=<-' http://sprunge.us" diff --git a/.extend.Xresources b/.extend.Xresources index c1005e5..e4ea7cc 100644 --- a/.extend.Xresources +++ b/.extend.Xresources @@ -219,7 +219,7 @@ URxvt.keysym.M-C-v: perl:clipboard:paste_escaped ! URxvt*scrollWithBuffer: boolean ! URxvt*tintColor: !7DA55 ! URxvt*blurRadius: HxV -URxvt*fading: 0 +URxvt*fading: 5 ! URxvt*fadeColor: color ! URxvt*utmpInhibit: boolean ! URxvt*urgentOnBell: boolean diff --git a/.i3/config b/.i3/config index a5d3fbc..b270a5c 100644 --- a/.i3/config +++ b/.i3/config @@ -4,8 +4,6 @@ # Set mod key (Mod1=, Mod4=) set $mod Mod4 -exec ~/bin/autostart - # custom bindsym $mod+Shift+Return exec cool-retro-term; @@ -273,7 +271,6 @@ bindsym $mod+Shift+KP_8 move container to workspace $ws18; workspace $ws18 bindsym $mod+Shift+KP_9 move container to workspace $ws19; workspace $ws19 exec --no-startup-id i3-msg 'workspace $ws4; layout stacking; exec keepassxc; exec thunderbird; exec hexchat' -exec_always ~/bin/restart_polybar # Open applications on specific workspaces # assign [class="mpv"] $ws5 @@ -348,8 +345,9 @@ mode "resize" { bindsym $mod+9 exec --no-startup-id i3lock -i ~/Pictures/bg.png -ut # Autostart applications -exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 +exec ~/bin/autostart exec --no-startup-id compton -b +exec_always ~/bin/restart_polybar # Color palette used for the terminal ( ~/.extend.Xresources file ) # Colors are gathered based on the documentation: @@ -454,8 +452,8 @@ client.background $i3_background ############################# # Set inner/outer gaps -gaps inner 30 -gaps outer -10 +gaps inner 0 +gaps outer 0 # Additionally, you can issue commands with the following syntax. This is useful to bind keys to changing the gap size. # gaps inner|outer current|all set|plus|minus @@ -463,7 +461,7 @@ gaps outer -10 # gaps outer all plus 5 # Smart gaps (gaps used if only more than one container on the workspace) -smart_gaps on +smart_gaps yes # Smart borders (draw borders around container only if it is not the only container on this workspace) # on|no_gaps (on=always activate and no_gaps=only activate if the gap size to the edge of the screen is 0) @@ -482,8 +480,8 @@ mode "$mode_gaps" { bindsym Escape mode "default" } mode "$mode_gaps_inner" { - bindsym plus gaps inner current plus 5 - bindsym minus gaps inner current minus 5 + bindsym k gaps inner current plus 5 + bindsym j gaps inner current minus 5 bindsym 0 gaps inner current set 0 bindsym Shift+plus gaps inner all plus 5 @@ -494,8 +492,8 @@ mode "$mode_gaps_inner" { bindsym Escape mode "default" } mode "$mode_gaps_outer" { - bindsym plus gaps outer current plus 5 - bindsym minus gaps outer current minus 5 + bindsym k gaps outer current plus 5 + bindsym j gaps outer current minus 5 bindsym 0 gaps outer current set 0 bindsym Shift+plus gaps outer all plus 5 diff --git a/.ncmpcpp/bindings b/.ncmpcpp/bindings index 006e844..63e767d 100644 --- a/.ncmpcpp/bindings +++ b/.ncmpcpp/bindings @@ -191,6 +191,8 @@ def_key "K" select_item scroll_up +def_key "x" + delete_playlist_items #def_key "mouse" # mouse_event diff --git a/bin/autostart b/bin/autostart index 124f34e..94e4813 100755 --- a/bin/autostart +++ b/bin/autostart @@ -2,11 +2,13 @@ rm -rf /home/kageru/temp/* cp ~/webpw.kdbx /mnt/gaia/ +cp ~/webpw.kdbx ~/Sync/webpw.kdbx fcitx -#syncthing & +sshfs -i ~/.ssh/lain lain:/home/kgt/download /mnt/lain -C & +syncthing & # xsetwacom --set 12 Area -14900 0 44400 16000 -# xrandr --fb 15360x2161 --dpi 192x192 --output DVI-D-0 --scale 2x2.0008 --pos 0x0 --panning 3840x2161+0+0 --output DP-0 --scale 2x2.0008 --panning 3840x2161+3840+0 --rate 144 --output HDMI-1 --panning 3840x2160+7680+0 --output HDMI-0 --scale 2x2.0008 --panning 3840x2161+11520+0 xrandr --fb 8320x2160 --output DVI-D-0 --pos 0x0 --mode 1920x1080 --rate 144 --output DP-0 --mode 2560x1440 --rate 144 --right-of DVI-D-0 --output HDMI-0 --right-of DP-0 --dpi 109x109 +#xrandr --fb 6400x2520 --output DP-0 --mode 2560x1440 --rate 144 --pos 0x0 --output DVI-D-0 --mode 1920x1080 --rate 144 --below DP-0 --output HDMI-0 --right-of DP-0 --dpi 109x109 ~/bin/fixkeyboard ~/.fehbg xrdb ~/.Xresources diff --git a/bin/restart_polybar b/bin/restart_polybar index 9514e3b..1bc4f53 100755 --- a/bin/restart_polybar +++ b/bin/restart_polybar @@ -1,7 +1,7 @@ #!/bin/sh killall polybar -#sleep 1 +sleep 1 polybar -c ~/.config/polybar/config left & polybar -c ~/.config/polybar/config main & polybar -c ~/.config/polybar/config right &