nezia/flocon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: nezia:59adcecd104607fdeedd6acf35927b004fafe098
Branches Tags
nezia:main
nezia:add-notifications-to-waybar
nezia:add-server
..
compare: nezia:6c9feb58a6de6a8b4765673616baddee61901ef5
Branches Tags
nezia:main
nezia:add-notifications-to-waybar
nezia:add-server

No commits in common. "59adcecd104607fdeedd6acf35927b004fafe098" and "6c9feb58a6de6a8b4765673616baddee61901ef5" have entirely different histories.
59adcecd10 ... 6c9feb58a6

4 changed files with 123 additions and 157 deletions
Show stats Expand all files Collapse all files

265
home/programs/waybar/default.nix
View file

@ -1,173 +1,152 @@
{ {
osConfig,
pkgs, pkgs,
lib, lib,
osConfig,
config,
... ...
}: let }: let
inherit (lib) getExe mkMerge mkIf; inherit (lib) getExe;
in { in {
imports = [./style.nix]; imports = [./style.nix];
programs.waybar = { programs.waybar = {
enable = true; enable = true;
systemd.enable = true; systemd.enable = true;
settings = { settings = {
mainBar = mkMerge [ mainBar = {
{ layer = "top";
layer = "top"; position = "top";
position = "top"; height = 30;
height = 30;
margin-top = 6; margin-top = 6;
margin-left = 6; margin-left = 6;
margin-right = 6; margin-right = 6;
margin-bottom = 0; margin-bottom = 0;
modules-left = ["niri/workspaces" "niri/window"]; modules-left = ["niri/workspaces" "niri/window"];
modules-center = ["group/clock"]; modules-center = ["group/clock"];
modules-right = modules-right = ["tray" "group/status" "group/power"];
["tray" "group/status" "group/power"]
++ lib.optional config.services.swaync.enable "custom/notification";
battery = { battery = {
interval = 10; interval = 10;
states = { states = {
warning = 30; warning = 30;
critical = 15; critical = 15;
};
format = "{icon} {capacity}%";
format-charging = " {capacity}% - {time}";
format-full = " {capacity}% - Full";
format-icons = [
""
""
""
""
""
];
max-length = 25;
}; };
format = "{icon} {capacity}%";
format-charging = " {capacity}% - {time}";
format-full = " {capacity}% - Full";
format-icons = [
""
""
""
""
""
];
max-length = 25;
};
"pulseaudio" = { "niri/window" = {
format = "{icon} {volume}%"; icon = true;
format-bluetooth = "{icon} {volume}%"; };
format-muted = " ";
format-icons = { "pulseaudio" = {
"alsa_output.pci-0000_00_1f.3.analog-stereo" = ""; format = "{icon} {volume}%";
"alsa_output.pci-0000_00_1f.3.analog-stereo-muted" = ""; format-bluetooth = "{icon} {volume}%";
headphone = ""; format-muted = " ";
hands-free = ""; format-icons = {
headset = ""; "alsa_output.pci-0000_00_1f.3.analog-stereo" = "";
phone = ""; "alsa_output.pci-0000_00_1f.3.analog-stereo-muted" = "";
phone-muted = ""; headphone = "";
portable = ""; hands-free = "";
car = ""; headset = "";
default = [ phone = "";
"" phone-muted = "";
"" portable = "";
]; car = "";
}; default = [
scroll-step = 1; ""
on-click = "pavucontrol"; ""
ignored-sinks = [
"Easy Effects Sink"
]; ];
}; };
scroll-step = 1;
on-click = "pavucontrol";
ignored-sinks = [
"Easy Effects Sink"
];
};
"power-profiles-daemon" = { "power-profiles-daemon" = {
format-icons = { format-icons = {
default = ""; default = "";
performance = ""; performance = "";
balanced = ""; balanced = "";
power-saver = ""; power-saver = "";
};
}; };
};
"group/status" = { "group/status" = {
orientation = "inherit"; orientation = "inherit";
modules = [ modules = [
"pulseaudio" "pulseaudio"
"power-profiles-daemon" "power-profiles-daemon"
"network" "network"
"battery" "battery"
]; ];
}; };
"group/power" = { "group/power" = {
orientation = "inherit"; orientation = "inherit";
modules = [ modules = [
"custom/power" "custom/power"
]; ];
}; };
"group/clock" = { "group/clock" = {
orientation = "inherit"; orientation = "inherit";
modules = [ modules = [
"clock#time" "clock#time"
"clock#date" "clock#date"
]; ];
}; };
"custom/power" = { "custom/power" = {
format = ""; format = "";
tooltip = false; tooltip = false;
on-click = getExe pkgs.wlogout; on-click = getExe pkgs.wlogout;
}; };
"clock#date" = { "clock#date" = {
format = "{:%D}"; format = "{:%D}";
tooltip-format = "<tt><big>{calendar}</big></tt>"; tooltip-format = "<tt><big>{calendar}</big></tt>";
}; };
"clock#time" = { "clock#time" = {
format = "{:%H:%M}"; format = "{:%H:%M}";
tooltip-format = "{tz_list}"; tooltip-format = "{tz_list}";
timezones = [ timezones = [
osConfig.time.timeZone osConfig.time.timeZone
"US/Eastern" "US/Eastern"
]; ];
}; };
network = { network = {
interface = "wlp1s0"; interface = "wlp1s0";
format = "{ifname}"; format = "{ifname}";
format-wifi = "{icon}"; format-wifi = "{icon}";
format-ethernet = "{ipaddr}/{cidr} 󰊗"; format-ethernet = "{ipaddr}/{cidr} 󰊗";
format-disconnected = ""; format-disconnected = "";
tooltip-format = "{ifname} via {gwaddr} 󰊗"; tooltip-format = "{ifname} via {gwaddr} 󰊗";
tooltip-format-wifi = "{essid} ({signalStrength}%)"; tooltip-format-wifi = "{essid} ({signalStrength}%)";
tooltip-format-ethernet = "{ifname} "; tooltip-format-ethernet = "{ifname} ";
tooltip-format-disconnected = "Disconnected"; tooltip-format-disconnected = "Disconnected";
max-length = 50; max-length = 50;
format-icons = [ format-icons = [
"󰤟" "󰤟"
"󰤢" "󰤢"
"󰤥" "󰤥"
"󰤨" "󰤨"
]; ];
}; };
} };
(mkIf osConfig.programs.niri.enable {
"niri/window" = {
icon = true;
};
})
(mkIf config.services.swaync.enable {
"custom/notification" = {
tooltip = false;
format = "{icon}";
format-icons = {
notification = "󱅫";
none = "󰂚";
dnd-notification = "󱏧";
dnd-none = "󱏧";
};
return-type = "json";
exec = "swaync-client -swb";
on-click = "swaync-client -t -sw";
};
})
];
}; };
}; };

7
home/programs/waybar/style.nix
View file

@ -88,8 +88,7 @@ in {
#network, #network,
#pulseaudio, #pulseaudio,
#tray, #tray,
#power-profiles-daemon #power-profiles-daemon {
{
padding: 0 0.5em; padding: 0 0.5em;
} }
@ -103,9 +102,5 @@ in {
padding: 0 1.2em; padding: 0 1.2em;
color: @base08; color: @base08;
} }
#custom-notification {
padding: 0 1.2em;
}
''; '';
} }

7
home/services/swaync.nix
View file

@ -1,7 +0,0 @@
{lib, ...}: {
services.swaync = {
enable = true;
};
# systemd.user.services.swaync.Service.Environment = "WAYLAND_DISPLAY=wayland-1";
systemd.user.services.swaync.Unit.ConditionEnvironment = lib.mkForce "";
}

1
hosts/vamos/default.nix
View file

@ -35,7 +35,6 @@ in {
"${home}/programs/niri" "${home}/programs/niri"
"${home}/programs/waybar" "${home}/programs/waybar"
"${home}/services/swaync.nix"
"${home}/programs/fuzzel.nix" "${home}/programs/fuzzel.nix"
"${home}/programs/swaybg.nix" "${home}/programs/swaybg.nix"
"${home}/programs/swaylock.nix" "${home}/programs/swaylock.nix"