summaryrefslogtreecommitdiff
path: root/modules/darwin
diff options
context:
space:
mode:
Diffstat (limited to 'modules/darwin')
-rw-r--r--modules/darwin/archetypes/default.nix6
-rw-r--r--modules/darwin/archetypes/personal.nix10
-rw-r--r--modules/darwin/base/programs.nix10
-rw-r--r--modules/darwin/desktop/default.nix3
-rw-r--r--modules/darwin/desktop/fonts.nix14
-rw-r--r--modules/darwin/desktop/homebrew.nix14
-rw-r--r--modules/darwin/desktop/programs.nix14
-rw-r--r--modules/darwin/traits/home-manager.nix5
-rw-r--r--modules/darwin/traits/users/default.nix6
-rw-r--r--modules/darwin/traits/users/seth.nix10
10 files changed, 41 insertions, 51 deletions
diff --git a/modules/darwin/archetypes/default.nix b/modules/darwin/archetypes/default.nix
index b4bd1b5..518cc57 100644
--- a/modules/darwin/archetypes/default.nix
+++ b/modules/darwin/archetypes/default.nix
@@ -1,5 +1 @@
-{
- imports = [
- ./personal.nix
- ];
-}
+{ imports = [ ./personal.nix ]; }
diff --git a/modules/darwin/archetypes/personal.nix b/modules/darwin/archetypes/personal.nix
index 7dcfbe0..a1eb761 100644
--- a/modules/darwin/archetypes/personal.nix
+++ b/modules/darwin/archetypes/personal.nix
@@ -1,10 +1,8 @@
-{
- config,
- lib,
- ...
-}: let
+{ config, lib, ... }:
+let
cfg = config.archetypes.personal;
-in {
+in
+{
options.archetypes.personal = {
enable = lib.mkEnableOption "personal archetype";
};
diff --git a/modules/darwin/base/programs.nix b/modules/darwin/base/programs.nix
index bb6d4f5..aefb852 100644
--- a/modules/darwin/base/programs.nix
+++ b/modules/darwin/base/programs.nix
@@ -1,11 +1,9 @@
-{
- config,
- lib,
- ...
-}: let
+{ config, lib, ... }:
+let
cfg = config.base.defaultPrograms;
enable = config.base.enable && cfg.enable;
-in {
+in
+{
config = lib.mkIf enable {
programs = {
bash.enable = true;
diff --git a/modules/darwin/desktop/default.nix b/modules/darwin/desktop/default.nix
index cdfb246..6f4e791 100644
--- a/modules/darwin/desktop/default.nix
+++ b/modules/darwin/desktop/default.nix
@@ -1,4 +1,5 @@
-{lib, ...}: {
+{ lib, ... }:
+{
options.desktop = {
enable = lib.mkEnableOption "base desktop settings";
};
diff --git a/modules/darwin/desktop/fonts.nix b/modules/darwin/desktop/fonts.nix
index 9b068bd..a26f774 100644
--- a/modules/darwin/desktop/fonts.nix
+++ b/modules/darwin/desktop/fonts.nix
@@ -3,17 +3,19 @@
lib,
pkgs,
...
-}: let
+}:
+let
cfg = config.desktop.fonts;
enable = config.desktop.enable && cfg.enable;
-in {
+in
+{
options.desktop.fonts = {
- enable = lib.mkEnableOption "desktop fonts" // {default = true;};
+ enable = lib.mkEnableOption "desktop fonts" // {
+ default = true;
+ };
};
config = lib.mkIf enable {
- fonts.packages = [
- (pkgs.nerdfonts.override {fonts = ["FiraCode"];})
- ];
+ fonts.packages = [ (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
};
}
diff --git a/modules/darwin/desktop/homebrew.nix b/modules/darwin/desktop/homebrew.nix
index 1015ff9..2371f57 100644
--- a/modules/darwin/desktop/homebrew.nix
+++ b/modules/darwin/desktop/homebrew.nix
@@ -1,13 +1,13 @@
-{
- config,
- lib,
- ...
-}: let
+{ config, lib, ... }:
+let
cfg = config.desktop.homebrew;
enable = config.desktop.enable && cfg.enable;
-in {
+in
+{
options.desktop.homebrew = {
- enable = lib.mkEnableOption "Homebrew integration" // {default = true;};
+ enable = lib.mkEnableOption "Homebrew integration" // {
+ default = true;
+ };
};
config = lib.mkIf enable {
diff --git a/modules/darwin/desktop/programs.nix b/modules/darwin/desktop/programs.nix
index b681c59..75a86e3 100644
--- a/modules/darwin/desktop/programs.nix
+++ b/modules/darwin/desktop/programs.nix
@@ -1,13 +1,13 @@
-{
- config,
- lib,
- ...
-}: let
+{ config, lib, ... }:
+let
cfg = config.desktop.defaultPrograms;
enable = config.desktop.enable && cfg.enable;
-in {
+in
+{
options.desktop.defaultPrograms = {
- enable = lib.mkEnableOption "default desktop programs" // {default = true;};
+ enable = lib.mkEnableOption "default desktop programs" // {
+ default = true;
+ };
};
config = lib.mkIf enable {
diff --git a/modules/darwin/traits/home-manager.nix b/modules/darwin/traits/home-manager.nix
index 9428499..6788651 100644
--- a/modules/darwin/traits/home-manager.nix
+++ b/modules/darwin/traits/home-manager.nix
@@ -1,3 +1,4 @@
-{inputs, ...}: {
- imports = [inputs.home-manager.darwinModules.home-manager];
+{ inputs, ... }:
+{
+ imports = [ inputs.home-manager.darwinModules.home-manager ];
}
diff --git a/modules/darwin/traits/users/default.nix b/modules/darwin/traits/users/default.nix
index a81dacf..df767b4 100644
--- a/modules/darwin/traits/users/default.nix
+++ b/modules/darwin/traits/users/default.nix
@@ -1,5 +1 @@
-{
- imports = [
- ./seth.nix
- ];
-}
+{ imports = [ ./seth.nix ]; }
diff --git a/modules/darwin/traits/users/seth.nix b/modules/darwin/traits/users/seth.nix
index 5e206f3..d60ff4e 100644
--- a/modules/darwin/traits/users/seth.nix
+++ b/modules/darwin/traits/users/seth.nix
@@ -1,10 +1,8 @@
-{
- config,
- lib,
- ...
-}: let
+{ config, lib, ... }:
+let
cfg = config.traits.users.seth;
-in {
+in
+{
config = lib.mkMerge [
(lib.mkIf cfg.enable {
home-manager.users.seth = {