river config working finally

This commit is contained in:
autumn
2025-08-23 08:05:21 -06:00
parent 3f27ab8a42
commit a11557c594
6 changed files with 134 additions and 229 deletions

View File

@@ -2,9 +2,9 @@
{
home.packages = with pkgs; [
fuzzel
];
#home.packages = with pkgs; [
# fuzzel
#];
programs.fuzzel = {
enable = true;

View File

@@ -11,9 +11,15 @@
wayland.windowManager.river = {
enable = true;
systemd.enable = true;
settings = {
default-layout = "wideriver";
send-layout-cmd="wideriver \"--layout left --stack dwindle --count 1 --ratio 0.5\"";
spawn = [
# "waybar"
"~/login-wm-setup-2.sh"
# "wideriver"
];
output-layout = "wideriver";
rule-add = "ssd";
map = {
normal = {
"Super Return" = "spawn alacritty";
@@ -22,10 +28,10 @@
"Super K" = "focus-view previous";
"Super+Shift J" = "swap next";
"Super+Shift K" = "swap previous";
"Super R" = "fuzzel";
"Super R" = "spawn fuzzel";
};
};
};
};
};
}

View File

@@ -9,7 +9,7 @@ $directory\
[](fg:#EF7627 bg:#FF9A56)\
$git_branch\
$git_status\
[](fg:#FF9A56 bg:#2b3339)\
[](fg:#FF9A56 bg:#D162A4)\
$c\
$python\
$elixir\
@@ -19,7 +19,6 @@ $haskell\
$java\
$julia\
$nodejs\
$nix_shell\
$nim\
$rust\
$zig\
@@ -114,11 +113,6 @@ symbol = " "
style = "fg:#d3c6aa bg:#D162A4"
format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)'
[nix_shell]
symbol = "󱄅 "
style = "fg:#d3c6aa bg:#D162a4"
format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#d126a4)]($style)'
[nim]
symbol = " "
style = "fg:#d3c6aa bg:#D162A4"

View File

@@ -2,12 +2,13 @@
{
home.packages = with pkgs; [
waybar
];
home.packages = with pkgs; [
waybar
];
programs.waybar = {
enable = true;
systemd.enable = true;
settings = {
mainBar = {
layer = "top";
@@ -17,193 +18,136 @@ home.packages = with pkgs; [
# Module layout
modules-right = [
"idle_inhibitor"
"pulseaudio"
"network#physical"
"network#vpn"
"network#wifi"
"power-profiles-daemon"
"cpu"
"memory"
"temperature"
"backlight"
"keyboard-state"
"sway/language"
"battery"
"clock"
"tray"
];
# Module configurations
"keyboard-state" = {
numlock = true;
capslock = true;
format = "{name} {icon}";
"tray" = {
icon-size = 21;
spacing = 10;
};
"clock" = {
# timezone = "America/Denver";
tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
format-alt = "{:%Y-%m-%d}";
};
"cpu" = {
format = "{usage}% ";
tooltip = true;
};
"memory" = {
format = "{}% ";
};
"temperature" = {
# thermal-zone = 2;
# hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input";
critical-threshold = 80;
format-critical = "{temperatureC}°C {icon}";
format = "{temperatureC}°C {icon}";
format-icons = ["" "" ""];
};
"backlight" = {
format = "{percent}% {icon}";
format-icons = ["" "" "" "" "" "" "" "" ""];
};
"battery" = {
states = {
good = 95;
warning = 30;
critical = 15;
};
format = "{icon} {capacity}%";
format-full = "{icon} Full";
format-charging = "{icon} Charging {capacity}% {time}";
format-plugged = "{icon} Charge complete";
format-good = ">{icon} {capacity}%";
format-icons = ["" "" "" "" "" "" "" ""];
};
"network#wifi" = {
interface = "wlp*";
format-wifi = "{essid} ({signalStrength}%) ";
tooltip-format = "{ifname} via {gwaddr} ";
format-linked = "{ifname} (No IP) ";
format-disconnected = "No WiFi";
format-alt = "{ifname}: {ipaddr}/{cidr}";
};
"pulseaudio" = {
format = "{volume}% {icon} {format_source}";
format-bluetooth = "{volume}% {icon} {format_source}";
format-bluetooth-muted = " {icon} {format_source}";
format-muted = " {format_source}";
format-source = "{volume}% ";
format-source-muted = "";
format-icons = {
locked = "";
unlocked = "";
};
};
"idle_inhibitor" = {
format = "{icon}";
format-icons = {
activated = "";
deactivated = "";
};
};
"tray" = {
icon-size = 21;
spacing = 10;
};
"clock" = {
# timezone = "America/Denver";
tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
format-alt = "{:%Y-%m-%d}";
};
"cpu" = {
format = "{usage}% ";
tooltip = true;
};
"memory" = {
format = "{}% ";
};
"temperature" = {
# thermal-zone = 2;
# hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input";
critical-threshold = 80;
format-critical = "{temperatureC}°C {icon}";
format = "{temperatureC}°C {icon}";
format-icons = ["" "" ""];
};
"backlight" = {
format = "{percent}% {icon}";
format-icons = ["" "" "" "" "" "" "" "" ""];
};
"battery" = {
states = {
good = 95;
warning = 30;
critical = 15;
};
format = "{icon} {capacity}%";
format-full = "{icon} Full";
format-charging = "{icon} Charging {capacity}% {time}";
format-plugged = "{icon} Charge complete";
format-good = ">{icon} {capacity}%";
format-icons = ["" "" "" "" "" "" "" ""];
};
"power-profiles-daemon" = {
format = "{icon}";
tooltip-format = "Power profile: {profile}\nDriver: {driver}";
tooltip = true;
format-icons = {
default = "";
performance = "";
balanced = "";
power-saver = "";
};
};
"network#physical" = {
interface = "enp0s13f*";
format-ethernet = "{ipaddr}/{cidr} ";
format = "{ipaddr}/{cidr} ";
tooltip-format = "{ifname} via {gwaddr} ";
format-linked = "{ifname} (Linked) ";
format-disconnected = "";
format-alt = "{ifname}: {ipaddr}/{cidr}";
};
"network#vpn" = {
interface = "tun*";
format-wifi = "{essid} ({signalStrength}%) ";
format-ethernet = "{ipaddr}/{cidr} ";
tooltip-format = "{ifname} via {gwaddr} ";
format-linked = "{ifname} (No IP) ";
format-disconnected = "click for VPN";
format-alt = "{ifname}: {ipaddr}/{cidr}";
# on-click = "kitty --override tab_bar_style=hidden --title 'vpn-launcher' --app-id 'vpn-launcher' /bin/bash -c $HOME/bin/vpn";
};
"network#wifi" = {
interface = "wlp*";
format-wifi = "{essid} ({signalStrength}%) ";
tooltip-format = "{ifname} via {gwaddr} ";
format-linked = "{ifname} (No IP) ";
format-disconnected = "No WiFi";
format-alt = "{ifname}: {ipaddr}/{cidr}";
};
"pulseaudio" = {
format = "{volume}% {icon} {format_source}";
format-bluetooth = "{volume}% {icon} {format_source}";
format-bluetooth-muted = " {icon} {format_source}";
format-muted = " {format_source}";
format-source = "{volume}% ";
format-source-muted = "";
format-icons = {
headphone = "";
hands-free = "";
headset = "";
phone = "";
portable = "";
car = "";
default = ["" "" ""];
};
on-click = "pavucontrol";
headphone = "";
hands-free = "";
headset = "";
phone = "";
portable = "";
car = "";
default = ["" "" ""];
};
on-click = "pavucontrol";
};
};
};
# Waybar styling inspired by the referenced swayhome configuration
style = ''
* {
font-family: "JetBrains Mono", "Font Awesome 6 Free";
font-size: 13px;
}
style = ''
* {
font-family: "JetBrains Mono", "Font Awesome 6 Free";
font-size: 13px;
}
window#waybar {
color: #ffffff;
background-color: #1e3b28;
border-bottom: 3px solid #8f2fef;
transition-property: background-color;
transition-duration: .5s;
}
window#waybar {
color: #ffffff;
background-color: #1e3b28;
border-bottom: 3px solid #8f2fef;
transition-property: background-color;
transition-duration: .5s;
}
window#waybar.hidden {
opacity: 0.2;
}
window#waybar.hidden {
opacity: 0.2;
}
button {
box-shadow: inset 0 -3px transparent;
border: none;
border-radius: 0;
}
button:hover {
background: inherit;
box-shadow: inset 0 -3px #ffffff;
}
button {
box-shadow: inset 0 -3px transparent;
border: none;
border-radius: 0;
}
#workspaces button {
padding: 0 15px;
background-color: transparent;
border: 2px solid #8f2fef
}
button:hover {
background: inherit;
box-shadow: inset 0 -3px #ffffff;
}
#workspaces button {
padding: 0 15px;
background-color: transparent;
border: 2px solid #8f2fef
}
#workspaces button:hover {
background: rgba(255, 255, 255, 0.2);
}
#workspaces button:hover {
background: rgba(255, 255, 255, 0.2);
}
#workspaces button.focused {
background-color: #8f2fef;
@@ -357,10 +301,10 @@ button:hover {
color: #ffffff;
background-color: transparent;
border-bottom: 3px solid #94e2d5;
}
}
'';
};
}