From 3e5297d04a1c23846ab0ac7c71d96ba8a10b10a8 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Wed, 7 Aug 2024 07:19:01 -0700 Subject: [PATCH] fix: correctly reference waybar config --- users/youwen/linux/desktop/default.nix | 2 +- users/youwen/linux/laptop/default.nix | 2 +- users/youwen/linux/waybar/default.nix | 90 ++++++++++++++++++++++- users/youwen/linux/waybar/waybar-conf.nix | 89 ---------------------- 4 files changed, 91 insertions(+), 92 deletions(-) delete mode 100755 users/youwen/linux/waybar/waybar-conf.nix diff --git a/users/youwen/linux/desktop/default.nix b/users/youwen/linux/desktop/default.nix index a76013f..9635892 100644 --- a/users/youwen/linux/desktop/default.nix +++ b/users/youwen/linux/desktop/default.nix @@ -1,4 +1,4 @@ { - imports = [ ../theming ../home.nix ../programs ../hyprland/desktop ]; + imports = [ ../theming ../home.nix ../programs ../hyprland/desktop ../waybar ]; } diff --git a/users/youwen/linux/laptop/default.nix b/users/youwen/linux/laptop/default.nix index 444b61d..3c7666f 100644 --- a/users/youwen/linux/laptop/default.nix +++ b/users/youwen/linux/laptop/default.nix @@ -1,4 +1,4 @@ { - imports = [ ../theming ../home.nix ../programs ../hyprland/laptop ]; + imports = [ ../theming ../home.nix ../programs ../hyprland/laptop ../waybar ]; } diff --git a/users/youwen/linux/waybar/default.nix b/users/youwen/linux/waybar/default.nix index 4eaad5c..feb589a 100644 --- a/users/youwen/linux/waybar/default.nix +++ b/users/youwen/linux/waybar/default.nix @@ -1,3 +1,91 @@ { - programs.waybar = import ./waybar-conf.nix; + programs.waybar = { + enable = true; + settings = { + mainBar = { + layer = "top"; + position = "top"; + height = 24; + width = 1600; + reload-style-on-change = true; + margin = "10px 0px 0px 0px"; + modules-left = [ "hyprland/window" "hyprland/workspaces" ]; + modules-right = [ "backlight" "group/adjustable" "custom/weather" ]; + modules-center = [ "network" "group/hardware" "clock" ]; + "hyprland/workspaces" = { + active-only = false; + all-outputs = false; + format = "{icon}"; + persistent-workspaces = { + eDP-1 = [ 1 ]; + DP-1 = [ 2 3 4 5 ]; + }; + }; + "group/hardware" = { + orientation = "inherit"; + modules = [ "cpu" "memory" "battery" ]; + }; + "group/adjustable" = { + orientation = "inherit"; + drawer = { + transition-duration = 500; + transition-left-to-right = true; + }; + modules = [ "pulseaudio" "mpris" ]; + }; + "custom/weather" = { + orientation = "horizontal"; + exec = ''curl wttr.in/?format="%l:%20%t"''; + interval = 10; + }; + cpu = { + interval = 10; + format = "{usage}%  "; + }; + memory = { + interval = 10; + format = "{percentage}%  "; + }; + # mpris = { + # format-playing = "  {title} "; + # format-paused = " 󰏤 {title} "; + # format-stopped = "Nothing Playing"; + # }; + tray = { spacing = 10; }; + clock = { format = "{:%a %b %d, %I:%M %p} "; }; + backlight = { + device = "intel_backlight"; + format = "{percent}% {icon}"; + format-icons = [ "󰃞" "󰃠" ]; + }; + battery = { + states = { + good = 95; + warning = 20; + critical = 10; + }; + format = "{capacity}% {icon}"; + format-icons = [ "󰁻" "󰁽" "󰁿" "󰂀" "󰁹" ]; + }; + "hyprland/window" = { format = "{class}"; }; + network = { + format-wifi = "{essid} "; + format-linked = "{ifname} (No IP) "; + format-disconnected = "Disconnected ⚠"; + 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 = { default = [ "" "" "" ]; }; + }; + }; + }; + style = ./waybar.css; + systemd.enable = true; + }; } diff --git a/users/youwen/linux/waybar/waybar-conf.nix b/users/youwen/linux/waybar/waybar-conf.nix deleted file mode 100755 index 4532d8b..0000000 --- a/users/youwen/linux/waybar/waybar-conf.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - enable = true; - settings = { - mainBar = { - layer = "top"; - position = "top"; - height = 24; - width = 1600; - reload-style-on-change = true; - margin = "10px 0px 0px 0px"; - modules-left = [ "hyprland/window" "hyprland/workspaces" ]; - modules-right = [ "backlight" "group/adjustable" "custom/weather" ]; - modules-center = [ "network" "group/hardware" "clock" ]; - "hyprland/workspaces" = { - active-only = false; - all-outputs = false; - format = "{icon}"; - persistent-workspaces = { - eDP-1 = [ 1 ]; - DP-1 = [ 2 3 4 5 ]; - }; - }; - "group/hardware" = { - orientation = "inherit"; - modules = [ "cpu" "memory" "battery" ]; - }; - "group/adjustable" = { - orientation = "inherit"; - drawer = { - transition-duration = 500; - transition-left-to-right = true; - }; - modules = [ "pulseaudio" "mpris" ]; - }; - "custom/weather" = { - orientation = "horizontal"; - exec = ''curl wttr.in/?format="%l:%20%t"''; - interval = 10; - }; - cpu = { - interval = 10; - format = "{usage}%  "; - }; - memory = { - interval = 10; - format = "{percentage}%  "; - }; - # mpris = { - # format-playing = "  {title} "; - # format-paused = " 󰏤 {title} "; - # format-stopped = "Nothing Playing"; - # }; - tray = { spacing = 10; }; - clock = { format = "{:%a %b %d, %I:%M %p} "; }; - backlight = { - device = "intel_backlight"; - format = "{percent}% {icon}"; - format-icons = [ "󰃞" "󰃠" ]; - }; - battery = { - states = { - good = 95; - warning = 20; - critical = 10; - }; - format = "{capacity}% {icon}"; - format-icons = [ "󰁻" "󰁽" "󰁿" "󰂀" "󰁹" ]; - }; - "hyprland/window" = { format = "{class}"; }; - network = { - format-wifi = "{essid} "; - format-linked = "{ifname} (No IP) "; - format-disconnected = "Disconnected ⚠"; - 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 = { default = [ "" "" "" ]; }; - }; - }; - }; - style = ./waybar.css; - systemd.enable = true; -}