nix format

2026-01-07 09:17:34 -06:00
parent 98c627531c
commit dabd791fac
20 changed files with 546 additions and 316 deletions
--- a/modules/home/programs/hyprland/default.nix
+++ b/modules/home/programs/hyprland/default.nix
@@ -68,7 +68,7 @@ in
          xwayland
        ]
        ++ (if cfg.notificationDaemon == "mako" then [ mako ] else [ dunst ])
-        ++ (if cfg.launcher == "wofi" then [ wofi ] else [ rofi ]) 
+        ++ (if cfg.launcher == "wofi" then [ wofi ] else [ rofi ])
        ++ (with pkgs.${namespace}; [ pipewire-python ])
      );

--- a/modules/home/programs/waybar/scripts/hass.nix
+++ b/modules/home/programs/waybar/scripts/hass.nix
@@ -8,9 +8,11 @@
 let
  cfg = config.${namespace}.programs.waybar;

-  pythonEnv = pkgs.python3.withPackages (_ps: with pkgs.${namespace}; [
-    homeassistant-api
-  ]);
+  pythonEnv = pkgs.python3.withPackages (
+    _ps: with pkgs.${namespace}; [
+      homeassistant-api
+    ]
+  );

  waybar-hass = pkgs.writeScriptBin "waybar-hass" ''
    #!${pythonEnv}/bin/python
--- a/modules/nixos/gaming/default.nix
+++ b/modules/nixos/gaming/default.nix
@@ -37,14 +37,17 @@ in
      remotePlay.openFirewall = true;
      # Open ports in the firewall for Source Dedicated Server
      dedicatedServer.openFirewall = true;
-      extraCompatPackages = with pkgs; [
-        proton-ge-bin
-      ] ++ (with pkgs.${namespace}; [
-        proton-cachyos
-        proton-cachyos-v3
-        proton-cachyos-v2
-        proton-cachyos-v1
-      ]);
+      extraCompatPackages =
+        with pkgs.unstable;
+        [
+          proton-ge-bin
+        ]
+        ++ (with pkgs.${namespace}; [
+          proton-cachyos
+          proton-cachyos-v3
+          proton-cachyos-v2
+          proton-cachyos-v1
+        ]);
      gamescopeSession = {
        enable = true;
        args = [
@@ -83,6 +86,9 @@ in
    };

    environment = {
+      systemPackages = with pkgs.${namespace}; [
+        superposition
+      ];
      variables = {
        STEAM_FORCE_DESKTOPUI_SCALING = "1.0";
      };
--- a/modules/nixos/hardware/raspberry-pi/audio.nix
+++ b/modules/nixos/hardware/raspberry-pi/audio.nix
@@ -18,22 +18,25 @@ in
    hardware.deviceTree = {
      overlays =
        [ ]
-        ++ (with pkgs.${namespace}; (
-          if (variant == "5") then
-            [
-              {
-                name = "pisound-pi5-overlay";
-                dtsFile = "${raspberrypi-overlays}/dtbs/raspberrypi-overlays/pisound-pi5-overlay.dts";
-              }
-            ]
-          else
-            [
-              {
-                name = "pisound-overlay";
-                dtsFile = "${raspberrypi-overlays}/dtbs/raspberrypi-overlays/pisound-overlay.dts";
-              }
-            ]
-        ));
+        ++ (
+          with pkgs.${namespace};
+          (
+            if (variant == "5") then
+              [
+                {
+                  name = "pisound-pi5-overlay";
+                  dtsFile = "${raspberrypi-overlays}/dtbs/raspberrypi-overlays/pisound-pi5-overlay.dts";
+                }
+              ]
+            else
+              [
+                {
+                  name = "pisound-overlay";
+                  dtsFile = "${raspberrypi-overlays}/dtbs/raspberrypi-overlays/pisound-overlay.dts";
+                }
+              ]
+          )
+        );
    };
  };
 }
--- a/modules/nixos/headless/default.nix
+++ b/modules/nixos/headless/default.nix
@@ -1,6 +1,5 @@
 {
  config,
-  pkgs,
  system,
  lib,
  namespace,
@@ -8,9 +7,8 @@
 }:
 with lib;
 let
-  inherit (lib.${namespace}) mkOpt mkBoolOpt;
+  inherit (lib.${namespace}) mkBoolOpt;
  cfg = config.${namespace}.headless;
-  isArm = ("aarch64-linux" == system) || ("aarch64-darwin" == system);
 in
 {
  options.${namespace}.headless = {
--- a/modules/nixos/homeassistant/services/homeassistant/default.nix
+++ b/modules/nixos/homeassistant/services/homeassistant/default.nix
@@ -233,30 +233,33 @@ in
        "zone"
      ];

-      customComponents = with pkgs.home-assistant-custom-components; [
-        # nixpkgs
-        auth_oidc
-        better_thermostat
-        localtuya
-        luxer_one
-        prometheus_sensor
-        roborock_custom_map
-        smartir
-        versatile_thermostat
-      ] ++ (with pkgs.${namespace}; [
-        ha-anycubic
-        ha-bambulab
-        ha-bedjet
-        ha-gehome
-        ha-icloud3
-        ha-local-llm
-        ha-mail-and-packages
-        ha-nanokvm
-        ha-openhasp
-        ha-overseerr
-        ha-petlibro
-        ha-wyzeapi
-      ]);
+      customComponents =
+        with pkgs.home-assistant-custom-components;
+        [
+          # nixpkgs
+          auth_oidc
+          better_thermostat
+          localtuya
+          luxer_one
+          prometheus_sensor
+          roborock_custom_map
+          smartir
+          versatile_thermostat
+        ]
+        ++ (with pkgs.${namespace}; [
+          ha-anycubic
+          ha-bambulab
+          ha-bedjet
+          ha-gehome
+          ha-icloud3
+          ha-local-llm
+          ha-mail-and-packages
+          ha-nanokvm
+          ha-openhasp
+          ha-overseerr
+          ha-petlibro
+          ha-wyzeapi
+        ]);

      customLovelaceModules = with pkgs.home-assistant-custom-lovelace-modules; [
        atomic-calendar-revive
--- a/modules/nixos/nix/ccache/overlays.nix
+++ b/modules/nixos/nix/ccache/overlays.nix
@@ -2,85 +2,71 @@
 {
  nixpkgs.overlays = [
    (_self: super: {
-      ${namespace} =
-        let
-          # clangCcacheStdenv = super.overrideCC super.llvmPackages.stdenv (
-          #   super.ccacheWrapper.override {
-          #     cc = super.llvmPackages.stdenv.cc;
-          #     extraConfig = ''
-          #       export CCACHE_SLOPPINESS=include_file_ctime,time_macros
-          #       export CCACHE_DIR=/var/cache/ccache
-          #     '';
-          #   }
-          # );
-          clangCcacheStdenv = pkgs.llvmPackages.stdenv; # pkgs.overrideCC pkgs.clangStdenv (pkgs.ccacheWrapper.override { cc = pkgs.llvmPackages.clangUseLLVM; });
-        in
-        super.${namespace}
-        // {
-          linuxPackages_rpi5 = super.linuxPackagesFor (
-            super.${namespace}.linux-rpi.override { stdenv = super.ccacheStdenv; }
-          );
-          linuxPackages_rpi4 = super.linuxPackagesFor (
-            super.${namespace}.linux-rpi.override {
-              stdenv = super.ccacheStdenv;
-              rpiVersion = 4;
-            }
-          );
-          libraspberrypi = super.${namespace}.libraspberrypi.override { stdenv = super.ccacheStdenv; };
-          raspberrypi-utils = super.${namespace}.raspberrypi-utils.override { stdenv = super.ccacheStdenv; };
+      ${namespace} = super.${namespace} // {
+        linuxPackages_rpi5 = super.linuxPackagesFor (
+          super.${namespace}.linux-rpi.override { stdenv = super.ccacheStdenv; }
+        );
+        linuxPackages_rpi4 = super.linuxPackagesFor (
+          super.${namespace}.linux-rpi.override {
+            stdenv = super.ccacheStdenv;
+            rpiVersion = 4;
+          }
+        );
+        libraspberrypi = super.${namespace}.libraspberrypi.override { stdenv = super.ccacheStdenv; };
+        raspberrypi-utils = super.${namespace}.raspberrypi-utils.override { stdenv = super.ccacheStdenv; };

-          linuxPackages_cachyos = super.${namespace}.linuxPackages_cachyos.override {
-            stdenv = super.ccacheStdenv;
-          };
-          # linuxPackages_cachyos-lto = super.${namespace}.linuxPackages_cachyos-lto.override {
-          #   stdenv = clangCcacheStdenv;
-          # };
-          # linuxPackages_cachyos-lto-full = super.${namespace}.linuxPackages_cachyos-lto-full.override {
-          #   stdenv = clangCcacheStdenv;
-          # };
-          linuxPackages_cachyos-lts = super.${namespace}.linuxPackages_cachyos-lts.override {
-            stdenv = super.ccacheStdenv;
-          };
-          # linuxPackages_cachyos-lts-lto = super.${namespace}.linuxPackages_cachyos-lts-lto.override {
-          #   stdenv = clangCcacheStdenv;
-          # };
-          # linuxPackages_cachyos-lto-znver4 = super.${namespace}.linuxPackages_cachyos-lto-znver4.override {
-          #   stdenv = clangCcacheStdenv;
-          # };
-          linuxPackages_cachyos-server = super.${namespace}.linuxPackages_cachyos-server.override {
-            stdenv = super.ccacheStdenv;
-          };
-          # linuxPackages_cachyos-server-lto = super.${namespace}.linuxPackages_cachyos-server-lto.override {
-          #   stdenv = clangCcacheStdenv;
-          # };
-          # linuxPackages_cachyos-server-lto-znver4 =
-          #   super.${namespace}.linuxPackages_cachyos-server-lto-znver4.override
-          #     { stdenv = clangCcacheStdenv; };
-          linuxPackages_cachyos-rc = super.${namespace}.linuxPackages_cachyos-rc.override {
-            stdenv = super.ccacheStdenv;
-          };
-          # linuxPackages_cachyos-rc-lto = super.${namespace}.linuxPackages_cachyos-rc-lto.override {
-          #   stdenv = clangCcacheStdenv;
-          # };
-          # linuxPackages_cachyos-rc-lto-znver4 =
-          #   super.${namespace}.linuxPackages_cachyos-rc-lto-znver4.override
-          #     { stdenv = clangCcacheStdenv; };
-          linuxPackages_cachyos-hardened = super.${namespace}.linuxPackages_cachyos-hardened.override {
-            stdenv = super.ccacheStdenv;
-          };
-          # linuxPackages_cachyos-hardened-lto =
-          #   super.${namespace}.linuxPackages_cachyos-hardened-lto.override
-          #     { stdenv = clangCcacheStdenv; };
-          # linuxPackages_cachyos-hardened-lto-znver4 =
-          #   super.${namespace}.linuxPackages_cachyos-hardened-lto-znver4.override
-          #     { stdenv = clangCcacheStdenv; };
-          linuxPackages_cachyos-deckify = super.${namespace}.linuxPackages_cachyos-deckify.override {
-            stdenv = super.ccacheStdenv;
-          };
-          # linuxPackages_cachyos-deckify-lto = super.${namespace}.linuxPackages_cachyos-deckify-lto.override {
-          #   stdenv = clangCcacheStdenv;
-          # };
+        linuxPackages_cachyos = super.${namespace}.linuxPackages_cachyos.override {
+          stdenv = super.ccacheStdenv;
        };
+        # linuxPackages_cachyos-lto = super.${namespace}.linuxPackages_cachyos-lto.override {
+        #   stdenv = clangCcacheStdenv;
+        # };
+        # linuxPackages_cachyos-lto-full = super.${namespace}.linuxPackages_cachyos-lto-full.override {
+        #   stdenv = clangCcacheStdenv;
+        # };
+        linuxPackages_cachyos-lts = super.${namespace}.linuxPackages_cachyos-lts.override {
+          stdenv = super.ccacheStdenv;
+        };
+        # linuxPackages_cachyos-lts-lto = super.${namespace}.linuxPackages_cachyos-lts-lto.override {
+        #   stdenv = clangCcacheStdenv;
+        # };
+        # linuxPackages_cachyos-lto-znver4 = super.${namespace}.linuxPackages_cachyos-lto-znver4.override {
+        #   stdenv = clangCcacheStdenv;
+        # };
+        linuxPackages_cachyos-server = super.${namespace}.linuxPackages_cachyos-server.override {
+          stdenv = super.ccacheStdenv;
+        };
+        # linuxPackages_cachyos-server-lto = super.${namespace}.linuxPackages_cachyos-server-lto.override {
+        #   stdenv = clangCcacheStdenv;
+        # };
+        # linuxPackages_cachyos-server-lto-znver4 =
+        #   super.${namespace}.linuxPackages_cachyos-server-lto-znver4.override
+        #     { stdenv = clangCcacheStdenv; };
+        linuxPackages_cachyos-rc = super.${namespace}.linuxPackages_cachyos-rc.override {
+          stdenv = super.ccacheStdenv;
+        };
+        # linuxPackages_cachyos-rc-lto = super.${namespace}.linuxPackages_cachyos-rc-lto.override {
+        #   stdenv = clangCcacheStdenv;
+        # };
+        # linuxPackages_cachyos-rc-lto-znver4 =
+        #   super.${namespace}.linuxPackages_cachyos-rc-lto-znver4.override
+        #     { stdenv = clangCcacheStdenv; };
+        linuxPackages_cachyos-hardened = super.${namespace}.linuxPackages_cachyos-hardened.override {
+          stdenv = super.ccacheStdenv;
+        };
+        # linuxPackages_cachyos-hardened-lto =
+        #   super.${namespace}.linuxPackages_cachyos-hardened-lto.override
+        #     { stdenv = clangCcacheStdenv; };
+        # linuxPackages_cachyos-hardened-lto-znver4 =
+        #   super.${namespace}.linuxPackages_cachyos-hardened-lto-znver4.override
+        #     { stdenv = clangCcacheStdenv; };
+        linuxPackages_cachyos-deckify = super.${namespace}.linuxPackages_cachyos-deckify.override {
+          stdenv = super.ccacheStdenv;
+        };
+        # linuxPackages_cachyos-deckify-lto = super.${namespace}.linuxPackages_cachyos-deckify-lto.override {
+        #   stdenv = clangCcacheStdenv;
+        # };
+      };
    })

    (_self: super: {
@@ -159,4 +145,4 @@
    #   });
    # })
  ];
-}
+}
--- a/modules/nixos/nix/default.nix
+++ b/modules/nixos/nix/default.nix
@@ -2,7 +2,6 @@
  config,
  lib,
  namespace,
-  pkgs,
  ...
 }:
 {
@@ -31,7 +30,7 @@
      connect-timeout = lib.mkDefault 5;
      fallback = true;
      log-lines = lib.mkDefault 25;
-    
+
      max-free = lib.mkDefault (3000 * 1024 * 1024);
      min-free = lib.mkDefault (512 * 1024 * 1024);
    };
--- a/modules/nixos/user/default.nix
+++ b/modules/nixos/user/default.nix
@@ -71,9 +71,7 @@ in

    hashedPassword = mkOpt (nullOr str) null "Hashed password for the user.";

-    hashedPasswordFile =
-      mkOpt (nullOr path) null
-        "Path to the password file for this user account";
+    hashedPasswordFile = mkOpt (nullOr path) null "Path to the password file for this user account";

    mutableUsers = mkBoolOpt false "Whether users are mutable (can be modified after creation).";
  };