From dd6f4fdd605474c2bf221109f3256903c90fba68 Mon Sep 17 00:00:00 2001
From: jayrovacsek <jay@rovacsek.com>
Date: Tue, 8 Oct 2024 21:44:18 +1100
Subject: [PATCH] fix: add zsh as user shell

---
 CHANGELOG.md                 |  2 ++
 hosts/alakazam/default.nix   |  2 ++
 hosts/jigglypuff/default.nix |  7 +++++++
 hosts/wigglytuff/default.nix | 17 +++++++----------
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4243a18b..3b637e6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -236,6 +236,8 @@
 - *(static)* Update build configs - ([3ab0dda](https://github.com/JayRovacsek/nix-config/commit/3ab0ddaa8eb135235b02bf9988379926476bead2))
 
 - *(tooling)* Add scopes to conform configuration - ([99a07f5](https://github.com/JayRovacsek/nix-config/commit/99a07f59513cfd6824a8d21875d4c8f95356f88d))
+- Remove system level zsh - ([b3a0f0b](https://github.com/JayRovacsek/nix-config/commit/b3a0f0b68b422d266f45ea76bd98f355d0d21b68))
+
 - Resolve eval issues - ([54773ee](https://github.com/JayRovacsek/nix-config/commit/54773eeeed0ba9e5bd530a78916e3c327479bb7d))
 
 - Migrate wireless configs over to new options - ([a1e24e5](https://github.com/JayRovacsek/nix-config/commit/a1e24e5bb1c7f3c625475ced21b6b0c80d356247))
diff --git a/hosts/alakazam/default.nix b/hosts/alakazam/default.nix
index 467ce435..ac0c31cf 100644
--- a/hosts/alakazam/default.nix
+++ b/hosts/alakazam/default.nix
@@ -1,5 +1,6 @@
 {
   config,
+  lib,
   pkgs,
   self,
   ...
@@ -26,6 +27,7 @@ let
   user-configs = merge [
     builder
     jay
+    { users.users.jay.shell = lib.getExe pkgs.zsh; }
   ];
 
 in
diff --git a/hosts/jigglypuff/default.nix b/hosts/jigglypuff/default.nix
index e1cc462c..c509f42a 100644
--- a/hosts/jigglypuff/default.nix
+++ b/hosts/jigglypuff/default.nix
@@ -76,6 +76,13 @@ in
 
   programs.fuse.userAllowOther = true;
 
+  services.timesyncd.servers = lib.mkForce [
+    "137.92.140.80" # -> ntp.ise.canberra.edu.au
+    "138.194.21.154" # -> ntp.mel.nml.csiro.au
+    "129.6.15.28" # -> time-a-g.nist.gov
+    "129.6.15.29" # -> time-b-g.nist.gov
+  ];
+
   systemd.network = {
     netdevs."00-vlan-dns" = {
       enable = true;
diff --git a/hosts/wigglytuff/default.nix b/hosts/wigglytuff/default.nix
index 3ddbe73b..8e6e03a8 100644
--- a/hosts/wigglytuff/default.nix
+++ b/hosts/wigglytuff/default.nix
@@ -45,6 +45,7 @@ in
     hyprland
     i18n
     impermanence
+    journald
     lorri
     nix
     nix-topology
@@ -111,16 +112,12 @@ in
 
   powerManagement.cpuFreqGovernor = "ondemand";
 
-  services = {
-    journald.storage = "volatile";
-    timesyncd.servers = lib.mkForce [
-      # "129.6.15.28"
-      "137.92.140.80" # -> ntp.ise.canberra.edu.au
-      "138.194.21.154" # -> ntp.mel.nml.csiro.au
-      "129.6.15.28" # -> time-a-g.nist.gov
-      "129.6.15.29" # -> time-b-g.nist.gov
-    ];
-  };
+  services.timesyncd.servers = lib.mkForce [
+    "137.92.140.80" # -> ntp.ise.canberra.edu.au
+    "138.194.21.154" # -> ntp.mel.nml.csiro.au
+    "129.6.15.28" # -> time-a-g.nist.gov
+    "129.6.15.29" # -> time-b-g.nist.gov
+  ];
 
   system.stateVersion = "24.05";
 }