From 2f4a77baada7f95ebe0f112730f2093a999856f7 Mon Sep 17 00:00:00 2001 From: kageru Date: Sat, 11 Dec 2021 13:15:10 +0100 Subject: [PATCH] All the changes --- .config/htop/htoprc | 20 ++++++++++++-------- .config/i3/config | 7 +++---- .config/mpv/mpv.conf | 8 ++------ .config/polybar/config | 3 ++- .config/ranger/rifle.conf | 1 + .config/starship.toml | 3 +++ .config/sway/config | 28 ++++++++++++++++------------ .config/zsh/aliases.sh | 7 +++++-- .zshrc | 4 +--- bin/autostart | 5 ++--- 10 files changed, 47 insertions(+), 39 deletions(-) diff --git a/.config/htop/htoprc b/.config/htop/htoprc index d3e8c89..dddd219 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -1,16 +1,19 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # The parser is also very primitive, and not human-friendly. +htop_version=3.1.1 +config_reader_min_version=2 fields=48 38 39 46 47 111 1 -sort_key=39 +sort_key=47 sort_direction=-1 -tree_sort_key=39 -tree_sort_direction=-1 +tree_sort_key=47 +tree_sort_direction=1 hide_kernel_threads=1 hide_userland_threads=0 shadow_other_users=0 show_thread_names=0 show_program_path=1 highlight_base_name=1 +highlight_deleted_exe=1 highlight_megabytes=1 highlight_threads=1 highlight_changes=0 @@ -18,7 +21,7 @@ highlight_changes_delay_secs=5 find_comm_in_cmdline=1 strip_exe_from_cmdline=1 show_merged_command=0 -tree_view=1 +tree_view=0 tree_view_always_by_pid=0 all_branches_collapsed=0 header_margin=1 @@ -33,8 +36,9 @@ account_guest_in_cpu_meter=0 color_scheme=5 enable_mouse=1 delay=15 -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 hide_function_bar=0 +header_layout=two_50_50 +column_meters_0=AllCPUs2 Memory CPU Tasks +column_meter_modes_0=1 1 2 2 +column_meters_1=CPU Memory Blank LoadAverage Uptime +column_meter_modes_1=3 3 2 2 2 diff --git a/.config/i3/config b/.config/i3/config index ae6216b..8a84528 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -10,9 +10,9 @@ bindsym $mod+Shift+Return exec cool-retro-term; #for_window [class="cool-retro-term"] fullscreen enable #bindsym $mod+Ctrl+o exec keepass --auto-type -bindsym Ctrl+Shift+4 exec /home/kageru/bin/pyshare -bindsym Ctrl+Shift+8 exec /home/kageru/bin/pyshare -e 1 -bindsym $mod+Shift+u exec /home/kageru/bin/pyshare -m text +bindsym Ctrl+Shift+4 exec /home/kageru/bin/ppsh +# bindsym Ctrl+Shift+8 exec /home/kageru/bin/pyshare -e 1 +# bindsym $mod+Shift+u exec /home/kageru/bin/pyshare -m text bindsym $mod+x exec "rofi -show window -modi window,run,drun" # -font Hack\ 20 -lines 8 -location 2 -width 100 -no-fixed-num-lines -fuzzy -levenshtein-sort # -color-normal "argb:ff222222, argb:cccccc, argb:333333, argb:663333, argb:ffffff" -color-window "#222222, #cccccc, #333333, #663333, #ffffff" -color-urgent "#222222, #cccccc, #333333, #663333, #ffffff" -color-active "#222222, #cccccc, #333333, #663333, #ffffff" @@ -59,7 +59,6 @@ hide_edge_borders none # change borders bindsym $mod+u border none bindsym $mod+y border pixel 3 -bindsym $mod+n border normal # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index 2aa39f8..a0b7a5e 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=vulkan profile=gpu-hq #hwdec=auto-safe spirv-compiler=shaderc @@ -54,12 +54,8 @@ cscale=spline36 # Interpolation opengl-waitvsync=no interpolation=yes -#interpolation-threshold=0.01 video-sync=display-resample -tscale=box -tscale-window=sphinx -tscale-radius=1.0 -tscale-clamp=0.0 +tscale=oversample blend-subtitles=yes #Deinterlace diff --git a/.config/polybar/config b/.config/polybar/config index 510fbfc..dcc170f 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -181,8 +181,9 @@ interval = 25 mount-0 = / mount-1 = /home +mount-2 = /home/kageru/.local/share/Steam -label-mounted = %free% +label-mounted = %free% | label-unmounted = %mountpoint% not mounted label-unmounted-foreground = ${colors.foreground-alt} diff --git a/.config/ranger/rifle.conf b/.config/ranger/rifle.conf index cdae758..8864606 100644 --- a/.config/ranger/rifle.conf +++ b/.config/ranger/rifle.conf @@ -161,6 +161,7 @@ ext djvu, has atril, X, flag f = atril -- "$@" #------------------------------------------- # Image Viewing: #------------------------------------------- +mime ^image, has imv, X, flag f = imv -- "$@" mime ^image, has sxiv, X, flag f = sxiv -- "$@" mime ^image, has feh, X, flag f = feh -- "$@" mime ^image, has mirage, X, flag f = mirage -- "$@" diff --git a/.config/starship.toml b/.config/starship.toml index 831fffd..05261c2 100644 --- a/.config/starship.toml +++ b/.config/starship.toml @@ -20,3 +20,6 @@ symbol = "" [git_status] disabled = true + +[package] +disabled = true diff --git a/.config/sway/config b/.config/sway/config index c5cfec7..a198024 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -4,6 +4,7 @@ # # Read `man 5 sway` for a complete reference. +gaps inner 10 ### Variables # # Logo key. Use Mod1 for Alt. @@ -19,7 +20,7 @@ set $term alacritty # Note: pass the final command to swaymsg so that the resulting window can be opened # on the original workspace that the command was run on. #set $menu dmenu_path | wofi --dmenu | xargs swaymsg exec -- -set $menu dmenu_run +set $menu wofi --show run bindsym XF86AudioPlay exec mpc toggle bindsym XF86AudioNext exec mpc next @@ -37,14 +38,14 @@ output * bg /home/kageru/Pictures/bg.png fill # You can get the names of your outputs by running: swaymsg -t get_outputs output HDMI-A-1 mode 2560x1440@144Hz -output HDMI-A-1 position 2560 0 +output HDMI-A-1 position 0 0 output DP-1 mode 2560x1440@240Hz -output DP-1 position 0 0 +output DP-1 position 2560 0 -default_border pixel 1 +default_border pixel 2 default_floating_border pixel 3 bindsym $mod+u border none -bindsym $mod+y border pixel 1 +bindsym $mod+y border pixel 3 ### Idle configuration # @@ -53,7 +54,9 @@ bindsym $mod+y border pixel 1 # exec swayidle -w \ # timeout 300 'swaylock -f -c 000000' \ # timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ -# before-sleep 'swaylock -f -c 000000' +exec swayidle -w timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ + before-sleep 'swaylock -f -c 000000' \ + after-resume /home/kageru/bin/tunnel # # This will lock your screen after 300 seconds of inactivity, then turn off # your displays after another 300 seconds, and turn your screens back on when @@ -75,8 +78,6 @@ input "type:keyboard" { repeat_rate 40 xkb_layout "de" xkb_variant "neo_qwertz" -} -input "type:pointer" { pointer_accel 0 accel_profile flat } @@ -111,12 +112,14 @@ bindsym $mod+q kill # Start your launcher bindsym $mod+d exec $menu -bindsym Ctrl+Shift+4 exec /home/kageru/bin/pyshare -bindsym Ctrl+Shift+8 exec /home/kageru/bin/pyshare -e 1 -bindsym $mod+Shift+u exec /home/kageru/bin/pyshare -m text -bindsym $mod+x exec rofi -show window +bindsym Ctrl+Shift+4 exec /home/kageru/bin/ppsh +#bindsym Ctrl+Shift+8 exec /home/kageru/bin/pyshare -e 1 +#bindsym $mod+Shift+u exec /home/kageru/bin/pyshare -m text +bindsym $mod+x exec swayr switch-window +bindsym $mod+Ctrl+s exec systemctl suspend bindsym $mod+Shift+d exec discord +bindsym $mod+Shift+s sticky toggle bindsym $mod+F2 exec qutebrowser bindsym $mod+F3 exec alacritty -e ranger bindsym $mod+F5 exec alacritty -e ncmpcpp @@ -270,4 +273,5 @@ bindsym $mod+r mode "resize" # } include /etc/sway/config.d/* +exec swayrd exec /home/kageru/bin/autostart_sway diff --git a/.config/zsh/aliases.sh b/.config/zsh/aliases.sh index 0b45f02..8846a98 100644 --- a/.config/zsh/aliases.sh +++ b/.config/zsh/aliases.sh @@ -12,7 +12,10 @@ alias feg=feh # don’t ask alias tree='exa --tree' alias animesync='python /home/kageru/programming/animesync-personal/animesync.py' #alias autoremove='sudo pacman -R $(pacaur -Qdtq)' -alias nt='alacritty --working-directory $PWD &' +function nt() { + alacritty --working-directory $PWD & + disown +} #alias nt='urxvtc -cd $PWD &' alias ej='udisksctl power-off -b' alias monitor_on='pactl load-module module-loopback' @@ -70,7 +73,7 @@ alias sprunge="curl -F 'sprunge=<-' http://sprunge.us" [ -f ~/.config/zsh/ssh.sh ] && source ~/.config/zsh/ssh.sh paste() { - curl -F"file=@$1" https://p.kageru.moe | xsel -b + curl -F"file=@$1" https://p.kageru.moe | wl-copy } alias dark='xset dpms force off' diff --git a/.zshrc b/.zshrc index 79dc6fb..2a3b917 100644 --- a/.zshrc +++ b/.zshrc @@ -1,6 +1,5 @@ export GOPATH=~/go -export PATH=$PATH:~/bin:~/go/bin -#:/opt/devkitpro/devkitARM/bin:/opt/devkitpro/tools/bin +export PATH=$PATH:~/bin:~/go/binA:/opt/devkitpro/devkitARM/bin:/opt/devkitpro/tools/bin:~/.local/bin export RUSTFLAGS="-C target-cpu=native" export DEVKITPRO=/opt/devkitpro export DEVKITARM=/opt/devkitpro/devkitARM @@ -54,7 +53,6 @@ export WINEDEBUG=-all setopt noalwayslastprompt setopt list_types setopt complete_in_word -setopt autocd if [ ! -S ~/.ssh/ssh_auth_sock ]; then eval `ssh-agent` diff --git a/bin/autostart b/bin/autostart index 4db5430..a52d8a7 100755 --- a/bin/autostart +++ b/bin/autostart @@ -3,10 +3,10 @@ ~/bin/fixkeyboard xrandr --fb 5120x1440 --dpi 96 \ --output DisplayPort-0 --pos 0x0 -r 240 --mode 2560x1440 \ - --output HDMI-A-0 --mode 2560x1440 -r 120 --right-of DisplayPort-0 + --output HDMI-A-0 --mode 2560x1440 -r 120 --left-of DisplayPort-0 ~/.fehbg rm -rf /home/kageru/temp/* -cp ~/webpw.kdbx /mnt/gaia/ +cp ~/webpw.kdbx /mnt/calliope/ cp ~/webpw.kdbx ~/Sync/webpw.kdbx fcitx sshfs -i ~/.ssh/lain lain:/home/kgt/download /mnt/lain -C & @@ -14,4 +14,3 @@ sshfs -i ~/.ssh/lain lain:/home/kgt/download /mnt/lain -C & xrdb ~/.Xresources dunst & redshift -t 6500:3200 -l 53.55:9.64 & -pactl unload-module module-role-cork