switch to nixfmt-rfc-style

xanderio · Jun 19, 2024 · 3925196 · 3925196
1 parent eded898
commit 3925196
Show file tree

Hide file tree

Showing 79 changed files with 955 additions and 642 deletions.
diff --git a/checks/darwinConfigurations.nix b/checks/darwinConfigurations.nix
@@ -5,7 +5,11 @@ let
   filterSystem = system: lib.filterAttrs (_: darwin: darwin.pkgs.hostPlatform.system == system);
 in
 {
-  perSystem = { system, ... }: {
-    checks = lib.mapAttrs' (name: darwin: lib.nameValuePair "darwinConfigurations-${name}" darwin.config.system.build.toplevel) (filterSystem system self.darwinConfigurations);
-  };
+  perSystem =
+    { system, ... }:
+    {
+      checks = lib.mapAttrs' (
+        name: darwin: lib.nameValuePair "darwinConfigurations-${name}" darwin.config.system.build.toplevel
+      ) (filterSystem system self.darwinConfigurations);
+    };
 }
diff --git a/checks/devShells.nix b/checks/devShells.nix
@@ -3,7 +3,9 @@ let
   inherit (inputs.nixpkgs) lib;
 in
 {
-  perSystem = { self', ... }: {
-    checks = lib.mapAttrs' (name: value: lib.nameValuePair "devShell-${name}" value) self'.devShells;
-  };
+  perSystem =
+    { self', ... }:
+    {
+      checks = lib.mapAttrs' (name: value: lib.nameValuePair "devShell-${name}" value) self'.devShells;
+    };
 }
diff --git a/checks/nixosConfigurations.nix b/checks/nixosConfigurations.nix
@@ -5,7 +5,11 @@ let
   filterSystem = system: lib.filterAttrs (_: nixos: nixos.pkgs.hostPlatform.system == system);
 in
 {
-  perSystem = { system, ... }: {
-    checks = lib.mapAttrs' (name: nixos: lib.nameValuePair "nixosConfigurations-${name}" nixos.config.system.build.toplevel) (filterSystem system self.nixosConfigurations);
-  };
+  perSystem =
+    { system, ... }:
+    {
+      checks = lib.mapAttrs' (
+        name: nixos: lib.nameValuePair "nixosConfigurations-${name}" nixos.config.system.build.toplevel
+      ) (filterSystem system self.nixosConfigurations);
+    };
 }
diff --git a/checks/packages.nix b/checks/packages.nix
@@ -3,7 +3,9 @@ let
   inherit (inputs.nixpkgs) lib;
 in
 {
-  perSystem = { self', ... }: {
-    checks = lib.mapAttrs' (name: value: lib.nameValuePair "package-${name}" value) self'.packages;
-  };
+  perSystem =
+    { self', ... }:
+    {
+      checks = lib.mapAttrs' (name: value: lib.nameValuePair "package-${name}" value) self'.packages;
+    };
 }
diff --git a/darwin/default.nix b/darwin/default.nix
@@ -1,5 +1 @@
-{
-  imports = [
-    ./ook
-  ];
-}
+{ imports = [ ./ook ]; }
diff --git a/darwin/ook/default.nix b/darwin/ook/default.nix
@@ -1,4 +1,5 @@
-{ inputs, self, ... }: {
+{ inputs, self, ... }:
+{
   flake.darwinConfigurations = {
     ook =
       let
@@ -40,7 +41,9 @@
       in
       darwinSystem {
         inherit system;
-        specialArgs = { inherit inputs; };
+        specialArgs = {
+          inherit inputs;
+        };
         modules = [
           inputs.home-manager.darwinModules.home-manager
           {
@@ -60,7 +63,10 @@
                 fallback = true;
                 connect-timeout = 5;
                 log-lines = 25;
-                trusted-users = [ "root" "xanderio" ];
+                trusted-users = [
+                  "root"
+                  "xanderio"
+                ];
                 builders-use-substitutes = true;
 
                 substituters = [
@@ -73,19 +79,21 @@
                 ];
               };
               distributedBuilds = true;
-              buildMachines = [{
-                sshUser = "builder";
-                hostName = "linux-builder";
-                systems = [
-                  linuxSystem
-                  "x86_64-linux"
-                ];
-                maxJobs = 4;
-                supportedFeatures = [ "big-parallel" ];
-                sshKey = "/etc/nix/builder_ed25519";
-                protocol = "ssh-ng";
-                publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUpCV2N4Yi9CbGFxdDFhdU90RStGOFFVV3JVb3RpQzVxQkorVXVFV2RWQ2Igcm9vdEBuaXhvcwo";
-              }];
+              buildMachines = [
+                {
+                  sshUser = "builder";
+                  hostName = "linux-builder";
+                  systems = [
+                    linuxSystem
+                    "x86_64-linux"
+                  ];
+                  maxJobs = 4;
+                  supportedFeatures = [ "big-parallel" ];
+                  sshKey = "/etc/nix/builder_ed25519";
+                  protocol = "ssh-ng";
+                  publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUpCV2N4Yi9CbGFxdDFhdU90RStGOFFVV3JVb3RpQzVxQkorVXVFV2RWQ2Igcm9vdEBuaXhvcwo";
+                }
+              ];
             };
 
             environment.shellAliases = {
@@ -112,7 +120,9 @@
 
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit inputs; };
+            home-manager.extraSpecialArgs = {
+              inherit inputs;
+            };
             home-manager.users.xanderio.imports = homeImports.ook;
           }
         ];

diff --git a/flake.nix b/flake.nix
@@ -47,15 +47,20 @@
       inputs."flake-parts".follows = "flake-parts";
     };
     nix-fast-build = {
-      url = "github:Mic92/nix-fast-build"; 
+      url = "github:Mic92/nix-fast-build";
       inputs."nixpkgs".follows = "nixpkgs";
       inputs."flake-parts".follows = "flake-parts";
     };
   };
 
-  outputs = inputs@{ flake-parts, self, ... }:
+  outputs =
+    inputs@{ flake-parts, self, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ];
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "aarch64-darwin"
+      ];
       imports = [
         ./hosts
         ./darwin
@@ -64,15 +69,24 @@
       flake = {
         inherit (import ./home/profiles inputs) homeConfigurations;
       };
-      perSystem = { pkgs, lib, inputs', self', system, ... }: {
-        formatter = pkgs.nixpkgs-fmt;
-        devShells.default = pkgs.mkShellNoCC {
-          buildInputs = [
-            pkgs.colmena
-            pkgs.sops
-            inputs'.sops-to-age.packages.ssh-to-age
-          ];
+      perSystem =
+        {
+          pkgs,
+          lib,
+          inputs',
+          self',
+          system,
+          ...
+        }:
+        {
+          formatter = pkgs.nixfmt-rfc-style;
+          devShells.default = pkgs.mkShellNoCC {
+            buildInputs = [
+              pkgs.colmena
+              pkgs.sops
+              inputs'.sops-to-age.packages.ssh-to-age
+            ];
+          };
         };
-      };
     };
 }
diff --git a/home/default.nix b/home/default.nix
@@ -1,2 +1 @@
-{
-}
+{ }
diff --git a/home/desktop/default.nix b/home/desktop/default.nix
@@ -1,7 +1,6 @@
-{ pkgs, ... }: {
-  imports = [
-    ./wayland
-  ];
+{ pkgs, ... }:
+{
+  imports = [ ./wayland ];
   home = {
     sessionVariables = {
       BROWSER = "firefox";
@@ -59,7 +58,10 @@
   programs = {
     chromium = {
       enable = true;
-      commandLineArgs = [ "--enable-features=UseOzonePlatform" "--ozone-platform=wayland" ];
+      commandLineArgs = [
+        "--enable-features=UseOzonePlatform"
+        "--ozone-platform=wayland"
+      ];
     };
     firefox = {
       enable = true;

diff --git a/home/desktop/wayland/default.nix b/home/desktop/wayland/default.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   imports = [
     ./kanshi.nix
     ./mako.nix

diff --git a/home/desktop/wayland/kanshi.nix b/home/desktop/wayland/kanshi.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   services.kanshi =
     let
       swaymsg = "${pkgs.sway}/bin/swaymsg";

diff --git a/home/desktop/wayland/mako.nix b/home/desktop/wayland/mako.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   services.mako = {
     enable = true;
 
@@ -27,11 +28,16 @@
   systemd.user.services.mako = {
     Unit = {
       Description = "Mako Notification daemon";
-      After = [ "graphical-session-pre.target" "tray.target" ];
+      After = [
+        "graphical-session-pre.target"
+        "tray.target"
+      ];
       PartOf = [ "graphical-session.target" ];
     };
 
-    Install = { WantedBy = [ "graphical-session.target" ]; };
+    Install = {
+      WantedBy = [ "graphical-session.target" ];
+    };
 
     Service = {
       ExecStart = "${pkgs.mako}/bin/mako";

diff --git a/home/desktop/wayland/sway/default.nix b/home/desktop/wayland/sway/default.nix
@@ -1,9 +1,11 @@
-{ pkgs
-, lib
-, config
-, ...
+{
+  pkgs,
+  lib,
+  config,
+  ...
 }:
-with lib; let
+with lib;
+let
   fuzzelOptions = lib.strings.concatStringsSep " " [
     ''--font="JetBrains Mono"''
     "--background-color=282a36ee"

diff --git a/home/desktop/wayland/swaylock/default.nix b/home/desktop/wayland/swaylock/default.nix
@@ -1,3 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   xdg.configFile."swaylock/config".source = ./config;
 }
diff --git a/home/desktop/wayland/tray-items.nix b/home/desktop/wayland/tray-items.nix
@@ -1,15 +1,23 @@
-{ pkgs, nixosConfig, ... }: {
+{ pkgs, nixosConfig, ... }:
+{
   services.blueman-applet.enable = true;
   systemd.user.services._1password = {
     Unit = {
       Description = "1Password";
       Requires = [ "tray.target" ];
-      After = [ "graphical-session-pre.target" "tray.target" ];
+      After = [
+        "graphical-session-pre.target"
+        "tray.target"
+      ];
       PartOf = [ "graphical-session.target" ];
     };
 
-    Install = { WantedBy = [ "graphical-session.target" ]; };
+    Install = {
+      WantedBy = [ "graphical-session.target" ];
+    };
 
-    Service = { ExecStart = "${nixosConfig.programs._1password-gui.package}/bin/1password --silent"; };
+    Service = {
+      ExecStart = "${nixosConfig.programs._1password-gui.package}/bin/1password --silent";
+    };
   };
 }
diff --git a/home/desktop/wayland/waybar/default.nix b/home/desktop/wayland/waybar/default.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   programs.waybar = {
     enable = true;
     systemd.enable = true;
@@ -9,9 +10,19 @@
         position = "top";
         height = 25;
         spacing = 0;
-        modules-left = [ "sway/workspaces" "sway/mode" ];
+        modules-left = [
+          "sway/workspaces"
+          "sway/mode"
+        ];
         modules-center = [ "sway/window" ];
-        modules-right = [ "network" "idle_inhibitor" "pulseaudio" "battery" "clock" "tray" ];
+        modules-right = [
+          "network"
+          "idle_inhibitor"
+          "pulseaudio"
+          "battery"
+          "clock"
+          "tray"
+        ];
         "sway/workspaces" = {
           disable-scroll = true;
           disable-markup = false;
@@ -55,7 +66,13 @@
             critical = 15;
           };
           format = "{icon} {capacity}%";
-          format-icons = [ "" "" "" "" "" ];
+          format-icons = [
+            ""
+            ""
+            ""
+            ""
+            ""
+          ];
         };
       };
     };
-Original file line number
+Diff line change
@@ -1,2 +1 @@
-    {
-    }
+    { }