Updates
This commit is contained in:
Stephan Raabe
parent
59a037c694
commit
51e9d67781
3
.bashrc
3
.bashrc
@ -36,7 +36,7 @@ alias dot="cd ~/dotfiles"
|
||||
# -----------------------------------------------------
|
||||
|
||||
alias Qtile='startx'
|
||||
alias QtileWayland='qtile start -b wayland'
|
||||
# alias QtileWayland='qtile start -b wayland'
|
||||
# Hyprland with Hyprland
|
||||
|
||||
# -----------------------------------------------------
|
||||
@ -120,7 +120,6 @@ if [[ $(tty) == *"pts"* ]]; then
|
||||
else
|
||||
if [ -f /bin/qtile ]; then
|
||||
echo "Start Qtile X11 with command Qtile"
|
||||
echo "Start Qtile Wayland with command QtileWayland"
|
||||
fi
|
||||
if [ -f /bin/hyprctl ]; then
|
||||
echo "Start Hyprland with command Hyprland"
|
||||
|
||||
@ -12,3 +12,4 @@ keyboard.py
|
||||
animation.conf
|
||||
decoration.conf
|
||||
window.conf
|
||||
autostart.sh
|
||||
@ -24,9 +24,12 @@ echo -e "${NONE}"
|
||||
echo ""
|
||||
fi
|
||||
if [[ $profile == *"Qtile"* ]]; then
|
||||
if [ -f /usr/share/wayland-sessions/qtile-wayland.desktop ]; then
|
||||
sudo mv /usr/share/wayland-sessions/qtile-wayland.desktop /usr/share/wayland-sessions/qtile-wayland.bak
|
||||
fi
|
||||
echo "PLEASE NOTE: Qtile works with Display Managers."
|
||||
echo "But if you want to use the tty based (terminal) login instead, you can disable the display manager now."
|
||||
echo "If you install the aliases with the included .bashrc, you can start Qtile with the command Qtile or QtileWayland."
|
||||
echo "If you install the aliases with the included .bashrc, you can start Qtile with the command Qtile."
|
||||
echo ""
|
||||
fi
|
||||
|
||||
|
||||
@ -50,9 +50,9 @@ else
|
||||
REPLACE="$keyboard_layout"
|
||||
sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/hypr/conf/keyboard.conf
|
||||
|
||||
SEARCH="\"KEYBOARD_LAYOUT\""
|
||||
REPLACE="\"$keyboard_layout\""
|
||||
sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/qtile/conf/keyboard.py
|
||||
SEARCH="\"setxkbmap en\""
|
||||
REPLACE="\"setxkbmap $keyboard_layout\""
|
||||
sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/qtile/autostart.sh
|
||||
|
||||
echo ""
|
||||
echo "Keyboard setup updated successfully."
|
||||
|
||||
@ -59,17 +59,9 @@ _showRestoreOptions() {
|
||||
fi
|
||||
fi
|
||||
if [[ $profile == *"Qtile"* ]]; then
|
||||
if [ -f ~/dotfiles/qtile/conf/keyboard.py ]; then
|
||||
restorelist+="~/dotfiles/qtile/conf/keyboard.py "
|
||||
selectedlist+="~/dotfiles/qtile/conf/keyboard.py,"
|
||||
fi
|
||||
if [ -f ~/dotfiles/qtile/autostart_wayland.sh ]; then
|
||||
restorelist+="~/dotfiles/qtile/autostart_wayland.sh "
|
||||
selectedlist+="~/dotfiles/qtile/autostart_wayland.sh,"
|
||||
fi
|
||||
if [ -f ~/dotfiles/qtile/autostart_x11.sh ]; then
|
||||
restorelist+="~/dotfiles/qtile/autostart_x11.sh "
|
||||
selectedlist+="~/dotfiles/qtile/autostart_x11.sh,"
|
||||
if [ -f ~/dotfiles/qtile/autostart.sh ]; then
|
||||
restorelist+="~/dotfiles/qtile/autostart.sh "
|
||||
selectedlist+="~/dotfiles/qtile/autostart.sh,"
|
||||
fi
|
||||
fi
|
||||
restoreselect=$(gum choose --no-limit --height 20 --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) " --selected="$selectedlist" $restorelist)
|
||||
|
||||
11
CHANGELOG
11
CHANGELOG
@ -8,11 +8,14 @@ Installation:
|
||||
Hyprland:
|
||||
- New Waybar Module Idle Inhibitor to deactivate the automatic start of swaylock e.g. to watch videos or for online meetings
|
||||
- Create own customization of ML4W waybar themes: https://gitlab.com/stephan-raabe/dotfiles/-/tree/main/waybar?ref_type=heads#define-your-own-config-and-stylecss-for-a-ml4w-theme
|
||||
|
||||
Settings Script:
|
||||
- Wallpaper selector now with preview thumbnails
|
||||
- Settings script reworked completely. Implementation of custom modules are now possible.
|
||||
- New waybar module to edit some ML4W waybar themes settings on the fly
|
||||
- SDDM module to update the SDDM background with current wallpaper
|
||||
- Waybar settings module to edit some ML4W waybar themes settings on the fly
|
||||
- SDDM settings module to update the SDDM background with current wallpaper
|
||||
|
||||
Qtile:
|
||||
- Removed wayland support due to many limitations. Installation script will rename /usr/share/wayland-sessions/qtile-wayland.session to qtile-wayland.bak to hide in sddm
|
||||
|
||||
|
||||
Version 2.6.1
|
||||
https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.6.1
|
||||
|
||||
@ -22,7 +22,11 @@ case $1 in
|
||||
|
||||
# Select wallpaper with rofi
|
||||
"select")
|
||||
selected=$(ls -1 ~/wallpaper | grep "jpg" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-wallpaper.rasi)
|
||||
|
||||
selected=$( find "$HOME/wallpaper" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" \) -exec basename {} \; | sort | while read rfile
|
||||
do
|
||||
echo -en "$rfile\x00icon\x1f$HOME/wallpaper/${rfile}\n"
|
||||
done | rofi -dmenu -replace -l 6 -config ~/dotfiles/rofi/config-wallpaper.rasi)
|
||||
if [ ! "$selected" ]; then
|
||||
echo "No wallpaper selected"
|
||||
exit
|
||||
|
||||
@ -15,7 +15,8 @@
|
||||
# For Virtual Machine
|
||||
# xrandr --output Virtual-1 --mode 1920x1080
|
||||
|
||||
# Set keyboard layout in config.py
|
||||
# Keyboard layout
|
||||
setxkbmap en
|
||||
|
||||
# Load picom
|
||||
picom &
|
||||
@ -1,35 +0,0 @@
|
||||
#!/bin/bash
|
||||
# ___ _____ ___ _ _____ ____ _ _
|
||||
# / _ \_ _|_ _| | | ____| / ___|| |_ __ _ _ __| |_
|
||||
# | | | || | | || | | _| \___ \| __/ _` | '__| __|
|
||||
# | |_| || | | || |___| |___ ___) | || (_| | | | |_
|
||||
# \__\_\|_| |___|_____|_____| |____/ \__\__,_|_| \__|
|
||||
#
|
||||
#
|
||||
# by Stephan Raabe (2023)
|
||||
# -----------------------------------------------------
|
||||
|
||||
# My screen resolution
|
||||
# xrandr --rate 120
|
||||
|
||||
# For Virtual Machine
|
||||
# xrandr --output Virtual-1 --mode 1920x1080
|
||||
|
||||
# Set keyboard mapping in config.py
|
||||
|
||||
# Load power manager
|
||||
xfce4-power-manager &
|
||||
|
||||
# Load notification service
|
||||
dunst &
|
||||
|
||||
# Load cliphist history
|
||||
wl-paste --watch cliphist store &
|
||||
|
||||
# Launch GTK
|
||||
~/dotfiles/gtk/gtk.sh
|
||||
|
||||
swww init
|
||||
|
||||
# Setup Wallpaper and update colors
|
||||
~/dotfiles/qtile/scripts/wayland/wallpaper.sh init &
|
||||
@ -60,13 +60,11 @@ logger.warning("Using config.py with " + core_name)
|
||||
# --------------------------------------------------------
|
||||
# Define Status Bar
|
||||
# --------------------------------------------------------
|
||||
if core_name == "x11":
|
||||
try:
|
||||
wm_bar = Path(home + "/.cache/.qtile_bar_x11.sh").read_text().replace("\n", "")
|
||||
except:
|
||||
wm_bar = "qtile"
|
||||
elif qtile.core.name == "wayland":
|
||||
wm_bar = "qtile"
|
||||
|
||||
|
||||
logger.warning("Status bar: " + wm_bar)
|
||||
|
||||
@ -89,8 +87,6 @@ terminal = "alacritty"
|
||||
|
||||
mod = "mod4" # SUPER KEY
|
||||
|
||||
if core_name == "x11":
|
||||
logger.warning("Using keys with x11")
|
||||
keys = [
|
||||
|
||||
# Focus
|
||||
@ -110,7 +106,7 @@ if core_name == "x11":
|
||||
Key([mod, "shift"], "h", lazy.layout.swap_left()),
|
||||
Key([mod, "shift"], "l", lazy.layout.swap_right()),
|
||||
|
||||
Key([mod], "Print", lazy.spawn(home + "/dotfiles/qtile/scripts/x11/screenshot.sh")),
|
||||
Key([mod], "Print", lazy.spawn(home + "/dotfiles/qtile/scripts/screenshot.sh")),
|
||||
|
||||
# Size
|
||||
Key([mod, "control"], "Down", lazy.layout.shrink(), desc="Grow window to the left"),
|
||||
@ -133,70 +129,14 @@ if core_name == "x11":
|
||||
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/x11/barswitcher.sh"), desc="Switch Status Bar"),
|
||||
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"),
|
||||
Key([mod, "control"], "Return", lazy.spawn("rofi -show drun"), desc="Launch Rofi"),
|
||||
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"),
|
||||
|
||||
Key([], "XF86MonBrightnessUp", lazy.spawn("brightnessctl -q s +20%")),
|
||||
Key([], "XF86MonBrightnessDown", lazy.spawn("brightnessctl -q s 20%-"))
|
||||
]
|
||||
elif qtile.core.name == "wayland":
|
||||
logger.warning("Using keys with wayland")
|
||||
|
||||
keys = [
|
||||
|
||||
# Focus
|
||||
Key([mod], "Left", lazy.layout.left(), desc="Move focus to left"),
|
||||
Key([mod], "Right", lazy.layout.right(), desc="Move focus to right"),
|
||||
Key([mod], "Down", lazy.layout.down(), desc="Move focus down"),
|
||||
Key([mod], "Up", lazy.layout.up(), desc="Move focus up"),
|
||||
Key([mod], "space", lazy.layout.next(), desc="Move window focus to other window around"),
|
||||
|
||||
# Move
|
||||
Key([mod, "shift"], "Left", lazy.layout.shuffle_left(), desc="Move window to the left"),
|
||||
Key([mod, "shift"], "Right", lazy.layout.shuffle_right(), desc="Move window to the right"),
|
||||
Key([mod, "shift"], "Down", lazy.layout.shuffle_down(), desc="Move window down"),
|
||||
Key([mod, "shift"], "Up", lazy.layout.shuffle_up(), desc="Move window up"),
|
||||
|
||||
# Swap
|
||||
Key([mod, "shift"], "h", lazy.layout.swap_left()),
|
||||
Key([mod, "shift"], "l", lazy.layout.swap_right()),
|
||||
|
||||
Key([mod], "Print", lazy.spawn(home + "/dotfiles/qtile/scripts/wayland/screenshot.sh")),
|
||||
|
||||
# Size
|
||||
Key([mod, "control"], "Down", lazy.layout.shrink(), desc="Grow window to the left"),
|
||||
Key([mod, "control"], "Up", lazy.layout.grow(), desc="Grow window to the right"),
|
||||
Key([mod], "n", lazy.layout.normalize(), desc="Reset all window sizes"),
|
||||
|
||||
# Floating
|
||||
Key([mod], "t", lazy.window.toggle_floating(), desc='Toggle floating'),
|
||||
|
||||
# Split
|
||||
Key([mod, "shift"], "Return", lazy.layout.toggle_split(), desc="Toggle between split and unsplit sides of stack"),
|
||||
|
||||
# Toggle Layouts
|
||||
Key([mod], "Tab", lazy.next_layout(), desc="Toggle between layouts"),
|
||||
|
||||
# Fullscreen
|
||||
Key([mod], "f", lazy.window.toggle_fullscreen()),
|
||||
|
||||
#System
|
||||
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"),
|
||||
|
||||
# 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("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"),
|
||||
Key([mod, "shift"], "w", lazy.spawn(home + "/dotfiles/qtile/scripts/wallpaper.sh"), desc="Update Theme and Wallpaper"),
|
||||
Key([mod, "control"], "w", lazy.spawn(home + "/dotfiles/qtile/scripts/wallpaper.sh select"), desc="Select Theme and Wallpaper"),
|
||||
|
||||
Key([], "XF86MonBrightnessUp", lazy.spawn("brightnessctl -q s +20%")),
|
||||
Key([], "XF86MonBrightnessDown", lazy.spawn("brightnessctl -q s 20%-"))
|
||||
@ -517,9 +457,6 @@ reconfigure_screens = True
|
||||
# focus, should we respect this or not?
|
||||
auto_minimize = True
|
||||
|
||||
# When using the Wayland backend, this can be used to configure input devices.
|
||||
wl_input_rules = None
|
||||
|
||||
# XXX: Gasp! We're lying here. In fact, nobody really uses or cares about this
|
||||
# string besides java UI toolkits; you can see several discussions on the
|
||||
# mailing lists, GitHub issues, and other WM documentation that suggest setting
|
||||
@ -535,15 +472,6 @@ wl_input_rules = None
|
||||
|
||||
wmname = "QTILE"
|
||||
|
||||
# --------------------------------------------------------
|
||||
# Set wayland properties
|
||||
# --------------------------------------------------------
|
||||
|
||||
# Keyboard layout
|
||||
wl_input_rules = {
|
||||
"type:keyboard": InputConfig(kb_layout=keyboard_layout),
|
||||
}
|
||||
|
||||
# --------------------------------------------------------
|
||||
# Hooks
|
||||
# --------------------------------------------------------
|
||||
@ -551,12 +479,8 @@ wl_input_rules = {
|
||||
# HOOK startup
|
||||
@hook.subscribe.startup_once
|
||||
def autostart():
|
||||
if qtile.core.name == "x11":
|
||||
autostartscript = "~/.config/qtile/autostart_x11.sh"
|
||||
subprocess.Popen(['setxkbmap',keyboard_layout])
|
||||
elif qtile.core.name == "wayland":
|
||||
autostartscript = "~/.config/qtile/autostart_wayland.sh"
|
||||
|
||||
home = os.path.expanduser(autostartscript)
|
||||
subprocess.Popen([home])
|
||||
|
||||
|
||||
@ -22,7 +22,10 @@ case $1 in
|
||||
|
||||
# Select wallpaper with rofi
|
||||
"select")
|
||||
selected=$(ls -1 ~/wallpaper | grep "jpg" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-wallpaper.rasi)
|
||||
selected=$( find "$HOME/wallpaper" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" \) -exec basename {} \; | sort | while read rfile
|
||||
do
|
||||
echo -en "$rfile\x00icon\x1f$HOME/wallpaper/${rfile}\n"
|
||||
done | rofi -dmenu -replace -l 6 -config ~/dotfiles/rofi/config-wallpaper.rasi)
|
||||
if [ ! "$selected" ]; then
|
||||
echo "No wallpaper selected"
|
||||
exit
|
||||
@ -1,32 +0,0 @@
|
||||
#!/bin/bash
|
||||
# ____ _ _
|
||||
# / ___| ___ _ __ ___ ___ _ __ ___| |__ ___ | |_
|
||||
# \___ \ / __| '__/ _ \/ _ \ '_ \/ __| '_ \ / _ \| __|
|
||||
# ___) | (__| | | __/ __/ | | \__ \ | | | (_) | |_
|
||||
# |____/ \___|_| \___|\___|_| |_|___/_| |_|\___/ \__|
|
||||
#
|
||||
#
|
||||
# by Stephan Raabe (2023)
|
||||
# -----------------------------------------------------
|
||||
|
||||
DIR="$HOME/Pictures/screenshots/"
|
||||
NAME="screenshot_$(date +%d%m%Y_%H%M%S).png"
|
||||
|
||||
option2="Selected area"
|
||||
option3="Fullscreen (delay 3 sec)"
|
||||
|
||||
options="$option2\n$option3"
|
||||
|
||||
choice=$(echo -e "$options" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-screenshot.rasi -i -no-show-icons -l 2 -width 30 -p "Take Screenshot")
|
||||
|
||||
case $choice in
|
||||
$option2)
|
||||
grim -g "$(slurp)" - | swappy -f -
|
||||
notify-send "Screenshot created" "Mode: Selected area"
|
||||
;;
|
||||
$option3)
|
||||
sleep 3
|
||||
grim - | swappy -f -
|
||||
notify-send "Screenshot created" "Mode: Fullscreen"
|
||||
;;
|
||||
esac
|
||||
@ -1,78 +0,0 @@
|
||||
#!/bin/bash
|
||||
# _ _
|
||||
# __ ____ _| | |_ __ __ _ _ __ ___ _ __
|
||||
# \ \ /\ / / _` | | | '_ \ / _` | '_ \ / _ \ '__|
|
||||
# \ V V / (_| | | | |_) | (_| | |_) | __/ |
|
||||
# \_/\_/ \__,_|_|_| .__/ \__,_| .__/ \___|_|
|
||||
# |_| |_|
|
||||
#
|
||||
# by Stephan Raabe (2023)
|
||||
# -----------------------------------------------------
|
||||
|
||||
case $1 in
|
||||
|
||||
# Load wallpaper from .cache of last session
|
||||
"init")
|
||||
if [ -f ~/.cache/current_wallpaper.jpg ]; then
|
||||
wal -q -i ~/.cache/current_wallpaper.jpg
|
||||
else
|
||||
wal -q -i ~/wallpaper/
|
||||
fi
|
||||
;;
|
||||
|
||||
# Select wallpaper with rofi
|
||||
"select")
|
||||
selected=$(ls -1 ~/wallpaper | grep "jpg" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-wallpaper.rasi)
|
||||
if [ ! "$selected" ]; then
|
||||
echo "No wallpaper selected"
|
||||
exit
|
||||
fi
|
||||
wal -q -i ~/wallpaper/$selected
|
||||
;;
|
||||
|
||||
# Randomly select wallpaper
|
||||
*)
|
||||
wal -q -i ~/wallpaper/
|
||||
;;
|
||||
|
||||
esac
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Load current pywal color scheme
|
||||
# -----------------------------------------------------
|
||||
source "$HOME/.cache/wal/colors.sh"
|
||||
echo "Wallpaper: $wallpaper"
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Copy selected wallpaper into .cache folder
|
||||
# -----------------------------------------------------
|
||||
cp $wallpaper ~/.cache/current_wallpaper.jpg
|
||||
|
||||
# -----------------------------------------------------
|
||||
# get wallpaper iamge name
|
||||
# -----------------------------------------------------
|
||||
newwall=$(echo $wallpaper | sed "s|$HOME/wallpaper/||g")
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Set the new wallpaper
|
||||
# -----------------------------------------------------
|
||||
swww init
|
||||
|
||||
transition_type="wipe"
|
||||
# transition_type="outer"
|
||||
# transition_type="random"
|
||||
|
||||
swww img $wallpaper \
|
||||
--transition-bezier .43,1.19,1,.4 \
|
||||
--transition-fps=60 \
|
||||
--transition-type=$transition_type \
|
||||
--transition-duration=0.7 \
|
||||
|
||||
qtile cmd-obj -o cmd -f reload_config
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Send notification
|
||||
# -----------------------------------------------------
|
||||
notify-send "Colors and Wallpaper updated" "with image $newwall"
|
||||
|
||||
echo "DONE!"
|
||||
@ -13,7 +13,7 @@
|
||||
configuration {
|
||||
modi: "drun,run";
|
||||
font: "Fira Sans Bold 10";
|
||||
show-icons: false;
|
||||
show-icons: true;
|
||||
icon-theme: "kora";
|
||||
display-drun: "APPS";
|
||||
display-run: "RUN";
|
||||
@ -212,7 +212,7 @@ element alternate.active {
|
||||
element-icon {
|
||||
background-color: transparent;
|
||||
text-color: inherit;
|
||||
size: 32px;
|
||||
size: 60px;
|
||||
cursor: inherit;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user