noa/nixconf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix waybar configs

Browse source
This commit is contained in:
Noa Aarts 2024-06-18 18:33:47 +02:00
parent bd0bfbc3d0
commit e504eae280
17 changed files with 283 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/hyprland.nix
View file

@ -40,7 +40,7 @@ in
waybar = {
modules = {
left = [ "hyprland/workspaces" "tray" "hyprland/window" ];
center = [ "clock" ];
center = [ "clock" "custom/spotify" ];
right = [ "custom/vpn" "wireplumber" "network" "cpu" "memory" "custom/poweroff" ];
};
enable = lib.mkDefault true;

4
modules/waybar/allmodules.nix
View file

@ -1,4 +0,0 @@
config:
[ "hyprland/workspaces" "tray" "hyprland/window" ] ++
[ "clock" ] ++
[ "custom/vpn" "wireplumber" "network" "cpu" "memory" "custom/poweroff" ]

4
modules/waybar/clock.nix
View file

@ -4,10 +4,10 @@ let
in
{
options.modules.waybar.modules = import ./addname.nix lib name;
options.modules.waybar.${name} = {
options.modules.waybar.enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
config = lib.mkIf config.modules.waybar.${name}.enable {
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar.${name} = {
tooltip-format = "<big>{:%Y %B}</big>\n\n{calendar}";
interval = 1;

4
modules/waybar/cpu.nix
View file

@ -4,10 +4,10 @@ let
in
{
options.modules.waybar.modules = import ./addname.nix lib name;
options.modules.waybar.${name} = {
options.modules.waybar.enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
config = lib.mkIf config.modules.waybar.${name}.enable {
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar."${name}" = {
format = "cpu: {usage}%";
tooltip = false;

1
modules/waybar/createmodules.nix
View file

@ -1 +0,0 @@
config: builtins.listToAttrs (import ./namedmodules.nix config)

23
modules/waybar/default.nix
View file

@ -37,12 +37,26 @@ in
./workspaces.nix
./temperature.nix
./wireplumber.nix
./spotify.nix
../../common/colors.nix
];
config = lib.mkIf cfg.enable {
modules.waybar = import ./createmodules.nix cfg.modules;
home.packages = with pkgs; [
config = lib.mkIf cfg.enable
rec {
modules.waybar.enabled = (
let
mods = config.modules.waybar.modules;
allmodules = mods.left ++ mods.center ++ mods.right;
namedmodules = builtins.map
(n: { name = n; value = { enable = true; }; })
allmodules;
createmodules = builtins.listToAttrs namedmodules;
in
createmodules
);
home.packages = with pkgs;
[
font-awesome
];
programs.waybar = {
@ -275,5 +289,6 @@ in
}
'';
};
};
}
;
}

4
modules/waybar/memory.nix
View file

@ -4,10 +4,10 @@ let
in
{
options.modules.waybar.modules = import ./addname.nix lib name;
options.modules.waybar.${name} = {
options.modules.waybar.enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
config = lib.mkIf config.modules.waybar.${name}.enable {
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar."${name}" = {
format = "mem: {}%";
tooltip = false;

4
modules/waybar/namedmodules.nix
View file

@ -1,4 +0,0 @@
config:
builtins.map
(n: { name = n; value = { enable = true; }; })
(import ./allmodules.nix config)

4
modules/waybar/network.nix
View file

@ -4,10 +4,10 @@ let
in
{
options.modules.waybar.modules = import ./addname.nix lib name;
options.modules.waybar.${name} = {
options.modules.waybar.enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
config = lib.mkIf config.modules.waybar.${name}.enable {
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar."${name}" = {
format-wifi = "{essid} ({signalStrength}%) 󰖩";
format-ethernet = "{ipaddr}/{cidr} 󰛳";

8
modules/waybar/power.nix
View file

@ -3,14 +3,16 @@ let
name = "custom/poweroff";
in
{
options.modules.waybar.modules = import ./addname.nix lib name;
options.modules.waybar.${name} = {
options.modules.waybar = {
modules = import ./addname.nix lib name;
enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
};
imports = [
../wofi.nix
];
config = lib.mkIf config.modules.waybar.${name}.enable {
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
modules.wofi.enable = true;
programs.waybar.settings.mainBar."${name}" = {
format = "";

31
modules/waybar/spotify.nix Normal file
View file

@ -0,0 +1,31 @@
{ lib, config, pkgs, ... }:
let
name = "custom/spotify";
in
{
options.modules.waybar = {
modules = import ./addname.nix lib name;
enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
};
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar.${name} = {
tooltip-format = "<big>{:%Y %B}</big>\n\n{calendar}";
interval = 1;
format = "{:%H:%M:%S}";
format-alt = "{:%Y-%m-%d %H:%M:%S}";
on-click-middle = "gnome-clocks";
calendar = {
weeks-pos = "left";
format = {
today = "<span color='#FF6666'><u>{}</u></span>"; # TODO: use nix-colors
weeks = "<span color='#707A8C'>{}</span>"; # TODO: use nix-colors
};
};
home.packages = [
pkgs.gnome.gnome-clocks
];
};
};
}

8
modules/waybar/temperature.nix
View file

@ -3,11 +3,13 @@ let
name = "temperature";
in
{
options.modules.waybar.modules = import ./addname.nix lib name;
options.modules.waybar.${name} = {
options.modules.waybar = {
modules = import ./addname.nix lib name;
enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
config = lib.mkIf config.modules.waybar.${name}.enable {
};
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar."${name}" = {
thermal-zone = 2;
hwmon-path = "/sys/class/hwmon/hwmon3/temp1_input";

4
modules/waybar/tray.nix
View file

@ -4,10 +4,10 @@ let
in
{
options.modules.waybar.modules = import ./addname.nix lib name;
options.modules.waybar.${name} = {
options.modules.waybar.enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
config = lib.mkIf config.modules.waybar.${name}.enable {
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar."${name}" = {
spacing = 10;
};

4
modules/waybar/vpn.nix
View file

@ -4,10 +4,10 @@ let
in
{
options.modules.waybar.modules = import ./addname.nix lib name;
options.modules.waybar.${name} = {
options.modules.waybar.enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
config = lib.mkIf config.modules.waybar.${name}.enable {
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar."${name}" = {
format = "VPN";
exec = "echo '{\"class\": \"connected\"}'";

4
modules/waybar/window.nix
View file

@ -4,10 +4,10 @@ let
in
{
options.modules.waybar.modules = import ./addname.nix lib name;
options.modules.waybar.${name} = {
options.modules.waybar.enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
config = lib.mkIf config.modules.waybar.${name}.enable {
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar."${name}" = {
max-length = 36;
};

8
modules/waybar/wireplumber.nix
View file

@ -3,11 +3,13 @@ let
name = "wireplumber";
in
{
options.modules.waybar.modules = import ./addname.nix lib name;
options.modules.waybar.${name} = {
options.modules.waybar = {
modules = import ./addname.nix lib name;
enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
config = lib.mkIf config.modules.waybar.${name}.enable {
};
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar."${name}" = {
format = "{volume}% {icon}";
format-muted = "";

4
modules/waybar/workspaces.nix
View file

@ -4,10 +4,10 @@ let
in
{
options.modules.waybar.modules = import ./addname.nix lib name;
options.modules.waybar.${name} = {
options.modules.waybar.enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
config = lib.mkIf config.modules.waybar.${name}.enable {
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar."${name}" = {
format = "{name}";
on-click = "activate";