Merge remote-tracking branch 'temp/patch-1'

This commit is contained in:
Tomas Baca 2020-04-23 09:19:41 +02:00
commit 2e2716018d

View File

@ -49,7 +49,11 @@ fi
# #} # #}
if [ -z "$XDG_CONFIG_HOME" ]; then if [ -z "$XDG_CONFIG_HOME" ]; then
LAYOUT_PATH=~/.layouts if [ -e "${HOME}/.layouts" ] && [ -n "$(command ls -A ${HOME}/.layouts)" ]; then
LAYOUT_PATH=${HOME}/.layouts
else
LAYOUT_PATH="${HOME}/.config/i3-layout-manager/layouts"
fi
else else
LAYOUT_PATH="$XDG_CONFIG_HOME/i3-layout-manager/layouts" LAYOUT_PATH="$XDG_CONFIG_HOME/i3-layout-manager/layouts"
fi fi
@ -265,7 +269,8 @@ MATCH ANY" | rofi -i -dmenu -p "How to identify windows? (xprop style)")
# all-tree file we can find the workspace part. # all-tree file we can find the workspace part.
# remove the floating window part, that would screw up out matching # remove the floating window part, that would screw up out matching
$VIM_BIN $HEADLESS -nEs -c '%g/"floating_con"/norm ?{ nd%' -c "wqa" -- "$LAYOUT_FILE" $VIM_BIN $HEADLESS -nEs -c '%g/"floating_con"/norm ?{
nd%' -c "wqa" -- "$LAYOUT_FILE"
# remove comments # remove comments
$VIM_BIN $HEADLESS -nEs -c '%g/\/\//norm dd' -c "wqa" -- "$LAYOUT_FILE" $VIM_BIN $HEADLESS -nEs -c '%g/\/\//norm dd' -c "wqa" -- "$LAYOUT_FILE"
@ -337,7 +342,8 @@ MATCH ANY" | rofi -i -dmenu -p "How to identify windows? (xprop style)")
# the information about the split type # the information about the split type
cat $ALL_WS_FILE | cat - $LAYOUT_FILE > /tmp/tmp.txt && mv /tmp/tmp.txt $LAYOUT_FILE cat $ALL_WS_FILE | cat - $LAYOUT_FILE > /tmp/tmp.txt && mv /tmp/tmp.txt $LAYOUT_FILE
# add closing bracked at the end # add closing bracked at the end
$VIM_BIN $HEADLESS -nEs -c 'normal Go] }' -c "wqa" -- "$LAYOUT_FILE" $VIM_BIN $HEADLESS -nEs -c 'normal Go]
}' -c "wqa" -- "$LAYOUT_FILE"
# now we have to do some postprocessing on it, all is even advices on the official website # now we have to do some postprocessing on it, all is even advices on the official website
# https://i3wm.org/docs/layout-saving.html # https://i3wm.org/docs/layout-saving.html
@ -390,19 +396,23 @@ MATCH ANY" | rofi -i -dmenu -p "How to identify windows? (xprop style)")
$VIM_BIN $HEADLESS -nEs -c '%g/\/\//norm dd' -c "wqa" -- "$LAYOUT_FILE" $VIM_BIN $HEADLESS -nEs -c '%g/\/\//norm dd' -c "wqa" -- "$LAYOUT_FILE"
# add a missing comma to the last element of array we just deleted # add a missing comma to the last element of array we just deleted
$VIM_BIN $HEADLESS -nEs -c '%g/swallows/norm j^%k:s/,$//g ' -c "wqa" -- "$LAYOUT_FILE" $VIM_BIN $HEADLESS -nEs -c '%g/swallows/norm j^%k:s/,$//g
' -c "wqa" -- "$LAYOUT_FILE"
# delete all empty lines # delete all empty lines
$VIM_BIN $HEADLESS -nEs -c '%g/^$/norm dd' -c "wqa" -- "$LAYOUT_FILE" $VIM_BIN $HEADLESS -nEs -c '%g/^$/norm dd' -c "wqa" -- "$LAYOUT_FILE"
# pick up floating containers and move them out of the root container # pick up floating containers and move them out of the root container
$VIM_BIN $HEADLESS -nEs -c '%g/floating_con/norm ?{ nd%GA p' -c "wqa" -- "$LAYOUT_FILE" $VIM_BIN $HEADLESS -nEs -c '%g/floating_con/norm ?{
nd%GA
p' -c "wqa" -- "$LAYOUT_FILE"
# delete all empty lines # delete all empty lines
$VIM_BIN $HEADLESS -nEs -c '%g/^$/norm dd' -c "wqa" -- "$LAYOUT_FILE" $VIM_BIN $HEADLESS -nEs -c '%g/^$/norm dd' -c "wqa" -- "$LAYOUT_FILE"
# add missing commas between the newly created inner parts of the root element # add missing commas between the newly created inner parts of the root element
$VIM_BIN $HEADLESS -nEs -c '%s/}\n{/}, {/g' -c "wqa" -- "$LAYOUT_FILE" $VIM_BIN $HEADLESS -nEs -c '%s/}\n{/},
{/g' -c "wqa" -- "$LAYOUT_FILE"
# surroun everythin in [] # surroun everythin in []
$VIM_BIN $HEADLESS -nEs -c 'normal ggO[Go]' -c "wqa" -- "$LAYOUT_FILE" $VIM_BIN $HEADLESS -nEs -c 'normal ggO[Go]' -c "wqa" -- "$LAYOUT_FILE"