Reformat using nixfmt-rfc-style

alapshin · Aug 21, 2024 · 4099f53 · 4099f53
1 parent 2e1b967
commit 4099f53
Show file tree

Hide file tree

Showing 103 changed files with 1,110 additions and 1,022 deletions.
diff --git a/configuration.nix b/configuration.nix
@@ -1,11 +1,13 @@
-{ self
-, lib
-, pkgs
-, config
-, inputs
-, outputs
-, ...
-}: {
+{
+  self,
+  lib,
+  pkgs,
+  config,
+  inputs,
+  outputs,
+  ...
+}:
+{
   nix = {
     gc = {
       automatic = true;

diff --git a/flake.nix b/flake.nix
@@ -39,15 +39,16 @@
   };
 
   outputs =
-    inputs @ { self
-    , nixos
-    , nixpkgs
-    , nur
-    , disko
-    , sops-nix
-    , lanzaboote
-    , home-manager
-    , ...
+    inputs@{
+      self,
+      nixos,
+      nixpkgs,
+      nur,
+      disko,
+      sops-nix,
+      lanzaboote,
+      home-manager,
+      ...
     }:
     let
       inherit (nixos) lib;
@@ -68,8 +69,9 @@
       };
 
       mkPkgs =
-        { pkgs
-        , extraOverlays ? [ nur.overlay ]
+        {
+          pkgs,
+          extraOverlays ? [ nur.overlay ],
         }:
         import pkgs {
           inherit system;
@@ -78,39 +80,43 @@
         };
       pkgs = mkPkgs { pkgs = nixos; };
 
-      homeManagerConfig = {
-        # Use global pkgs configured via nixpkgs.* options
-        home-manager.useGlobalPkgs = true;
-        # Install user packages to /etc/profiles instead.
-        # Necessary for nixos-rebuild build-vm to work.
-        home-manager.useUserPackages = true;
-        home-manager.extraSpecialArgs = {
-          inherit dotfileDir;
-        };
-        home-manager.sharedModules = [
-          sops-nix.homeManagerModules.sops
-        ];
-      };
       mkNixosConfiguration =
-        { system ? "x86_64-linux"
-        , baseModules ? [
+        {
+          system ? "x86_64-linux",
+          baseModules ? [
             ./configuration.nix
 
             disko.nixosModules.disko
             sops-nix.nixosModules.sops
             lanzaboote.nixosModules.lanzaboote
-            home-manager.nixosModules.home-manager homeManagerConfig
-          ]
-        , hostModules ? [ ]
-        , userModules ? [ ]
-        , specialArgs ? { }
-        ,
+            home-manager.nixosModules.home-manager
+            {
+              # Use global pkgs configured via nixpkgs.* options
+              home-manager.useGlobalPkgs = true;
+              # Install user packages to /etc/profiles instead.
+              # Necessary for nixos-rebuild build-vm to work.
+              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = {
+                inherit dotfileDir;
+              };
+              home-manager.sharedModules = [ sops-nix.homeManagerModules.sops ];
+            }
+          ],
+          hostModules ? [ ],
+          userModules ? [ ],
+          specialArgs ? { },
         }:
         nixos.lib.nixosSystem {
           inherit system;
           modules = baseModules ++ hostModules ++ userModules;
           specialArgs = specialArgs // {
-            inherit inputs pkgs self libutil dotfileDir;
+            inherit
+              inputs
+              pkgs
+              self
+              libutil
+              dotfileDir
+              ;
           };
         };
     in
@@ -127,7 +133,7 @@
         };
       };
       formatter = {
-        ${system} = pkgs.nixpkgs-fmt;
+        ${system} = pkgs.nixfmt-rfc-style;
       };
 
       # Reusable nixos modules you might want to export
@@ -140,16 +146,10 @@
             ./hosts/common
             ./hosts/carbon
           ];
-          userModules = [
-            ./users/alapshin
-          ];
+          userModules = [ ./users/alapshin ];
         };
 
-        bifrost = mkNixosConfiguration {
-          hostModules = [
-            ./hosts/bifrost
-          ];
-        };
+        bifrost = mkNixosConfiguration { hostModules = [ ./hosts/bifrost ]; };
 
         niflheim = mkNixosConfiguration {
           hostModules = [
@@ -164,19 +164,15 @@
             ./hosts/common
             ./hosts/desktop
           ];
-          userModules = [
-            ./users/alapshin
-          ];
+          userModules = [ ./users/alapshin ];
         };
 
         altdesk = mkNixosConfiguration {
           hostModules = [
             ./hosts/common
             ./hosts/altdesk
           ];
-          userModules = [
-            ./users/alapshin
-          ];
+          userModules = [ ./users/alapshin ];
         };
       };
       # Stand-alone home-manager configuration for non NixOS machines

diff --git a/hosts/altdesk/bluetooth.nix b/hosts/altdesk/bluetooth.nix
@@ -1,7 +1,5 @@
-{ config
-, pkgs
-, ...
-}: {
+{ config, pkgs, ... }:
+{
   hardware = {
     bluetooth = {
       enable = true;

diff --git a/hosts/altdesk/default.nix b/hosts/altdesk/default.nix
@@ -1,8 +1,10 @@
-{ lib
-, pkgs
-, config
-, ...
-}: {
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+{
   imports = [
     ./backup.nix
     ./bluetooth.nix

diff --git a/hosts/altdesk/graphical-desktop.nix b/hosts/altdesk/graphical-desktop.nix
@@ -1,8 +1,10 @@
-{ lib
-, pkgs
-, config
-, ...
-}: {
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+{
   services = {
     colord.enable = true;
     flatpak.enable = true;
@@ -22,9 +24,7 @@
         options = "grp:caps_toggle,compose:ralt";
       };
 
-      videoDrivers = [
-        "nvidia"
-      ];
+      videoDrivers = [ "nvidia" ];
     };
   };
 

diff --git a/hosts/altdesk/hardware-configuration.nix b/hosts/altdesk/hardware-configuration.nix
@@ -1,7 +1,8 @@
-{ config
-, lib
-, pkgs
-, ...
+{
+  config,
+  lib,
+  pkgs,
+  ...
 }:
 {
   boot = {
@@ -22,7 +23,13 @@
     '';
 
     initrd = {
-      availableKernelModules = [ "ahci" "nvme" "usbhid" "usb_storage" "xhci_pci" ];
+      availableKernelModules = [
+        "ahci"
+        "nvme"
+        "usbhid"
+        "usb_storage"
+        "xhci_pci"
+      ];
       luks.devices."luks-9ebe5c59-eac5-47eb-b517-c82f2ede2ca3" = {
         device = "/dev/disk/by-uuid/9ebe5c59-eac5-47eb-b517-c82f2ede2ca3";
         keyFile = "/dev/sda";
@@ -40,12 +47,18 @@
     "/" = {
       device = "/dev/disk/by-uuid/4a5edb30-f86b-4ec3-a493-8de48c8ee703";
       fsType = "btrfs";
-      options = [ "subvol=root" "discard=async" ];
+      options = [
+        "subvol=root"
+        "discard=async"
+      ];
     };
     "/home" = {
       device = "/dev/disk/by-uuid/4a5edb30-f86b-4ec3-a493-8de48c8ee703";
       fsType = "btrfs";
-      options = [ "subvol=home" "discard=async" ];
+      options = [
+        "subvol=home"
+        "discard=async"
+      ];
     };
   };
 

diff --git a/hosts/altdesk/networking.nix b/hosts/altdesk/networking.nix
@@ -1,6 +1,4 @@
-{ config
-, pkgs
-, ...
-}: {
+{ config, pkgs, ... }:
+{
   networking.hostName = "altdesk";
 }
diff --git a/hosts/bifrost/default.nix b/hosts/bifrost/default.nix
@@ -1,8 +1,10 @@
-{ lib
-, pkgs
-, config
-, ...
-}: {
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+{
   imports = [
     ./openssh.nix
     ./secrets.nix

diff --git a/hosts/bifrost/disk-config.nix b/hosts/bifrost/disk-config.nix
@@ -39,4 +39,3 @@ in
     };
   };
 }
-
diff --git a/hosts/bifrost/hardware-configuration.nix b/hosts/bifrost/hardware-configuration.nix
@@ -1,8 +1,9 @@
-{ config
-, lib
-, pkgs
-, modulesPath
-, ...
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
 }:
 {
   imports = [
@@ -20,7 +21,13 @@
     };
 
     initrd = {
-      availableKernelModules = [ "ahci" "nvme" "usbhid" "usb_storage" "xhci_pci" ];
+      availableKernelModules = [
+        "ahci"
+        "nvme"
+        "usbhid"
+        "usb_storage"
+        "xhci_pci"
+      ];
     };
   };
 }
diff --git a/hosts/bifrost/networking.nix b/hosts/bifrost/networking.nix
@@ -1,8 +1,10 @@
-{ lib
-, pkgs
-, config
-, ...
-}: {
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+{
   networking = {
     hostName = "bifrost";
     firewall = {

diff --git a/hosts/bifrost/openssh.nix b/hosts/bifrost/openssh.nix
@@ -1,8 +1,10 @@
-{ lib
-, pkgs
-, config
-, ...
-}: {
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+{
   services = {
     openssh = {
       enable = true;
@@ -12,4 +14,3 @@
     };
   };
 }
-
diff --git a/hosts/bifrost/secrets.nix b/hosts/bifrost/secrets.nix
@@ -1,7 +1,5 @@
-{ config
-, pkgs
-, ...
-}: {
+{ config, pkgs, ... }:
+{
   sops = {
     defaultSopsFile = ./secrets.yaml;
     secrets = {