From 42658ef82689a343ae4e386c289ed636c752771b Mon Sep 17 00:00:00 2001 From: Harri Lahtinen Date: Mon, 18 Nov 2019 22:53:00 +0200 Subject: [PATCH] fixing & tweaking --- .config/Scripts/i3-resurrect-restore-all | 4 ++-- .config/Scripts/i3-resurrect-save-all | 2 +- .config/i3/config | 5 +++-- .config/wpg/templates/config_i3_config.base | 3 ++- .zshenv | 10 ++-------- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.config/Scripts/i3-resurrect-restore-all b/.config/Scripts/i3-resurrect-restore-all index 9d4eeda..fa614ba 100755 --- a/.config/Scripts/i3-resurrect-restore-all +++ b/.config/Scripts/i3-resurrect-restore-all @@ -12,13 +12,13 @@ IFS=$'\n\t' cur_workspace=$(i3-msg -t get_workspaces | jq -r '.[] | select(.visible == true) | .name') # extract workspace name which is defined between two underscored -workspaces=$(ls -l ~/.config/i3-resurrect/*.json | grep -Po '.*_\K(.*)_' | sed 's/_//' | uniq) +workspaces=$(ls -l ~/.config/i3/i3-resurrect/*.json | grep -Po '.*_\K(.*)_' | sed 's/_//' | uniq) echo "Found workspaces: $workspaces" # restore workspaces for ws in ${workspaces[*]}; do echo "restoring $ws" - i3-resurrect restore -w $ws + i3-resurrect restore -w $ws -d ~/.config/i3/i3-resurrect done notify-send "i3-resurrect" "Restored all workspaces" diff --git a/.config/Scripts/i3-resurrect-save-all b/.config/Scripts/i3-resurrect-save-all index 2dbb180..33f3619 100755 --- a/.config/Scripts/i3-resurrect-save-all +++ b/.config/Scripts/i3-resurrect-save-all @@ -21,7 +21,7 @@ for ws in ${workspaces[*]}; do temp="${ws%\"}" temp="${temp#\"}" echo "saving $temp" - i3-resurrect save -w $temp + i3-resurrect save -w $temp -d ~/.config/i3/i3-resurrect done notify-send "i3-resurrect" "Saved all workspaces" diff --git a/.config/i3/config b/.config/i3/config index 53c1bcb..8572e34 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -149,7 +149,7 @@ bindsym $mod+BackSpace exec $flash bindsym $mod+Shift+BackSpace exec ~/.config/Scripts/on # Show selection: -bindsym Mod1+c exec clipster -sp +bindsym Mod1+l exec clipster -sp #STOP/HIDE EVERYTHING: bindsym $mod+Shift+Delete exec $truemute ; exec $truepause ; workspace lmao ; exec $term -e htop ; exec $term -e ranger @@ -296,6 +296,7 @@ bindsym $mod+Shift+9 move container to workspace $ws9; workspace $ws9 bindsym $mod+Shift+0 move container to workspace $ws10; workspace $ws10 for_window [class="Google-chrome"] move to workspace $ws2 +for_window [class="Chromium"] move to workspace $ws2 for_window [class="Firefox"] move to workspace $ws2 for_window [class="Pcmanfm"] move to workspace $ws3 for_window [title="GIMP Startup"] move workspace $ws7 @@ -316,7 +317,7 @@ for_window [class="Nm-connection-editor"] floating enable for_window [class="Lxappearance"] floating enable for_window [instance="^package-update$" class="^st$"] floating enable, move position center for_window [class="Yad"] floating enable -for_window [class="St"] floating enable, resize set 1664 936 +for_window [class="St"] floating enable, resize set 2560 1440, move position center for_window [class="Pcmanfm"] floating enable, resize set 1920 1080 for_window [class="(G|g)oogle-chrome"] border none for_window [class="(G|g)oogle-chrome" window_role="pop-up"] floating enable, border normal diff --git a/.config/wpg/templates/config_i3_config.base b/.config/wpg/templates/config_i3_config.base index 38348c5..aac9644 100644 --- a/.config/wpg/templates/config_i3_config.base +++ b/.config/wpg/templates/config_i3_config.base @@ -296,6 +296,7 @@ bindsym $mod+Shift+9 move container to workspace $ws9; workspace $ws9 bindsym $mod+Shift+0 move container to workspace $ws10; workspace $ws10 for_window [class="Google-chrome"] move to workspace $ws2 +for_window [class="Chromium"] move to workspace $ws2 for_window [class="Firefox"] move to workspace $ws2 for_window [class="Pcmanfm"] move to workspace $ws3 for_window [title="GIMP Startup"] move workspace $ws7 @@ -316,7 +317,7 @@ for_window [class="Nm-connection-editor"] floating enable for_window [class="Lxappearance"] floating enable for_window [instance="^package-update$" class="^st$"] floating enable, move position center for_window [class="Yad"] floating enable -for_window [class="St"] floating enable, resize set 1664 936 +for_window [class="St"] floating enable, resize set 2560 1440, move position center for_window [class="Pcmanfm"] floating enable, resize set 1920 1080 for_window [class="(G|g)oogle-chrome"] border none for_window [class="(G|g)oogle-chrome" window_role="pop-up"] floating enable, border normal diff --git a/.zshenv b/.zshenv index 6c53a15..a14c264 100644 --- a/.zshenv +++ b/.zshenv @@ -17,6 +17,8 @@ export SSH_KEY_PATH="~/.ssh/id_rsa" export FZF_CTRL_R_OPTS='--sort --exact' export FZF_ALT_C_OPTS="--preview 'tree -C {} | head -200'" export FZF_DEFAULT_COMMAND='fd --type f --hidden' +export FZF_DEFAULT_OPTS="--layout=reverse --inline-info" +export FZF_CTRL_T_OPTS="--preview '(highlight -O ansi -l {} 2> /dev/null || bat {} || tree -C {}) 2> /dev/null | head -200'" # Compilation flags export ARCHFLAGS="-arch x86_64" @@ -28,11 +30,3 @@ export BORG_RSH='ssh -i /home/hate/.ssh/id_ed25519' export GDK_SCALE=2 export GDK_DPI_SCALE=0.5 export QT_AUTO_SCREEN_SCALE_FACTOR=1 - -# gnome-keyring -#if [ -n "$DESKTOP_SESSION" ];then -# eval $(gnome-keyring-daemon --start) -# export SSH_AUTH_SOCK -#fi -#eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh) -#export $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg)