From 7621cd4f14bfb94f832834d17da1b8d404087ae6 Mon Sep 17 00:00:00 2001
From: Lily Anderson <lilylanderson@zoho.com>
Date: Sat, 14 Feb 2026 09:42:47 -0600
Subject: [PATCH] switched desktop configs to using general localization
 settings. some tidying.

---
 modules/hosts/desktop/configuration.nix | 71 +++----------------------
 modules/hosts/desktop/desktop.nix       |  1 +
 2 files changed, 8 insertions(+), 64 deletions(-)

diff --git a/modules/hosts/desktop/configuration.nix b/modules/hosts/desktop/configuration.nix
index 83bd914..ce4ec5d 100644
--- a/modules/hosts/desktop/configuration.nix
+++ b/modules/hosts/desktop/configuration.nix
@@ -1,49 +1,15 @@
-# 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`).
-
 { inputs, lib, pkgs, self, ... }:{
 flake.nixosModules.lily-desktop = { pkgs, ... }:{
-  # Use the systemd-boot EFI boot loader.
-  boot.loader = {
-	systemd-boot.enable = true;
-  	efi.canTouchEfiVariables = true;
-};
+	# Use the systemd-boot EFI boot loader.
+	boot.loader = {
+		systemd-boot.enable = true;
+		efi.canTouchEfiVariables = true;
+	};
 
   networking.hostName = "lily-desktop"; # Define your hostname.
-
-  # Configure network connections interactively with nmcli or nmtui.
   networking.networkmanager.enable = true;
 
-# Set your time zone.
-	time.timeZone = "America/Chicago";
-
-# Select internationalisation properties.
-	i18n.defaultLocale = "en_US.UTF-8";
-
-	i18n.extraLocaleSettings = {
-		LC_ADDRESS = "en_US.UTF-8";
-		LC_IDENTIFICATION = "en_US.UTF-8";
-		LC_MEASUREMENT = "en_US.UTF-8";
-		LC_MONETARY = "en_US.UTF-8";
-		LC_NAME = "en_US.UTF-8";
-		LC_NUMERIC = "en_US.UTF-8";
-		LC_PAPER = "en_US.UTF-8";
-		LC_TELEPHONE = "en_US.UTF-8";
-		LC_TIME = "en_US.UTF-8";
-	};
-
-# Configure keymap in X11
-	services.xserver.xkb = {
-		layout = "us";
-		variant = "";
-	};
-
-  # Enable the X11 windowing system.
   services.xserver.enable = true;
-
-
-  # Enable the GNOME Desktop Environment.
   services.displayManager.gdm.enable = true;
   services.desktopManager.gnome.enable = true;
   
@@ -61,8 +27,8 @@ flake.nixosModules.lily-desktop = { pkgs, ... }:{
   # Enable touchpad support (enabled default in most desktopManager).
   # services.libinput.enable = true;
 
-   programs.firefox.enable = true;
- 		nixpkgs.config.allowUnfree = true;
+	programs.firefox.enable = true;
+	nixpkgs.config.allowUnfree = true;
 
   # List packages installed in system profile.
   # You can use https://search.nixos.org/ to find more packages (and options).
@@ -83,16 +49,11 @@ flake.nixosModules.lily-desktop = { pkgs, ... }:{
   #   enableSSHSupport = true;
   # };
 
-  # List services that you want to enable:
 
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
-
-  # Open ports in the firewall.
   networking.firewall.allowedTCPPorts = [ 22 ];
   # 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
@@ -100,24 +61,6 @@ flake.nixosModules.lily-desktop = { pkgs, ... }:{
   # system.copySystemConfiguration = true;
 
 	nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  # 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.stateVersion .
   system.stateVersion = "25.11"; # Did you read the comment?
 };
 }
diff --git a/modules/hosts/desktop/desktop.nix b/modules/hosts/desktop/desktop.nix
index f70c1c3..370ea75 100644
--- a/modules/hosts/desktop/desktop.nix
+++ b/modules/hosts/desktop/desktop.nix
@@ -5,6 +5,7 @@
 			self.nixosModules.lily-desktop
 			self.nixosModules.lily
 			self.nixosModules.llama
+			self.nixosModules.localization
 		];
 	};
 }