From 92797eb03dd911016cb50fb30b7c3a0e8fbe932d Mon Sep 17 00:00:00 2001 From: juan Date: Sat, 16 Apr 2022 12:46:50 +0800 Subject: [PATCH] Add box shadows to grimshot and tmux colorscheme --- .config/sway/config | 6 +++--- .config/sway/scripts/boxshadow.sh | 11 +++++++++++ .config/sway/scripts/grimshot-ui.sh | 9 ++++++++- .config/sway/scripts/grimshot.sh | 4 +++- .config/tmux/tmux.conf | 18 +++++++++--------- .zshrc | 1 - 6 files changed, 34 insertions(+), 15 deletions(-) create mode 100755 .config/sway/scripts/boxshadow.sh diff --git a/.config/sway/config b/.config/sway/config index 8761ece..4a9de7b 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -18,7 +18,7 @@ exec playerctld daemon #my keybinds bindsym $mod+Ctrl+l exec ~/.config/sway/scripts/logout.sh -bindsym $mod+Print exec ~/.config/sway/scripts/grimshot-ui.sh && \ +bindsym $mod+Print exec ~/.config/sway/scripts/grimshot-ui.sh bindsym $mod+n exec swaync-client -t -sw #set gtk theme @@ -29,13 +29,13 @@ exec_always { gsettings set $gnome-schema icon-theme 'Papirus-Light' gsettings set $gnome-schema cursor-theme 'Adwaita' gsettings set $gnome-schema font-name 'ibm-plex 12' - export XDG_CURRENT_DESKTOP=Unity + gsettings set org.gtk.Settings.FileChooser startup-mode cwd } #set colour #color class border backgr. text indicator child_border -client.focused #87c095 #2a2f33 #bfddb2 #415c6d #7fbbb3 +client.focused #87c095 #2a2f33 #bfddb2 #415c6d #d39bb6 client.focused_inactive #3f464b #2a2f33 #bfddb2 #415c6d #3f464b client.unfocused #3f464b #2a2f33 #bfddb2 #415c6d #3f464b client.urgent #d76e6e #2a2f33 #bfddb2 #415c6d #e68183 diff --git a/.config/sway/scripts/boxshadow.sh b/.config/sway/scripts/boxshadow.sh new file mode 100755 index 0000000..d5ba794 --- /dev/null +++ b/.config/sway/scripts/boxshadow.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +background_color=#2a2f33 + +convert $1 \ + \( -clone 0 -background black -shadow 40x5+12+16 \) \ + \( -clone 0 -background black -shadow 40x5-4-4 \) \ + \( -clone 0 -background black -shadow 40x12+12-4 \) \ + \( -clone 0 -background black -shadow 40x12-4+16 \) \ + -reverse -background $background_color -layers merge +repage \ + $2 diff --git a/.config/sway/scripts/grimshot-ui.sh b/.config/sway/scripts/grimshot-ui.sh index 5aa7e12..20cae2d 100755 --- a/.config/sway/scripts/grimshot-ui.sh +++ b/.config/sway/scripts/grimshot-ui.sh @@ -3,4 +3,11 @@ action=`echo "copy\nsave" | wofi -d -Oalphabetical --prompt="Select your action"` target=`echo "active\nscreen\noutput\narea\nwindow" | wofi -d -Oalphabetical --prompt="Select the target"` -~/.config/sway/scripts/grimshot.sh --notify $action $target +test $action || exit +test $target || exit + +test -d /tmp/share/screenshot || mkdir -p /tmp/share/screenshots + +# TODO, add box shadows + +XDG_SCREENSHOTS_DIR=/tmp/share/screenshots ~/.config/sway/scripts/grimshot.sh --notify $action $target diff --git a/.config/sway/scripts/grimshot.sh b/.config/sway/scripts/grimshot.sh index 131c87b..140e54f 100755 --- a/.config/sway/scripts/grimshot.sh +++ b/.config/sway/scripts/grimshot.sh @@ -32,6 +32,7 @@ fi ACTION=${1:-usage} SUBJECT=${2:-screen} FILE=${3:-$(getTargetDirectory)/$(date +'%y%m%d%H%M.png')} +SCRIPT_LOC=~/.config/sway/scripts/ if [ "$ACTION" != "save" ] && [ "$ACTION" != "copy" ] && [ "$ACTION" != "check" ]; then echo "Usage:" @@ -99,7 +100,8 @@ takeScreenshot() { elif [ -z "$GEOM" ]; then grim "$FILE" || die "Unable to invoke grim" else - grim -g "$GEOM" "$FILE" || die "Unable to invoke grim" + grim -g "$GEOM" "$FILE" || die "Unable to invoke grim" && \ + $SCRIPT_LOC/boxshadow.sh "$FILE" "$FILE" || die "Unable to save screenshot" fi } diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 7dd793e..bf6b6dc 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -10,7 +10,7 @@ set -g @plugin 'tmux-plugins/tmux-sensible' set -g status-position bottom set -g status-justify centre -set -g status-style "bg=#1e2132" +set -g status-style "bg=#474f54" set -g window-style "" set -g window-active-style "" @@ -21,21 +21,21 @@ module_left_2="#{client_width}x#{client_height}" module_right_1="%a %d %b" module_right_2="%R %Z" -set -g status-left " #[fg=#c6c8d1]$module_left_1 #[fg=#6b7089]$module_left_2" +set -g status-left " #[fg=#bfddb2]$module_left_1 #[fg=#767b82]$module_left_2" set -g status-left-style "" set -g status-left-length 50 -set -g status-right "$module_right_1 #[fg=#c6c8d1]$module_right_2 " -set -g status-right-style "fg=#6b7089" +set -g status-right "$module_right_1 #[fg=#bfddb2]$module_right_2 " +set -g status-right-style "fg=#767b82" set -g status-right-length 25 set -g window-status-current-style "bold" -set -g window-status-style "fg=#6b7089" -set -g window-status-format " #[fg=#c6c8d1]#{?#{==:#W,fish},#{b:pane_current_path},#W}#F " -set -g window-status-current-format " #[fg=#c6c8d1]#{?#{==:#W,fish},#{b:pane_current_path},#W}#F " +set -g window-status-style "fg=#767b82" +set -g window-status-format " #[fg=#bfddb2]#{?#{==:#W,fish},#{b:pane_current_path},#W}#F " +set -g window-status-current-format " #[fg=#bfddb2]#{?#{==:#W,fish},#{b:pane_current_path},#W}#F " set -g window-status-separator "" -set -g pane-active-border-style "fg=#6b7089" -set -g pane-border-style "fg=#6b7089" +set -g pane-active-border-style "fg=#767b82" +set -g pane-border-style "fg=#767b82" run '~/.tmux/plugins/tpm/tpm' diff --git a/.zshrc b/.zshrc index 1cf277f..13dbab4 100644 --- a/.zshrc +++ b/.zshrc @@ -112,7 +112,6 @@ export TASKRC=$HOME/.config/task/taskrc export WINEPREFIX=$HOME/.config/wine export XDG_CACHE_HOME=$HOME/.cache export XDG_CONFIG_HOME=$HOME/.config -export XDG_SCREENSHOTS_DIR=$HOME/Pictures/Screenshots #settings for software export FZF_DEFAULT_OPTS="--reverse --cycle --height=40% --border sharp --prompt=🔎"