This commit is contained in:
Stephan Raabe 2023-12-06 21:00:34 +01:00
parent 0c16122ae3
commit ab8bb8db61
10 changed files with 24 additions and 12 deletions

View File

@ -53,4 +53,5 @@ packagesYay=(
"swaylock-effects" "swaylock-effects"
"wlogout" "wlogout"
"wlr-randr" "wlr-randr"
"pacseek"
); );

View File

@ -56,4 +56,5 @@ packagesYay=(
"swww" "swww"
"qtile-extras" "qtile-extras"
"wlr-randr" "wlr-randr"
"pacseek"
); );

View File

@ -13,6 +13,9 @@ _showRestoreOptions() {
if [ -f ~/dotfiles/.bashrc ]; then if [ -f ~/dotfiles/.bashrc ]; then
restorelist+="~/dotfiles/.bashrc " restorelist+="~/dotfiles/.bashrc "
fi fi
if [ -d ~/dotfiles/.settings ]; then
restorelist+="~/dotfiles/.settings "
fi
if [[ $profile == *"Hyprland"* ]]; then if [[ $profile == *"Hyprland"* ]]; then
if [ -f ~/dotfiles/hypr/conf/keyboard.conf ]; then if [ -f ~/dotfiles/hypr/conf/keyboard.conf ]; then
restorelist+="~/dotfiles/hypr/conf/keyboard.conf " restorelist+="~/dotfiles/hypr/conf/keyboard.conf "
@ -88,6 +91,12 @@ _startRestore() {
echo ".bashrc restored!" echo ".bashrc restored!"
fi fi
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 [[ $profile == *"Hyprland"* ]]; then
if [[ $restoreselect == *"~/dotfiles/hypr/conf/keyboard.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then if [[ $restoreselect == *"~/dotfiles/hypr/conf/keyboard.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
if [ -f ~/dotfiles/hypr/conf/keyboard.conf ]; then if [ -f ~/dotfiles/hypr/conf/keyboard.conf ]; then

1
.settings/browser.sh Executable file
View File

@ -0,0 +1 @@
chromium

1
.settings/filemanager.sh Executable file
View File

@ -0,0 +1 @@
thunar

1
.settings/software.sh Executable file
View File

@ -0,0 +1 @@
alacritty -e pacseek

View File

@ -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. 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.

View File

@ -82,8 +82,6 @@ platform = int(os.popen("cat /sys/class/dmi/id/chassis_type").read())
# -------------------------------------------------------- # --------------------------------------------------------
terminal = "alacritty" terminal = "alacritty"
browser = "chromium"
# browser = "brave"
# -------------------------------------------------------- # --------------------------------------------------------
# Keybindings # Keybindings
@ -140,8 +138,7 @@ if core_name == "x11":
# Apps # Apps
Key([mod], "Return", lazy.spawn(terminal), desc="Launch terminal"), Key([mod], "Return", lazy.spawn(terminal), desc="Launch terminal"),
Key([mod, "control"], "Return", lazy.spawn("rofi -show drun"), desc="Launch Rofi"), 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, "control"], "b", lazy.spawn(home + "/dotfiles/scripts/bravebookmarks.sh"), desc="Rofi Brave Bookmarks"),
Key([mod, "shift"], "w", lazy.spawn(home + "/dotfiles/qtile/scripts/x11/wallpaper.sh"), desc="Update Theme and Wallpaper"), 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"), 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 # Apps
Key([mod], "Return", lazy.spawn(terminal), desc="Launch terminal"), Key([mod], "Return", lazy.spawn(terminal), desc="Launch terminal"),
Key([mod, "control"], "Return", lazy.spawn("rofi -show drun"), desc="Launch Rofi"), 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, "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"), 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="", text="",
foreground="000000.6", foreground="000000.6",
fontsize=18, 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( widget.TextBox(
**decor_left, **decor_left,
@ -363,7 +360,7 @@ widget_list = [
text="", text="",
foreground="000000.6", foreground="000000.6",
fontsize=18, 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( widget.WindowName(

View File

@ -1 +1 @@
2.6 2.6.1

View File

@ -83,6 +83,7 @@
"exec": "~/dotfiles/scripts/updates.sh", "exec": "~/dotfiles/scripts/updates.sh",
"restart-interval": 60, "restart-interval": 60,
"on-click": "alacritty -e ~/dotfiles/scripts/installupdates.sh", "on-click": "alacritty -e ~/dotfiles/scripts/installupdates.sh",
"on-click-right": "~/dotfiles/.settings/software.sh",
"tooltip": false "tooltip": false
}, },
@ -118,7 +119,7 @@
// Filemanager Launcher // Filemanager Launcher
"custom/filemanager": { "custom/filemanager": {
"format": "", "format": "",
"on-click": "thunar", "on-click": "~/dotfiles/.settings/filemanager.sh",
"tooltip": false "tooltip": false
}, },
@ -139,7 +140,7 @@
// Browser Launcher // Browser Launcher
"custom/browser": { "custom/browser": {
"format": "", "format": "",
"on-click": "chromium", "on-click": "~/dotfiles/.settings/browser.sh",
"tooltip": false "tooltip": false
}, },