From 72d0cf1c17b1a2665ea44418223d35c033a477f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Czy=C5=BC?= Date: Sat, 25 Feb 2023 19:10:06 +0100 Subject: [PATCH] Rofi and bar customization --- dwm/.dwm/bar.sh | 18 +-- dwm/.dwm/config.def.h | 8 +- rofi/.config/rofi/config.rasi | 94 ++------------- rofi/.config/rofi/themes/dracula.rasi | 11 -- rofi/.config/rofi/themes/everblush.rasi | 11 -- rofi/.config/rofi/themes/forest.rasi | 11 -- rofi/.config/rofi/themes/gruv.rasi | 11 -- rofi/.config/rofi/themes/nord.rasi | 11 -- rofi/.config/rofi/themes/onedark.rasi | 11 -- .../share/rofi/themes/catppuccin-frappe.rasi | 111 ++++++++++++++++++ .../share/rofi/themes/catppuccin-latte.rasi | 111 ++++++++++++++++++ .../rofi/themes/catppuccin-macchiato.rasi | 111 ++++++++++++++++++ .../share/rofi/themes/catppuccin-mocha.rasi | 111 ++++++++++++++++++ 13 files changed, 465 insertions(+), 165 deletions(-) delete mode 100644 rofi/.config/rofi/themes/dracula.rasi delete mode 100644 rofi/.config/rofi/themes/everblush.rasi delete mode 100644 rofi/.config/rofi/themes/forest.rasi delete mode 100644 rofi/.config/rofi/themes/gruv.rasi delete mode 100644 rofi/.config/rofi/themes/nord.rasi delete mode 100644 rofi/.config/rofi/themes/onedark.rasi create mode 100644 rofi/.local/share/rofi/themes/catppuccin-frappe.rasi create mode 100644 rofi/.local/share/rofi/themes/catppuccin-latte.rasi create mode 100644 rofi/.local/share/rofi/themes/catppuccin-macchiato.rasi create mode 100644 rofi/.local/share/rofi/themes/catppuccin-mocha.rasi diff --git a/dwm/.dwm/bar.sh b/dwm/.dwm/bar.sh index c4e72bd..da412b6 100755 --- a/dwm/.dwm/bar.sh +++ b/dwm/.dwm/bar.sh @@ -21,8 +21,8 @@ darkblue=#83bae8 cpu() { cpu_val=$(grep -o "^[^ ]*" /proc/loadavg) - printf "^c$black^ ^b$green^ CPU" - printf "^c$white^ ^b$grey^ $cpu_val" + printf "^c$black^ ^b$green^ 󰇄 " + printf "^c$black^ ^b$green^$cpu_val" } pkg_updates() { @@ -31,9 +31,9 @@ pkg_updates() { # updates=$(aptitude search '~U' | wc -l) # apt (ubuntu,debian etc) if [ -z "$updates" ]; then - printf " ^c$green^  Fully Updated" + printf " ^c$blue^  Fully Updated" else - printf " ^c$green^  $updates"" updates" + printf " ^c$blue^  $updates"" updates" fi } @@ -48,8 +48,8 @@ brightness() { } mem() { - printf "^c$blue^^b$black^  " - printf "^c$blue^ $(free -h | awk '/^Mem/ { print $3 }' | sed s/i//g)" + printf "^c$black^^b$red^  " + printf "^c$black^ $(free -h | awk '/^Mem/ { print $3 }' | sed s/i//g)" } wlan() { @@ -60,8 +60,8 @@ wlan() { } clock() { - printf "^c$black^ ^b$darkblue^ 󱑆 " - printf "^c$black^^b$blue^ $(date '+%H:%M') " + printf "^c$black^ ^b$blue^ 󱑁 " + printf "^c$black^^b$blue^ $(date '+%r') " } while true; do @@ -70,5 +70,5 @@ while true; do interval=$((interval + 1)) # sleep 1 && xsetroot -name "$updates $(battery) $(brightness) $(cpu) $(mem) $(wlan) $(clock)" - sleep 1 && xsetroot -name "$updates $(cpu) $(mem) $(clock)" + sleep 1 && xsetroot -name "$(cpu) $(mem) $(clock)" done diff --git a/dwm/.dwm/config.def.h b/dwm/.dwm/config.def.h index a95e3cd..f9313b8 100644 --- a/dwm/.dwm/config.def.h +++ b/dwm/.dwm/config.def.h @@ -156,9 +156,9 @@ static void (*bartabmonfns[])(Monitor *) = { NULL /* , customlayoutfn */ }; #if BAR_PANGO_PATCH static const char font[] = "monospace 11"; #else -static const char *fonts[] = { "SauceCodePro Nerd Font Mono:size=11:antialias=true", "monospace:size=11:antialias=true" }; +static const char *fonts[] = { "SauceCodePro Nerd Font:size=11:antialias=true", "monospace:size=11:antialias=true" }; #endif // BAR_PANGO_PATCH -static const char dmenufont[] = "SauceCodePro Nerd Font Mono:size=11:antialias=true"; +static const char dmenufont[] = "SauceCodePro Nerd Font:size=11:antialias=true"; static char c000000[] = "#000000"; // placeholder value @@ -848,6 +848,7 @@ static const char *xkb_layouts[] = { #if !NODMENU_PATCH static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ #endif // NODMENU_PATCH +static const char *rofidruncmd[] = {"rofi", "-show", "drun", NULL}; static const char *dmenucmd[] = { "dmenu_run", #if !NODMENU_PATCH @@ -1039,6 +1040,7 @@ static const Key keys[] = { { MODKEY|ControlMask, XK_z, showhideclient, {0} }, #endif // BAR_WINTITLEACTIONS_PATCH { MODKEY|ShiftMask, XK_c, killclient, {0} }, + { MODKEY, XK_q, killclient, {0} }, #if KILLUNSEL_PATCH { MODKEY|ShiftMask, XK_x, killunsel, {0} }, #endif // KILLUNSEL_PATCH @@ -1078,7 +1080,7 @@ static const Key keys[] = { { MODKEY|Mod5Mask|Mod1Mask, XK_Tab, rotatelayoutaxis, {.i = -4 } }, /* flextile, 4 = secondary stack axis */ { MODKEY|ControlMask, XK_Return, mirrorlayout, {0} }, /* flextile, flip master and stack areas */ #endif // FLEXTILE_DELUXE_LAYOUT - { MODKEY, XK_space, setlayout, {0} }, + { MODKEY, XK_space, spawn, {.v = rofidruncmd}}, { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, #if MAXIMIZE_PATCH { MODKEY|ControlMask|ShiftMask, XK_h, togglehorizontalmax, {0} }, diff --git a/rofi/.config/rofi/config.rasi b/rofi/.config/rofi/config.rasi index bae4142..fb503d3 100644 --- a/rofi/.config/rofi/config.rasi +++ b/rofi/.config/rofi/config.rasi @@ -1,98 +1,18 @@ configuration{ modi: "run,drun,window"; - lines: 5; - font: "Iosevka 12"; + icon-theme: "Oranchelo"; show-icons: true; - icon-theme: "Paper Mono"; - terminal: "st"; + terminal: "alacritty"; drun-display-format: "{icon} {name}"; location: 0; disable-history: false; hide-scrollbar: true; display-drun: "  Apps "; + display-run: "  Run "; + display-window: " 﩯 Window"; + display-Network: " 󰤨 Network"; + sidebar-mode: true; } -@theme "everblush" +@theme "catppuccin-mocha" -element-text, element-icon , mode-switcher { - background-color: inherit; - text-color: inherit; -} - -window { - height: 360px; - border: 3px; - border-color: @border-col; - background-color: @bg-col; -} - -mainbox { - background-color: @bg-col; -} - -inputbar { - children: [prompt,entry]; - background-color: @bg-col; - border-radius: 5px; - padding: 2px; -} - -prompt { - background-color: @blue; - padding: 6px; - text-color: @bg-col; - border-radius: 3px; - margin: 20px 0px 0px 20px; -} - -textbox-prompt-colon { - expand: false; - str: ":"; -} - -entry { - padding: 6px; - margin: 20px 0px 0px 10px; - text-color: @fg-col; - background-color: @bg-col; -} - -listview { - border: 0px 0px 0px; - padding: 6px 0px 0px; - margin: 10px 0px 0px 20px; - columns: 2; - background-color: @bg-col; -} - -element { - padding: 5px; - background-color: @bg-col; - text-color: @fg-col ; -} - -element-icon { - size: 25px; -} - -element selected { - background-color: @selected-col ; - text-color: @fg-col2 ; -} - -mode-switcher { - spacing: 0; - } - -button { - padding: 10px; - background-color: @bg-col-light; - text-color: @grey; - vertical-align: 0.5; - horizontal-align: 0.5; -} - -button selected { - background-color: @bg-col; - text-color: @blue; -} diff --git a/rofi/.config/rofi/themes/dracula.rasi b/rofi/.config/rofi/themes/dracula.rasi deleted file mode 100644 index cc3fd9b..0000000 --- a/rofi/.config/rofi/themes/dracula.rasi +++ /dev/null @@ -1,11 +0,0 @@ -* { - bg-col: #282a36; - bg-col-light: #44475a; - border-col: #44475a; - selected-col: #44475a; - blue: #bd93f9; - fg-col: #f8f8f2; - fg-col2: #ffffff; - grey: #6272a4; - width: 600; -} diff --git a/rofi/.config/rofi/themes/everblush.rasi b/rofi/.config/rofi/themes/everblush.rasi deleted file mode 100644 index 0d5ab21..0000000 --- a/rofi/.config/rofi/themes/everblush.rasi +++ /dev/null @@ -1,11 +0,0 @@ -* { - bg-col: #181f21; - bg-col-light: #22292b; - border-col: #272e30; - selected-col: #31383a; - blue: #67b0e8; - fg-col: #dadada; - fg-col2: #d5d5d5; - grey: #363d3f; - width: 600; -} diff --git a/rofi/.config/rofi/themes/forest.rasi b/rofi/.config/rofi/themes/forest.rasi deleted file mode 100644 index 8523049..0000000 --- a/rofi/.config/rofi/themes/forest.rasi +++ /dev/null @@ -1,11 +0,0 @@ -* { - bg-col: #2B3339; - bg-col-light: #333b41; - border-col: #333b41; - selected-col: #333b41; - blue: #87c095; - fg-col: #b4bbc8; - fg-col2: #e67e80; - grey: #545c62; - width: 600; -} diff --git a/rofi/.config/rofi/themes/gruv.rasi b/rofi/.config/rofi/themes/gruv.rasi deleted file mode 100644 index 834e66c..0000000 --- a/rofi/.config/rofi/themes/gruv.rasi +++ /dev/null @@ -1,11 +0,0 @@ -* { - bg-col: #1e2122; - bg-col-light: #26292a; - border-col: #282b2c; - selected-col: #242728; - blue: #8dae88; - fg-col: #d4be98; - fg-col2: #df736d; - grey: #5b5e5f; - width: 600; -} diff --git a/rofi/.config/rofi/themes/nord.rasi b/rofi/.config/rofi/themes/nord.rasi deleted file mode 100644 index a50eb45..0000000 --- a/rofi/.config/rofi/themes/nord.rasi +++ /dev/null @@ -1,11 +0,0 @@ -* { - bg-col: #2E3440; - bg-col-light: #343a46; - border-col: #343a46; - selected-col: #343a46; - blue: #81A1C1; - fg-col: #b4bbc8; - fg-col2: #BF616A; - grey: #646a76; - width: 600; -} diff --git a/rofi/.config/rofi/themes/onedark.rasi b/rofi/.config/rofi/themes/onedark.rasi deleted file mode 100644 index cb40d7c..0000000 --- a/rofi/.config/rofi/themes/onedark.rasi +++ /dev/null @@ -1,11 +0,0 @@ -* { - bg-col: #1e222a; - bg-col-light: #282c34; - border-col: #282c34; - selected-col: #282c34; - blue: #61afef; - fg-col: #abb2bf; - fg-col2: #e06c75; - grey: #565c64; - width: 600; -} diff --git a/rofi/.local/share/rofi/themes/catppuccin-frappe.rasi b/rofi/.local/share/rofi/themes/catppuccin-frappe.rasi new file mode 100644 index 0000000..e6e8783 --- /dev/null +++ b/rofi/.local/share/rofi/themes/catppuccin-frappe.rasi @@ -0,0 +1,111 @@ +* { + bg-col: #303446; + bg-col-light: #303446; + border-col: #303446; + selected-col: #303446; + blue: #8caaee; + fg-col: #c6d0f5; + fg-col2: #e78284; + grey: #737994; + + width: 600; + font: "JetBrainsMono Nerd Font 14"; +} + +element-text, element-icon , mode-switcher { + background-color: inherit; + text-color: inherit; +} + +window { + height: 360px; + border: 3px; + border-color: @border-col; + background-color: @bg-col; +} + +mainbox { + background-color: @bg-col; +} + +inputbar { + children: [prompt,entry]; + background-color: @bg-col; + border-radius: 5px; + padding: 2px; +} + +prompt { + background-color: @blue; + padding: 6px; + text-color: @bg-col; + border-radius: 3px; + margin: 20px 0px 0px 20px; +} + +textbox-prompt-colon { + expand: false; + str: ":"; +} + +entry { + padding: 6px; + margin: 20px 0px 0px 10px; + text-color: @fg-col; + background-color: @bg-col; +} + +listview { + border: 0px 0px 0px; + padding: 6px 0px 0px; + margin: 10px 0px 0px 20px; + columns: 2; + lines: 5; + background-color: @bg-col; +} + +element { + padding: 5px; + background-color: @bg-col; + text-color: @fg-col ; +} + +element-icon { + size: 25px; +} + +element selected { + background-color: @selected-col ; + text-color: @fg-col2 ; +} + +mode-switcher { + spacing: 0; + } + +button { + padding: 10px; + background-color: @bg-col-light; + text-color: @grey; + vertical-align: 0.5; + horizontal-align: 0.5; +} + +button selected { + background-color: @bg-col; + text-color: @blue; +} + +message { + background-color: @bg-col-light; + margin: 2px; + padding: 2px; + border-radius: 5px; +} + +textbox { + padding: 6px; + margin: 20px 0px 0px 20px; + text-color: @blue; + background-color: @bg-col-light; +} diff --git a/rofi/.local/share/rofi/themes/catppuccin-latte.rasi b/rofi/.local/share/rofi/themes/catppuccin-latte.rasi new file mode 100644 index 0000000..6826db6 --- /dev/null +++ b/rofi/.local/share/rofi/themes/catppuccin-latte.rasi @@ -0,0 +1,111 @@ +* { + bg-col: #eff1f5; + bg-col-light: #eff1f5; + border-col: #eff1f5; + selected-col: #eff1f5; + blue: #1e66f5; + fg-col: #4c4f69; + fg-col2: #d20f39; + grey: #9ca0b0; + + width: 600; + font: "JetBrainsMono Nerd Font 14"; +} + +element-text, element-icon , mode-switcher { + background-color: inherit; + text-color: inherit; +} + +window { + height: 360px; + border: 3px; + border-color: @border-col; + background-color: @bg-col; +} + +mainbox { + background-color: @bg-col; +} + +inputbar { + children: [prompt,entry]; + background-color: @bg-col; + border-radius: 5px; + padding: 2px; +} + +prompt { + background-color: @blue; + padding: 6px; + text-color: @bg-col; + border-radius: 3px; + margin: 20px 0px 0px 20px; +} + +textbox-prompt-colon { + expand: false; + str: ":"; +} + +entry { + padding: 6px; + margin: 20px 0px 0px 10px; + text-color: @fg-col; + background-color: @bg-col; +} + +listview { + border: 0px 0px 0px; + padding: 6px 0px 0px; + margin: 10px 0px 0px 20px; + columns: 2; + lines: 5; + background-color: @bg-col; +} + +element { + padding: 5px; + background-color: @bg-col; + text-color: @fg-col ; +} + +element-icon { + size: 25px; +} + +element selected { + background-color: @selected-col ; + text-color: @fg-col2 ; +} + +mode-switcher { + spacing: 0; + } + +button { + padding: 10px; + background-color: @bg-col-light; + text-color: @grey; + vertical-align: 0.5; + horizontal-align: 0.5; +} + +button selected { + background-color: @bg-col; + text-color: @blue; +} + +message { + background-color: @bg-col-light; + margin: 2px; + padding: 2px; + border-radius: 5px; +} + +textbox { + padding: 6px; + margin: 20px 0px 0px 20px; + text-color: @blue; + background-color: @bg-col-light; +} diff --git a/rofi/.local/share/rofi/themes/catppuccin-macchiato.rasi b/rofi/.local/share/rofi/themes/catppuccin-macchiato.rasi new file mode 100644 index 0000000..696d769 --- /dev/null +++ b/rofi/.local/share/rofi/themes/catppuccin-macchiato.rasi @@ -0,0 +1,111 @@ +* { + bg-col: #24273a; + bg-col-light: #24273a; + border-col: #24273a; + selected-col: #24273a; + blue: #8aadf4; + fg-col: #cad3f5; + fg-col2: #ed8796; + grey: #6e738d; + + width: 600; + font: "JetBrainsMono Nerd Font 14"; +} + +element-text, element-icon , mode-switcher { + background-color: inherit; + text-color: inherit; +} + +window { + height: 360px; + border: 3px; + border-color: @border-col; + background-color: @bg-col; +} + +mainbox { + background-color: @bg-col; +} + +inputbar { + children: [prompt,entry]; + background-color: @bg-col; + border-radius: 5px; + padding: 2px; +} + +prompt { + background-color: @blue; + padding: 6px; + text-color: @bg-col; + border-radius: 3px; + margin: 20px 0px 0px 20px; +} + +textbox-prompt-colon { + expand: false; + str: ":"; +} + +entry { + padding: 6px; + margin: 20px 0px 0px 10px; + text-color: @fg-col; + background-color: @bg-col; +} + +listview { + border: 0px 0px 0px; + padding: 6px 0px 0px; + margin: 10px 0px 0px 20px; + columns: 2; + lines: 5; + background-color: @bg-col; +} + +element { + padding: 5px; + background-color: @bg-col; + text-color: @fg-col ; +} + +element-icon { + size: 25px; +} + +element selected { + background-color: @selected-col ; + text-color: @fg-col2 ; +} + +mode-switcher { + spacing: 0; + } + +button { + padding: 10px; + background-color: @bg-col-light; + text-color: @grey; + vertical-align: 0.5; + horizontal-align: 0.5; +} + +button selected { + background-color: @bg-col; + text-color: @blue; +} + +message { + background-color: @bg-col-light; + margin: 2px; + padding: 2px; + border-radius: 5px; +} + +textbox { + padding: 6px; + margin: 20px 0px 0px 20px; + text-color: @blue; + background-color: @bg-col-light; +} diff --git a/rofi/.local/share/rofi/themes/catppuccin-mocha.rasi b/rofi/.local/share/rofi/themes/catppuccin-mocha.rasi new file mode 100644 index 0000000..38c0b80 --- /dev/null +++ b/rofi/.local/share/rofi/themes/catppuccin-mocha.rasi @@ -0,0 +1,111 @@ +* { + bg-col: #1e1e2e; + bg-col-light: #1e1e2e; + border-col: #1e1e2e; + selected-col: #1e1e2e; + blue: #89b4fa; + fg-col: #cdd6f4; + fg-col2: #f38ba8; + grey: #6c7086; + + width: 600; + font: "JetBrainsMono Nerd Font 14"; +} + +element-text, element-icon , mode-switcher { + background-color: inherit; + text-color: inherit; +} + +window { + height: 360px; + border: 3px; + border-color: @border-col; + background-color: @bg-col; +} + +mainbox { + background-color: @bg-col; +} + +inputbar { + children: [prompt,entry]; + background-color: @bg-col; + border-radius: 5px; + padding: 2px; +} + +prompt { + background-color: @blue; + padding: 6px; + text-color: @bg-col; + border-radius: 3px; + margin: 20px 0px 0px 20px; +} + +textbox-prompt-colon { + expand: false; + str: ":"; +} + +entry { + padding: 6px; + margin: 20px 0px 0px 10px; + text-color: @fg-col; + background-color: @bg-col; +} + +listview { + border: 0px 0px 0px; + padding: 6px 0px 0px; + margin: 10px 0px 0px 20px; + columns: 2; + lines: 5; + background-color: @bg-col; +} + +element { + padding: 5px; + background-color: @bg-col; + text-color: @fg-col ; +} + +element-icon { + size: 25px; +} + +element selected { + background-color: @selected-col ; + text-color: @fg-col2 ; +} + +mode-switcher { + spacing: 0; + } + +button { + padding: 10px; + background-color: @bg-col-light; + text-color: @grey; + vertical-align: 0.5; + horizontal-align: 0.5; +} + +button selected { + background-color: @bg-col; + text-color: @blue; +} + +message { + background-color: @bg-col-light; + margin: 2px; + padding: 2px; + border-radius: 5px; +} + +textbox { + padding: 6px; + margin: 20px 0px 0px 20px; + text-color: @blue; + background-color: @bg-col-light; +}