From 506aed82ff3c1ed3a1adb2d3a450d4e19ef03d1f Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Fri, 12 Sep 2025 23:51:00 +0200 Subject: [PATCH] change formatter to nixfmt-tree, reformat --- flake.nix | 18 ++++++++++++++---- home/vinzenz/gnome.nix | 17 ++++++++++------- hosts/vinzenz-lpt2/configuration.nix | 5 ++++- hosts/vinzenz-pc2/configuration.nix | 2 +- 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index e719f8d..8d5ee19 100644 --- a/flake.nix +++ b/flake.nix @@ -85,6 +85,19 @@ "ronja-pc" ]; forDevice = f: nixpkgs.lib.mapAttrs f devices; + supported-systems = [ + "x86_64-linux" + "aarch64-linux" + ]; + forAllSystems = + f: + nixpkgs.lib.genAttrs supported-systems ( + system: + f rec { + inherit system; + pkgs = nixpkgs.legacyPackages.${system}; + } + ); in rec { nixosConfigurations = forDevice ( @@ -148,9 +161,6 @@ }; }; - formatter = { - x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; - aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.nixfmt-rfc-style; - }; + formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree); }; } diff --git a/home/vinzenz/gnome.nix b/home/vinzenz/gnome.nix index c8d5a5e..5648cf6 100644 --- a/home/vinzenz/gnome.nix +++ b/home/vinzenz/gnome.nix @@ -1,13 +1,16 @@ { pkgs, ... }: { config = { - home.packages = with pkgs.gnomeExtensions; [ - gsconnect - # battery-health-charging - quick-settings-tweaker - solaar-extension - alphabetical-app-grid - ] ++ (with pkgs; [foliate]); + home.packages = + with pkgs.gnomeExtensions; + [ + gsconnect + # battery-health-charging + quick-settings-tweaker + solaar-extension + alphabetical-app-grid + ] + ++ (with pkgs; [ foliate ]); dconf.settings = { "org/gnome/shell" = { diff --git a/hosts/vinzenz-lpt2/configuration.nix b/hosts/vinzenz-lpt2/configuration.nix index b627078..b38f25a 100644 --- a/hosts/vinzenz-lpt2/configuration.nix +++ b/hosts/vinzenz-lpt2/configuration.nix @@ -37,6 +37,9 @@ }; }; - networking.firewall.allowedTCPPorts = [ 8776 1337 ]; + networking.firewall.allowedTCPPorts = [ + 8776 + 1337 + ]; }; } diff --git a/hosts/vinzenz-pc2/configuration.nix b/hosts/vinzenz-pc2/configuration.nix index fcd9256..4f6b859 100644 --- a/hosts/vinzenz-pc2/configuration.nix +++ b/hosts/vinzenz-pc2/configuration.nix @@ -31,6 +31,6 @@ ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgN6J8KyVyQqBAz+y3drXDmIsxOPkdPB+ISgpIP9Eld Generated By Termius'' ]; - environment.systemPackages = with pkgs; [lact]; + environment.systemPackages = with pkgs; [ lact ]; }; }