diff --git a/.install/qtile-packages.sh b/.install/qtile-packages.sh index d49a249..b114269 100644 --- a/.install/qtile-packages.sh +++ b/.install/qtile-packages.sh @@ -1,11 +1,13 @@ packagesPacman=( "qtile" - "polybar" "picom" "scrot" "slock" "xorg" "xorg-xinit" + "nitrogen" + "python-dbus-next" + "python-iwlib" ); packagesYay=( diff --git a/.version/name b/.version/name index bd77c46..fce74a5 100644 --- a/.version/name +++ b/.version/name @@ -1 +1 @@ -2.7.1RC2 \ No newline at end of file +2.7.1RC3 \ No newline at end of file diff --git a/CHANGELOG b/CHANGELOG index 6704594..94e76ec 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,9 @@ Hyprland: - New Settings for keyboard (incl. natural_scroll for touchpads) - Add ChatGPT Icon to Waybar. Can be disabled in settings +Qtile: +- Removed polybar from the installation. Please make sure that you check the keyboard layout in qtile/autostart.sh after an update. + Version 2.7 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.7 -------------------------------------------------------- diff --git a/README.md b/README.md index bbdb7a3..1f5d897 100644 --- a/README.md +++ b/README.md @@ -301,10 +301,6 @@ Included is a pywal configuration that changes the color scheme based on a rando SUPER + CTRL + W opens rofi with a list of installed wallpapers in ~/wallpaper/ for your individual selection. -## Qtile status bar switcher - -With SUPER + SHIFT + S, you can switch between the Qtile standard status bar and Polybar and back. - ## Main Packages - Terminal: alacritty @@ -317,7 +313,7 @@ With SUPER + SHIFT + S, you can switch between - Filemanager: Thunar - Cursor: Bibata Modern Ice - Icons: Papirus-Icon-Theme -- Status Bar: Qtile status bar + Polybar (optional) +- Status Bar: Qtile status bar - Compositor: picom - Screenshots: scrot diff --git a/hypr/settings/modules/module.sh b/hypr/settings/modules/module.sh index ac284eb..4f0050c 100755 --- a/hypr/settings/modules/module.sh +++ b/hypr/settings/modules/module.sh @@ -1,7 +1,7 @@ #!/bin/bash _getHeader "$name" "$author" +echo "ML4W dotfiles Version" $(cat $HOME/dotfiles/.version/name) +echo echo "$homepage ($email)" -echo "ML4W dotfiles Version 2.7" -echo "Settings Version" $(_getVersion) -echo "" +echo echo $description diff --git a/qtile/autostart.sh b/qtile/autostart.sh index 33812e3..91888be 100755 --- a/qtile/autostart.sh +++ b/qtile/autostart.sh @@ -27,10 +27,5 @@ xfce4-power-manager & # Load notification service dunst & -# Launch polybar -~/dotfiles/qtile/scripts/loadbar.sh - -sleep 1 - # Setup Wallpaper and update colors ~/dotfiles/qtile/scripts/wallpaper.sh init diff --git a/qtile/conf/keyboard.py b/qtile/conf/keyboard.py deleted file mode 100644 index c06875e..0000000 --- a/qtile/conf/keyboard.py +++ /dev/null @@ -1,3 +0,0 @@ -# Setup global keyboard layout here - -keyboard_layout = "us" diff --git a/qtile/config.py b/qtile/config.py index 1d00b4f..410b552 100644 --- a/qtile/config.py +++ b/qtile/config.py @@ -30,13 +30,12 @@ from libqtile.backend.wayland import InputConfig from qtile_extras import widget from qtile_extras.widget.decorations import RectDecoration from qtile_extras.widget.decorations import PowerLineDecoration -from conf.keyboard import * # -------------------------------------------------------- # Your configuration # -------------------------------------------------------- -# Keyboard layout in conf/keyboard.py +# Keyboard layout in autostart.sh # Show wlan status bar widget (set to False if wired network) # show_wlan = True @@ -53,21 +52,6 @@ show_bluetooth = False # Get home path home = str(Path.home()) -# Get Core name: x11 or wayland -core_name = qtile.core.name -logger.warning("Using config.py with " + core_name) - -# -------------------------------------------------------- -# Define Status Bar -# -------------------------------------------------------- -try: - wm_bar = Path(home + "/.cache/.qtile_bar_x11.sh").read_text().replace("\n", "") -except: - wm_bar = "qtile" - - -logger.warning("Status bar: " + wm_bar) - # -------------------------------------------------------- # Check for Desktop/Laptop # -------------------------------------------------------- @@ -129,7 +113,6 @@ keys = [ Key([mod], "q", lazy.window.kill(), desc="Kill focused window"), Key([mod, "shift"], "r", lazy.reload_config(), desc="Reload the config"), Key([mod, "control"], "q", lazy.spawn(home + "/dotfiles/qtile/scripts/powermenu.sh"), desc="Open Powermenu"), - Key([mod, "shift"], "s", lazy.spawn(home + "/dotfiles/qtile/scripts/barswitcher.sh"), desc="Switch Status Bar"), # Apps Key([mod], "Return", lazy.spawn(terminal), desc="Launch terminal"), @@ -365,14 +348,6 @@ widget_list = [ padding=10, format="%Y-%m-%d / %I:%M %p", ), - widget.TextBox( - **decor_right, - background=Color2+".4", - padding=5, - text="", - fontsize=20, - mouse_callbacks={"Button1": lambda: qtile.cmd_spawn(home + "/dotfiles/scripts/cliphist.sh")}, - ), widget.TextBox( **decor_right, background=Color2+".4", @@ -390,34 +365,23 @@ if (show_wlan == False): if (show_bluetooth == False): del widget_list[12:13] -if (core_name == "x11"): - del widget_list[13:14] - # -------------------------------------------------------- # Screens # -------------------------------------------------------- -if (wm_bar == "qtile"): - logger.warning("Loading qtile bar") - screens = [ - Screen( - top=bar.Bar( - widget_list, - 30, - padding=20, - opacity=0.7, - border_width=[0, 0, 0, 0], - margin=[0,0,0,0], - background="#000000.3" - ), +screens = [ + Screen( + top=bar.Bar( + widget_list, + 30, + padding=20, + opacity=0.7, + border_width=[0, 0, 0, 0], + margin=[0,0,0,0], + background="#000000.3" ), - ] -else: - screens = [Screen(top=bar.Gap(size=28))] - if (core_name == "x11"): - screens = [Screen(top=bar.Gap(size=28))] - else: - screens = [Screen(top=bar.Gap(size=0))] + ), +] # -------------------------------------------------------- # Drag floating layouts diff --git a/qtile/scripts/barswitcher.sh b/qtile/scripts/barswitcher.sh deleted file mode 100755 index bad0f00..0000000 --- a/qtile/scripts/barswitcher.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# _ _ _ _ -# | |__ __ _ _ __ _____ _(_) |_ ___| |__ ___ _ __ -# | '_ \ / _` | '__/ __\ \ /\ / / | __/ __| '_ \ / _ \ '__| -# | |_) | (_| | | \__ \\ V V /| | || (__| | | | __/ | -# |_.__/ \__,_|_| |___/ \_/\_/ |_|\__\___|_| |_|\___|_| -# -# by Stephan Raabe (2023) -# ----------------------------------------------------- - -# ----------------------------------------------------- -# Load status bar information -# ----------------------------------------------------- -bar=$(cat ~/.cache/.qtile_bar_x11.sh) - -# ----------------------------------------------------- -# Switch status bar information -# ----------------------------------------------------- -if [ $bar == "qtile" ]; then - echo "Change to Polybar" - echo "polybar" > ~/.cache/.qtile_bar_x11.sh - notify-send "Status Bar is changing..." "to Polybar" -else - echo "Change to Qtile Bar" - echo "qtile" > ~/.cache/.qtile_bar_x11.sh - notify-send "Status Bar is changing..." "to Qtile Status Bar" -fi - -# ----------------------------------------------------- -# Load status bar -# ----------------------------------------------------- -~/dotfiles/qtile/scripts/x11/loadbar.sh \ No newline at end of file diff --git a/qtile/scripts/loadbar.sh b/qtile/scripts/loadbar.sh index ff8cbea..310ae1e 100755 --- a/qtile/scripts/loadbar.sh +++ b/qtile/scripts/loadbar.sh @@ -8,36 +8,4 @@ # by Stephan Raabe (2023) # ----------------------------------------------------- -# ----------------------------------------------------- -# Check if information about the bar exists in .cache -# If not create it -# ----------------------------------------------------- -if [ ! -f ~/.cache/.qtile_bar_x11.sh ]; then - touch ~/.cache/.qtile_bar_x11.sh - echo "qtile" > ~/.cache/.qtile_bar_x11.sh - echo ".qtile_bar_x11.sh created" -fi - -# ----------------------------------------------------- -# Load status bar information -# ----------------------------------------------------- -bar=$(cat ~/.cache/.qtile_bar_x11.sh) - -# ----------------------------------------------------- -# Load status bar based on loaded information -# ----------------------------------------------------- -if [ $bar == "qtile" ]; then - killall polybar - sleep 0.2 - qtile cmd-obj -o cmd -f reload_config -else - killall polybar - sleep 0.2 - qtile cmd-obj -o cmd -f reload_config - sleep 0.2 - source "$HOME/.cache/wal/colors.sh" - ~/dotfiles/polybar/launch.sh & - sleep 0.2 - qtile cmd-obj -o cmd -f reload_config -fi - +echo "Loading Qtile status bar..." \ No newline at end of file