diff --git a/.install/hyprland-packages.sh b/.install/hyprland-packages.sh index 76b78c7..6c9bda3 100644 --- a/.install/hyprland-packages.sh +++ b/.install/hyprland-packages.sh @@ -53,4 +53,5 @@ packagesYay=( "swaylock-effects" "wlogout" "wlr-randr" + "pacseek" ); diff --git a/.install/qtile-packages.sh b/.install/qtile-packages.sh index 13475a5..2929857 100644 --- a/.install/qtile-packages.sh +++ b/.install/qtile-packages.sh @@ -55,5 +55,6 @@ packagesYay=( "trizen" "swww" "qtile-extras" - "wlr-randr" + "wlr-randr" + "pacseek" ); diff --git a/.install/restore.sh b/.install/restore.sh index 6c57f9c..b14e903 100755 --- a/.install/restore.sh +++ b/.install/restore.sh @@ -13,6 +13,9 @@ _showRestoreOptions() { if [ -f ~/dotfiles/.bashrc ]; then restorelist+="~/dotfiles/.bashrc " fi + if [ -d ~/dotfiles/.settings ]; then + restorelist+="~/dotfiles/.settings " + fi if [[ $profile == *"Hyprland"* ]]; then if [ -f ~/dotfiles/hypr/conf/keyboard.conf ]; then restorelist+="~/dotfiles/hypr/conf/keyboard.conf " @@ -88,6 +91,12 @@ _startRestore() { echo ".bashrc restored!" fi fi + if [[ $restoreselect == *"~/dotfiles/.settings"* ]] || [[ $restoreselect == *"All"* ]] ; then + if [ -d ~/dotfiles/.settings ]; then + rsync -a -I ~/dotfiles/.settings/ ~/dotfiles-versions/$version/.settings/ + echo ".settings restored!" + fi + fi if [[ $profile == *"Hyprland"* ]]; then if [[ $restoreselect == *"~/dotfiles/hypr/conf/keyboard.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then if [ -f ~/dotfiles/hypr/conf/keyboard.conf ]; then diff --git a/.settings/browser.sh b/.settings/browser.sh new file mode 100755 index 0000000..4994c67 --- /dev/null +++ b/.settings/browser.sh @@ -0,0 +1 @@ +chromium \ No newline at end of file diff --git a/.settings/filemanager.sh b/.settings/filemanager.sh new file mode 100755 index 0000000..af8fd0e --- /dev/null +++ b/.settings/filemanager.sh @@ -0,0 +1 @@ +thunar \ No newline at end of file diff --git a/.settings/software.sh b/.settings/software.sh new file mode 100755 index 0000000..61bd6e1 --- /dev/null +++ b/.settings/software.sh @@ -0,0 +1 @@ +alacritty -e pacseek \ No newline at end of file diff --git a/README.md b/README.md index 8c14b3a..ede5cce 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ML4W dotfiles 2.6 +# ML4W dotfiles 2.6.1 BETA This is my configuration of Hyprland (Wayland) and Qtile (Xorg & Wayland) for Arch. This package includes an installation script to install and setup the required components. diff --git a/qtile/config.py b/qtile/config.py index 5add732..ad64790 100644 --- a/qtile/config.py +++ b/qtile/config.py @@ -82,8 +82,6 @@ platform = int(os.popen("cat /sys/class/dmi/id/chassis_type").read()) # -------------------------------------------------------- terminal = "alacritty" -browser = "chromium" -# browser = "brave" # -------------------------------------------------------- # Keybindings @@ -140,8 +138,7 @@ if core_name == "x11": # Apps Key([mod], "Return", lazy.spawn(terminal), desc="Launch terminal"), Key([mod, "control"], "Return", lazy.spawn("rofi -show drun"), desc="Launch Rofi"), - Key([mod], "b", lazy.spawn(browser), desc="Launch Browser"), - Key([mod, "control"], "b", lazy.spawn(home + "/dotfiles/scripts/bravebookmarks.sh"), desc="Rofi Brave Bookmarks"), + Key([mod], "b", lazy.spawn("sh " + home + "/dotfiles/.settings/browser.sh"), desc="Launch Browser"), Key([mod, "shift"], "w", lazy.spawn(home + "/dotfiles/qtile/scripts/x11/wallpaper.sh"), desc="Update Theme and Wallpaper"), Key([mod, "control"], "w", lazy.spawn(home + "/dotfiles/qtile/scripts/x11/wallpaper.sh select"), desc="Select Theme and Wallpaper"), @@ -197,7 +194,7 @@ elif qtile.core.name == "wayland": # Apps Key([mod], "Return", lazy.spawn(terminal), desc="Launch terminal"), Key([mod, "control"], "Return", lazy.spawn("rofi -show drun"), desc="Launch Rofi"), - Key([mod], "b", lazy.spawn(browser), desc="Launch Browser"), + Key([mod], "b", lazy.spawn("sh " + home + "/dotfiles/.settings/browser.sh"), desc="Launch Browser"), Key([mod, "shift"], "w", lazy.spawn(home + "/dotfiles/qtile/scripts/wayland/wallpaper.sh"), desc="Update Theme and Wallpaper"), Key([mod, "control"], "w", lazy.spawn(home + "/dotfiles/qtile/scripts/wayland/wallpaper.sh select"), desc="Select Theme and Wallpaper"), @@ -355,7 +352,7 @@ widget_list = [ text=" ", foreground="000000.6", fontsize=18, - mouse_callbacks={"Button1": lambda: qtile.cmd_spawn("chromium")}, + mouse_callbacks={"Button1": lambda: qtile.cmd_spawn("sh " + home + "/dotfiles/.settings/browser.sh")}, ), widget.TextBox( **decor_left, @@ -363,7 +360,7 @@ widget_list = [ text=" ", foreground="000000.6", fontsize=18, - mouse_callbacks={"Button1": lambda: qtile.cmd_spawn("thunar")} + mouse_callbacks={"Button1": lambda: qtile.cmd_spawn("sh " + home + "/dotfiles/.settings/filemanager.sh")} ), widget.WindowName( diff --git a/version b/version index c20c8ac..b8d12d7 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.6 \ No newline at end of file +2.6.1 \ No newline at end of file diff --git a/waybar/modules.json b/waybar/modules.json index 2f703de..0112923 100644 --- a/waybar/modules.json +++ b/waybar/modules.json @@ -83,6 +83,7 @@ "exec": "~/dotfiles/scripts/updates.sh", "restart-interval": 60, "on-click": "alacritty -e ~/dotfiles/scripts/installupdates.sh", + "on-click-right": "~/dotfiles/.settings/software.sh", "tooltip": false }, @@ -118,7 +119,7 @@ // Filemanager Launcher "custom/filemanager": { "format": "", - "on-click": "thunar", + "on-click": "~/dotfiles/.settings/filemanager.sh", "tooltip": false }, @@ -139,7 +140,7 @@ // Browser Launcher "custom/browser": { "format": "", - "on-click": "chromium", + "on-click": "~/dotfiles/.settings/browser.sh", "tooltip": false },