This commit is contained in:
Stephan Raabe 2024-01-06 13:31:16 +01:00
parent 2080825c69
commit 86e5d0993a
10 changed files with 25 additions and 132 deletions

View File

@ -1,11 +1,13 @@
packagesPacman=( packagesPacman=(
"qtile" "qtile"
"polybar"
"picom" "picom"
"scrot" "scrot"
"slock" "slock"
"xorg" "xorg"
"xorg-xinit" "xorg-xinit"
"nitrogen"
"python-dbus-next"
"python-iwlib"
); );
packagesYay=( packagesYay=(

View File

@ -1 +1 @@
2.7.1RC2 2.7.1RC3

View File

@ -7,6 +7,9 @@ Hyprland:
- New Settings for keyboard (incl. natural_scroll for touchpads) - New Settings for keyboard (incl. natural_scroll for touchpads)
- Add ChatGPT Icon to Waybar. Can be disabled in settings - 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 Version 2.7
https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.7 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.7
-------------------------------------------------------- --------------------------------------------------------

View File

@ -301,10 +301,6 @@ Included is a pywal configuration that changes the color scheme based on a rando
<kbd>SUPER</kbd> + <kbd>CTRL</kbd> + <kbd>W</kbd> opens rofi with a list of installed wallpapers in ~/wallpaper/ for your individual selection. <kbd>SUPER</kbd> + <kbd>CTRL</kbd> + <kbd>W</kbd> opens rofi with a list of installed wallpapers in ~/wallpaper/ for your individual selection.
## Qtile status bar switcher
With <kbd>SUPER</kbd> + <kbd>SHIFT</kbd> + <kbd>S</kbd>, you can switch between the Qtile standard status bar and Polybar and back.
## Main Packages ## Main Packages
- Terminal: alacritty - Terminal: alacritty
@ -317,7 +313,7 @@ With <kbd>SUPER</kbd> + <kbd>SHIFT</kbd> + <kbd>S</kbd>, you can switch between
- Filemanager: Thunar - Filemanager: Thunar
- Cursor: Bibata Modern Ice - Cursor: Bibata Modern Ice
- Icons: Papirus-Icon-Theme - Icons: Papirus-Icon-Theme
- Status Bar: Qtile status bar + Polybar (optional) - Status Bar: Qtile status bar
- Compositor: picom - Compositor: picom
- Screenshots: scrot - Screenshots: scrot

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
_getHeader "$name" "$author" _getHeader "$name" "$author"
echo "ML4W dotfiles Version" $(cat $HOME/dotfiles/.version/name)
echo
echo "$homepage ($email)" echo "$homepage ($email)"
echo "ML4W dotfiles Version 2.7" echo
echo "Settings Version" $(_getVersion)
echo ""
echo $description echo $description

View File

@ -27,10 +27,5 @@ xfce4-power-manager &
# Load notification service # Load notification service
dunst & dunst &
# Launch polybar
~/dotfiles/qtile/scripts/loadbar.sh
sleep 1
# Setup Wallpaper and update colors # Setup Wallpaper and update colors
~/dotfiles/qtile/scripts/wallpaper.sh init ~/dotfiles/qtile/scripts/wallpaper.sh init

View File

@ -1,3 +0,0 @@
# Setup global keyboard layout here
keyboard_layout = "us"

View File

@ -30,13 +30,12 @@ from libqtile.backend.wayland import InputConfig
from qtile_extras import widget from qtile_extras import widget
from qtile_extras.widget.decorations import RectDecoration from qtile_extras.widget.decorations import RectDecoration
from qtile_extras.widget.decorations import PowerLineDecoration from qtile_extras.widget.decorations import PowerLineDecoration
from conf.keyboard import *
# -------------------------------------------------------- # --------------------------------------------------------
# Your configuration # 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 status bar widget (set to False if wired network)
# show_wlan = True # show_wlan = True
@ -53,21 +52,6 @@ show_bluetooth = False
# Get home path # Get home path
home = str(Path.home()) 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 # Check for Desktop/Laptop
# -------------------------------------------------------- # --------------------------------------------------------
@ -129,7 +113,6 @@ keys = [
Key([mod], "q", lazy.window.kill(), desc="Kill focused window"), Key([mod], "q", lazy.window.kill(), desc="Kill focused window"),
Key([mod, "shift"], "r", lazy.reload_config(), desc="Reload the config"), 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, "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 # Apps
Key([mod], "Return", lazy.spawn(terminal), desc="Launch terminal"), Key([mod], "Return", lazy.spawn(terminal), desc="Launch terminal"),
@ -365,14 +348,6 @@ widget_list = [
padding=10, padding=10,
format="%Y-%m-%d / %I:%M %p", 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( widget.TextBox(
**decor_right, **decor_right,
background=Color2+".4", background=Color2+".4",
@ -390,15 +365,10 @@ if (show_wlan == False):
if (show_bluetooth == False): if (show_bluetooth == False):
del widget_list[12:13] del widget_list[12:13]
if (core_name == "x11"):
del widget_list[13:14]
# -------------------------------------------------------- # --------------------------------------------------------
# Screens # Screens
# -------------------------------------------------------- # --------------------------------------------------------
if (wm_bar == "qtile"):
logger.warning("Loading qtile bar")
screens = [ screens = [
Screen( Screen(
top=bar.Bar( top=bar.Bar(
@ -412,12 +382,6 @@ if (wm_bar == "qtile"):
), ),
), ),
] ]
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 # Drag floating layouts

View File

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

View File

@ -8,36 +8,4 @@
# by Stephan Raabe (2023) # by Stephan Raabe (2023)
# ----------------------------------------------------- # -----------------------------------------------------
# ----------------------------------------------------- echo "Loading Qtile status bar..."
# 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