From 4fcd627fac6dada9d4dc6c38c5fdb04183e4f931 Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Sat, 31 May 2025 16:18:12 -0400
Subject: [PATCH] make changes for evaluation warnings

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
---
 modules/locale.nix                   |  2 +-
 systems/artemision/configuration.nix |  5 -----
 systems/artemision/desktop.nix       | 17 ++---------------
 systems/palatine-hill/samba.nix      |  3 +--
 users/alice/home/zsh.nix             | 24 ++++++++++++++++++++++--
 5 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/modules/locale.nix b/modules/locale.nix
index 275417d..3fe44b9 100644
--- a/modules/locale.nix
+++ b/modules/locale.nix
@@ -5,7 +5,7 @@
 
   i18n = {
     defaultLocale = lib.mkDefault "en_US.utf8";
-    supportedLocales = lib.mkDefault [ "en_US.UTF-8/UTF-8" ];
+    extraLocales = lib.mkDefault [ "en_US.UTF-8/UTF-8" ];
     extraLocaleSettings = lib.mkDefault {
       LC_ADDRESS = "en_US.UTF-8";
       LC_IDENTIFICATION = "en_US.UTF-8";
diff --git a/systems/artemision/configuration.nix b/systems/artemision/configuration.nix
index 9bf71c9..72dcc48 100644
--- a/systems/artemision/configuration.nix
+++ b/systems/artemision/configuration.nix
@@ -37,11 +37,6 @@
     default = true;
   };
 
-  i18n = {
-    defaultLocale = "en_US.utf8";
-    supportedLocales = [ "en_US.UTF-8/UTF-8" ];
-  };
-
   sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
 
   services = {
diff --git a/systems/artemision/desktop.nix b/systems/artemision/desktop.nix
index 207b75f..97cfe56 100644
--- a/systems/artemision/desktop.nix
+++ b/systems/artemision/desktop.nix
@@ -32,22 +32,9 @@
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
   services = {
-    xserver = {
+    displayManager.gdm = {
       enable = true;
-      displayManager.session = [
-        {
-          manage = "desktop";
-          name = "hyprland";
-          start = ''
-            bash ${./hypr/wrappedhl} &
-            waitPID=$!
-          '';
-        }
-      ];
-      displayManager.gdm = {
-        enable = true;
-        wayland = true;
-      };
+      wayland = true;
     };
 
     dbus = {
diff --git a/systems/palatine-hill/samba.nix b/systems/palatine-hill/samba.nix
index 339e2ef..abe9dc8 100644
--- a/systems/palatine-hill/samba.nix
+++ b/systems/palatine-hill/samba.nix
@@ -2,14 +2,13 @@
 {
   services.samba = {
     enable = true;
-    securityType = "user";
     openFirewall = true;
     settings = {
       global = {
+        security = "user";
         "workgroup" = "WORKGROUP";
         "server string" = "palatine-hill";
         "netbios name" = "palatine-hill";
-        "security" = "user";
         #"use sendfile" = "yes";
         #"max protocol" = "smb2";
         # note: localhost is the ipv6 localhost ::1
diff --git a/users/alice/home/zsh.nix b/users/alice/home/zsh.nix
index ecb3192..a2d3c73 100644
--- a/users/alice/home/zsh.nix
+++ b/users/alice/home/zsh.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ lib, ... }:
 {
 
   programs.zsh = {
@@ -22,7 +22,27 @@
         "z"
       ];
     };
-    initExtra = ''
+    /*
+      To specify the order, use lib.mkOrder.
+
+      Common order values:
+
+      500 (mkBefore): Early initialization (replaces initExtraFirst)
+
+      550: Before completion initialization (replaces initExtraBeforeCompInit)
+
+      1000 (default): General configuration (replaces initExtra)
+
+      1500 (mkAfter): Last to run configuration
+
+      To specify both content in Early initialization and General configuration, use lib.mkMerge.
+
+      e.g.
+
+      initContent = let zshConfigEarlyInit = lib.mkOrder 500 “do something”; zshConfig = lib.mkOrder 1000 “do something”; in lib.mkMerge [ zshConfigEarlyInit zshConfig ];
+    */
+
+    initContent = lib.mkOrder 1000 ''
       # functions
       function mount-data {
           if [[ -f /home/alice/backup/.noconnection ]]; then