Autoformat using RFC style nixfmt

rake5k · Nov 9, 2024 · 8f948d7 · 8f948d7
1 parent ea90087
commit 8f948d7
Show file tree

Hide file tree

Showing 112 changed files with 1,185 additions and 722 deletions.
diff --git a/flake.nix b/flake.nix
@@ -90,37 +90,29 @@
     };
   };
 
-  outputs = { self, nixpkgs, ... } @ inputs:
+  outputs =
+    { self, nixpkgs, ... }@inputs:
     let
-      nixcfgLib = import ./lib {
-        inherit inputs;
-      };
+      nixcfgLib = import ./lib { inherit inputs; };
       inherit (inputs.flake-utils.lib.system) aarch64-darwin aarch64-linux x86_64-linux;
       inherit (nixpkgs.lib) listToAttrs recursiveUpdate;
     in
     with nixcfgLib;
     {
       name = "nixcfg";
 
-      lib = { inputs }:
-        import ./lib { inputs = inputs // self.inputs; };
+      lib = { inputs }: import ./lib { inputs = inputs // self.inputs; };
 
-      darwinConfigurations = listToAttrs [
-        (mkNixDarwin aarch64-darwin "macos")
-      ];
+      darwinConfigurations = listToAttrs [ (mkNixDarwin aarch64-darwin "macos") ];
 
       homeConfigurations = listToAttrs [
         (mkHome x86_64-linux "christian@non-nixos")
         (mkHome x86_64-linux "demo@non-nixos")
       ];
 
-      nixosConfigurations = listToAttrs [
-        (mkNixos x86_64-linux "nixos")
-      ];
+      nixosConfigurations = listToAttrs [ (mkNixos x86_64-linux "nixos") ];
 
-      nixOnDroidConfigurations = listToAttrs [
-        (mkNixOnDroid aarch64-linux "nix-on-droid")
-      ];
+      nixOnDroidConfigurations = listToAttrs [ (mkNixOnDroid aarch64-linux "nix-on-droid") ];
 
       formatter = forEachSystem (system: nixpkgs.legacyPackages."${system}".nixfmt-rfc-style);
 
@@ -131,42 +123,52 @@
             _doNotClearPath = true;
             flakePath = "/home/\$(logname)/.nix-config";
           };
-          path = pkgs: with pkgs; [
-            git
-            hostname
-            jq
-          ];
+          path =
+            pkgs: with pkgs; [
+              git
+              hostname
+              jq
+            ];
         })
 
         (mkApp "nixos-install" {
           file = "nixos-install.sh";
           envs = {
             _doNotClearPath = true;
           };
-          path = pkgs: with pkgs; [
-            git
-            hostname
-            util-linux
-            parted
-            cryptsetup
-            lvm2
-          ];
+          path =
+            pkgs: with pkgs; [
+              git
+              hostname
+              util-linux
+              parted
+              cryptsetup
+              lvm2
+            ];
         })
       ];
 
-      checks = recursiveUpdate
-        (forEachSystem (system: import ./lib/checks { pkgs = pkgsFor."${system}"; flake = self; }))
-        ((mkForSystem aarch64-darwin [
-          (mkBuild "build-macos" self.darwinConfigurations.macos.system)
-        ]) // (mkForSystem x86_64-linux [
-          (mkBuild "build-christian@non-nixos" self.homeConfigurations."christian@non-nixos".activationPackage)
-          (mkBuild "build-demo@non-nixos" self.homeConfigurations."demo@non-nixos".activationPackage)
-          (mkBuild "build-nixos" self.nixosConfigurations.nixos.config.system.build.toplevel)
-        ]));
-
-      devShells = mkForEachSystem [
-        (mkDevShell "default" { flake = self; })
-      ];
+      checks =
+        recursiveUpdate
+          (forEachSystem (
+            system:
+            import ./lib/checks {
+              pkgs = pkgsFor."${system}";
+              flake = self;
+            }
+          ))
+          (
+            (mkForSystem aarch64-darwin [ (mkBuild "build-macos" self.darwinConfigurations.macos.system) ])
+            // (mkForSystem x86_64-linux [
+              (mkBuild "build-christian@non-nixos"
+                self.homeConfigurations."christian@non-nixos".activationPackage
+              )
+              (mkBuild "build-demo@non-nixos" self.homeConfigurations."demo@non-nixos".activationPackage)
+              (mkBuild "build-nixos" self.nixosConfigurations.nixos.config.system.build.toplevel)
+            ])
+          );
+
+      devShells = mkForEachSystem [ (mkDevShell "default" { flake = self; }) ];
 
       # Necessary for nix-tree
       # Run it using `nix-tree . --impure --derivation`

diff --git a/home/base/default.nix b/home/base/default.nix
@@ -1,12 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
   home = {
     homeDirectory = lib.mkDefault "/home/${config.home.username}";
 
-    sessionPath = [
-      "$HOME/bin"
-    ];
+    sessionPath = [ "$HOME/bin" ];
 
     enableNixpkgsReleaseCheck = true;
   };

diff --git a/home/base/fonts/default.nix b/home/base/fonts/default.nix
@@ -5,7 +5,5 @@ with pkgs;
 {
   fonts.fontconfig.enable = true;
 
-  home.packages = [
-    corefonts
-  ];
+  home.packages = [ corefonts ];
 }
diff --git a/home/base/nix/default.nix b/home/base/nix/default.nix
@@ -1,9 +1,7 @@
 { pkgs, ... }:
 
 {
-  home.packages = [
-    pkgs.nix-output-monitor
-  ];
+  home.packages = [ pkgs.nix-output-monitor ];
 
   # Command-not-found replacement
   programs.nix-index.enable = true;

diff --git a/home/base/non-nixos/default.nix b/home/base/non-nixos/default.nix
@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 
 let
 
@@ -14,7 +19,9 @@ in
     custom.base.non-nixos = {
       enable = lib.mkEnableOption "Config for non NixOS systems";
 
-      installNix = lib.mkEnableOption "Nix installation" // { default = true; };
+      installNix = lib.mkEnableOption "Nix installation" // {
+        default = true;
+      };
     };
   };
 

diff --git a/home/base/non-nixos/home-manager/auto-upgrade/default.nix b/home/base/non-nixos/home-manager/auto-upgrade/default.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 with lib;
 

diff --git a/home/base/non-nixos/home-manager/default.nix b/home/base/non-nixos/home-manager/default.nix
@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 
 let
 
@@ -17,9 +22,7 @@ in
   config = lib.mkIf cfg.enable {
 
     home = {
-      packages = with pkgs; [
-        home-manager
-      ];
+      packages = with pkgs; [ home-manager ];
 
       shellAliases = {
         hm-switch = "home-manager switch -b hm-bak --impure --flake '${flakeBaseDir}'";

diff --git a/home/programs/abcde/default.nix b/home/programs/abcde/default.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 with lib;
 

diff --git a/home/programs/davmail/default.nix b/home/programs/davmail/default.nix
@@ -1,26 +1,42 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 with lib;
 
 let
 
   cfg = config.custom.programs.davmail;
 
-  configType = with types;
-    oneOf [ (attrsOf configType) str int bool ] // {
+  configType =
+    with types;
+    oneOf [
+      (attrsOf configType)
+      str
+      int
+      bool
+    ]
+    // {
       description = "davmail config type (str, int, bool or attribute set thereof)";
     };
 
   toStr = val: if isBool val then boolToString val else toString val;
 
-  linesForAttrs = attrs: concatMap
-    (name:
-      let value = attrs."${name}"; in
-      if isAttrs value
-      then map (line: name + "." + line) (linesForAttrs value)
-      else [ "${name}=${toStr value}" ]
-    )
-    (attrNames attrs);
+  linesForAttrs =
+    attrs:
+    concatMap (
+      name:
+      let
+        value = attrs."${name}";
+      in
+      if isAttrs value then
+        map (line: name + "." + line) (linesForAttrs value)
+      else
+        [ "${name}=${toStr value}" ]
+    ) (attrNames attrs);
 
   configFile = pkgs.writeText "davmail.properties" (concatStringsSep "\n" (linesForAttrs cfg.config));
 
@@ -106,4 +122,4 @@ in
 
     home.packages = [ pkgs.davmail ];
   };
-} 
+}
diff --git a/home/programs/firefox/default.nix b/home/programs/firefox/default.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 with lib;
 
@@ -156,44 +161,64 @@ in
             default = "Harke Search";
             engines = {
               "${engines.harke}" = {
-                urls = [{
-                  template = "https://search.harke.ch/search";
-                  params = [
-                    { name = "q"; value = "{searchTerms}"; }
-                  ];
-                }];
+                urls = [
+                  {
+                    template = "https://search.harke.ch/search";
+                    params = [
+                      {
+                        name = "q";
+                        value = "{searchTerms}";
+                      }
+                    ];
+                  }
+                ];
                 icon = ./icons/search.harke.ch.svg;
               };
 
               "${engines.nixPkgs}" = {
-                urls = [{
-                  template = "https://search.nixos.org/packages";
-                  params = [
-                    { name = "query"; value = "{searchTerms}"; }
-                  ];
-                }];
+                urls = [
+                  {
+                    template = "https://search.nixos.org/packages";
+                    params = [
+                      {
+                        name = "query";
+                        value = "{searchTerms}";
+                      }
+                    ];
+                  }
+                ];
                 icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
                 definedAliases = [ "@np" ];
               };
 
               "${engines.nixOpts}" = {
-                urls = [{
-                  template = "https://search.nixos.org/options";
-                  params = [
-                    { name = "query"; value = "{searchTerms}"; }
-                  ];
-                }];
+                urls = [
+                  {
+                    template = "https://search.nixos.org/options";
+                    params = [
+                      {
+                        name = "query";
+                        value = "{searchTerms}";
+                      }
+                    ];
+                  }
+                ];
                 icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
                 definedAliases = [ "@no" ];
               };
 
               "${engines.nixWiki}" = {
-                urls = [{
-                  template = "https://nixos.wiki/index.php";
-                  params = [
-                    { name = "search"; value = "{searchTerms}"; }
-                  ];
-                }];
+                urls = [
+                  {
+                    template = "https://nixos.wiki/index.php";
+                    params = [
+                      {
+                        name = "search";
+                        value = "{searchTerms}";
+                      }
+                    ];
+                  }
+                ];
                 iconUpdateURL = "https://nixos.wiki/favicon.png";
                 updateInterval = 24 * 60 * 60 * 1000; # every day
                 definedAliases = [ "@nw" ];