diff --git a/CHANGELOG b/CHANGELOG index 4ada501..2d902a6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,10 @@ Version 2.9 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9 -------------------------------------------------------- -- New Hyprland Settings App. Can be launched from the App Launcher or the ML4W Welcome App +- New Hyprland Settings App. Can be launched from the App Launcher, the ML4W Welcome App or the new ML4W logo context menu (right click) +- Added context menu (right click) to ML4W Logo in Waybar. +- Updated hyprlock screen showing the wallpaper in a circle. hyprlock 3 required +- Waybar Taskbar Module hidden by default. Can be enabled again in the ML4W Settings App Version 2.8.4 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8.4 diff --git a/README.md b/README.md index 54a1717..70d36fb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ML4W Dotfiles 2.9 BETA 1 +# ML4W Dotfiles 2.9 BETA 2 An advanced configuration of Hyprland and Qtile for Arch Linux based distributions. This package includes an installation script to install and setup the required components. diff --git a/apps/ML4W_Dotfiles_Settings-x86_64.AppImage b/apps/ML4W_Dotfiles_Settings-x86_64.AppImage index 95d869f..847835c 100755 Binary files a/apps/ML4W_Dotfiles_Settings-x86_64.AppImage and b/apps/ML4W_Dotfiles_Settings-x86_64.AppImage differ diff --git a/hypr/scripts/ml4w-launcher.sh b/hypr/scripts/ml4w-launcher.sh new file mode 100755 index 0000000..4ae1a57 --- /dev/null +++ b/hypr/scripts/ml4w-launcher.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# __ __ _ _ ___ __ _ _ +# | \/ | | | || \ \ / / | | __ _ _ _ _ __ ___| |__ ___ _ __ +# | |\/| | | | || |\ \ /\ / / | | / _` | | | | '_ \ / __| '_ \ / _ \ '__| +# | | | | |__|__ _\ V V / | |__| (_| | |_| | | | | (__| | | | __/ | +# |_| |_|_____| |_| \_/\_/ |_____\__,_|\__,_|_| |_|\___|_| |_|\___|_| +# + +option1="ML4W Dotfiles Settings" +option2="Hyprland Settings" +option3="Change Wallpaper" +option4="Change Waybar Theme" +option5="ML4W Welcome App" + +options="$option1\n" +options="$options$option2\n" +options="$options$option3\n" +options="$options$option4\n$option5" + +choice=$(echo -e "$options" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-ml4w-launcher.rasi -l 5) + +case $choice in + $option1) + $HOME/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage ;; + $option2) + $HOME/dotfiles/apps/ML4W_Hyprland_Settings-x86_64.AppImage ;; + $option3) + $HOME/dotfiles/hypr/scripts/wallpaper.sh select ;; + $option4) + $HOME/dotfiles/waybar/themeswitcher.sh ;; + $option5) + $HOME/dotfiles/apps/ML4W_Welcome-x86_64.AppImage ;; +esac \ No newline at end of file diff --git a/rofi/config-ml4w-launcher.rasi b/rofi/config-ml4w-launcher.rasi new file mode 100644 index 0000000..e5e82f0 --- /dev/null +++ b/rofi/config-ml4w-launcher.rasi @@ -0,0 +1,261 @@ +/* +# ____ __ _ +# | _ \ ___ / _(_) +# | |_) / _ \| |_| | +# | _ < (_) | _| | +# |_| \_\___/|_| |_| +# +# by Stephan Raabe (2023) +# ----------------------------------------------------- +*/ + +/* ---- Configuration ---- */ +configuration { + modi: "drun,run"; + font: "Fira Sans 8"; + show-icons: false; + display-drun: "APPS"; + display-run: "RUN"; + display-filebrowser: "FILES"; + display-window: "WINDOW"; + hover-select: true; + me-select-entry: ""; + me-accept-entry: "MousePrimary"; + drun-display-format: "{name}"; + window-format: "{w} · {c} · {t}"; + +} + +/* ---- Load font ---- */ +@import "~/dotfiles/.settings/rofi-font.rasi" + +/* ---- Load pywal colors (custom wal template) ---- */ +@import "~/.cache/wal/colors-rofi-pywal" + +/* ---- Load wallpaper ---- */ +@import "~/.cache/current_wallpaper.rasi" + +/* ---- Load border width ---- */ +@import "~/dotfiles/.settings/rofi-border.rasi" + +/* ---- Window ---- */ +window { + width: 260px; + x-offset: -14px; + y-offset: 15px; + spacing: 0px; + padding: 0px; + margin: 0px; + color: #FFFFFF; + border: @border-width; + border-color: #FFFFFF; + cursor: "default"; + transparency: "real"; + location: northeast; + anchor: northeast; + fullscreen: false; + enabled: true; + border-radius: 10px; + background-color: transparent; +} + +/* ---- Mainbox ---- */ +mainbox { + enabled: true; + orientation: horizontal; + spacing: 0px; + margin: 0px; + background-color: @background; + background-image: @current-image; + children: ["listbox"]; +} + +/* ---- Imagebox ---- */ +imagebox { + padding: 18px; + background-color: transparent; + orientation: vertical; + children: [ "inputbar", "dummy", "mode-switcher" ]; +} + +/* ---- Listbox ---- */ +listbox { + spacing: 20px; + background-color: transparent; + orientation: vertical; + children: [ "listview" ]; +} + +/* ---- Dummy ---- */ +dummy { + background-color: transparent; +} + +/* ---- Inputbar ---- */ +inputbar { + enabled: true; + text-color: @foreground; + spacing: 10px; + padding: 15px; + border-radius: 0px; + border-color: @foreground; + background-color: @background; + children: [ "textbox-prompt-colon", "entry" ]; +} + +textbox-prompt-colon { + enabled: true; + expand: false; + padding: 0px 5px 0px 0px; + str: ""; + background-color: transparent; + text-color: inherit; +} + +entry { + enabled: true; + background-color: transparent; + text-color: inherit; + cursor: text; + placeholder: "Search"; + placeholder-color: inherit; +} + +/* ---- Mode Switcher ---- */ +mode-switcher{ + enabled: true; + spacing: 20px; + background-color: transparent; + text-color: @foreground; +} + +button { + padding: 10px; + border-radius: 10px; + background-color: @background; + text-color: inherit; + cursor: pointer; + border: 0px; +} + +button selected { + background-color: @color11; + text-color: @foreground; +} + +/* ---- Listview ---- */ +listview { + enabled: true; + columns: 1; + lines: 2; + cycle: true; + dynamic: true; + scrollbar: false; + layout: vertical; + reverse: false; + fixed-height: true; + fixed-columns: true; + spacing: 0px; + padding: 10px; + margin: 0px; + background-color: @background; + border:0px; +} + +/* ---- Element ---- */ +element { + enabled: true; + padding: 10px; + margin: 5px; + cursor: pointer; + background-color: @background; + border-radius: 10px; + border: @border-width; +} + +element normal.normal { + background-color: inherit; + text-color: @foreground; +} + +element normal.urgent { + background-color: inherit; + text-color: @foreground; +} + +element normal.active { + background-color: inherit; + text-color: @foreground; +} + +element selected.normal { + background-color: @color11; + text-color: @foreground; +} + +element selected.urgent { + background-color: inherit; + text-color: @foreground; +} + +element selected.active { + background-color: inherit; + text-color: @foreground; +} + +element alternate.normal { + background-color: inherit; + text-color: @foreground; +} + +element alternate.urgent { + background-color: inherit; + text-color: @foreground; +} + +element alternate.active { + background-color: inherit; + text-color: @foreground; +} + +element-icon { + background-color: transparent; + text-color: inherit; + size: 32px; + cursor: inherit; +} + +element-text { + background-color: transparent; + text-color: inherit; + cursor: inherit; + vertical-align: 0.5; + horizontal-align: 0.0; +} + +/*****----- Message -----*****/ +message { + background-color: transparent; + border:0px; + margin:20px 0px 0px 0px; + padding:0px; + spacing:0px; + border-radius: 10px; +} + +textbox { + padding: 15px; + margin: 0px; + border-radius: 0px; + background-color: @background; + text-color: @foreground; + vertical-align: 0.5; + horizontal-align: 0.0; +} + +error-message { + padding: 15px; + border-radius: 20px; + background-color: @background; + text-color: @foreground; +} diff --git a/waybar/modules.json b/waybar/modules.json index d845ec0..f251750 100644 --- a/waybar/modules.json +++ b/waybar/modules.json @@ -59,6 +59,7 @@ // ML4W Welcome App "custom/ml4w-welcome": { "on-click": "~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage", + "on-click-right": "~/dotfiles/hypr/scripts/ml4w-launcher.sh", "format": " ", "tooltip": false }, @@ -284,15 +285,28 @@ }, // Group Settings - "group/settings": { + "group/links": { "orientation": "horizontal", "modules": [ // START CHATGPT TOOGLE "custom/chatgpt", // END CHATGPT TOOGLE + "custom/wallpaper" + ] + }, + + // Group Settings + "group/settings": { + "orientation": "inherit", + "drawer": { + "transition-duration": 300, + "children-class": "not-memory", + "transition-left-to-right": false + }, + "modules": [ "custom/settings", "custom/waybarthemes", - "custom/wallpaper" + "custom/ml4w-hyprland-settings" ] }, diff --git a/waybar/themes/ml4w-blur-bottom/config b/waybar/themes/ml4w-blur-bottom/config index 50383e6..00f8fd9 100644 --- a/waybar/themes/ml4w-blur-bottom/config +++ b/waybar/themes/ml4w-blur-bottom/config @@ -24,8 +24,9 @@ // Modules Left "modules-left": [ "custom/appmenu", + "group/links", "group/settings", - "wlr/taskbar", + //"wlr/taskbar", "group/quicklinks", "hyprland/window", "custom/empty" @@ -49,7 +50,6 @@ "idle_inhibitor", "tray", "custom/exit", - "custom/ml4w-hyprland-settings", "custom/ml4w-welcome", "clock" ] diff --git a/waybar/themes/ml4w-blur/config b/waybar/themes/ml4w-blur/config index e353a81..fc5269e 100644 --- a/waybar/themes/ml4w-blur/config +++ b/waybar/themes/ml4w-blur/config @@ -24,8 +24,9 @@ // Modules Left "modules-left": [ "custom/appmenu", + "group/links", "group/settings", - "wlr/taskbar", + //"wlr/taskbar", "group/quicklinks", "hyprland/window", "custom/empty" @@ -48,7 +49,6 @@ "idle_inhibitor", "tray", "custom/exit", - "custom/ml4w-hyprland-settings", "custom/ml4w-welcome", "clock" ] diff --git a/waybar/themes/ml4w-bottom/config b/waybar/themes/ml4w-bottom/config index 35d4108..b6471b9 100644 --- a/waybar/themes/ml4w-bottom/config +++ b/waybar/themes/ml4w-bottom/config @@ -24,8 +24,9 @@ // Modules Left "modules-left": [ "custom/appmenu", + "group/links", "group/settings", - "wlr/taskbar", + //"wlr/taskbar", "group/quicklinks", "hyprland/window" ], @@ -48,7 +49,6 @@ "idle_inhibitor", "tray", "custom/exit", - "custom/ml4w-hyprland-settings", "custom/ml4w-welcome", "clock" ] diff --git a/waybar/themes/ml4w-minimal/config b/waybar/themes/ml4w-minimal/config index 5ad8f17..5bdde98 100644 --- a/waybar/themes/ml4w-minimal/config +++ b/waybar/themes/ml4w-minimal/config @@ -24,6 +24,7 @@ "modules-left": [ "custom/appmenuicon", "hyprland/workspaces", + "group/links", "group/settings", "group/quicklinks" ], @@ -47,7 +48,6 @@ "custom/exit", "clock", "tray", - "custom/ml4w-hyprland-settings", "custom/ml4w-welcome" ] } diff --git a/waybar/themes/ml4w/config b/waybar/themes/ml4w/config index 9597b01..4e40db2 100644 --- a/waybar/themes/ml4w/config +++ b/waybar/themes/ml4w/config @@ -24,8 +24,9 @@ // Modules Left "modules-left": [ "custom/appmenu", + "group/links", "group/settings", - "wlr/taskbar", + //"wlr/taskbar", "group/quicklinks", "hyprland/window", "custom/empty" @@ -48,7 +49,6 @@ "idle_inhibitor", "tray", "custom/exit", - "custom/ml4w-hyprland-settings", "custom/ml4w-welcome", "clock" ] diff --git a/waybar/themes/starter/config b/waybar/themes/starter/config index b1c1062..0506cad 100644 --- a/waybar/themes/starter/config +++ b/waybar/themes/starter/config @@ -34,7 +34,7 @@ "custom/settings", "custom/waybarthemes", "custom/wallpaper", - // "wlr/taskbar", + //"wlr/taskbar", "group/quicklinks", "hyprland/window", "custom/starter"