diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix
index be4bd70..968b0e0 100644
--- a/hosts/common/global/default.nix
+++ b/hosts/common/global/default.nix
@@ -2,6 +2,7 @@
   imports = [
     inputs.home-manager.nixosModules.home-manager
     ./fish.nix
+    ./locale.nix
     ./tailscale.nix
   ] ++ (builtins.attrValues outputs.nixosModules);
 
@@ -19,19 +20,4 @@
   hardware.enableRedistributableFirmware = true;
   networking.domain = "vim.wtf";
 
-  i18n = {
-    defaultLocale = "en_US.UTF-8";
-    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";
-    };
-  };
-
 }
\ No newline at end of file
diff --git a/hosts/common/global/locale.nix b/hosts/common/global/locale.nix
new file mode 100644
index 0000000..77c4c4e
--- /dev/null
+++ b/hosts/common/global/locale.nix
@@ -0,0 +1,17 @@
+{ lib, ... }: {
+  i18n = {
+    defaultLocale = lib.mkDefault "en_US.UTF-8";
+    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";
+    };
+  };
+  time.timeZone = lib.mkDefault "America/Chicago";
+}
\ No newline at end of file
diff --git a/hosts/pixnix/services/pipewire.nix b/hosts/common/optional/pipewire.nix
similarity index 90%
rename from hosts/pixnix/services/pipewire.nix
rename to hosts/common/optional/pipewire.nix
index 76665e1..684c0f6 100644
--- a/hosts/pixnix/services/pipewire.nix
+++ b/hosts/common/optional/pipewire.nix
@@ -7,5 +7,6 @@
     alsa.enable = true;
     alsa.support32Bit = true;
     pulse.enable = true;
+    jack.enable = true;
   };
 }
\ No newline at end of file
diff --git a/hosts/pixnix/default.nix b/hosts/pixnix/default.nix
index 678932a..0ea0d5d 100644
--- a/hosts/pixnix/default.nix
+++ b/hosts/pixnix/default.nix
@@ -11,6 +11,7 @@
 
     ../common/optional/docker.nix
     ../common/optional/libvirtd.nix
+    ../common/optional/pipewire.nix
     ../common/optional/sshd.nix
   ];
 
@@ -26,8 +27,6 @@
     networkmanager.enable = true;
   };
 
-  time.timeZone = "America/Chicago";
-
   system.stateVersion = "23.05";
 
 }
diff --git a/hosts/pixnix/services/default.nix b/hosts/pixnix/services/default.nix
index 91529ed..0e007d0 100644
--- a/hosts/pixnix/services/default.nix
+++ b/hosts/pixnix/services/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
-    ./pipewire.nix
     ./printing.nix
     ./xserver.nix
   ];