From fea0831c13cd988fdc9f22dd706800595f94c599 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Sun, 23 Oct 2022 23:17:44 +0000 Subject: [PATCH] Unstaged changes Signed-off-by: Joe Groocock --- X11/xprofile | 4 ++-- aliases | 2 +- environment.d/20-xdg-overrides.conf | 2 +- git/config | 5 +++-- i3/config | 8 ++++---- i3/powermenu.sh | 4 ++-- picom/picom.conf | 22 ++++++++++++++++++++-- polybar/config.ini | 2 +- rofi/config.rasi | 4 ++-- scripts/rofi-fontawesome | 2 +- systemd/user/xprofile.service | 2 +- user-dirs.dirs | 2 +- vim/vimrc | 10 ++++++++-- zsh/.zshrc | 7 +++++++ 14 files changed, 54 insertions(+), 22 deletions(-) diff --git a/X11/xprofile b/X11/xprofile index 8bd4bde..b2b552c 100644 --- a/X11/xprofile +++ b/X11/xprofile @@ -16,8 +16,8 @@ export MOZ_USE_XINPUT2=1 # enable pixel-accurate scrolling in firefox # Load Xorg resources and set the DPI -xrdb -merge $XDG_CONFIG_HOME/X11/xresources -xrandr --dpi $(xrdb -query | grep -i xft.dpi | cut -d: -f2) +xrdb -merge "$XDG_CONFIG_HOME/X11/xresources" +#"$XDG_CONFIG_HOME/scripts/dpi" "$(xrdb -query | grep -i xft.dpi | cut -d: -f2 | xargs)" setxkbmap -option caps:none xset r rate 200 18 diff --git a/aliases b/aliases index fb953c2..1681ee7 100644 --- a/aliases +++ b/aliases @@ -53,7 +53,7 @@ alias scp='scp -r' alias dd='dd status=progress' alias wget='wget --hsts-file=$XDG_DATA_HOME/wget/hsts-file' alias vi=vim -alias grip='grip --user=frebib --pass=$GRIP_API_KEY' +alias grip='grip --pass=$GRIP_API_KEY' alias acme.sh='$XDG_CONFIG_HOME/acme.sh/acme.sh --home $XDG_CONFIG_HOME/acme.sh --config-home $XDG_CONFIG_HOME/acme.sh --log $XDG_CONFIG_HOME/acme.sh/acme.sh.log' alias acmesh='$XDG_CONFIG_HOME/acme.sh/acme.sh --home $XDG_CONFIG_HOME/acme.sh --config-home $XDG_CONFIG_HOME/acme.sh --log $XDG_CONFIG_HOME/acme.sh/acme.sh.log' alias alpine-sdk="docker run -ti --rm \ diff --git a/environment.d/20-xdg-overrides.conf b/environment.d/20-xdg-overrides.conf index 6064e29..38ba89c 100644 --- a/environment.d/20-xdg-overrides.conf +++ b/environment.d/20-xdg-overrides.conf @@ -22,6 +22,6 @@ WEECHAT_HOME="$XDG_CONFIG_HOME/weechat" XINITRC="$XDG_CONFIG_HOME/X11/xinitrc" ZDOTDIR="$XDG_CONFIG_HOME/zsh" -PATH="${PATH}:${GOPATH}/bin:${GEM_HOME}/bin" +PATH="${PATH}:${GOPATH}/bin:${GEM_HOME}/ruby/3.0.0/bin" # vim: ft=sh diff --git a/git/config b/git/config index 5886cbc..33a7829 100644 --- a/git/config +++ b/git/config @@ -5,11 +5,11 @@ [core] autocrlf = input excludesfile = /home/frebib/.config/git/gitignore - pager = diff-highlight | $PAGER + pager = delta --diff-so-fancy --color-only [init] defaultBranch = master [interactive] - diffFilter = diff-highlight + diffFilter = delta --diff-so-fancy --color-only [commit] gpgsign = true [fetch] @@ -38,6 +38,7 @@ unpushed = !git log --oneline @{u}..HEAD leaders = !git shortlog -s -n --all --no-merges defbranch = !git symbolic-ref refs/remotes/origin/HEAD | sed \"s@^refs/remotes/origin/@@\" + rbranch = for-each-ref --sort='committerdate' --format="%20%20%(refname:short)" refs/heads/ [advice] statusHints = false pushUpdateRejected = false diff --git a/i3/config b/i3/config index b1b3523..fa9ce2d 100644 --- a/i3/config +++ b/i3/config @@ -139,18 +139,18 @@ bindsym $mod+v exec systemd-run-i3 -n alacritty -e sh -c "($SHE bindsym $mod+Ctrl+v exec systemd-run-i3 -n alacritty --class floating -e sh -c "($SHELL -c $EDITOR || : ) && $SHELL" bindsym $mod+l exec dm-tool switch-to-greeter bindsym $mod+space exec "pkill rofi; rofi -show run -sidebar-mode -terminal i3-sensible-terminal -normal-window -run-command 'systemd-run-i3 -n {cmd}'" -bindsym $mod+Shift+p exec rofi-pass --root $(grep path ~/.config/gopass/config.yml | sed -E 's|^.*fs\+file://||g' | tr '\n' ':') | sed 's/:$//g' +bindsym $mod+Shift+p exec systemd-run-i3 -n rofi-rbw bindsym $mod+Shift+e exec "pkill rofi; rofi -show emoji -modi emoji -normal-window" bindsym $mod+Shift+i exec rofi-fontawesome -bindsym --release Print exec screenshot -bindsym --release $mod+Print exec screenshot --clip +bindsym --release Print exec screenshot --clip +bindsym --release $mod+Print exec screenshot bindsym --release Shift+Print exec screenshot --active bindsym --release $mod+Shift+Print exec screenshot --active --clip bindsym $mod+Shift+x exec systemd-run-i3 -n i3-sensible-terminal --class floating-term --hold -e /bin/echo "$(xprop -id $(xdotool getactivewindow))" bindsym $mod+$alt+space exec systemd-run-i3 -s background -n ~/.config/i3/cycleaudio.py bindsym $mod+numbersign exec systemd-run-i3 -n i3-sensible-terminal --hold -e sh -c 'xclip -o | gpg --decrypt 2>&1' bindsym $mod+r exec bash -c 'pwgen -snc 32 1 | tee >(xargs notify-send Generated\ password\:) | xclip -i -r' -bindsym $mod+g exec systemd-run-i3 -n notify-send -c transfer "$(gist -PRpc)" +bindsym $mod+g exec systemd-run-i3 -n bash -xc 'xclip -o | gh gist create -d Paste - 2>&1 | grep -vE "^[-✓] Creat(ing|ed) gist" | tee >(xclip -i >&2 >/dev/null) | xargs -I% --null -r notify-send -c transfer -- %' bindsym --release $mod+i exec systemd-run-i3 -s background -n sh -c 'sleep 0.5 && xdotool getactivewindow type --delay 10 -- "$(xclip -o -selection clipboard)"' bindsym $mod+z exec otp | rofi -dmenu -p otp | xargs otp diff --git a/i3/powermenu.sh b/i3/powermenu.sh index 613f771..6bd604f 100755 --- a/i3/powermenu.sh +++ b/i3/powermenu.sh @@ -11,7 +11,7 @@ case $option in power\ off) systemctl poweroff;; reboot) systemctl reboot;; windows) - windows=`efibootmgr | grep -Po -m1 'Boot\K(\d{4}).*Windows.*' | head -c4` + windows="$(efibootmgr | grep -Po -m1 'Boot\K(\d{4}).*Windows.*' | head -c4)" sudo efibootmgr -n $windows - reboot;; + systemctl reboot;; esac diff --git a/picom/picom.conf b/picom/picom.conf index 3a08bad..61d5fa2 100644 --- a/picom/picom.conf +++ b/picom/picom.conf @@ -6,8 +6,8 @@ log-level = "info"; shadow = true; shadow-radius = 30; shadow-offset-x = -30; -shadow-offset-y = -26; -shadow-opacity = 0.35; +shadow-offset-y = -24; +shadow-opacity = 0.4; shadow-color = "#000000"; shadow-exclude = [ "class_g = 'slop'", @@ -79,6 +79,11 @@ focus-exclude = [ "class_g = 'steam_app_271590'" ]; +transition-length = 350; +transition-pow-x = 0.3; +transition-pow-y = 0.3; +size-transition = true; + # Other # https://github.com/yshui/picom/blob/next/picom.sample.conf#L203 backend = "glx"; @@ -131,4 +136,17 @@ wintypes: { } }; +#animations = true; +#animation-clamping = false; +#animation-dampening = 1.0; +#animation-window-mass = 0.125; +#animation-unmap = "fade-out"; +#animation-for-unmap-window = "zoom"; +#animation-for-open-window = "auto"; +#animation-workspace-in = "slide-left"; +#animation-workspace-out = "slide-left"; +#animation-for-workspace-switch-in = "auto"; +#animation-for-workspace-switch-out = "auto"; +#animation-for-transient-window = "zoom"; + # vim: ft=conf noet diff --git a/polybar/config.ini b/polybar/config.ini index b68dbb1..99b151e 100644 --- a/polybar/config.ini +++ b/polybar/config.ini @@ -267,7 +267,7 @@ ramp-capacity-1-foreground = ${colours.warning} [module/cputemp] type = internal/temperature -hwmon-path = /sys/devices/platform/nct6775.656/hwmon/hwmon1/temp2_input +hwmon-path = /sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon1/temp2_input base-temperature = 25 format =