diff --git a/home-manager/features/linux-desktop.nix b/home-manager/features/linux-desktop.nix
index ce63840..f7be8d2 100644
--- a/home-manager/features/linux-desktop.nix
+++ b/home-manager/features/linux-desktop.nix
@@ -3,7 +3,6 @@
   imports = [
     ./audio.nix
     ./hyprland.nix
-    ./nix.nix
     ./rofi/rofi.nix
     ./sway.nix
     ../apps/element.nix
diff --git a/home-manager/features/nix.nix b/home-manager/features/nix.nix
deleted file mode 100644
index 6b57dc6..0000000
--- a/home-manager/features/nix.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-  # Enable flakes and nix-commnands.
-  nix.settings.experimental-features = ["flakes" "nix-command"];
-
-  # Allow unfree code
-  nixpkgs.config = {
-    allowUnfree = true;
-  };
-}
diff --git a/home-manager/features/shell.nix b/home-manager/features/shell.nix
index c3b3ef7..bba9fe5 100644
--- a/home-manager/features/shell.nix
+++ b/home-manager/features/shell.nix
@@ -48,7 +48,7 @@
       PATH=$PATH:$HOME/.local/bin
       GITHUB_USERNAME=periodic
     '';
-    initExtra = ''
+    initContent = ''
       # Make ^U work like it does in Bash
       bindkey "^U" backward-kill-line
 
diff --git a/system/features/audio.nix b/system/features/audio.nix
new file mode 100644
index 0000000..d3ee42b
--- /dev/null
+++ b/system/features/audio.nix
@@ -0,0 +1,16 @@
+{ ... }: {
+  # RealtimeKit hands out realtime scheduling priority to user processes on
+  # demand, e.g. audio
+  security.rtkit.enable = true;
+
+  # Enable sound with pipewire.
+  services.pulseaudio.enable = false;
+  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;
+  };
+}
diff --git a/system/hosts/altair/configuration.nix b/system/hosts/altair/configuration.nix
index 7b825ae..311cc0d 100644
--- a/system/hosts/altair/configuration.nix
+++ b/system/hosts/altair/configuration.nix
@@ -88,11 +88,6 @@
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
 
-  # Allow unfree packages
-  nixpkgs.config = {
-    allowUnfree = true;
-  };
-
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
diff --git a/system/hosts/altair/default.nix b/system/hosts/altair/default.nix
index 7abb143..e700708 100644
--- a/system/hosts/altair/default.nix
+++ b/system/hosts/altair/default.nix
@@ -5,6 +5,7 @@
     ./hardware-configuration.nix
     ./qmk.nix
     ../../authorized-keys.nix
+    ../../features/audio.nix
     ../../features/gc.nix
     ../../features/gui.nix
     ../../features/container-dev.nix
diff --git a/system/hosts/vega/configuration.nix b/system/hosts/vega/configuration.nix
index 16bfc1a..96c3b61 100644
--- a/system/hosts/vega/configuration.nix
+++ b/system/hosts/vega/configuration.nix
@@ -57,22 +57,6 @@
   # Enable a secret manager
   services.gnome.gnome-keyring.enable = true;
 
-  # Enable sound with pipewire.
-  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;
-  };
-
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
 
diff --git a/system/hosts/vega/default.nix b/system/hosts/vega/default.nix
index 3ca21ba..c1b97a5 100644
--- a/system/hosts/vega/default.nix
+++ b/system/hosts/vega/default.nix
@@ -4,6 +4,7 @@
     ./configuration.nix
     ./hardware-configuration.nix
     ../../authorized-keys.nix
+    ../../features/audio.nix
     ../../features/gc.nix
     ../../features/gui.nix
     ../../features/container-dev.nix