From efa0ee26fedd3bbd220af763eb809c1a8b89e75c Mon Sep 17 00:00:00 2001 From: beatzaplenty Date: Mon, 13 Jul 2026 02:43:08 +1000 Subject: [PATCH] modularized locale settings --- common/configuration.nix | 2 +- hosts/kuma/configuration.nix | 79 ----------------------------- hosts/nix-minimal/configuration.nix | 31 ----------- hosts/nixos/configuration.nix | 24 ++++----- modules/set-locale.nix | 18 +++++++ 5 files changed, 31 insertions(+), 123 deletions(-) delete mode 100644 hosts/kuma/configuration.nix create mode 100644 modules/set-locale.nix diff --git a/common/configuration.nix b/common/configuration.nix index a895c53..73aa2ed 100644 --- a/common/configuration.nix +++ b/common/configuration.nix @@ -4,7 +4,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - + ../modules.set-locale.nix ]; # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; diff --git a/hosts/kuma/configuration.nix b/hosts/kuma/configuration.nix deleted file mode 100644 index ed05350..0000000 --- a/hosts/kuma/configuration.nix +++ /dev/null @@ -1,79 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page, on -# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). - -{ config, lib, pkgs, inputs, ... }: - -let - pythonEnv = pkgs.python3.withPackages (ps: with ps; [ - docker - pytz - ]); -in - -{ - imports = - [ # Include the results of the hardware scan. - ../../common/configuration.nix - ../../modules/nix/cache-client.nix - ../../modules/nix/remote-builder-client.nix - ]; - - networking.hostName = "kuma"; # Define your hostname. - virtualisation.docker.enable = true; - - # Enable docker-compose - environment.systemPackages = with pkgs; [ - docker-compose - docker - ]; - - # Mount docker persistent data - # fileSystems."/mnt/docker-persistent-data" = { - # device = "/dev/disk/by-label/docker-data"; - # fsType = "ext4"; - # options = [ "defaults" "nofail" "noatime" ]; - # }; - - -#Add sym links to data on users home folder -# system.userActivationScripts.createDockerSymlink.text = '' -# ln -sf /mnt/docker-persistent-data/docker /home/nixos/docker -# ''; -# system.userActivationScripts.createSetupSymlink.text = '' -# ln -sf /mnt/docker-persistent-data/setup /home/nixos/setup -# ''; - - users.users.nixos.extraGroups = [ "docker" ]; - services.openssh.settings.PermitRootLogin = "yes"; - - # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 80 8080 443 ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - - # This option defines the first version of NixOS you have installed on this particular machine, - # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. - # - # Most users should NEVER change this value after the initial install, for any reason, - # even if you've upgraded your system to a new NixOS release. - # - # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, - # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how - # to actually do that. - # - # This value being lower than the current NixOS release does NOT mean your system is - # out of date, out of support, or vulnerable. - # - # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, - # and migrated your data accordingly. - # - # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.sta> - system.stateVersion = "25.05"; # Did you read the comment? -} diff --git a/hosts/nix-minimal/configuration.nix b/hosts/nix-minimal/configuration.nix index 1dc9f8e..e06fd2e 100644 --- a/hosts/nix-minimal/configuration.nix +++ b/hosts/nix-minimal/configuration.nix @@ -14,38 +14,7 @@ networking.hostName = "nix-minimal"; # Define your hostname. - environment.systemPackages = with pkgs; [ - sshfs - fuse3 # needed for modern sshfs - ]; - - # Enable FUSE (if not already) - boot.extraModprobeConfig = '' - options fuse user_allow_other - ''; - - # Allow mounting with user permissions (optional, see note) - # security.wrappers.sshfs = { - # source = "${pkgs.sshfs}/bin/sshfs"; - # owner = "nixos"; - # group = "users"; - # permissions = "4755"; - # fileSystems."/mnt/proxmox-iso" = { - # device = "root@pve:/var/lib/vz/template/iso"; - # fsType = "fuse.sshfs"; - # options = [ - # "IdentityFile=/home/nixos/.ssh/id_ed25519.pub" # or your SSH key path - # "allow_other" - # "reconnect" - # "ServerAliveInterval=15" - # "ServerAliveCountMax=3" - # "StrictHostKeyChecking=no" # only if you're OK with this - # ]; - # }; - # }; - - # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ 80 8080 443 ]; # networking.firewall.allowedUDPPorts = [ ... ]; diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix index d51f61c..6cab841 100644 --- a/hosts/nixos/configuration.nix +++ b/hosts/nixos/configuration.nix @@ -39,19 +39,19 @@ in { # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # Select internationalisation properties. - i18n.defaultLocale = "en_AU.UTF-8"; + # i18n.defaultLocale = "en_AU.UTF-8"; - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_AU.UTF-8"; - LC_IDENTIFICATION = "en_AU.UTF-8"; - LC_MEASUREMENT = "en_AU.UTF-8"; - LC_MONETARY = "en_AU.UTF-8"; - LC_NAME = "en_AU.UTF-8"; - LC_NUMERIC = "en_AU.UTF-8"; - LC_PAPER = "en_AU.UTF-8"; - LC_TELEPHONE = "en_AU.UTF-8"; - LC_TIME = "en_AU.UTF-8"; - }; + # i18n.extraLocaleSettings = { + # LC_ADDRESS = "en_AU.UTF-8"; + # LC_IDENTIFICATION = "en_AU.UTF-8"; + # LC_MEASUREMENT = "en_AU.UTF-8"; + # LC_MONETARY = "en_AU.UTF-8"; + # LC_NAME = "en_AU.UTF-8"; + # LC_NUMERIC = "en_AU.UTF-8"; + # LC_PAPER = "en_AU.UTF-8"; + # LC_TELEPHONE = "en_AU.UTF-8"; + # LC_TIME = "en_AU.UTF-8"; + # }; # Enable the X11 windowing system. services.xserver.enable = true; diff --git a/modules/set-locale.nix b/modules/set-locale.nix new file mode 100644 index 0000000..a81070d --- /dev/null +++ b/modules/set-locale.nix @@ -0,0 +1,18 @@ +{ ... }: + +{ + i18n.defaultLocale = "en_AU.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_AU.UTF-8"; + LC_IDENTIFICATION = "en_AU.UTF-8"; + LC_MEASUREMENT = "en_AU.UTF-8"; + LC_MONETARY = "en_AU.UTF-8"; + LC_NAME = "en_AU.UTF-8"; + LC_NUMERIC = "en_AU.UTF-8"; + LC_PAPER = "en_AU.UTF-8"; + LC_TELEPHONE = "en_AU.UTF-8"; + LC_TIME = "en_AU.UTF-8"; + }; + +} \ No newline at end of file