Compare commits

..

7 Commits

Author SHA1 Message Date
f02c5dbc0b minor patches 2025-10-01 10:57:19 +02:00
ab9f2e41a5 feat: changed layout to fib dindle 2025-07-16 16:12:02 +02:00
7b365e95a7 fix: readded monocle layout for fullscreens 2025-07-15 15:32:49 +02:00
d400b7b0e9 feat: changed default tiling modes 2025-07-05 21:13:10 +02:00
e965863d95 fix: bar changes 2025-07-02 20:29:01 +02:00
66fa978463 feat: themes 2025-07-02 16:18:43 +02:00
e63c8cbfd4 fix: battery calculation 2025-07-02 16:17:49 +02:00
6 changed files with 730 additions and 569 deletions

143
bar.sh
View File

@@ -1,24 +1,97 @@
#!/usr/bin/env bash
# Rosé Pine color palette
BASE=#191724
SURFACE=#1f1d2e
OVERLAY=#26233a
# Global variables for theme tracking
CURRENT_THEME=""
THEME_FILE="$HOME/.current_theme"
LAST_MTIME=0
MUTED=#6e6a86
SUBTLE=#908caa
TEXT=#e0def4
# Function to read current theme from file
get_current_theme() {
if [ -f "$THEME_FILE" ]; then
cat "$THEME_FILE" 2>/dev/null || echo "dark"
else
echo "dark" # default to dark theme
fi
}
LOVE=#eb6f92
GOLD=#f6c177
ROSE=#ebbcba
PINE=#31748f
FOAM=#9ccfd8
IRIS=#c4a7e7
# Function to check if theme file has been modified
theme_file_changed() {
if [ -f "$THEME_FILE" ]; then
local current_mtime=$(stat -c %Y "$THEME_FILE" 2>/dev/null || echo 0)
if [ "$current_mtime" -gt "$LAST_MTIME" ]; then
LAST_MTIME="$current_mtime"
return 0 # File was modified
fi
fi
return 1 # No change
}
HIGHLIGHT_LOW=#21202e
HIGHLIGHT_MED=#403d52
HIGHLIGHT_HIGH=#524f67
# Function to update theme if changed
update_theme_if_changed() {
if theme_file_changed; then
local new_theme=$(get_current_theme)
if [ "$new_theme" != "$CURRENT_THEME" ]; then
CURRENT_THEME="$new_theme"
set_colors
echo "Bar theme changed to: $CURRENT_THEME" >&2
return 0 # Theme was updated
fi
fi
return 1 # No update
}
# Function to set color palette based on theme
set_colors() {
if [ "$CURRENT_THEME" = "light" ]; then
# Rosé Pine Dawn (light) color palette
BASE=#faf4ed
SURFACE=#fffaf3
OVERLAY=#f2e9e1
MUTED=#9893a5
SUBTLE=#797593
TEXT=#575279
LOVE=#b4637a
GOLD=#ea9d34
ROSE=#d7827e
PINE=#286983
FOAM=#56949f
IRIS=#907aa9
HIGHLIGHT_LOW=#f4ede8
HIGHLIGHT_MED=#dfdad9
HIGHLIGHT_HIGH=#cecacd
else
# Rosé Pine (dark) color palette - default
BASE=#191724
SURFACE=#1f1d2e
OVERLAY=#26233a
MUTED=#6e6a86
SUBTLE=#908caa
TEXT=#e0def4
LOVE=#eb6f92
GOLD=#f6c177
ROSE=#ebbcba
PINE=#31748f
FOAM=#9ccfd8
IRIS=#c4a7e7
HIGHLIGHT_LOW=#21202e
HIGHLIGHT_MED=#403d52
HIGHLIGHT_HIGH=#524f67
fi
}
# Initialize theme
CURRENT_THEME=$(get_current_theme)
if [ -f "$THEME_FILE" ]; then
LAST_MTIME=$(stat -c %Y "$THEME_FILE" 2>/dev/null || echo 0)
fi
set_colors
echo "Bar started with theme: $CURRENT_THEME" >&2
# Function to get CPU usage
get_cpu_usage() {
@@ -83,6 +156,37 @@ get_brightness() {
# Function to get weighted average battery level
get_battery_level() {
BAT_PATHS=(/sys/class/power_supply/BAT*)
total_now=0
total_full=0
for BAT in "${BAT_PATHS[@]}"; do
if [[ -f "$BAT/energy_now" && -f "$BAT/energy_full" ]]; then
now=$(<"$BAT/energy_now")
full=$(<"$BAT/energy_full")
elif [[ -f "$BAT/charge_now" && -f "$BAT/charge_full" ]]; then
now=$(<"$BAT/charge_now")
full=$(<"$BAT/charge_full")
else
continue
fi
total_now=$((total_now + now))
total_full=$((total_full + full))
done
if [[ $total_full -eq 0 ]]; then
percent=0
else
percent=$((100 * total_now / total_full))
fi
if (( percent < 15 )); then
echo "^c$TEXT^^b$LOVE^BAT: $percent%^b$BASE^"
else
echo "^c$LOVE^BAT: $percent%"
fi
# Get battery levels (adjust paths if needed)
# battery0_level=$(cat /sys/class/power_supply/BAT0/capacity)
# battery1_level=$(cat /sys/class/power_supply/BAT1/capacity)
@@ -96,8 +200,8 @@ get_battery_level() {
# Calculate weighted average
# weighted_avg=$(awk "BEGIN {printf \"%.0f%%\", ($battery0_level * $weight0 + $battery1_level * $weight1)}")
battery0_level=$(cat /sys/class/power_supply/BAT0/capacity)
echo "^c$LOVE^BAT: $battery0_level%"
# battery0_level=$(cat /sys/class/power_supply/BAT0/capacity)
# echo "^c$LOVE^BAT: $battery0_level%"
# Output the result with color
# echo "^c$LOVE^BAT: $weighted_avg"
@@ -121,6 +225,9 @@ is_laptop() {
# Main loop to update xsetroot
while true; do
# Check for theme changes on every iteration
update_theme_if_changed
# Combine all status components
if is_laptop; then
# Include battery and brightness for laptops

View File

@@ -3,14 +3,14 @@
#include <X11/XF86keysym.h>
/* Helper macros for spawning commands */
#define SHCMD(cmd) \
{ \
.v = (const char *[]) { "/bin/sh", "-c", cmd, NULL } \
}
#define CMD(...) \
{ \
.v = (const char *[]) { __VA_ARGS__, NULL } \
}
#define SHCMD(cmd) \
{ \
.v = (const char *[]) { "/bin/sh", "-c", cmd, NULL } \
}
#define CMD(...) \
{ \
.v = (const char *[]) { __VA_ARGS__, NULL } \
}
/* appearance */
#if ROUNDED_CORNERS_PATCH
@@ -70,11 +70,12 @@ static const int topbar = 1; /* 0 means bottom bar */
/* Display modes of the tab bar: never shown, always shown, shown only in */
/* monocle mode in the presence of several windows. */
/* Modes after showtab_nmodes are disabled. */
enum showtab_modes {
showtab_never,
showtab_auto,
showtab_nmodes,
showtab_always
enum showtab_modes
{
showtab_never,
showtab_auto,
showtab_nmodes,
showtab_always
};
static const int showtab = showtab_auto; /* Default tab bar show mode */
static const int toptab = False; /* False means bottom tab bar */
@@ -176,7 +177,7 @@ static const unsigned int tabcyclekey =
static const unsigned int tabposy =
1; /* tab position on Y axis, 0 = top, 1 = center, 2 = bottom */
static const unsigned int tabposx =
1; /* tab position on X axis, 0 = left, 1 = center, 2 = right */
1; /* tab position on X axis, 0 = left, 1 = center, 2 = right */
static const unsigned int maxwtab = 600; /* tab menu width */
static const unsigned int maxhtab = 200; /* tab menu height */
#endif // ALT_TAB_PATCH
@@ -382,10 +383,14 @@ static const char title_bg_dark[] = "#303030";
static const char title_bg_light[] = "#fdfdfd";
static const int color_ptrs[][ColCount] = {
/* fg bg border float */
[SchemeNorm] = {-1, -1, 5, 12}, [SchemeSel] = {-1, -1, 11, 13},
[SchemeTitleNorm] = {6, -1, -1, -1}, [SchemeTitleSel] = {6, -1, -1, -1},
[SchemeTagsNorm] = {2, 0, 0, -1}, [SchemeTagsSel] = {6, 5, 5, -1},
[SchemeHidNorm] = {5, 0, 0, -1}, [SchemeHidSel] = {6, -1, -1, -1},
[SchemeNorm] = {-1, -1, 5, 12},
[SchemeSel] = {-1, -1, 11, 13},
[SchemeTitleNorm] = {6, -1, -1, -1},
[SchemeTitleSel] = {6, -1, -1, -1},
[SchemeTagsNorm] = {2, 0, 0, -1},
[SchemeTagsSel] = {6, 5, 5, -1},
[SchemeHidNorm] = {5, 0, 0, -1},
[SchemeHidSel] = {6, -1, -1, -1},
[SchemeUrg] = {7, 9, 9, 15},
};
#endif // BAR_VTCOLORS_PATCH
@@ -631,7 +636,7 @@ static const Rule rules[] = {
#if PERTAG_PATCH
static const MonitorRule monrules[] = {
/* monitor tag layout mfact nmaster showbar topbar */
{1, -1, 2, -1, -1, -1, -1}, // use a different layout for the second monitor
{1, -1, 2, -1, -1, -1, -1}, // use a different layout for the second monitor
{-1, -1, 0, -1, -1, -1, -1}, // default
};
#else
@@ -816,8 +821,8 @@ static const Layout layouts[] = {
{"[]=",
flextile,
{-1, -1, SPLIT_VERTICAL, TOP_TO_BOTTOM, TOP_TO_BOTTOM, 0,
NULL}}, // default tile layout
{"><>", NULL, {0}}, /* no layout function means floating behavior */
NULL}}, // default tile layout
{"><>", NULL, {0}}, /* no layout function means floating behavior */
{"[M]", flextile, {-1, -1, NO_SPLIT, MONOCLE, MONOCLE, 0, NULL}}, // monocle
{"|||",
flextile,
@@ -906,10 +911,6 @@ static const Layout layouts[] = {
/* symbol arrange function */
#if TILE_LAYOUT
{"[]=", tile}, /* first entry is default */
#endif
{"><>", NULL}, /* no layout function means floating behavior */
#if MONOCLE_LAYOUT
{"[M]", monocle},
#endif
#if BSTACK_LAYOUT
{"TTT", bstack},
@@ -947,6 +948,10 @@ static const Layout layouts[] = {
#if NROWGRID_LAYOUT
{"###", nrowgrid},
#endif
#if MONOCLE_LAYOUT
{"[M]", monocle},
#endif
{"><>", NULL}, /* no layout function means floating behavior */
};
#endif // FLEXTILE_DELUXE_LAYOUT
@@ -961,76 +966,76 @@ static const char *xkb_layouts[] = {
/* key definitions */
#define MODKEY Mod4Mask
#if COMBO_PATCH && SWAPTAGS_PATCH && TAGOTHERMONITOR_PATCH
#define TAGKEYS(KEY, TAG) \
{MODKEY, KEY, comboview, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
{MODKEY | ShiftMask, KEY, combotag, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask | ShiftMask, KEY, swaptags, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask, KEY, tagnextmon, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask | ControlMask, KEY, tagprevmon, {.ui = 1 << TAG}},
#define TAGKEYS(KEY, TAG) \
{MODKEY, KEY, comboview, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
{MODKEY | ShiftMask, KEY, combotag, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask | ShiftMask, KEY, swaptags, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask, KEY, tagnextmon, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask | ControlMask, KEY, tagprevmon, {.ui = 1 << TAG}},
#elif COMBO_PATCH && SWAPTAGS_PATCH
#define TAGKEYS(KEY, TAG) \
{MODKEY, KEY, comboview, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
{MODKEY | ShiftMask, KEY, combotag, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask | ShiftMask, KEY, swaptags, {.ui = 1 << TAG}},
#define TAGKEYS(KEY, TAG) \
{MODKEY, KEY, comboview, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
{MODKEY | ShiftMask, KEY, combotag, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask | ShiftMask, KEY, swaptags, {.ui = 1 << TAG}},
#elif COMBO_PATCH && TAGOTHERMONITOR_PATCH
#define TAGKEYS(KEY, TAG) \
{MODKEY, KEY, comboview, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
{MODKEY | ShiftMask, KEY, combotag, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask, KEY, tagnextmon, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask | ControlMask, KEY, tagprevmon, {.ui = 1 << TAG}},
#define TAGKEYS(KEY, TAG) \
{MODKEY, KEY, comboview, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
{MODKEY | ShiftMask, KEY, combotag, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask, KEY, tagnextmon, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask | ControlMask, KEY, tagprevmon, {.ui = 1 << TAG}},
#elif COMBO_PATCH
#define TAGKEYS(KEY, TAG) \
{MODKEY, KEY, comboview, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
{MODKEY | ShiftMask, KEY, combotag, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}},
#define TAGKEYS(KEY, TAG) \
{MODKEY, KEY, comboview, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
{MODKEY | ShiftMask, KEY, combotag, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}},
#elif SWAPTAGS_PATCH && TAGOTHERMONITOR_PATCH
#define TAGKEYS(KEY, TAG) \
{MODKEY, KEY, view, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
{MODKEY | ShiftMask, KEY, tag, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask | ShiftMask, KEY, swaptags, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask, KEY, tagnextmon, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask | ControlMask, KEY, tagprevmon, {.ui = 1 << TAG}},
#define TAGKEYS(KEY, TAG) \
{MODKEY, KEY, view, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
{MODKEY | ShiftMask, KEY, tag, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask | ShiftMask, KEY, swaptags, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask, KEY, tagnextmon, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask | ControlMask, KEY, tagprevmon, {.ui = 1 << TAG}},
#elif SWAPTAGS_PATCH
#define TAGKEYS(KEY, TAG) \
{MODKEY, KEY, view, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
{MODKEY | ShiftMask, KEY, tag, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask | ShiftMask, KEY, swaptags, {.ui = 1 << TAG}},
#define TAGKEYS(KEY, TAG) \
{MODKEY, KEY, view, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
{MODKEY | ShiftMask, KEY, tag, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask | ShiftMask, KEY, swaptags, {.ui = 1 << TAG}},
#elif TAGOTHERMONITOR_PATCH
#define TAGKEYS(KEY, TAG) \
{MODKEY, KEY, view, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
{MODKEY | ShiftMask, KEY, tag, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask, KEY, tagnextmon, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask | ControlMask, KEY, tagprevmon, {.ui = 1 << TAG}},
#define TAGKEYS(KEY, TAG) \
{MODKEY, KEY, view, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
{MODKEY | ShiftMask, KEY, tag, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask, KEY, tagnextmon, {.ui = 1 << TAG}}, \
{MODKEY | Mod4Mask | ControlMask, KEY, tagprevmon, {.ui = 1 << TAG}},
#else
#define TAGKEYS(KEY, TAG) \
{MODKEY, KEY, view, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
{MODKEY | ShiftMask, KEY, tag, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}},
#define TAGKEYS(KEY, TAG) \
{MODKEY, KEY, view, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \
{MODKEY | ShiftMask, KEY, tag, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}},
#endif // COMBO_PATCH / SWAPTAGS_PATCH / TAGOTHERMONITOR_PATCH
#if STACKER_PATCH
#define STACKKEYS(MOD, ACTION) \
{MOD, XK_j, ACTION##stack, {.i = INC(+1)}}, \
{MOD, XK_k, ACTION##stack, {.i = INC(-1)}}, \
{MOD, XK_s, ACTION##stack, {.i = PREVSEL}}, \
{MOD, XK_w, ACTION##stack, {.i = 0}}, \
{MOD, XK_e, ACTION##stack, {.i = 1}}, \
{MOD, XK_a, ACTION##stack, {.i = 2}}, \
{MOD, XK_z, ACTION##stack, {.i = -1}},
#define STACKKEYS(MOD, ACTION) \
{MOD, XK_j, ACTION##stack, {.i = INC(+1)}}, \
{MOD, XK_k, ACTION##stack, {.i = INC(-1)}}, \
{MOD, XK_s, ACTION##stack, {.i = PREVSEL}}, \
{MOD, XK_w, ACTION##stack, {.i = 0}}, \
{MOD, XK_e, ACTION##stack, {.i = 1}}, \
{MOD, XK_a, ACTION##stack, {.i = 2}}, \
{MOD, XK_z, ACTION##stack, {.i = -1}},
#endif // STACKER_PATCH
#if BAR_HOLDBAR_PATCH
@@ -1680,7 +1685,7 @@ static const Key keys[] = {
{Mod3Mask | Mod1Mask, XK_m, floatpos, {.v = "-1p 1p"}}, // ↙
{Mod3Mask | Mod1Mask, XK_comma, floatpos, {.v = " 0p 1p"}}, // ↓
{Mod3Mask | Mod1Mask, XK_period, floatpos, {.v = " 1p 1p"}}, // ↘
#endif // FLOATPOS_PATCH
#endif // FLOATPOS_PATCH
#if SETBORDERPX_PATCH
{MODKEY | ControlMask, XK_minus, setborderpx, {.i = -1}},
{MODKEY | ControlMask, XK_plus, setborderpx, {.i = +1}},
@@ -1689,6 +1694,8 @@ static const Key keys[] = {
#if CYCLELAYOUTS_PATCH
{MODKEY | ControlMask, XK_comma, cyclelayout, {.i = -1}},
{MODKEY | ControlMask, XK_period, cyclelayout, {.i = +1}},
{MODKEY, XK_grave, cyclelayout, {.i = +1}},
{MODKEY | ShiftMask, XK_grave, cyclelayout, {.i = -1}},
#endif // CYCLELAYOUTS_PATCH
#if MPDCONTROL_PATCH
{MODKEY, XK_F1, mpdchange, {.i = -1}},

0
patch/dwmc Executable file → Normal file
View File

0
patch/layoutmenu.sh Executable file → Normal file
View File

File diff suppressed because it is too large Load Diff

0
rebuild.sh Executable file → Normal file
View File