diff --git a/.bashrc b/.bashrc index 1e47a5d..0e4a186 100644 --- a/.bashrc +++ b/.bashrc @@ -28,6 +28,7 @@ alias ll='eza -al --icons' alias lt='eza -a --tree --level=1 --icons' alias shutdown='systemctl poweroff' alias v='$EDITOR' +alias vim='$EDITOR' alias ts='~/dotfiles/scripts/snapshot.sh' alias matrix='cmatrix' alias wifi='nmtui' @@ -73,8 +74,6 @@ alias ascii='~/dotfiles/scripts/figlet.sh' alias vm='~/private/launchvm.sh' alias lg='~/dotfiles/scripts/looking-glass.sh' -alias vmstart='virsh --connect qemu:///system start win11' -alias vmstop='virsh --connect qemu:///system destroy win11' # ----------------------------------------------------- # EDIT CONFIG FILES @@ -107,6 +106,11 @@ alias res2='xrandr --output DisplayPort-0 --mode 1920x1080 --rate 120' export PATH="/usr/lib/ccache/bin/:$PATH" +# ----------------------------------------------------- +# DEVELOPMENT +# ----------------------------------------------------- +alias dotsync="~/dotfiles-versions/dotfiles/.dev/sync.sh dotfiles" + # ----------------------------------------------------- # START STARSHIP # ----------------------------------------------------- diff --git a/.dev/sync.sh b/.dev/sync.sh index fc7f3a5..c642ac7 100755 --- a/.dev/sync.sh +++ b/.dev/sync.sh @@ -4,7 +4,7 @@ if [ ! -z $1 ] ;then if [ -d ~/dotfiles-versions/"$1" ] ;then echo "Folder exists. Start rsync now ..." - rsync -avhp -I --exclude-from=excludes.txt ~/dotfiles-versions/$1/ ~/dotfiles + rsync -avhp -I --exclude-from=$HOME/dotfiles-versions/$1/.dev/excludes.txt ~/dotfiles-versions/$1/ ~/dotfiles else echo "Folder ~/dotfiles-versions/$1 not found." fi diff --git a/.install/qtile-dotfiles.sh b/.install/qtile-dotfiles.sh index ee864ee..3e4721d 100644 --- a/.install/qtile-dotfiles.sh +++ b/.install/qtile-dotfiles.sh @@ -24,9 +24,6 @@ if [ ! $mode == "dev" ]; then if [ -d ~/dotfiles-versions/$version/qtile ]; then _installSymLink qtile ~/.config/qtile ~/dotfiles/qtile/ ~/.config fi - if [ -d ~/dotfiles-versions/$version/polybar ]; then - _installSymLink polybar ~/.config/polybar ~/dotfiles/polybar/ ~/.config - fi if [ -d ~/dotfiles-versions/$version/picom ]; then _installSymLink picom ~/.config/picom ~/dotfiles/picom/ ~/.config fi @@ -39,15 +36,6 @@ if [ ! $mode == "dev" ]; then if [ -d ~/dotfiles-versions/$version/swappy ]; then _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config fi - #if [ -d ~/dotfiles-versions/$version/gtk ]; then - # _installSymLink .gtkrc-2.0 ~/.gtkrc-2.0 ~/dotfiles/gtk/.gtkrc-2.0 ~/.gtkrc-2.0 - #fi - #if [ -d ~/dotfiles-versions/$version/gtk ]; then - # _installSymLink .Xresources ~/.Xresources ~/dotfiles/gtk/.Xresources ~/.Xresources - #fi - #if [ -d ~/dotfiles-versions/$version/gtk ]; then - # _installSymLink gtk-3.0 ~/.config/gtk-3.0 ~/dotfiles/gtk/gtk-3.0/ ~/.config/ - #fi else echo "Skipped: DEV MODE!" fi diff --git a/.version/name b/.version/name index 96d7717..71e433b 100644 --- a/.version/name +++ b/.version/name @@ -1 +1 @@ -2.8.1 \ No newline at end of file +2.8.1RC1 \ No newline at end of file diff --git a/CHANGELOG b/CHANGELOG index 338015b..ea71c5d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,16 @@ +Version 2.8.1 +https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8 +-------------------------------------------------------- +ML4W Welcome App: +- Terminal can be set for Thunar +- Opens systeminfo of Hyprland + +Hyprland: +- Bugfix timeshift detection in installupdates.sh + +Qtile: +- + Version 2.8 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8 -------------------------------------------------------- diff --git a/README.md b/README.md index 61ab37e..cf4ca06 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ML4W dotfiles 2.8 +# ML4W dotfiles 2.8.1 RC1 This is my configuration of Hyprland (Wayland) and Qtile (X11) for Arch Linux based distributions. This package includes an installation script to install and setup the required components. diff --git a/apps/ML4W_Welcome-x86_64.AppImage b/apps/ML4W_Welcome-x86_64.AppImage index e73ef58..f017604 100755 Binary files a/apps/ML4W_Welcome-x86_64.AppImage and b/apps/ML4W_Welcome-x86_64.AppImage differ diff --git a/polybar/config.ini b/polybar/config.ini deleted file mode 100644 index 536e0ac..0000000 --- a/polybar/config.ini +++ /dev/null @@ -1,239 +0,0 @@ -; ____ _ _ -; | _ \ ___ | |_ _| |__ __ _ _ __ -; | |_) / _ \| | | | | '_ \ / _` | '__| -; | __/ (_) | | |_| | |_) | (_| | | -; |_| \___/|_|\__, |_.__/ \__,_|_| -; |___/ -; -; by Stephan Raabe (2023) -; ----------------------------------------------------- -; Icons: https://fontawesome.com/search?o=r&m=free - -[colors] -background = #aa000000 -foreground = ${xrdb:color7:#222} -foreground-alt = ${xrdb:color7:#000} -primary = ${xrdb:color3:#222} -secondary = ${xrdb:color7:#222} -alert = ${xrdb:color3:#222} - -[bar/mybar] -width = 100% -height = 20pt -radius = 0 -background = ${colors.background} -foreground = ${colors.foreground} -border-size = 0pt -border-color = #00000000 -padding-left = 2 -padding-right = 1 -module-margin = 2 -separator = "" -separator-foreground = ${colors.disabled} -font-0 = "Fira Sans SemiBold:size=11;2" -font-1 = "Font Awesome 6 Free Solid:pixelsize=11;2" -modules-left = appmenu browser xwindow -modules-center = xworkspaces -modules-right = battery xkeyboard mysystem filesystem pulseaudio memory cpu date exit -cursor-click = pointer -cursor-scroll = ns-resize -enable-ipc = true -tray-position = right -tray-detached = false - -[module/youtubesubs] -type = custom/script -exec = "python ~/private/youtube.py" -format-prefix = " " -format-prefix-foreground = ${colors.primary} -interval = 300 -click-left = "chromium --app=https://studio.youtube.com" -label-foreground = #FFFFFF - -[module/outlook] -type = custom/text -content-foreground = ${colors.foreground} -content = "" -click-left = "chromium --app=https://outlook.office.com/mail/" - -[module/teams] -type = custom/text -content-foreground = ${colors.foreground} -content = "" -click-left = "chromium --app=https://teams.microsoft.com/go" - -[module/browser] -type = custom/text -content-foreground = ${colors.foreground} -content = "" -click-left = "chromium" - -[module/appmenu] -type = custom/text -content-foreground = ${colors.primary} -content = "" -click-left = "rofi -show drun" - -[module/scrcpy] -type = custom/text -content-foreground = ${colors.foreground} -content = "Pixel" -click-left = "scrcpy -d" - -[module/chatgpt] -type = custom/text -content-foreground = ${colors.foreground} -content = "" -click-left = "chromium --app=https://chat.openai.com" - -[module/calculator] -type = custom/text -content-foreground = ${colors.foreground} -content = "" -click-left = "~/dotfiles/scripts/calculator.sh" - -[module/launchvm] -type = custom/text -content-foreground = ${colors.foreground} -content = "" -click-left = "xfreerdp -grab-keyboard /v:192.168.122.42 /size:100% /cert-ignore /u:raabe /p:SECRET /d: /dynamic-resolution /gfx-h264:avc444 +gfx-progressive" - -[module/exit] -type = custom/text -content-foreground = ${colors.primary} -content = " " -click-left = "~/dotfiles/qtile/scripts/powermenu.sh" - -[module/xworkspaces] -type = internal/xworkspaces -icon1=3 -icon-default = "" -label-active = %name% -label-active-background = ${colors.foreground} -label-active-padding = 2 -label-active-foreground = #FF000000 -; label-active-foreground = ${color.foreground} -label-occupied = %name% -label-occupied-padding = 2 -label-occupied-foreground = #FFFFFF -label-occupied-background=#66000000 -label-urgent = %name% -label-urgent-background = ${colors.alert} -label-urgent-padding = 2 -label-empty = %name% -label-empty-foreground =#FFFFFF -label-empty-background=#99000000 -label-empty-padding = 2 -; format-prefix = "  " -; format-prefix-foreground = ${colors.primary} - -[module/xwindow] -type = internal/xwindow -label = %title:0:60:...% -format-prefix = " " -format-prefix-foreground = ${colors.primary} -format-foreground = #FFFFFF - -[module/mysystem] -type = custom/text -content-foreground = ${colors.primary} -content = " " -click-left = "alacritty -e htop" - -[module/filesystem] -type = internal/fs -interval = 25 -mount-0 = / -format-foreground = #FFFFFF -label-mounted = %mountpoint% %percentage_used%% -label-mounted-foreground = #FFFFFF -label-unmounted = %mountpoint% not mounted -label-unmounted-foreground = #FFFFFF - -[module/pulseaudio] -type = internal/pulseaudio -format-volume-prefix = " " -format-volume-prefix-foreground = ${colors.primary} -format-volume = -format-volume-foreground = #FFFFFF -label-volume = %percentage%% -label-muted = muted -label-muted-foreground = ${colors.disabled} - -[module/xkeyboard] -type = internal/xkeyboard -blacklist-0 = num lock -label-layout = %layout% -label-layout-foreground = ${colors.primary} -label-indicator-padding = 2 -label-indicator-margin = 1 -label-indicator-foreground = ${colors.background} -label-indicator-background = ${colors.secondary} - -[module/memory] -type = internal/memory -interval = 2 -format-prefix = " " -format-prefix-foreground = ${colors.primary} -format-foreground = #FFFFFF -label = %percentage_used:2%% - -[module/cpu] -type = internal/cpu -interval = 2 -format-prefix = " " -format-prefix-foreground = ${colors.primary} -format-foreground = #FFFFFF -label = %percentage:2%% -click = "htop" - -[network-base] -type = internal/network -interval = 5 -format-connected = -format-disconnected = -label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected - -[module/wlan] -inherit = network-base -interface-type = wireless -label-connected = %{F#F0C674}%ifname%%{F-} %essid% %local_ip% - -[module/eth] -inherit = network-base -interface-type = wired -label-connected = %{F#F0C674}%ifname%%{F-} %local_ip% - -[module/date] -type = internal/date -interval = 1 -format-prefix = " " -format-prefix-foreground = ${colors.primary} -date = %H:%M -date-alt = %Y-%m-%d %H:%M:%S -label = %date% -label-foreground = #FFFFFF - -[settings] -screenchange-reload = true -pseudo-transparency = true - -[module/battery] -type = internal/battery -label-discharging = " %percentage%%" -label-full = " 100%" -label-charging = " %percentage%% -label-low = " BATTERY LOW" -format-discharging-foreground = #FFFFFF -format-full-foreground = #FFFFFF -format-charging-foreground = #FFFFFF -format-low-foreground = #FFFFFF -full-at = 99 -low-at = 5 -; Use the following command to list batteries and adapters: -; $ ls -1 /sys/class/power_supply/ -battery = BAT1 -; adapter = AC -poll-interval = 5 - -; vim:ft=dosini diff --git a/polybar/launch.sh b/polybar/launch.sh deleted file mode 100755 index 188b630..0000000 --- a/polybar/launch.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash -# ____ _ _ ____ _ _ -# / ___|| |_ __ _ _ __| |_ | _ \ ___ | |_ _| |__ __ _ _ __ -# \___ \| __/ _` | '__| __| | |_) / _ \| | | | | '_ \ / _` | '__| -# ___) | || (_| | | | |_ | __/ (_) | | |_| | |_) | (_| | | -# |____/ \__\__,_|_| \__| |_| \___/|_|\__, |_.__/ \__,_|_| -# |___/ -# -# by Stephan Raabe (2023) -# ----------------------------------------------------- - -# ----------------------------------------------------- -# Quit running polybar instances -# ----------------------------------------------------- -killall polybar - -# polybar-msg cmd quit - - -# ----------------------------------------------------- -# Loading the configuration based on the username -# ----------------------------------------------------- -polybar -r mybar