Format using nixfmt
This commit is contained in:
@@ -1,4 +1,9 @@
|
||||
{ pkgs, lib, osConfig, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
osConfig,
|
||||
...
|
||||
}:
|
||||
let
|
||||
flakestat = pkgs.writeShellApplication {
|
||||
name = "flakestat";
|
||||
@@ -11,9 +16,7 @@ let
|
||||
arrhist = pkgs.stdenv.mkDerivation {
|
||||
name = "arrhist";
|
||||
propagatedBuildInputs = [
|
||||
(pkgs.python3.withPackages (pythonPackages: with pythonPackages; [
|
||||
requests
|
||||
]))
|
||||
(pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ requests ]))
|
||||
];
|
||||
src = ./arrhist.py;
|
||||
dontUnpack = true;
|
||||
@@ -29,13 +32,14 @@ in
|
||||
sops.secrets."radarr_api_key" = { };
|
||||
|
||||
xdg.configFile."waybar/macchiato.css" = {
|
||||
source = pkgs.fetchFromGitHub
|
||||
{
|
||||
source =
|
||||
pkgs.fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "waybar";
|
||||
rev = "f74ab1eecf2dcaf22569b396eed53b2b2fbe8aff";
|
||||
sha256 = "WLJMA2X20E5PCPg0ZPtSop0bfmu+pLImP9t8A8V4QK8=";
|
||||
} + "/themes/macchiato.css";
|
||||
}
|
||||
+ "/themes/macchiato.css";
|
||||
};
|
||||
|
||||
programs.waybar = {
|
||||
@@ -165,17 +169,16 @@ in
|
||||
"position" = "top";
|
||||
modules-left = [ "custom/flakestat" ];
|
||||
modules-center = [ "hyprland/workspaces" ];
|
||||
modules-right =
|
||||
[
|
||||
(lib.mkIf (withArrhist) "custom/arrhist")
|
||||
"pulseaudio"
|
||||
"pulseaudio#microphone"
|
||||
"memory"
|
||||
"cpu"
|
||||
(lib.mkIf (withBattery) "battery")
|
||||
"clock"
|
||||
"tray"
|
||||
];
|
||||
modules-right = [
|
||||
(lib.mkIf (withArrhist) "custom/arrhist")
|
||||
"pulseaudio"
|
||||
"pulseaudio#microphone"
|
||||
"memory"
|
||||
"cpu"
|
||||
(lib.mkIf (withBattery) "battery")
|
||||
"clock"
|
||||
"tray"
|
||||
];
|
||||
"hyprland/workspaces" = {
|
||||
"format" = "{name}";
|
||||
"on-click" = "activate";
|
||||
@@ -186,7 +189,13 @@ in
|
||||
"scroll-step" = 5;
|
||||
"format" = "{icon} {volume}%";
|
||||
"format-muted" = "";
|
||||
"format-icons" = { "default" = [ "" "" "" ]; };
|
||||
"format-icons" = {
|
||||
"default" = [
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
};
|
||||
"on-scroll-up" = "pamixer -i ${volInterval}";
|
||||
"on-scroll-down" = "pamixer -d ${volInterval}";
|
||||
"on-click" = "pamixer -t";
|
||||
@@ -209,7 +218,9 @@ in
|
||||
"memory" = {
|
||||
"interval" = 3;
|
||||
"format" = " {percentage}%";
|
||||
"states" = { "warning" = 85; };
|
||||
"states" = {
|
||||
"warning" = 85;
|
||||
};
|
||||
};
|
||||
"cpu" = {
|
||||
"interval" = 3;
|
||||
@@ -240,7 +251,8 @@ in
|
||||
"return-type" = "json";
|
||||
"interval" = 600;
|
||||
};
|
||||
} // lib.optionalAttrs (withArrhist) {
|
||||
}
|
||||
// lib.optionalAttrs (withArrhist) {
|
||||
"custom/arrhist" = {
|
||||
"exec" = "${arrhist}/bin/arrhist";
|
||||
"return-type" = "json";
|
||||
|
Reference in New Issue
Block a user