From 0b936b1f6e1d76e18a8565c1b6963653c04e9e04 Mon Sep 17 00:00:00 2001 From: Andre Date: Sat, 2 Mar 2024 12:58:30 -0500 Subject: [PATCH] Run statix linter --- flake.nix | 2 +- hosts/common/default.nix | 2 +- modules/apps/gaming.nix | 2 +- modules/base/bluetooth.nix | 2 +- modules/base/bootloader.nix | 4 ++-- modules/base/network.nix | 2 +- modules/roles/server.nix | 2 +- modules/roles/workstation.nix | 3 ++- modules/services/apcupsd.nix | 2 +- modules/services/duplicacy-web.nix | 2 +- modules/services/k3s.nix | 4 ++-- modules/ui/audio.nix | 2 +- modules/ui/gnome.nix | 4 ++-- modules/users/aires/default.nix | 16 ++++++++-------- modules/users/common/gnome.nix | 2 +- modules/users/gremlin/default.nix | 8 ++++---- nix-secrets | 2 +- 17 files changed, 31 insertions(+), 30 deletions(-) diff --git a/flake.nix b/flake.nix index 5b5a874..882bc2e 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ outputs = inputs@{ self, nixpkgs, lanzaboote, nix-flatpak, home-manager, nixos-hardware, ... }: let inherit (self) outputs; - lib = nixpkgs.lib; + inherit (nixpkgs) lib; systems = [ "x86_64-linux" "aarch64-linux" ]; forEachSystem = f: lib.genAttrs systems (sys: f pkgsFor.${sys}); pkgsFor = lib.genAttrs systems (system: import nixpkgs { diff --git a/hosts/common/default.nix b/hosts/common/default.nix index a2da20f..19932d9 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -5,7 +5,7 @@ let nix-secrets = builtins.fetchGit { url = "/home/aires/Development/nix-configuration/nix-secrets"; ref = "main"; - rev = "7e6dd41b5a89a1ff2ead22bf69e5b82b585c0fa2"; + rev = "55fc814d477d956ab885e157f24c2d43f433dc7a"; }; in{ imports = [ diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix index 17e433d..bdb0cdf 100644 --- a/modules/apps/gaming.nix +++ b/modules/apps/gaming.nix @@ -11,7 +11,7 @@ with lib; }; config = mkIf cfg.enable { - services.flatpak.packages = lib.mkIf (config.services.flatpak.enable == true) [ + services.flatpak.packages = lib.mkIf config.services.flatpak.enable [ "gg.minion.Minion" "com.valvesoftware.Steam" "org.firestormviewer.FirestormViewer" diff --git a/modules/base/bluetooth.nix b/modules/base/bluetooth.nix index 29d1133..70126d5 100644 --- a/modules/base/bluetooth.nix +++ b/modules/base/bluetooth.nix @@ -32,7 +32,7 @@ with lib; ]; # Reduce audio latency per https://nixos.wiki/wiki/PipeWire#Low-latency_setup - services.pipewire.extraConfig.pipewire = lib.mkIf (config.sound.enable == true) { + services.pipewire.extraConfig.pipewire = lib.mkIf config.sound.enable { "92-low-latency.conf" = { "context.properties" = { "default.clock.rate" = 48000; diff --git a/modules/base/bootloader.nix b/modules/base/bootloader.nix index ce6cef7..69ccae0 100644 --- a/modules/base/bootloader.nix +++ b/modules/base/bootloader.nix @@ -24,7 +24,7 @@ with lib; }; config = mkIf cfg.enable (mkMerge[ - (mkIf (cfg.secureboot.enable == true) { + (mkIf cfg.secureboot.enable { boot = { # Enable Secure Boot bootspec.enable = true; @@ -48,7 +48,7 @@ with lib; }) # Plain boot - (mkIf (cfg.secureboot.enable == false) { + (mkIf (!cfg.secureboot.enable) { boot = { loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; diff --git a/modules/base/network.nix b/modules/base/network.nix index ca33112..4e40820 100644 --- a/modules/base/network.nix +++ b/modules/base/network.nix @@ -1,4 +1,4 @@ -{ ... }: { +_: { networking = { # Enable networking via NetworkManager networkmanager.enable = true; diff --git a/modules/roles/server.nix b/modules/roles/server.nix index 3c98482..1651d7b 100644 --- a/modules/roles/server.nix +++ b/modules/roles/server.nix @@ -1,6 +1,6 @@ { config, lib, modulesPath, pkgs, ... }: let - role = config.host.role; + inherit (config.host) role; in with lib; { diff --git a/modules/roles/workstation.nix b/modules/roles/workstation.nix index 0c55699..53ad625 100644 --- a/modules/roles/workstation.nix +++ b/modules/roles/workstation.nix @@ -1,6 +1,6 @@ { config, lib, modulesPath, pkgs, ... }: let - role = config.host.role; + inherit (config.host) role; in with lib; { @@ -16,6 +16,7 @@ in environment.systemPackages = with pkgs; [ direnv + statix # Nix linting tool ]; boot = { diff --git a/modules/services/apcupsd.nix b/modules/services/apcupsd.nix index 899327a..7910639 100644 --- a/modules/services/apcupsd.nix +++ b/modules/services/apcupsd.nix @@ -11,7 +11,7 @@ with lib; config = mkIf cfg.enable { services.apcupsd = { enable = true; - configText = (builtins.readFile ./etc/apcupsd.conf); + configText = builtins.readFile ./etc/apcupsd.conf; }; }; } \ No newline at end of file diff --git a/modules/services/duplicacy-web.nix b/modules/services/duplicacy-web.nix index 187c8e2..9241e40 100644 --- a/modules/services/duplicacy-web.nix +++ b/modules/services/duplicacy-web.nix @@ -47,6 +47,6 @@ rec { environment = { HOME = cfg.environment; }; - } // optionalAttrs (cfg.autostart == true) { wantedBy = ["multi-user.target"]; }; # Start at boot if autostart is enabled. + } // optionalAttrs cfg.autostart { wantedBy = ["multi-user.target"]; }; # Start at boot if autostart is enabled. }; } diff --git a/modules/services/k3s.nix b/modules/services/k3s.nix index 65264c0..40a32be 100644 --- a/modules/services/k3s.nix +++ b/modules/services/k3s.nix @@ -43,11 +43,11 @@ with lib; services.k3s = { enable = true; - role = cfg.role; + inherit (cfg) role; extraFlags = toString [ # "--kubelet-arg=v=4" # Optionally add additional args to k3s ]; - } // optionalAttrs (cfg.role == "agent") { serverAddr = cfg.serverAddr; }; + } // optionalAttrs (cfg.role == "agent") { inherit (cfg) serverAddr; }; # Increase number of open file handlers so K3s doesn't exhaust them...again. systemd.extraConfig = '' diff --git a/modules/ui/audio.nix b/modules/ui/audio.nix index 20ca0d0..4f23ef7 100644 --- a/modules/ui/audio.nix +++ b/modules/ui/audio.nix @@ -26,7 +26,7 @@ with lib; jack.enable = true; }; - services.flatpak.packages = lib.mkIf (config.host.ui.flatpak.enable == true) [ + services.flatpak.packages = lib.mkIf config.host.ui.flatpak.enable [ "com.github.wwmm.easyeffects" ]; }; diff --git a/modules/ui/gnome.nix b/modules/ui/gnome.nix index 5160308..498541d 100644 --- a/modules/ui/gnome.nix +++ b/modules/ui/gnome.nix @@ -34,9 +34,9 @@ with lib; }; # Remove default packages that came with the install - services.xserver.excludePackages = (with pkgs; [ + services.xserver.excludePackages = with pkgs; [ xterm - ]); + ]; environment.gnome.excludePackages = (with pkgs; [ gnome-photos gnome-tour diff --git a/modules/users/aires/default.nix b/modules/users/aires/default.nix index 14e0457..1bf4511 100644 --- a/modules/users/aires/default.nix +++ b/modules/users/aires/default.nix @@ -24,7 +24,7 @@ with lib; }; config = mkIf cfg.enable (mkMerge [ - ({ + { users.users.aires = { isNormalUser = true; description = "Aires"; @@ -36,7 +36,7 @@ with lib; }; # Install aires-specific Flatpaks - services.flatpak.packages = mkIf (config.services.flatpak.enable == true) [ + services.flatpak.packages = mkIf config.services.flatpak.enable [ "com.discordapp.Discord" "org.telegram.desktop" ]; @@ -58,7 +58,7 @@ with lib; home.homeDirectory = "/home/aires"; # Install extra packages, specifically gnome extensions - home.packages = lib.mkIf (config.host.ui.gnome.enable) [ + home.packages = lib.mkIf config.host.ui.gnome.enable [ pkgs.gnomeExtensions.wallpaper-slideshow ]; @@ -109,10 +109,10 @@ with lib; }; }; }; - }) + } # Autologin aires - (mkIf (cfg.autologin == true) { + (mkIf cfg.autologin { services.xserver.displayManager.autoLogin = { enable = true; user = "aires"; @@ -124,10 +124,10 @@ with lib; }) # Enable Syncthing - (mkIf (cfg.services.syncthing.enable == true) { + (mkIf cfg.services.syncthing.enable { users.users.aires.packages = [ pkgs.syncthing - (mkIf (cfg.services.syncthing.enableTray == true) pkgs.syncthingtray) + (mkIf cfg.services.syncthing.enableTray pkgs.syncthingtray) ]; # Open port 8080 @@ -147,7 +147,7 @@ with lib; }; # Override the default Syncthing settings so it doesn't start on boot - systemd.user.services."syncthing" = mkIf (cfg.services.syncthing.autostart == false) { + systemd.user.services."syncthing" = mkIf (!cfg.services.syncthing.autostart) { Install = lib.mkForce {}; }; }; diff --git a/modules/users/common/gnome.nix b/modules/users/common/gnome.nix index 0b9434f..6b50d73 100644 --- a/modules/users/common/gnome.nix +++ b/modules/users/common/gnome.nix @@ -1,6 +1,6 @@ { lib, pkgs, osConfig, ... }: { # Additional Gnome configurations via home-manager. Imported by default by aires and gremlin. - dconf.settings = lib.mkIf (osConfig.host.ui.gnome.enable) { + dconf.settings = lib.mkIf osConfig.host.ui.gnome.enable { "org/gnome/mutter" = { edge-tiling = true; workspaces-only-on-primary = false; diff --git a/modules/users/gremlin/default.nix b/modules/users/gremlin/default.nix index 9b0d31c..a16dacc 100644 --- a/modules/users/gremlin/default.nix +++ b/modules/users/gremlin/default.nix @@ -36,7 +36,7 @@ with lib; }; # Install gremlin-specific flatpaks - services.flatpak.packages = lib.mkIf (config.services.flatpak.enable == true) [ + services.flatpak.packages = lib.mkIf config.services.flatpak.enable [ "com.google.Chrome" "com.slack.Slack" ]; @@ -96,11 +96,11 @@ with lib; }) # Enable Syncthing - (mkIf (cfg.services.syncthing.enable == true) { + (mkIf cfg.services.syncthing.enable { users.users.gremlin = { packages = [ pkgs.syncthing - (mkIf (cfg.services.syncthing.enableTray == true) pkgs.syncthingtray) + (mkIf cfg.services.syncthing.enableTray pkgs.syncthingtray) ]; }; @@ -116,7 +116,7 @@ with lib; }; # Override the default Syncthing settings so it doesn't start on boot - systemd.user.services."syncthing" = mkIf (cfg.services.syncthing.autostart == false) { + systemd.user.services."syncthing" = mkIf (!cfg.services.syncthing.autostart) { Install = lib.mkForce {}; }; }; diff --git a/nix-secrets b/nix-secrets index 7e6dd41..55fc814 160000 --- a/nix-secrets +++ b/nix-secrets @@ -1 +1 @@ -Subproject commit 7e6dd41b5a89a1ff2ead22bf69e5b82b585c0fa2 +Subproject commit 55fc814d477d956ab885e157f24c2d43f433dc7a