diff --git a/nixos/desktop.nix b/nixos/desktop.nix
index 98cf6d3..ce9eae8 100644
--- a/nixos/desktop.nix
+++ b/nixos/desktop.nix
@@ -2,7 +2,10 @@
   imports = [
     # Base configs
     ./modules/base.nix
+
+    # Import users and groups
     ./users/jimbo.nix
+    ./users/groups.nix
 
     # Desktop only
     ./desktop/misc.nix
diff --git a/nixos/modules/secrets.nix b/nixos/modules/secrets.nix
index 31679f8..27f416e 100644
Binary files a/nixos/modules/secrets.nix and b/nixos/modules/secrets.nix differ
diff --git a/nixos/server.nix b/nixos/server.nix
index 23777f4..df3a8d2 100644
--- a/nixos/server.nix
+++ b/nixos/server.nix
@@ -2,11 +2,12 @@
   imports = [
     # Base configs
     ./modules/base.nix
-    ./users/jimbo.nix
 
-    # Import more users
+    # Import users and groups
+    ./users/jimbo.nix
     ./users/nextcloud.nix
     ./users/nginx.nix
+    ./users/groups.nix
 
     # Modules
     ./modules/security.nix
diff --git a/nixos/server/icecast.nix b/nixos/server/icecast.nix
new file mode 100644
index 0000000..e3d81f0
--- /dev/null
+++ b/nixos/server/icecast.nix
@@ -0,0 +1,24 @@
+let
+  secrets = import ../modules/secrets.nix;
+in {
+  # Icecast, replacing Azuracast maybe
+  services = {
+    icecast = {
+      enable = true;
+      listen.port = 265;
+      hostname = "icecast.${secrets.jimDomain}";
+      admin = {
+        user = "jimbo";
+	password = "${secrets.castPass}";
+      };
+    };
+    nginx.virtualHosts."icecast.${secrets.jimDomain}" =  {
+      enableACME = true;
+      forceSSL = true;
+      locations."/" = {
+        proxyPass = "http://127.0.0.1:265";
+        proxyWebsockets = true;
+      };
+    };
+  };
+}
diff --git a/nixos/users/groups.nix b/nixos/users/groups.nix
new file mode 100644
index 0000000..334f839
--- /dev/null
+++ b/nixos/users/groups.nix
@@ -0,0 +1,6 @@
+{
+  # Define custom groups
+  users.groups = {
+    nfsShare = {};
+  };
+}