fixed wrongly fixed dependency check, reverted vim commands

This commit is contained in:
Tomas Baca 2018-09-13 15:29:38 +02:00
parent a4b84b5149
commit 7bdb386d6e

View File

@ -200,8 +200,7 @@ 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 ?{ $VIM_BIN $HEADLESS -nEs -c '%g/"floating_con"/norm ?{ nd%' -c "wqa" -- "$LAYOUT_FILE"
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"
@ -273,8 +272,7 @@ nd%' -c "wqa" -- "$LAYOUT_FILE"
# 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] $VIM_BIN $HEADLESS -nEs -c "normal Go] }" -c "wqa" -- "$LAYOUT_FILE"
}" -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
@ -327,20 +325,16 @@ nd%' -c "wqa" -- "$LAYOUT_FILE"
$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 $VIM_BIN $HEADLESS -nEs -c '%g/swallows/norm j^%k:s/,$//g ' -c "wqa" -- "$LAYOUT_FILE"
' -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 ?{ $VIM_BIN $HEADLESS -nEs -c '%g/floating_con/norm ?{ nd%"_ddGA p' -c "wqa" -- "$LAYOUT_FILE"
nd%"_ddGA
p' -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{/}, $VIM_BIN $HEADLESS -nEs -c '%s/}\n{/}, {/g' -c "wqa" -- "$LAYOUT_FILE"
{/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"