mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more laptop->desktop hyprland coexistence

Browse Source
This commit is contained in:
mjallen18
2025-07-07 18:23:21 -05:00
parent 1ae1cc6f45
commit bc183bc8dd
15 changed files with 356 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
modules/desktop-environments/hyprland/config/waybar/default.nix
View File

@@ -1,34 +1,11 @@
{ pkgs, hyprlandSettings, ... }:
let
settings = import ../../settings.nix { inherit pkgs; };
defaultOpacity = "opacity: 0.85;";
defaultBorderRadius = "border-radius: 1rem;";
defaultCenterOptions = ''
padding-top: 0.5rem;
padding-bottom: 0.5rem;
padding-left: 0.5rem;
padding-right: 0.5rem;
margin: 3px 0;
'';
borderRight = ''
padding-top: 0.5rem;
padding-bottom: 0.5rem;
padding-left: 0.5rem;
padding-right: 0.5rem;
margin: 3px 0;
border-radius: 0rem 1rem 1rem 0rem;
margin-right: 0.5rem;
'';
borderLeft = ''
padding-top: 0.5rem;
padding-bottom: 0.5rem;
padding-left: 0.5rem;
padding-right: 0.5rem;
margin: 3px 0;
border-radius: 1rem 0rem 0rem 1rem;
margin-left: 0.5rem;
'';
defaultOpacity = settings.theme.waybar.defaultOpacity;
defaultBorderRadius = settings.theme.waybar.defaultBorderRadius;
defaultCenterOptions = settings.theme.waybar.defaultCenterOptions;
borderLeft = settings.theme.waybar.borderLeft;
borderRight = settings.theme.waybar.borderRight;
in
{
imports = [
@@ -43,7 +20,7 @@ in
systemd.enable = true;
settings = {
mainBar = {
layer = "top";
layer = hyprlandSettings.waybar.layer;
position = "top";
mod = "dock";
exclusive = true;
@@ -56,21 +33,6 @@ in
modules-center = [ "hyprland/window" ];
# modules-right = [
# "tray"
# "custom/lights"
# "temperature"
# "temperature#gpu"
# "keyboard-state#capslock"
# "keyboard-state#numlock"
# "wireplumber#sink"
# "wireplumber#source"
# "bluetooth"
# "idle_inhibitor"
# "clock"
# "custom/weather"
# ];
modules-right = hyprlandSettings.waybar.modules-right;
# Module Definitions
@@ -96,15 +58,6 @@ in
spacing = 10;
};
"custom/lights" = {
tooltip = false;
exec = "waybar-hass --get_light light.living_room_lights";
interval = "once";
format = "{text}";#"󱉓";
on-click = "waybar-hass --toggle_light light.living_room_lights";
return-type = "json";
};
temperature = {
hwmon-path = "/sys/class/hwmon/hwmon4/temp1_input";
critical-threshold = 100;
@@ -242,10 +195,10 @@ in
calendar = {
mode = "month";
format = {
months = "<span color='${settings.nord.frost.nord9}'><b>{}</b></span>";
days = "<span color='${settings.nord.frost.nord10}'><b>{}</b></span>";
weekdays = "<span color='${settings.nord.frost.nord8}'><b>{}</b></span>";
today = "<span color='${settings.nord.aurora.nord14}'><b><u>{}</u></b></span>";
months = "<span color='${settings.theme.nord.frost.nord9}'><b>{}</b></span>";
days = "<span color='${settings.theme.nord.frost.nord10}'><b>{}</b></span>";
weekdays = "<span color='${settings.theme.nord.frost.nord8}'><b>{}</b></span>";
today = "<span color='${settings.theme.nord.aurora.nord14}'><b><u>{}</u></b></span>";
};
};
};
@@ -269,9 +222,12 @@ in
exec = "waybar-weather";
return-type = "json";
};
};
} // hyprlandSettings.waybar.extraModules or { };
};
# * { font-size: 13px; }
# window.eDP-1 * { font-size: 10px; }
style = ''
* {
font-family:
@@ -283,12 +239,12 @@ in
#waybar {
background: transparent;
color: ${settings.nord.snowStorm.nord6};
color: ${settings.theme.nord.snowStorm.nord6};
margin: 5px 5px;
}
#workspaces {
background-color: ${settings.nord.polarNight.nord0};
background-color: ${settings.theme.nord.polarNight.nord0};
${defaultBorderRadius}
${defaultOpacity}
${defaultCenterOptions}
@@ -296,69 +252,69 @@ in
}
#workspaces button {
color: ${settings.nord.frost.nord10};
color: ${settings.theme.nord.frost.nord10};
${defaultBorderRadius}
padding: 0.4rem;
}
#workspaces button.active {
color: ${settings.nord.frost.nord8};
color: ${settings.theme.nord.frost.nord8};
${defaultBorderRadius}
}
#workspaces button:hover {
color: ${settings.nord.frost.nord7};
color: ${settings.theme.nord.frost.nord7};
${defaultBorderRadius}
}
#workspaces button.focused {
color: ${settings.nord.snowStorm.nord6};
background: ${settings.nord.aurora.nord13};
color: ${settings.theme.nord.snowStorm.nord6};
background: ${settings.theme.nord.aurora.nord13};
${defaultBorderRadius}
}
#workspaces button.urgent {
color: ${settings.nord.polarNight.nord0};
background: ${settings.nord.snowStorm.nord6};
color: ${settings.theme.nord.polarNight.nord0};
background: ${settings.theme.nord.snowStorm.nord6};
${defaultBorderRadius}
}
#tooltip {
background: ${settings.nord.polarNight.nord0};
border-color: ${settings.nord.polarNight.nord0};
background: ${settings.theme.nord.polarNight.nord0};
border-color: ${settings.theme.nord.polarNight.nord0};
${defaultBorderRadius}
border-width: 1rem;
border-style: solid;
}
#window {
color: ${settings.nord.aurora.nord15};
background-color: ${settings.nord.polarNight.nord0};
color: ${settings.theme.nord.aurora.nord15};
background-color: ${settings.theme.nord.polarNight.nord0};
${defaultOpacity}
${defaultBorderRadius}
${defaultCenterOptions}
margin-left: 4rem;
margin-right: 100rem;
margin-left: ${hyprlandSettings.waybar.moduleStyle.window.margin-left or "4rem"};
margin-right: ${hyprlandSettings.waybar.moduleStyle.window.margin-right or "4rem"};
}
#custom-weather {
color: ${settings.nord.frost.nord10};
background-color: ${settings.nord.polarNight.nord0};
color: ${settings.theme.nord.frost.nord10};
background-color: ${settings.theme.nord.polarNight.nord0};
${defaultOpacity}
${borderRight}
}
#battery {
color: ${settings.nord.aurora.nord15};
background-color: ${settings.nord.polarNight.nord0};
color: ${settings.theme.nord.aurora.nord15};
background-color: ${settings.theme.nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#clock {
color: ${settings.nord.frost.nord9};
background-color: ${settings.nord.polarNight.nord0};
color: ${settings.theme.nord.frost.nord9};
background-color: ${settings.theme.nord.polarNight.nord0};
${defaultOpacity}
${borderLeft}
}
@@ -366,91 +322,88 @@ in
/* ------------- */
#idle_inhibitor {
color: ${settings.nord.frost.nord10};
background-color: ${settings.nord.polarNight.nord0};
color: ${settings.theme.nord.frost.nord10};
background-color: ${settings.theme.nord.polarNight.nord0};
${defaultOpacity}
${borderRight}
}
#network {
color: ${settings.nord.aurora.nord15};
background-color: ${settings.nord.polarNight.nord0};
color: ${settings.theme.nord.aurora.nord15};
background-color: ${settings.theme.nord.polarNight.nord0};
${defaultOpacity}
${borderRight}
${defaultCenterOptions}
border-radius: 0;
padding-right: 15px;
}
#bluetooth {
color: ${settings.nord.frost.nord9};
background-color: ${settings.nord.polarNight.nord0};
color: ${settings.theme.nord.frost.nord9};
background-color: ${settings.theme.nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#wireplumber.source {
color: ${settings.nord.frost.nord8};
background-color: ${settings.nord.polarNight.nord0};
color: ${settings.theme.nord.frost.nord8};
background-color: ${settings.theme.nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#wireplumber.sink {
color: ${settings.nord.frost.nord7};
background-color: ${settings.nord.polarNight.nord0};
color: ${settings.theme.nord.frost.nord7};
background-color: ${settings.theme.nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#keyboard-state.numlock {
color: ${settings.nord.frost.nord8};
background-color: ${settings.nord.polarNight.nord0};
color: ${settings.theme.nord.frost.nord8};
background-color: ${settings.theme.nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#keyboard-state.capslock {
color: ${settings.nord.frost.nord9};
background-color: ${settings.nord.polarNight.nord0};
color: ${settings.theme.nord.frost.nord9};
background-color: ${settings.theme.nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#temperature.gpu {
color: ${settings.nord.frost.nord10};
background-color: ${settings.nord.polarNight.nord0};
color: ${settings.theme.nord.frost.nord10};
background-color: ${settings.theme.nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#temperature {
color: ${settings.nord.frost.nord9};
background-color: ${settings.nord.polarNight.nord0};
color: ${settings.theme.nord.frost.nord9};
background-color: ${settings.theme.nord.polarNight.nord0};
${defaultOpacity}
${borderLeft}
}
#custom-lights {
color: ${settings.nord.frost.nord8};
background-color: ${settings.nord.polarNight.nord0};
${defaultOpacity}
${borderLeft}
${hyprlandSettings.waybar.moduleStyle.temperature.location or defaultCenterOptions}
border-radius: ${hyprlandSettings.waybar.moduleStyle.temperature.border-radius or "0"}
}
/* ------------- */
#tray {
background-color: ${settings.nord.polarNight.nord0};
background-color: ${settings.theme.nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
${defaultBorderRadius}
margin-right: 1rem;
}
'';
/* ------------- */
'' + hyprlandSettings.waybar.extraModulesStyle or '''';
};
}