Feat: Split the config apart

6 files changed, 55 insertions, 3 deletions

diff --git a/system/locale/locale.nix b/system/locale/locale.nix
new file mode 100644
index 00000000..2fcc2115
--- /dev/null
+++ b/system/locale/locale.nix
@@ -0,0 +1,26 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  # Set your time zone.
+  time.timeZone = "Europe/Berlin";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "de_DE.UTF-8";
+    LC_IDENTIFICATION = "de_DE.UTF-8";
+    LC_MEASUREMENT = "de_DE.UTF-8";
+    LC_MONETARY = "de_DE.UTF-8";
+    LC_NAME = "de_DE.UTF-8";
+    LC_NUMERIC = "de_DE.UTF-8";
+    LC_PAPER = "de_DE.UTF-8";
+    LC_TELEPHONE = "de_DE.UTF-8";
+    LC_TIME = "de_DE.UTF-8";
+  };
+
+  # Configure console keymap
+  console.keyMap = "dvorak";
+}
diff --git a/system/packages.conf b/system/packages/packages.conf
index 25f6ace8..4d409077 100644
--- a/system/packages.conf
+++ b/system/packages/packages.conf
@@ -107,9 +107,9 @@
             # Listen
                 moc # An ncurses console audio player designed to be powerful and easy to use
                 pavucontrol # PulseAudio Volume Control
-                pipewire-alsa # Low-latency audio/video router and processor - ALSA configuration
-                pipewire-jack # Low-latency audio/video router and processor - JACK support
-                pipewire-pulse # Low-latency audio/video router and processor - PulseAudio replacement
+#pipewire-alsa # Low-latency audio/video router and processor - ALSA configuration
+#pipewire-jack # Low-latency audio/video router and processor - JACK support
+#pipewire-pulse # Low-latency audio/video router and processor - PulseAudio replacement
 
         # Hardware
             # Boot
diff --git a/system/packages.nix b/system/packages/packages.nix
index 1acba85e..1acba85e 100644
--- a/system/packages.nix
+++ b/system/packages/packages.nix
diff --git a/system/sound/sound.nix b/system/sound/sound.nix
new file mode 100644
index 00000000..16dd4279
--- /dev/null
+++ b/system/sound/sound.nix
@@ -0,0 +1,18 @@
+{config, ...}: {
+  # Enable sound with pipewire.
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
+  };
+}
diff --git a/system/system.nix b/system/system.nix
new file mode 100644
index 00000000..3a034742
--- /dev/null
+++ b/system/system.nix
@@ -0,0 +1,8 @@
+{config, ...}: {
+  imports = [
+    ./locale/locale.nix
+    ./users/users.nix
+    ./sound/sound.nix
+    ./packages/packages.nix
+  ];
+}
diff --git a/system/users.nix b/system/users/users.nix
index ca2fc352..ca2fc352 100644
--- a/system/users.nix
+++ b/system/users/users.nix