diff --git a/README.md b/README.md index 79dd054..5cf58fb 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,8 @@ swaylock, swayidle), [mako][l_mako] and [waybar][l_waybar]. Execute I use a custom launcher based on fzf with a script taken from [FlyingWombat][l_won] with some light modifications. -## Installation - -Use [dotinstall][l_dotinstall] script to install this repo. - [l_sway]:https://swayvm.org [l_mako]:https://wayland.emersion.fr/mako/ [l_waybar]:https://github.com/Alexays/Waybar -[l_fzf]:https://github.com/junegunn/fzf -[l_won]:https://gitlab.com/FlyingWombat/my-scripts/blob/master/sway-launcher -[l_dotinstall]:https://git.epha.se/ephase/dotinstall +[l_fzf]: https://gitlab.com/FlyingWombat/my-scripts/blob/master/sway-launcher +[l_won]: https://gitlab.com/FlyingWombat/my-scripts/blob/master/sway-launcher diff --git a/bin/sway.sh b/bin/sway.sh index 405cab4..00571ac 100755 --- a/bin/sway.sh +++ b/bin/sway.sh @@ -1,3 +1,8 @@ #/bin/bash +export QT_AUTO_SCREEN_SCALE_FACTOR=0 +export QT_QPA_PLATFORM=wayland-egl +export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 +export MOZ_ENABLE_WAYLAND=1 +export QT_QPA_PLATFORMTHEME=gtk2 sway diff --git a/config/gtk-2.0/gtkfilechooser.ini b/conf/gtk-2.0/gtkfilechooser.ini similarity index 86% rename from config/gtk-2.0/gtkfilechooser.ini rename to conf/gtk-2.0/gtkfilechooser.ini index c522196..08e76a8 100644 --- a/config/gtk-2.0/gtkfilechooser.ini +++ b/conf/gtk-2.0/gtkfilechooser.ini @@ -2,8 +2,8 @@ LocationMode=filename-entry ShowHidden=false ShowSizeColumn=true -GeometryX=282 -GeometryY=194 +GeometryX=0 +GeometryY=0 GeometryWidth=876 GeometryHeight=538 SortColumn=name diff --git a/config/gtk-3.0/settings.ini b/conf/gtk-3.0/settings.ini similarity index 100% rename from config/gtk-3.0/settings.ini rename to conf/gtk-3.0/settings.ini diff --git a/config/mako/config b/conf/mako/config similarity index 100% rename from config/mako/config rename to conf/mako/config diff --git a/config/sway/conf.d/morty.config b/conf/sway/conf.d/morty.config similarity index 100% rename from config/sway/conf.d/morty.config rename to conf/sway/conf.d/morty.config diff --git a/config/sway/conf.d/rick.config b/conf/sway/conf.d/rick.config similarity index 100% rename from config/sway/conf.d/rick.config rename to conf/sway/conf.d/rick.config diff --git a/config/sway/config b/conf/sway/config similarity index 100% rename from config/sway/config rename to conf/sway/config diff --git a/config/swaylock/config b/conf/swaylock/config similarity index 100% rename from config/swaylock/config rename to conf/swaylock/config diff --git a/config/waybar/config b/conf/waybar/config similarity index 100% rename from config/waybar/config rename to conf/waybar/config diff --git a/config/waybar/style.css b/conf/waybar/style.css similarity index 100% rename from config/waybar/style.css rename to conf/waybar/style.css diff --git a/install.sh b/install.sh new file mode 100755 index 0000000..90c6b9b --- /dev/null +++ b/install.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +required="sway swayidle swaylock waybar fzf" +BIN_FOLDER="$HOME/.local/bin" + +printf "Checking required programs :\n" +for p in $required +do + command -v $p >/dev/null 2>&1 || { printf "\t%s is not installed, bye\n" $p; exit 10; } + printf "\t%s found\n" $p +done + +printf "Create symblinks for configurations :\n" +cd conf +while read d +do + printf "\t%s conf folder found\n" $d + rm -rf $HOME/.config/${d%/} + ln -s "$(pwd)/${d%/}" "$HOME/.config/${d%/}" +done < <(ls -d -1 */) +cd .. + +printf "Create symblink for executables\n" +if [ ! -d "$BIN_FOLDER" ] +then + printf "\tCreate $BIN_FOLDER\n" + mkdir -p $BIN_FOLDER +fi + +cd bin +while read d +do + printf "\t%s script found\n" "$d" + rm -rf $BIN_FOLDER/${d} + ln -s "$(pwd)/${d}" "$BIN_FOLDER/${d}" +done < <(ls -1 *) +exit 0