treewide: format with nixfmt

This commit is contained in:
insects 2024-09-22 10:56:40 +02:00
parent 303e982a8e
commit 26ad72592a
47 changed files with 380 additions and 725 deletions

View file

@ -1,10 +1,5 @@
{ pkgs, ... }:
{
imports = [
./mako.nix
./wofi.nix
./waybar.nix
];
{ pkgs, ... }: {
imports = [ ./mako.nix ./wofi.nix ./waybar.nix ];
home.packages = with pkgs; [
wf-recorder
@ -19,12 +14,6 @@
xdg.portal = {
enable = true;
extraPortals = [ pkgs.xdg-desktop-portal-wlr ];
config = {
common = {
default = [
"wlr"
];
};
};
config = { common = { default = [ "wlr" ]; }; };
};
}

View file

@ -1,5 +1,4 @@
{ config, lib, ... }:
{
{ config, lib, ... }: {
services.mako = {
enable = true;
font = lib.mkForce "${config.fontProfiles.regular.family} 12";

View file

@ -1,10 +1,6 @@
{ config, pkgs, ... }:
{
{ config, pkgs, ... }: {
# additional deps for cava support
home.packages = with pkgs; [
iniparser
fftw
];
home.packages = with pkgs; [ iniparser fftw ];
systemd.user.services.waybar = {
Unit.StartLimitBurst = 30;
@ -21,40 +17,19 @@
margin-top = 10;
margin-left = 20;
margin-right = 20;
modules-left = [
"hyprland/workspaces"
"hyprland/language"
];
modules-left = [ "hyprland/workspaces" "hyprland/language" ];
modules-center = [
"cpu"
"clock"
"memory"
];
modules-center = [ "cpu" "clock" "memory" ];
modules-right = [
"mpris"
"network"
"pulseaudio"
"battery"
"tray"
];
modules-right = [ "mpris" "network" "pulseaudio" "battery" "tray" ];
cpu = {
format = "CPU {usage}%";
};
cpu = { format = "CPU {usage}%"; };
memory = {
format = "MEM {}%";
};
memory = { format = "MEM {}%"; };
tray = {
spacing = 10;
};
tray = { spacing = 10; };
pulseaudio = {
format = "AUD {volume}%";
};
pulseaudio = { format = "AUD {volume}%"; };
network = {
format = "NET {ipaddr}";
@ -74,63 +49,60 @@
};
};
style =
let
inherit (config.lib.stylix.colors) withHashtag;
in
''
* {
font-family: ${config.fontProfiles.bitmap.family}, ${config.fontProfiles.monospace.family};
font-size: 11pt;
padding: 0;
}
style = let inherit (config.lib.stylix.colors) withHashtag;
in ''
* {
font-family: ${config.fontProfiles.bitmap.family}, ${config.fontProfiles.monospace.family};
font-size: 11pt;
padding: 0;
}
window#waybar {
padding: 0;
border-radius: 0.5em;
}
window#waybar {
padding: 0;
border-radius: 0.5em;
}
#workspaces {
transition: background-color .5s, color .5s;
}
#workspaces {
transition: background-color .5s, color .5s;
}
#workspaces button {
padding: 0 6px;
}
#workspaces button {
padding: 0 6px;
}
#workspaces button.active,
#workspaces button.focused {
background-color: ${withHashtag.base05};
color: ${withHashtag.base00};
}
#workspaces button.active,
#workspaces button.focused {
background-color: ${withHashtag.base05};
color: ${withHashtag.base00};
}
#cpu,
#memory {
color: ${withHashtag.base04};
}
#cpu,
#memory {
color: ${withHashtag.base04};
}
#mpris {
font-size: 10pt;
margin-right: 6px;
}
#mpris {
font-size: 10pt;
margin-right: 6px;
}
#tray {
padding: 0 5px;
background-color: ${withHashtag.base02};
}
#tray {
padding: 0 5px;
background-color: ${withHashtag.base02};
}
#pulseaudio {
color: ${withHashtag.base0D};
}
#pulseaudio {
color: ${withHashtag.base0D};
}
#network {
color: ${withHashtag.base0C};
}
#network {
color: ${withHashtag.base0C};
}
#language {
color: ${withHashtag.base02};
margin-left: 10px;
}
'';
#language {
color: ${withHashtag.base02};
margin-left: 10px;
}
'';
};
}

View file

@ -1,5 +1,4 @@
{ config, lib, ... }:
{
{ config, lib, ... }: {
programs.wofi = {
enable = true;
settings = {