diff --git a/hosts/nixedo/configuration.nix b/hosts/nixedo/configuration.nix
index 81542cd0..de2c649c 100644
--- a/hosts/nixedo/configuration.nix
+++ b/hosts/nixedo/configuration.nix
@@ -8,6 +8,7 @@
     ./hardware-configuration.nix
     ./modules
     ./secrets.nix
+    ./services
 
     ../../users/opdavies.nix
   ];
diff --git a/hosts/nixedo/services/default.nix b/hosts/nixedo/services/default.nix
new file mode 100644
index 00000000..18582aab
--- /dev/null
+++ b/hosts/nixedo/services/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./samba.nix
+  ];
+}
diff --git a/hosts/nixedo/services/samba.nix b/hosts/nixedo/services/samba.nix
new file mode 100644
index 00000000..2c4c915f
--- /dev/null
+++ b/hosts/nixedo/services/samba.nix
@@ -0,0 +1,28 @@
+{
+  services.samba = {
+    enable = true;
+    openFirewall = true;
+
+    shares = {
+      home = {
+        path = "/home/opdavies";
+        browseable = true;
+        writable = true;
+        "valid users" = [ "opdavies" ];
+        "force group" = "media";
+        "create mask" = "0660";
+        "directory mask" = "0770";
+      };
+
+      media = {
+        path = "/mnt/media";
+        browseable = true;
+        writable = true;
+        "valid users" = [ "opdavies" ];
+        "force group" = "media";
+        "create mask" = "0660";
+        "directory mask" = "0770";
+      };
+    };
+  };
+}