summaryrefslogtreecommitdiff
path: root/darwinConfigurations
diff options
context:
space:
mode:
Diffstat (limited to 'darwinConfigurations')
-rw-r--r--darwinConfigurations/default.nix61
-rw-r--r--darwinConfigurations/mairon/default.nix45
2 files changed, 54 insertions, 52 deletions
diff --git a/darwinConfigurations/default.nix b/darwinConfigurations/default.nix
index b8f1498..0e19d26 100644
--- a/darwinConfigurations/default.nix
+++ b/darwinConfigurations/default.nix
@@ -1,33 +1,36 @@
inputs:
-with inputs.self.lib; let
- mkConfiguration = name: {
- modules ? [],
- configuration ? ./${name},
- this ? my.configurations.${name},
- extraSpecialArgs ? {
- localUsername = my.username;
- localHostname = this.hostname;
- },
- }:
- nameValuePair name (inputs.darwin.lib.darwinSystem {
- inherit (this) system;
- modules =
- modules
- ++ attrValues inputs.self.modules
- ++ attrValues inputs.self.darwinModules
- ++ optional (configuration != null) (import configuration);
- specialArgs =
- {
+with inputs.self.lib;
+let
+ mkConfiguration =
+ name:
+ {
+ modules ? [ ],
+ configuration ? ./${name},
+ this ? my.configurations.${name},
+ extraSpecialArgs ? {
+ localUsername = my.username;
+ localHostname = this.hostname;
+ },
+ }:
+ nameValuePair name (
+ inputs.darwin.lib.darwinSystem {
+ inherit (this) system;
+ modules =
+ modules
+ ++ attrValues inputs.self.modules
+ ++ attrValues inputs.self.darwinModules
+ ++ optional (configuration != null) (import configuration);
+ specialArgs = {
inherit inputs this;
inherit (inputs.self) lib;
- }
- // extraSpecialArgs;
- });
+ } // extraSpecialArgs;
+ }
+ );
in
- mapAttrs' mkConfiguration {
- mairon.extraSpecialArgs = {
- # These values are managed by my employer.
- localUsername = "username";
- localHostname = "hostname";
- };
- }
+mapAttrs' mkConfiguration {
+ mairon.extraSpecialArgs = {
+ # These values are managed by my employer.
+ localUsername = "username";
+ localHostname = "hostname";
+ };
+}
diff --git a/darwinConfigurations/mairon/default.nix b/darwinConfigurations/mairon/default.nix
index a2813a1..b9e7474 100644
--- a/darwinConfigurations/mairon/default.nix
+++ b/darwinConfigurations/mairon/default.nix
@@ -4,7 +4,8 @@
pkgs,
...
}:
-with lib; {
+with lib;
+{
nixfiles.modules.zathura.enable = mkForce false;
hm.home.packages = with pkgs; [
@@ -13,31 +14,29 @@ with lib; {
];
homebrew = {
- taps = [
- {name = "kreuzwerker/homebrew-taps";}
- ];
+ taps = [ { name = "kreuzwerker/homebrew-taps"; } ];
brews = [
- {name = "carthage";}
- {name = "go@1.21";}
- {name = "m1-terraform-provider-helper";} # kreuzwerker/homebrew-taps
- {name = "podman";}
- {name = "sourcery";}
- {name = "xcbeautify";}
- {name = "xcodegen";}
- {name = "xcodes";}
+ { name = "carthage"; }
+ { name = "go@1.21"; }
+ { name = "m1-terraform-provider-helper"; } # kreuzwerker/homebrew-taps
+ { name = "podman"; }
+ { name = "sourcery"; }
+ { name = "xcbeautify"; }
+ { name = "xcodegen"; }
+ { name = "xcodes"; }
];
casks = [
- {name = "burp-suite";}
- {name = "docker";}
- {name = "jetbrains-toolbox";}
- {name = "krita";}
- {name = "obs";}
- {name = "openlens";}
- {name = "podman-desktop";}
- {name = "shadowsocksx-ng";}
- {name = "vial";}
- {name = "vnc-viewer";}
- {name = "wireshark";}
+ { name = "burp-suite"; }
+ { name = "docker"; }
+ { name = "jetbrains-toolbox"; }
+ { name = "krita"; }
+ { name = "obs"; }
+ { name = "openlens"; }
+ { name = "podman-desktop"; }
+ { name = "shadowsocksx-ng"; }
+ { name = "vial"; }
+ { name = "vnc-viewer"; }
+ { name = "wireshark"; }
];
};