From 3ff05f0117cbf7075a28386074b00dc386f38e89 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 25 May 2023 09:09:53 -0400 Subject: [PATCH] Simplify common imports This shouldn't be an issue since I'd rather import all of these at once than selectively import them. --- common/default.nix | 38 ++++++++++++++++++++++++++++----- common/home-manager/default.nix | 10 --------- common/locale/default.nix | 5 ----- common/nix/default.nix | 10 --------- common/systemd/default.nix | 5 ----- common/timezone/default.nix | 3 --- 6 files changed, 33 insertions(+), 38 deletions(-) delete mode 100644 common/home-manager/default.nix delete mode 100644 common/locale/default.nix delete mode 100644 common/nix/default.nix delete mode 100644 common/systemd/default.nix delete mode 100644 common/timezone/default.nix diff --git a/common/default.nix b/common/default.nix index 7fccdd4..aa1b3c8 100644 --- a/common/default.nix +++ b/common/default.nix @@ -1,10 +1,38 @@ +{ pkgs, ... }: + { imports = [ - ./home-manager - ./locale - ./nix - ./systemd - ./timezone ./user ]; + + # locale + i18n.defaultLocale = "en_US.UTF-8"; + i18n.supportedLocales = + [ "en_US.UTF-8/UTF-8" "ja_JP.UTF-8/UTF-8" "fr_FR.UTF-8/UTF-8" ]; + + # nix + nix = { + package = pkgs.nixFlakes; + settings = { + experimental-features = [ "nix-command" "flakes" ]; + }; + }; + + # home-manager + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + + sharedModules = [{ + home.stateVersion = "22.11"; + }]; + }; + + # systemd + systemd.extraConfig = '' + DefaultTimeoutStopSec=10s + ''; + + # timezone + time.timeZone = "America/New_York"; } diff --git a/common/home-manager/default.nix b/common/home-manager/default.nix deleted file mode 100644 index 5492753..0000000 --- a/common/home-manager/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - - sharedModules = [{ - home.stateVersion = "22.11"; - }]; - }; -} diff --git a/common/locale/default.nix b/common/locale/default.nix deleted file mode 100644 index 08738a5..0000000 --- a/common/locale/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - i18n.defaultLocale = "en_US.UTF-8"; - i18n.supportedLocales = - [ "en_US.UTF-8/UTF-8" "ja_JP.UTF-8/UTF-8" "fr_FR.UTF-8/UTF-8" ]; -} diff --git a/common/nix/default.nix b/common/nix/default.nix deleted file mode 100644 index fcdc332..0000000 --- a/common/nix/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, ... }: - -{ - nix = { - package = pkgs.nixFlakes; - settings = { - experimental-features = [ "nix-command" "flakes" ]; - }; - }; -} diff --git a/common/systemd/default.nix b/common/systemd/default.nix deleted file mode 100644 index 30f1993..0000000 --- a/common/systemd/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - systemd.extraConfig = '' - DefaultTimeoutStopSec=10s - ''; -} diff --git a/common/timezone/default.nix b/common/timezone/default.nix deleted file mode 100644 index 5174a5b..0000000 --- a/common/timezone/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - time.timeZone = "America/New_York"; -}