From b264393480f0311fc6d6bd45770bce26d204a0b7 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 11:29:38 -0700 Subject: configuring waybar for first time --- modules/home-manager/waybar.nix | 85 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 modules/home-manager/waybar.nix (limited to 'modules/home-manager/waybar.nix') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix new file mode 100644 index 0000000..a865499 --- /dev/null +++ b/modules/home-manager/waybar.nix @@ -0,0 +1,85 @@ +{ config, ... }: { + programs.waybar = { + enable = true; + systemd.enable = true; + systemd.target = "hyprland-session.target"; + settings = { + mainBar = { + layer = "top"; + position = "top"; + height = 40; + }; + modules-left = [ "tray" "hyprland/workspaces" ]; + modules-center = [ "clock" ]; + modules-right = [ "wireplumber" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" ]; + + "tray" = { + icon-size = 21; + spacing = 10; + }; + "wireplumber" = { + format = "{volume}% {icon}"; + format-muted = ""; + on-click = "helvum"; + format-icons = [ "" "" "" ]; + max-volume = 150; + scroll-step = 0.2; + }; + "backlight/slider" = { + min = 1; + max = 100; + orientation = "horizontal"; + # device = "intel_backlight"; + }; + "clock" = { + format = "{:%H:%M}  "; + format-alt = "{:%A, %B %d, %Y (%R)}  "; + timezone = config.time.timeZone; + tooltip-format = "{calendar}"; + calendar = { + mode = "year"; + mode-mon-col = 3; + weeks-pos = "right"; + on-scroll = 1; + on-right-click = "mode"; + format = { + months = "{}"; + days = "{}"; + weeks = "W{}"; + weekdays = "{}"; + today = "{}"; + }; + }; + }; + "battery" = { + interval = 60; + states = { + "warning" = 30; + "critical" = 15; + }; + format = "{capacity}% {icon}"; + format-icons = [ "" "" "" "" "" ]; + max-length = 25; + }; + "memory" = { + format = "{used:0.1f}G/{total:0.1f}G "; + }; + "temperature" = { + format = "{temperatureC}°C "; + }; + "keyboard-state" = { + numlock = true; + capslock = true; + "format" = { + numlock = "N {icon}"; + # capslock = "C {icon}"; + }; + "format-icons" = { + locked = ""; + unlocked = ""; + }; + }; + }; + }; + +} -- cgit v1.2.3 From 6943c98073e292b5056fc593d3cd8ad46d6cf983 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 11:44:00 -0700 Subject: not sure how to get system variable into home manager module --- modules/home-manager/waybar.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'modules/home-manager/waybar.nix') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index a865499..efee997 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -34,7 +34,8 @@ "clock" = { format = "{:%H:%M}  "; format-alt = "{:%A, %B %d, %Y (%R)}  "; - timezone = config.time.timeZone; + # timezone = config.time.timeZone; + timezone = "US/Mountain"; tooltip-format = "{calendar}"; calendar = { mode = "year"; -- cgit v1.2.3 From e315b06f07a9d38eff798fa3ee051a2fed0e1b9e Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 12:09:37 -0700 Subject: waybar config should be fixed, all settings needed to be in main --- modules/home-manager/waybar.nix | 110 ++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 55 deletions(-) (limited to 'modules/home-manager/waybar.nix') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index efee997..aad658c 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -8,42 +8,41 @@ layer = "top"; position = "top"; height = 40; - }; - modules-left = [ "tray" "hyprland/workspaces" ]; - modules-center = [ "clock" ]; - modules-right = [ "wireplumber" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" ]; + modules-left = [ "tray" "hyprland/workspaces" ]; + # modules-center = [ "clock" ]; + modules-right = [ "wireplumber" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" ]; - "tray" = { - icon-size = 21; - spacing = 10; - }; - "wireplumber" = { - format = "{volume}% {icon}"; - format-muted = ""; - on-click = "helvum"; - format-icons = [ "" "" "" ]; - max-volume = 150; - scroll-step = 0.2; - }; - "backlight/slider" = { - min = 1; - max = 100; - orientation = "horizontal"; - # device = "intel_backlight"; - }; - "clock" = { - format = "{:%H:%M}  "; - format-alt = "{:%A, %B %d, %Y (%R)}  "; - # timezone = config.time.timeZone; - timezone = "US/Mountain"; - tooltip-format = "{calendar}"; - calendar = { + "tray" = { + icon-size = 21; + spacing = 10; + }; + "wireplumber" = { + format = "{volume}% {icon}"; + format-muted = ""; + on-click = "helvum"; + format-icons = [ "" "" "" ]; + max-volume = 150; + scroll-step = 0.2; + }; + "backlight/slider" = { + min = 1; + max = 100; + orientation = "horizontal"; + # device = "intel_backlight"; + }; + "clock" = { + format = "{:%H:%M}  "; + format-alt = "{:%A, %B %d, %Y (%R)}  "; + # timezone = config.time.timeZone; + timezone = "US/Mountain"; + tooltip-format = "{calendar}"; + "calendar" = { mode = "year"; mode-mon-col = 3; weeks-pos = "right"; on-scroll = 1; on-right-click = "mode"; - format = { + "format" = { months = "{}"; days = "{}"; weeks = "W{}"; @@ -51,33 +50,34 @@ today = "{}"; }; }; - }; - "battery" = { - interval = 60; - states = { - "warning" = 30; - "critical" = 15; }; - format = "{capacity}% {icon}"; - format-icons = [ "" "" "" "" "" ]; - max-length = 25; - }; - "memory" = { - format = "{used:0.1f}G/{total:0.1f}G "; - }; - "temperature" = { - format = "{temperatureC}°C "; - }; - "keyboard-state" = { - numlock = true; - capslock = true; - "format" = { - numlock = "N {icon}"; - # capslock = "C {icon}"; + "battery" = { + interval = 60; + states = { + "warning" = 30; + "critical" = 15; + }; + format = "{capacity}% {icon}"; + format-icons = [ "" "" "" "" "" ]; + max-length = 25; }; - "format-icons" = { - locked = ""; - unlocked = ""; + "memory" = { + format = "{used:0.1f}G/{total:0.1f}G "; + }; + "temperature" = { + format = "{temperatureC}°C "; + }; + "keyboard-state" = { + numlock = true; + capslock = true; + "format" = { + numlock = "N {icon}"; + # capslock = "C {icon}"; + }; + "format-icons" = { + locked = ""; + unlocked = ""; + }; }; }; }; -- cgit v1.2.3 From 7d5baf5ccdb64fc1b8009667675dc75bfbde8d4c Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 12:11:35 -0700 Subject: forget to re-enable clock --- modules/home-manager/waybar.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/home-manager/waybar.nix') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index aad658c..d6619cb 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -9,7 +9,7 @@ position = "top"; height = 40; modules-left = [ "tray" "hyprland/workspaces" ]; - # modules-center = [ "clock" ]; + modules-center = [ "clock" ]; modules-right = [ "wireplumber" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" ]; "tray" = { -- cgit v1.2.3 From b0840aab7d0639e2c41d82b48663e1746fcdd7b6 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 12:29:16 -0700 Subject: swiped a few more settings from default config --- modules/home-manager/waybar.nix | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) (limited to 'modules/home-manager/waybar.nix') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index d6619cb..a965cba 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -8,21 +8,43 @@ layer = "top"; position = "top"; height = 40; - modules-left = [ "tray" "hyprland/workspaces" ]; + modules-left = [ "hyprland/workspaces" ]; modules-center = [ "clock" ]; - modules-right = [ "wireplumber" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" ]; + modules-right = [ "wireplumber" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" "tray" ]; "tray" = { icon-size = 21; spacing = 10; }; "wireplumber" = { - format = "{volume}% {icon}"; - format-muted = ""; on-click = "helvum"; - format-icons = [ "" "" "" ]; max-volume = 150; scroll-step = 0.2; + + 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" + }; + "network" = { + format-wifi = "{essid} ({signalStrength}%) "; + format-ethernet = "{ipaddr}/{cidr} "; + tooltip-format = "{ifname} via {gwaddr} "; + format-linked = "{ifname} (No IP) "; + format-disconnected = "Disconnected ⚠"; + format-alt = "{ifname}: {ipaddr}/{cidr}"; }; "backlight/slider" = { min = 1; -- cgit v1.2.3 From 21012fb0f0c6bb90c1be206c10a7e171516f7272 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 12:50:17 -0700 Subject: wireplumber waybard module has few options, and default pulseaudio options work --- modules/home-manager/waybar.nix | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'modules/home-manager/waybar.nix') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index a965cba..c94deef 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -10,17 +10,14 @@ height = 40; modules-left = [ "hyprland/workspaces" ]; modules-center = [ "clock" ]; - modules-right = [ "wireplumber" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" "tray" ]; + modules-right = [ "pulseaudio" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" "tray" ]; "tray" = { icon-size = 21; spacing = 10; }; - "wireplumber" = { - on-click = "helvum"; - max-volume = 150; - scroll-step = 0.2; - + "pulseaudio" = { + # // "scroll-step": 1, // %, can be a float format = "{volume}% {icon} {format_source}"; format-bluetooth = "{volume}% {icon} {format_source}"; format-bluetooth-muted = " {icon} {format_source}"; @@ -36,6 +33,27 @@ car = ""; default = [ "" "" "" ]; }; + on-click = "pavucontrol"; + }; + "wireplumber" = { + on-click = "helvum"; + max-volume = 150; + scroll-step = 0.2; + + # format-bluetooth = "{volume}% {icon} {format_source}"; + # format-bluetooth-muted = " {icon} {format_source}"; + format-muted = " "; + format = "{volume}% {icon} "; + # format-source-muted = ""; + format-icons = { + # headphone = ""; + # hands-free = ""; + # headset = ""; + # phone = ""; + # portable = ""; + # car = ""; + default = [ "" "" "" ]; + }; # on-click = "pavucontrol" }; "network" = { -- cgit v1.2.3 From 0b552aa92460acd5dd5357b5101f7d97a4840198 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 12:53:58 -0700 Subject: add cpu monitor to waybar --- modules/home-manager/waybar.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'modules/home-manager/waybar.nix') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index c94deef..83161ce 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -10,7 +10,7 @@ height = 40; modules-left = [ "hyprland/workspaces" ]; modules-center = [ "clock" ]; - modules-right = [ "pulseaudio" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" "tray" ]; + modules-right = [ "pulseaudio" "bluetooth" "network" "backlight/slider" "battery" "cpu" "temperature" "memory" "keyboard_state" "tray" ]; "tray" = { icon-size = 21; @@ -101,6 +101,10 @@ format-icons = [ "" "" "" "" "" ]; max-length = 25; }; + cpu = { + format = "{usage}% "; + tooltip = false; + }; "memory" = { format = "{used:0.1f}G/{total:0.1f}G "; }; -- cgit v1.2.3 From a70825ffcadd2806f89d3e8042c2ebcfaf85f4eb Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 13:08:00 -0700 Subject: added idle inhibitor and cleared up formatting --- modules/home-manager/waybar.nix | 52 +++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 23 deletions(-) (limited to 'modules/home-manager/waybar.nix') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index 83161ce..c35bc75 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -10,12 +10,19 @@ height = 40; modules-left = [ "hyprland/workspaces" ]; modules-center = [ "clock" ]; - modules-right = [ "pulseaudio" "bluetooth" "network" "backlight/slider" "battery" "cpu" "temperature" "memory" "keyboard_state" "tray" ]; + modules-right = [ "idle_inhibitor" "pulseaudio" "bluetooth" "network" "backlight/slider" "battery" "cpu" "temperature" "memory" "keyboard_state" "tray" ]; "tray" = { icon-size = 21; spacing = 10; }; + "idle_inhibitor" = { + format = "{icon}"; + format-icons = { + activated = ""; + deactivated = ""; + }; + }; "pulseaudio" = { # // "scroll-step": 1, // %, can be a float format = "{volume}% {icon} {format_source}"; @@ -24,7 +31,7 @@ format-muted = " {format_source}"; format-source = "{volume}% "; format-source-muted = ""; - format-icons = { + "format-icons" = { headphone = ""; hands-free = ""; headset = ""; @@ -71,26 +78,26 @@ # device = "intel_backlight"; }; "clock" = { - format = "{:%H:%M}  "; - format-alt = "{:%A, %B %d, %Y (%R)}  "; - # timezone = config.time.timeZone; - timezone = "US/Mountain"; - tooltip-format = "{calendar}"; - "calendar" = { - mode = "year"; - mode-mon-col = 3; - weeks-pos = "right"; - on-scroll = 1; - on-right-click = "mode"; - "format" = { - months = "{}"; - days = "{}"; - weeks = "W{}"; - weekdays = "{}"; - today = "{}"; + format = "{:%H:%M}  "; + format-alt = "{:%A, %B %d, %Y (%R)}  "; + # timezone = config.time.timeZone; + timezone = "US/Mountain"; + tooltip-format = "{calendar}"; + "calendar" = { + mode = "year"; + mode-mon-col = 3; + weeks-pos = "right"; + on-scroll = 1; + on-right-click = "mode"; + "format" = { + months = "{}"; + days = "{}"; + weeks = "W{}"; + weekdays = "{}"; + today = "{}"; + }; }; }; - }; "battery" = { interval = 60; states = { @@ -101,7 +108,7 @@ format-icons = [ "" "" "" "" "" ]; max-length = 25; }; - cpu = { + "cpu" = { format = "{usage}% "; tooltip = false; }; @@ -125,6 +132,5 @@ }; }; }; - }; - + }; } -- cgit v1.2.3 From fedc948df7883e41dd88e38e388a6684d312ab84 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Thu, 18 Jan 2024 12:47:22 -0700 Subject: waybar timezone can now update with system --- modules/home-manager/waybar.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/home-manager/waybar.nix') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index c35bc75..0e02ded 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -80,8 +80,8 @@ "clock" = { format = "{:%H:%M}  "; format-alt = "{:%A, %B %d, %Y (%R)}  "; - # timezone = config.time.timeZone; - timezone = "US/Mountain"; + timezone = config.time.timeZone; + # timezone = "US/Mountain"; tooltip-format = "{calendar}"; "calendar" = { mode = "year"; -- cgit v1.2.3 From 8cd5c241774d48fb24bda912b4f6f847b8d557b7 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Thu, 18 Jan 2024 13:00:28 -0700 Subject: home-manager can't acces time variable set in nixos config --- modules/home-manager/waybar.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/home-manager/waybar.nix') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index 0e02ded..c35bc75 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -80,8 +80,8 @@ "clock" = { format = "{:%H:%M}  "; format-alt = "{:%A, %B %d, %Y (%R)}  "; - timezone = config.time.timeZone; - # timezone = "US/Mountain"; + # timezone = config.time.timeZone; + timezone = "US/Mountain"; tooltip-format = "{calendar}"; "calendar" = { mode = "year"; -- cgit v1.2.3