diff --git a/modules/filesystems.nix b/modules/filesystems.nix
index 4b579b2..29b2dfa 100644
--- a/modules/filesystems.nix
+++ b/modules/filesystems.nix
@@ -65,6 +65,7 @@ with deviceSpecific; {
         "gid=${toString config.users.groups.smbgrp.gid}"
       ];
     };
+    # Samba Windows
     "/media/windows/files" = lib.mkIf (!isHost) {
       fsType = "cifs";
       device = "//192.168.0.100/Files";
@@ -88,6 +89,30 @@ with deviceSpecific; {
         "gid=${toString config.users.groups.users.gid}"
       ];
     };
+    # Samba Linux
+    "/media/linux/files" = lib.mkIf (!isHost) {
+      fsType = "cifs";
+      device = "//192.168.0.100/files";
+      options = [
+        "user=${secrets.linux-samba.user}"
+        "password=${secrets.linux-samba.password}"
+        # "nofail"
+        "uid=${toString config.users.users.alukard.uid}"
+        "gid=${toString config.users.groups.users.gid}"
+      ];
+    };
+    "/media/linux/data" = lib.mkIf (!isHost) {
+      fsType = "cifs";
+      device = "//192.168.0.100/data";
+      options = [
+        "ro"
+        "user=${secrets.linux-samba.user}"
+        "password=${secrets.linux-samba.password}"
+        # "nofail"
+        "uid=${toString config.users.users.alukard.uid}"
+        "gid=${toString config.users.groups.users.gid}"
+      ];
+    };
   };
   swapDevices = [
     {
diff --git a/modules/samba.nix b/modules/samba.nix
index 341edd4..870df4a 100644
--- a/modules/samba.nix
+++ b/modules/samba.nix
@@ -32,7 +32,7 @@ with deviceSpecific; {
       disable netbios = yes
       smb ports = 445
 
-      [Data]
+      [data]
       path = /shared/data
       browsable = yes
       read only = yes
@@ -40,7 +40,7 @@ with deviceSpecific; {
       force directory mode = 2770
       valid users = @smbgrp
 
-      [Files]
+      [files]
       path = /shared/files
       browsable = yes
       read only = no
diff --git a/modules/services.nix b/modules/services.nix
index 1ebe189..9fcf4e4 100644
--- a/modules/services.nix
+++ b/modules/services.nix
@@ -40,10 +40,11 @@
   services.accounts-daemon.enable = true;
 
   services.avahi.enable = true;
-  services.avahi.ipv6 = true;
+  # services.avahi.ipv6 = true;
   services.avahi.nssmdns = true;
   services.avahi.publish.enable = true;
   services.avahi.publish.addresses = true;
+  services.avahi.publish.domain = true;
 
   systemd.services.systemd-udev-settle.enable = false;
 
diff --git a/modules/workspace/barrier.nix b/modules/workspace/barrier.nix
index f2f6a50..7f02ae5 100644
--- a/modules/workspace/barrier.nix
+++ b/modules/workspace/barrier.nix
@@ -68,7 +68,6 @@ in
 
   config = mkMerge [
     (mkIf cfgC.enable {
-      environment.systemPackages = with pkgs; [ (barrier.override { avahiWithLibdnssdCompat = true; }) ];
       systemd.user.services."barrier-client" = {
         after = [ "network.target" "graphical-session.target" ];
         description = "Barrier client";
@@ -79,7 +78,6 @@ in
       };
     })
     (mkIf cfgS.enable {
-      environment.systemPackages = with pkgs; [ (barrier.override { avahiWithLibdnssdCompat = true; }) ];
       systemd.user.services."barrier-server" = {
         after = [ "network.target" "graphical-session.target" ];
         description = "Barrier server";
diff --git a/secret.nix.gpg b/secret.nix.gpg
index 97358f1..29c425c 100644
Binary files a/secret.nix.gpg and b/secret.nix.gpg differ