diff --git a/.install/general-packages.sh b/.install/general-packages.sh index cfc81b1..d66d481 100644 --- a/.install/general-packages.sh +++ b/.install/general-packages.sh @@ -42,6 +42,8 @@ packagesPacman=( "xdg-user-dirs" "networkmanager" "network-manager-applet" + "xarchiver" + "thunar-archive-plugin" "fuse2" "gtk4" "libadwaita" diff --git a/.settings/rofi-border.rasi b/.settings/rofi-border.rasi new file mode 100644 index 0000000..c9103bf --- /dev/null +++ b/.settings/rofi-border.rasi @@ -0,0 +1 @@ +* { border-width: 1px; } \ No newline at end of file diff --git a/.version/name b/.version/name index af65e02..96d7717 100644 --- a/.version/name +++ b/.version/name @@ -1 +1 @@ -2.8 \ No newline at end of file +2.8.1 \ No newline at end of file diff --git a/apps/ML4W_Welcome-x86_64.AppImage b/apps/ML4W_Welcome-x86_64.AppImage index b206f3d..b99c284 100755 Binary files a/apps/ML4W_Welcome-x86_64.AppImage and b/apps/ML4W_Welcome-x86_64.AppImage differ diff --git a/rofi/config-cliphist.rasi b/rofi/config-cliphist.rasi index 680d810..16117ec 100644 --- a/rofi/config-cliphist.rasi +++ b/rofi/config-cliphist.rasi @@ -30,6 +30,7 @@ configuration { /* ---- Load pywal colors (custom wal template) ---- */ @import "~/.cache/wal/colors-rofi-pywal" @import "~/.cache/current_wallpaper.rasi" +@import "~/dotfiles/.settings/rofi-border.rasi" /* ---- Window ---- */ window { @@ -40,7 +41,7 @@ window { padding: 0px; margin: 0px; color: #FFFFFF; - border: 3px; + border: @border-width; border-color: #FFFFFF; cursor: "default"; transparency: "real"; @@ -162,7 +163,7 @@ element { cursor: pointer; background-color: @background; border-radius: 10px; - border: 2px; + border: @border-width; } element normal.normal { diff --git a/rofi/config-compact.rasi b/rofi/config-compact.rasi index 9856256..dc648f9 100644 --- a/rofi/config-compact.rasi +++ b/rofi/config-compact.rasi @@ -30,6 +30,7 @@ configuration { /* ---- Load pywal colors (custom wal template) ---- */ @import "~/.cache/wal/colors-rofi-pywal" @import "~/.cache/current_wallpaper.rasi" +@import "~/dotfiles/.settings/rofi-border.rasi" /* ---- Window ---- */ window { @@ -40,7 +41,7 @@ window { padding: 0px; margin: 0px; color: #FFFFFF; - border: 3px; + border: @border-width; border-color: #FFFFFF; cursor: "default"; transparency: "real"; @@ -162,7 +163,7 @@ element { cursor: pointer; background-color: @background; border-radius: 10px; - border: 2px; + border: @border-width; } element normal.normal { diff --git a/rofi/config-power.rasi b/rofi/config-power.rasi index 37ccdf9..e35bd44 100644 --- a/rofi/config-power.rasi +++ b/rofi/config-power.rasi @@ -30,6 +30,7 @@ configuration { /* ---- Load pywal colors (custom wal template) ---- */ @import "~/.cache/wal/colors-rofi-pywal" @import "~/.cache/current_wallpaper.rasi" +@import "~/dotfiles/.settings/rofi-border.rasi" /* ---- Window ---- */ window { @@ -40,7 +41,7 @@ window { padding: 0px; margin: 0px; color: #FFFFFF; - border: 3px; + border: @border-width; border-color: #FFFFFF; cursor: "default"; transparency: "real"; @@ -162,7 +163,7 @@ element { cursor: pointer; background-color: @background; border-radius: 10px; - border: 2px; + border: @border-width; } element normal.normal { diff --git a/rofi/config-screenshot.rasi b/rofi/config-screenshot.rasi index 7f6b9ed..82b1e40 100644 --- a/rofi/config-screenshot.rasi +++ b/rofi/config-screenshot.rasi @@ -30,6 +30,7 @@ configuration { /* ---- Load pywal colors (custom wal template) ---- */ @import "~/.cache/wal/colors-rofi-pywal" @import "~/.cache/current_wallpaper.rasi" +@import "~/dotfiles/.settings/rofi-border.rasi" /* ---- Window ---- */ window { @@ -40,7 +41,7 @@ window { padding: 0px; margin: 0px; color: #FFFFFF; - border: 3px; + border: @border-width; border-color: #FFFFFF; cursor: "default"; transparency: "real"; @@ -162,7 +163,7 @@ element { cursor: pointer; background-color: @background; border-radius: 10px; - border: 2px; + border: @border-width; } element normal.normal { diff --git a/rofi/config-short.rasi b/rofi/config-short.rasi index 9f1126d..63e90ca 100644 --- a/rofi/config-short.rasi +++ b/rofi/config-short.rasi @@ -30,6 +30,7 @@ configuration { /* ---- Load pywal colors (custom wal template) ---- */ @import "~/.cache/wal/colors-rofi-pywal" @import "~/.cache/current_wallpaper.rasi" +@import "~/dotfiles/.settings/rofi-border.rasi" /* ---- Window ---- */ window { @@ -41,7 +42,7 @@ window { padding: 0px; margin: 0px; color: #FFFFFF; - border: 3px; + border: @border-width; border-color: #FFFFFF; cursor: "default"; transparency: "real"; @@ -163,7 +164,7 @@ element { cursor: pointer; background-color: @background; border-radius: 10px; - border: 2px; + border: @border-width; } element normal.normal { diff --git a/rofi/config-themes.rasi b/rofi/config-themes.rasi index a407eb5..e8ed070 100644 --- a/rofi/config-themes.rasi +++ b/rofi/config-themes.rasi @@ -30,6 +30,7 @@ configuration { /* ---- Load pywal colors (custom wal template) ---- */ @import "~/.cache/wal/colors-rofi-pywal" @import "~/.cache/current_wallpaper.rasi" +@import "~/dotfiles/.settings/rofi-border.rasi" /* ---- Window ---- */ window { @@ -40,7 +41,7 @@ window { padding: 0px; margin: 0px; color: #FFFFFF; - border: 3px; + border: @border-width; border-color: #FFFFFF; cursor: "default"; transparency: "real"; @@ -162,7 +163,7 @@ element { cursor: pointer; background-color: @background; border-radius: 10px; - border: 2px; + border: @border-width; } element normal.normal { diff --git a/rofi/config-wallpaper.rasi b/rofi/config-wallpaper.rasi index 8b1c87b..2e22165 100644 --- a/rofi/config-wallpaper.rasi +++ b/rofi/config-wallpaper.rasi @@ -25,6 +25,7 @@ configuration { /* ---- Load pywal colors (custom wal template) ---- */ @import "~/.cache/wal/colors-rofi-pywal" @import "~/.cache/current_wallpaper.rasi" +@import "~/dotfiles/.settings/rofi-border.rasi" /* ---- Window ---- */ window { @@ -35,7 +36,7 @@ window { padding: 0px; margin: 0px; color: #FFFFFF; - border: 3px; + border: @border-width; border-color: #FFFFFF; cursor: "default"; transparency: "real"; @@ -153,7 +154,7 @@ element { cursor: pointer; background-color: @background; border-radius: 10px; - border: 2px; + border: @border-width; layout: vertical; } diff --git a/rofi/config.rasi b/rofi/config.rasi index 4dc21b4..66ee0af 100644 --- a/rofi/config.rasi +++ b/rofi/config.rasi @@ -30,6 +30,7 @@ configuration { /* ---- Load pywal colors (custom wal template) ---- */ @import "~/.cache/wal/colors-rofi-pywal" @import "~/.cache/current_wallpaper.rasi" +@import "~/dotfiles/.settings/rofi-border.rasi" /* ---- Window ---- */ window { @@ -40,7 +41,7 @@ window { padding: 0px; margin: 0px; color: #FFFFFF; - border: 3px; + border: @border-width; border-color: #FFFFFF; cursor: "default"; transparency: "real"; @@ -162,7 +163,7 @@ element { cursor: pointer; background-color: @background; border-radius: 10px; - border: 2px; + border: @border-width; } element normal.normal { diff --git a/scripts/unlock-pacman.sh b/scripts/unlock-pacman.sh new file mode 100755 index 0000000..33b7de0 --- /dev/null +++ b/scripts/unlock-pacman.sh @@ -0,0 +1,9 @@ +#!/bin/bash +sleep 1 +if [ -f /var/lib/pacman/db.lck ]; then + sudo rm /var/lib/pacman/db.lck + echo ":: Unlock complete" +else + echo ":: Pacman database is not locked" +fi +sleep 3 \ No newline at end of file diff --git a/waybar/modules.json b/waybar/modules.json index 5d1779f..19bc8c9 100644 --- a/waybar/modules.json +++ b/waybar/modules.json @@ -186,7 +186,7 @@ // Rofi Application Launcher "custom/appmenuicon": { - "format": "", + "format": "", "on-click": "rofi -show drun -replace", "on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh", "tooltip": false diff --git a/waybar/themes/default/config b/waybar/themes/default/config index 46de27c..af50014 100644 --- a/waybar/themes/default/config +++ b/waybar/themes/default/config @@ -7,7 +7,7 @@ // Choose the order of the modules "modules-left": ["hyprland/workspaces","custom/waybarthemes"], "modules-center": ["hyprland/window"], - "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "battery#bat2", "clock", "tray"], + "modules-right": ["custom/ml4w-welcome","mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "battery#bat2", "clock", "tray"], // Modules configuration // "sway/workspaces": { // "disable-scroll": true, @@ -34,6 +34,12 @@ "unlocked": "" } }, + // ML4W Welcome App + "custom/ml4w-welcome": { + "on-click": "~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage", + "format": " ", + "tooltip": false + }, // Waybar Themes "custom/waybarthemes": { "format": "Themes", diff --git a/waybar/themes/default/config.sh b/waybar/themes/default/config.sh index aa77c90..71a3429 100644 --- a/waybar/themes/default/config.sh +++ b/waybar/themes/default/config.sh @@ -1,2 +1,2 @@ #!/bin/bash -theme_name="Default" +theme_name="Waybar Default Theme" diff --git a/waybar/themes/default/style.css b/waybar/themes/default/style.css index cf5c5fb..8f51ff6 100644 --- a/waybar/themes/default/style.css +++ b/waybar/themes/default/style.css @@ -34,6 +34,15 @@ window#waybar.chromium { border: none; } +#custom-ml4w-welcome { + margin-right: 15px; + background-image: url("../assets/ml4w-icon-20.png"); + background-repeat: no-repeat; + background-position: center; + padding-right: 20px; + margin-right: 0px; +} + button { /* Use box-shadow instead of border so the text isn't offset */ box-shadow: inset 0 -3px transparent;