From 23fddf9a46c284b4f6fc23c8cfee2afa6b31f662 Mon Sep 17 00:00:00 2001 From: Stephan Raabe Date: Mon, 2 Oct 2023 10:17:11 +0200 Subject: [PATCH] Rofi updates --- CHANGELOG | 7 +- hypr/conf/keybindings.conf | 1 + rofi/config-cliphist.rasi | 249 ++++++++++++++++++++++++++ rofi/config-screenshot.rasi | 250 +++++++++++++++++++++++++++ rofi/config-short.rasi | 250 +++++++++++++++++++++++++++ rofi/config-wallpaper.rasi | 249 ++++++++++++++++++++++++++ scripts/applauncher.sh | 2 +- scripts/cliphist.sh | 23 +++ scripts/figlet.sh | 3 +- scripts/grim.sh | 2 +- scripts/wallpaper-swww.sh | 2 +- wal/templates/colors-rofi-pywal.rasi | 2 +- waybar/config | 1 + waybar/modules.json | 16 +- waybar/myconfig | 3 +- waybar/style.css | 2 +- 16 files changed, 1046 insertions(+), 16 deletions(-) create mode 100644 rofi/config-cliphist.rasi create mode 100644 rofi/config-screenshot.rasi create mode 100644 rofi/config-short.rasi create mode 100644 rofi/config-wallpaper.rasi create mode 100755 scripts/cliphist.sh diff --git a/CHANGELOG b/CHANGELOG index ffb4142..c9debc9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,12 +1,13 @@ Version 2.3 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.3 -------------------------------------------------------- +- Add clipboard manager cliphist - Waybar: Add numbers to workspaces +- Waybar: Add icon for wallpaper selection +- Waybar: Add cliphist icon (click = open, right-click = delete item, middle-click = clear data) - Screenshots: Add swappy - Icons: Changed to Kora Icon Theme -- Rofi: New Layout featuring current wallpaper as a background -- Cliphist: Added to the toolbar -- Rofi: Add layout for cliphist +- Rofi: New Layout featuring current wallpaper as a background for launcher, cliphist and wallpaper selection - Update Wallpaper: Add random transition effects - Hyprland: Exclude configurations files into dedicated files in hypr/conf/ directory - Hyprland: New window animations (in hypr/conf/) diff --git a/hypr/conf/keybindings.conf b/hypr/conf/keybindings.conf index 5778037..3f9c7a5 100644 --- a/hypr/conf/keybindings.conf +++ b/hypr/conf/keybindings.conf @@ -23,6 +23,7 @@ bind = $mainMod CTRL, W, exec, ~/dotfiles/scripts/wallpaper-swww.sh bind = $mainMod CTRL, RETURN, exec, ~/dotfiles/scripts/applauncher.sh bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh bind = $mainMod CTRL, F, exec, ~/dotfiles/scripts/filemanager.sh +bind = $mainMod CTRL, C, exec, ~/dotfiles/scripts/cliphist.sh bind = $mainMod, 1, workspace, 1 bind = $mainMod, 2, workspace, 2 diff --git a/rofi/config-cliphist.rasi b/rofi/config-cliphist.rasi new file mode 100644 index 0000000..0ea5541 --- /dev/null +++ b/rofi/config-cliphist.rasi @@ -0,0 +1,249 @@ +/* +# ____ __ _ +# | _ \ ___ / _(_) +# | |_) / _ \| |_| | +# | _ < (_) | _| | +# |_| \_\___/|_| |_| +# +# by Stephan Raabe (2023) +# ----------------------------------------------------- +*/ + +/* ---- Configuration ---- */ +configuration { + modi: "drun,run"; + font: "Fira Sans Bold 10"; + show-icons: false; + icon-theme: "kora"; + display-drun: "APPS"; + display-run: "RUN"; + display-filebrowser: "FILES"; + display-window: "WINDOW"; + drun-display-format: "{name}"; + window-format: "{w} · {c} · {t}"; + +} + +/* ---- Load pywal colors (custom wal template) ---- */ +@import "~/.cache/wal/colors-rofi-pywal" + +/* ---- Window ---- */ +window { + width: 400px; + x-offset: -15px; + y-offset: 65px; + spacing: 0px; + padding: 0px; + margin: 0px; + color: #FFFFFF; + border: 3px; + 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: url("~/.cache/current_wallpaper.jpg", height); + 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: [ "inputbar", "message", "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; + 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: 8; + 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: 2px; +} + +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/rofi/config-screenshot.rasi b/rofi/config-screenshot.rasi new file mode 100644 index 0000000..1a8e7ba --- /dev/null +++ b/rofi/config-screenshot.rasi @@ -0,0 +1,250 @@ +/* +# ____ __ _ +# | _ \ ___ / _(_) +# | |_) / _ \| |_| | +# | _ < (_) | _| | +# |_| \_\___/|_| |_| +# +# by Stephan Raabe (2023) +# ----------------------------------------------------- +*/ + +/* ---- Configuration ---- */ +configuration { + modi: "drun,run"; + font: "Fira Sans Bold 10"; + show-icons: false; + icon-theme: "kora"; + display-drun: "APPS"; + display-run: "RUN"; + display-filebrowser: "FILES"; + display-window: "WINDOW"; + drun-display-format: "{name}"; + window-format: "{w} · {c} · {t}"; + +} + +/* ---- Load pywal colors (custom wal template) ---- */ +@import "~/.cache/wal/colors-rofi-pywal" + +/* ---- Window ---- */ +window { + width: 400px; + height: 130px; + x-offset: -15px; + y-offset: 65px; + spacing: 0px; + padding: 0px; + margin: 0px; + color: #FFFFFF; + border: 3px; + 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: url("~/.cache/current_wallpaper.jpg", height); + 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; + 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: 2px; +} + +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/rofi/config-short.rasi b/rofi/config-short.rasi new file mode 100644 index 0000000..4f414d5 --- /dev/null +++ b/rofi/config-short.rasi @@ -0,0 +1,250 @@ +/* +# ____ __ _ +# | _ \ ___ / _(_) +# | |_) / _ \| |_| | +# | _ < (_) | _| | +# |_| \_\___/|_| |_| +# +# by Stephan Raabe (2023) +# ----------------------------------------------------- +*/ + +/* ---- Configuration ---- */ +configuration { + modi: "drun,run"; + font: "Fira Sans Bold 10"; + show-icons: false; + icon-theme: "kora"; + display-drun: "APPS"; + display-run: "RUN"; + display-filebrowser: "FILES"; + display-window: "WINDOW"; + drun-display-format: "{name}"; + window-format: "{w} · {c} · {t}"; + +} + +/* ---- Load pywal colors (custom wal template) ---- */ +@import "~/.cache/wal/colors-rofi-pywal" + +/* ---- Window ---- */ +window { + width: 200px; + height: 130px; + x-offset: -15px; + y-offset: 65px; + spacing: 0px; + padding: 0px; + margin: 0px; + color: #FFFFFF; + border: 3px; + 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: url("~/.cache/current_wallpaper.jpg", height); + 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; + 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: 2px; +} + +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/rofi/config-wallpaper.rasi b/rofi/config-wallpaper.rasi new file mode 100644 index 0000000..d3a544d --- /dev/null +++ b/rofi/config-wallpaper.rasi @@ -0,0 +1,249 @@ +/* +# ____ __ _ +# | _ \ ___ / _(_) +# | |_) / _ \| |_| | +# | _ < (_) | _| | +# |_| \_\___/|_| |_| +# +# by Stephan Raabe (2023) +# ----------------------------------------------------- +*/ + +/* ---- Configuration ---- */ +configuration { + modi: "drun,run"; + font: "Fira Sans Bold 10"; + show-icons: false; + icon-theme: "kora"; + display-drun: "APPS"; + display-run: "RUN"; + display-filebrowser: "FILES"; + display-window: "WINDOW"; + drun-display-format: "{name}"; + window-format: "{w} · {c} · {t}"; + +} + +/* ---- Load pywal colors (custom wal template) ---- */ +@import "~/.cache/wal/colors-rofi-pywal" + +/* ---- Window ---- */ +window { + width: 400px; + x-offset: 0px; + y-offset: 65px; + spacing: 0px; + padding: 0px; + margin: 0px; + color: #FFFFFF; + border: 3px; + border-color: #FFFFFF; + cursor: "default"; + transparency: "real"; + location: north; + anchor: north; + 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: url("~/.cache/current_wallpaper.jpg", height); + 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: [ "inputbar", "message", "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; + 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: 8; + 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: 2px; +} + +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/scripts/applauncher.sh b/scripts/applauncher.sh index 076dcd2..14e25c8 100755 --- a/scripts/applauncher.sh +++ b/scripts/applauncher.sh @@ -9,4 +9,4 @@ # by Stephan Raabe (2023) # ----------------------------------------------------- -rofi -show drun -l 10 +rofi -show drun diff --git a/scripts/cliphist.sh b/scripts/cliphist.sh new file mode 100755 index 0000000..1a40ec9 --- /dev/null +++ b/scripts/cliphist.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# ____ _ _ _ _ _ +# / ___| (_)_ __ | |__ (_)___| |_ +# | | | | | '_ \| '_ \| / __| __| +# | |___| | | |_) | | | | \__ \ |_ +# \____|_|_| .__/|_| |_|_|___/\__| +# |_| +# +# by Stephan Raabe (2023) +# ----------------------------------------------------- + +case $1 in + d) cliphist list | rofi -dmenu -config ~/dotfiles/rofi/config-cliphist.rasi | cliphist delete + ;; + + w) if [ `echo -e "Clear\nCancel" | rofi -dmenu -config ~/dotfiles/rofi/config-short.rasi` == "Clear" ] ; then + cliphist wipe + fi + ;; + + *) cliphist list | rofi -dmenu -config ~/dotfiles/rofi/config-cliphist.rasi | cliphist decode | wl-copy + ;; +esac diff --git a/scripts/figlet.sh b/scripts/figlet.sh index 6554786..1d74fd7 100755 --- a/scripts/figlet.sh +++ b/scripts/figlet.sh @@ -18,7 +18,8 @@ echo "" >> ~/figlet.txt echo "by Stephan Raabe (2023)" >> ~/figlet.txt echo "-----------------------------------------------------" >> ~/figlet.txt sed -i 's/^/# /; s/$/ /' ~/figlet.txt - +lines=$( cat ~/figlet.txt ) +wl-copy "$lines" xclip -sel clip ~/figlet.txt echo "Text copied to clipboard!" diff --git a/scripts/grim.sh b/scripts/grim.sh index 15ed3da..9337f7b 100755 --- a/scripts/grim.sh +++ b/scripts/grim.sh @@ -17,7 +17,7 @@ option3="Fullscreen (delay 3 sec)" options="$option2\n$option3" -choice=$(echo -e "$options" | rofi -dmenu -i -no-show-icons -l 4 -width 30 -p "Take Screenshot") +choice=$(echo -e "$options" | rofi -dmenu -config ~/dotfiles/rofi/config-screenshot.rasi -i -no-show-icons -l 4 -width 30 -p "Take Screenshot") case $choice in $option2) diff --git a/scripts/wallpaper-swww.sh b/scripts/wallpaper-swww.sh index 5eb6cb2..5f0b7dd 100755 --- a/scripts/wallpaper-swww.sh +++ b/scripts/wallpaper-swww.sh @@ -12,7 +12,7 @@ # ----------------------------------------------------- # Select wallpaper # ----------------------------------------------------- -selected=$(ls -1 ~/wallpaper | grep "jpg" | rofi -dmenu -p "Wallpapers") +selected=$(ls -1 ~/wallpaper | grep "jpg" | rofi -dmenu -config ~/dotfiles/rofi/config-wallpaper.rasi -p "Wallpapers") if [ "$selected" ]; then diff --git a/wal/templates/colors-rofi-pywal.rasi b/wal/templates/colors-rofi-pywal.rasi index 8dbafcc..f0b1665 100644 --- a/wal/templates/colors-rofi-pywal.rasi +++ b/wal/templates/colors-rofi-pywal.rasi @@ -1,6 +1,6 @@ * {{ background: rgba(0,0,1,0.5); - foreground: {foreground}; + foreground: #FFFFFF; color0: {color0}; color1: {color1}; color2: {color2}; diff --git a/waybar/config b/waybar/config index 807dc67..c58d8d2 100644 --- a/waybar/config +++ b/waybar/config @@ -45,6 +45,7 @@ // Modules Right "modules-right": [ + "custom/wallpaper", "custom/cliphist", "custom/updates", "pulseaudio", diff --git a/waybar/modules.json b/waybar/modules.json index f250613..43491e6 100644 --- a/waybar/modules.json +++ b/waybar/modules.json @@ -68,12 +68,9 @@ // Cliphist "custom/cliphist": { "format": "", - "on-click": "cliphist list | rofi -dmenu | cliphist decode | wl-copy", - // "exec": "echo ; echo 󰅇 clipboard history", - // "on-click": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh c", - // "on-click-right": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh d", - // "on-click-middle": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh w", - // "interval" : 86400, // once every day + "on-click": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh", + "on-click-right": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh d", + "on-click-middle": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh w", "tooltip": false }, @@ -88,6 +85,13 @@ "on-click": "alacritty -e ~/dotfiles/scripts/installupdates.sh", "tooltip": false }, + + // Wallpaper + "custom/wallpaper": { + "format": "", + "on-click": "~/dotfiles/scripts/wallpaper-swww.sh", + "tooltip": false + }, // Filemanager Launcher "custom/filemanager": { diff --git a/waybar/myconfig b/waybar/myconfig index 7bce079..8a8276d 100644 --- a/waybar/myconfig +++ b/waybar/myconfig @@ -48,7 +48,8 @@ "custom/updates", "pulseaudio", "bluetooth", - "battery", + "battery", + "custom/wallpaper", "custom/cliphist", "group/hardware", "custom/exit", diff --git a/waybar/style.css b/waybar/style.css index d56ee25..586fd46 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -151,7 +151,7 @@ window#waybar.empty #window { * Custom Quicklinks * ----------------------------------------------------- */ -#custom-brave, #custom-outlook, #custom-filemanager, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-windowsvm, #custom-cliphist { +#custom-brave, #custom-outlook, #custom-filemanager, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-windowsvm, #custom-cliphist, #custom-wallpaper { margin-right:20px; font-size:20px; font-weight:bold;