summaryrefslogtreecommitdiff
path: root/modules/shared
diff options
context:
space:
mode:
Diffstat (limited to 'modules/shared')
-rw-r--r--modules/shared/base/default.nix6
-rw-r--r--modules/shared/base/documentation.nix14
-rw-r--r--modules/shared/base/nix.nix21
-rw-r--r--modules/shared/base/programs.nix18
-rw-r--r--modules/shared/traits/home-manager.nix10
-rw-r--r--modules/shared/traits/locale.nix16
-rw-r--r--modules/shared/traits/users/default.nix6
-rw-r--r--modules/shared/traits/users/seth.nix10
8 files changed, 53 insertions, 48 deletions
diff --git a/modules/shared/base/default.nix b/modules/shared/base/default.nix
index 9154ae7..e2bbdee 100644
--- a/modules/shared/base/default.nix
+++ b/modules/shared/base/default.nix
@@ -3,10 +3,12 @@
lib,
inputs,
...
-}: let
+}:
+let
cfg = config.base;
inherit (inputs) self;
-in {
+in
+{
options.base = {
enable = lib.mkEnableOption "basic configurations";
};
diff --git a/modules/shared/base/documentation.nix b/modules/shared/base/documentation.nix
index 0139f7d..1335c17 100644
--- a/modules/shared/base/documentation.nix
+++ b/modules/shared/base/documentation.nix
@@ -1,13 +1,13 @@
-{
- config,
- lib,
- ...
-}: let
+{ config, lib, ... }:
+let
cfg = config.base.documentation;
enable = config.base.enable && cfg.enable;
-in {
+in
+{
options.base.documentation = {
- enable = lib.mkEnableOption "documentation settings" // {default = true;};
+ enable = lib.mkEnableOption "documentation settings" // {
+ default = true;
+ };
};
config = lib.mkIf enable {
diff --git a/modules/shared/base/nix.nix b/modules/shared/base/nix.nix
index 26f16bc..9002455 100644
--- a/modules/shared/base/nix.nix
+++ b/modules/shared/base/nix.nix
@@ -3,22 +3,31 @@
lib,
pkgs,
...
-}: let
+}:
+let
cfg = config.base.nixSettings;
enable = config.base.enable && cfg.enable;
-in {
+in
+{
options.base.nixSettings = {
- enable = lib.mkEnableOption "nix settings" // {default = true;};
+ enable = lib.mkEnableOption "nix settings" // {
+ default = true;
+ };
};
config = lib.mkIf enable {
nix = {
settings = {
auto-optimise-store = pkgs.stdenv.isLinux;
- experimental-features = ["nix-command" "flakes" "auto-allocate-uids" "repl-flake"];
+ experimental-features = [
+ "nix-command"
+ "flakes"
+ "auto-allocate-uids"
+ "repl-flake"
+ ];
- trusted-substituters = ["https://getchoo.cachix.org"];
- trusted-public-keys = ["getchoo.cachix.org-1:ftdbAUJVNaFonM0obRGgR5+nUmdLMM+AOvDOSx0z5tE="];
+ trusted-substituters = [ "https://getchoo.cachix.org" ];
+ trusted-public-keys = [ "getchoo.cachix.org-1:ftdbAUJVNaFonM0obRGgR5+nUmdLMM+AOvDOSx0z5tE=" ];
nix-path = config.nix.nixPath;
};
diff --git a/modules/shared/base/programs.nix b/modules/shared/base/programs.nix
index 796fce0..e5208b0 100644
--- a/modules/shared/base/programs.nix
+++ b/modules/shared/base/programs.nix
@@ -1,16 +1,14 @@
-{
- config,
- lib,
- ...
-}: let
+{ config, lib, ... }:
+let
cfg = config.base.defaultPrograms;
enable = config.base.enable && cfg.enable;
-in {
+in
+{
options.base.defaultPrograms = {
- enable = lib.mkEnableOption "default programs" // {default = true;};
+ enable = lib.mkEnableOption "default programs" // {
+ default = true;
+ };
};
- config = lib.mkIf enable {
- programs.gnupg.agent.enable = lib.mkDefault true;
- };
+ config = lib.mkIf enable { programs.gnupg.agent.enable = lib.mkDefault true; };
}
diff --git a/modules/shared/traits/home-manager.nix b/modules/shared/traits/home-manager.nix
index e49c4a5..6420b5a 100644
--- a/modules/shared/traits/home-manager.nix
+++ b/modules/shared/traits/home-manager.nix
@@ -3,9 +3,11 @@
lib,
inputs,
...
-}: let
+}:
+let
cfg = config.traits.home-manager;
-in {
+in
+{
options.traits.home-manager = {
enable = lib.mkEnableOption "home-manager configuration";
};
@@ -14,7 +16,9 @@ in {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
- extraSpecialArgs = {inherit inputs;};
+ extraSpecialArgs = {
+ inherit inputs;
+ };
};
};
}
diff --git a/modules/shared/traits/locale.nix b/modules/shared/traits/locale.nix
index 9c07c14..a260988 100644
--- a/modules/shared/traits/locale.nix
+++ b/modules/shared/traits/locale.nix
@@ -1,19 +1,13 @@
-{
- config,
- lib,
- ...
-}: let
+{ config, lib, ... }:
+let
cfg = config.traits.locale;
-in {
+in
+{
options.traits.locale = {
US-east = {
enable = lib.mkEnableOption "eastern United States locale";
};
};
- config = lib.mkMerge [
- (lib.mkIf cfg.US-east.enable {
- time.timeZone = "America/New_York";
- })
- ];
+ config = lib.mkMerge [ (lib.mkIf cfg.US-east.enable { time.timeZone = "America/New_York"; }) ];
}
diff --git a/modules/shared/traits/users/default.nix b/modules/shared/traits/users/default.nix
index a81dacf..df767b4 100644
--- a/modules/shared/traits/users/default.nix
+++ b/modules/shared/traits/users/default.nix
@@ -1,5 +1 @@
-{
- imports = [
- ./seth.nix
- ];
-}
+{ imports = [ ./seth.nix ]; }
diff --git a/modules/shared/traits/users/seth.nix b/modules/shared/traits/users/seth.nix
index 136a343..b5f330d 100644
--- a/modules/shared/traits/users/seth.nix
+++ b/modules/shared/traits/users/seth.nix
@@ -3,9 +3,11 @@
lib,
pkgs,
...
-}: let
+}:
+let
cfg = config.traits.users.seth;
-in {
+in
+{
options.traits.users.seth = {
enable = lib.mkEnableOption "Seth's user & home configurations";
};
@@ -17,7 +19,7 @@ in {
programs.fish.enable = true;
home-manager.users.seth = {
- imports = [../../../../users/seth];
+ imports = [ ../../../../users/seth ];
seth = {
enable = true;
shell.fish.enable = true;
@@ -33,7 +35,7 @@ in {
(lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
users.users.seth = {
- extraGroups = ["wheel"];
+ extraGroups = [ "wheel" ];
isNormalUser = true;
};
})