Lillian-Violet/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Small refactor to make locale a global setting

Browse source
This commit is contained in:
Lillian Violet 2024-01-09 13:19:42 +01:00
parent d76d21a39b
commit 808ab9fea5
5 changed files with 36 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
nixos/desktop/configuration.nix
View file

@ -8,6 +8,9 @@
pkgs,
...
}: {
imports = [
../shared/locale/configuration.nix
];
nixpkgs = {
# You can add overlays here
overlays = [
@ -101,21 +104,6 @@
# Set your time zone.
time.timeZone = "Europe/Amsterdam";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "nl_NL.UTF-8";
LC_IDENTIFICATION = "nl_NL.UTF-8";
LC_MEASUREMENT = "nl_NL.UTF-8";
LC_MONETARY = "nl_NL.UTF-8";
LC_NAME = "nl_NL.UTF-8";
LC_NUMERIC = "nl_NL.UTF-8";
LC_PAPER = "nl_NL.UTF-8";
LC_TELEPHONE = "nl_NL.UTF-8";
LC_TIME = "en_DK.UTF-8";
};
# Enable the X11 windowing system.
services.xserver.enable = true;

19
nixos/hosts/queen/configuration.nix
View file

@ -16,6 +16,10 @@
# You can also split up your configuration and import pieces of it here:
# ./nvim.nix
./hardware-configuration.nix
# Import locale settings
../../shared/locale/configuration.nix
#../../server/package-configs/akkoma/configuration.nix
../../server/package-configs/forgejo/configuration.nix
../../server/package-configs/gotosocial/configuration.nix
@ -134,21 +138,6 @@
# Set your time zone.
time.timeZone = "Europe/Amsterdam";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "nl_NL.UTF-8";
LC_IDENTIFICATION = "nl_NL.UTF-8";
LC_MEASUREMENT = "nl_NL.UTF-8";
LC_MONETARY = "nl_NL.UTF-8";
LC_NAME = "nl_NL.UTF-8";
LC_NUMERIC = "nl_NL.UTF-8";
LC_PAPER = "nl_NL.UTF-8";
LC_TELEPHONE = "nl_NL.UTF-8";
LC_TIME = "en_DK.UTF-8";
};
programs.zsh = {
enable = true;
};

18
nixos/hosts/shodan/configuration.nix
View file

@ -26,6 +26,9 @@
# Or modules exported from other flakes (such as nix-colors):
# inputs.nix-colors.homeManagerModules.default
# Import the locale settings
../../shared/locale/configuration.nix
# You can also split up your configuration and import pieces of it here:
# ./nvim.nix
./hardware-configuration.nix
@ -175,21 +178,6 @@
# Set your time zone.
time.timeZone = "Europe/Amsterdam";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "nl_NL.UTF-8";
LC_IDENTIFICATION = "nl_NL.UTF-8";
LC_MEASUREMENT = "nl_NL.UTF-8";
LC_MONETARY = "nl_NL.UTF-8";
LC_NAME = "nl_NL.UTF-8";
LC_NUMERIC = "nl_NL.UTF-8";
LC_PAPER = "nl_NL.UTF-8";
LC_TELEPHONE = "nl_NL.UTF-8";
LC_TIME = "en_DK.UTF8";
};
# Enable CUPS to print documents.
services.printing.enable = true;

19
nixos/hosts/wheatley/configuration.nix
View file

@ -11,7 +11,9 @@
# nixos-generate-config should normally set up file systems correctly
imports = [
#inputs.home-manager.nixosModules.home-manager
inputs.home-manager.nixosModules.home-manager
# Import locale settings
../../shared/locale/configuration.nix
./hardware-configuration.nix
];
@ -149,21 +151,6 @@
# Set your time zone.
time.timeZone = "Europe/Amsterdam";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "nl_NL.UTF-8";
LC_IDENTIFICATION = "nl_NL.UTF-8";
LC_MEASUREMENT = "nl_NL.UTF-8";
LC_MONETARY = "nl_NL.UTF-8";
LC_NAME = "nl_NL.UTF-8";
LC_NUMERIC = "nl_NL.UTF-8";
LC_PAPER = "nl_NL.UTF-8";
LC_TELEPHONE = "nl_NL.UTF-8";
LC_TIME = "en_DK.UTF-8";
};
programs.zsh = {
enable = true;
};

23
nixos/shared/locale/configuration.nix Normal file
View file

@ -0,0 +1,23 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "nl_NL.UTF-8";
LC_IDENTIFICATION = "nl_NL.UTF-8";
LC_MEASUREMENT = "nl_NL.UTF-8";
LC_MONETARY = "nl_NL.UTF-8";
LC_NAME = "nl_NL.UTF-8";
LC_NUMERIC = "nl_NL.UTF-8";
LC_PAPER = "nl_NL.UTF-8";
LC_TELEPHONE = "nl_NL.UTF-8";
LC_TIME = "en_DK.UTF8";
};
}