diff --git a/home-manager/features/vim.nix b/home-manager/features/vim.nix
index 8fe1f1e..d601736 100644
--- a/home-manager/features/vim.nix
+++ b/home-manager/features/vim.nix
@@ -6,7 +6,7 @@
   programs.nixvim = {
     enable = true;
 
-    options = {
+    opts = {
       number = true;
     };
 
@@ -43,7 +43,7 @@
       barbar.enable = true;
       gitgutter.enable = true;
       persistence.enable = true;
-      nvim-cmp.enable = true;
+      cmp.enable = true;
       cmp-nvim-lsp.enable = true;
       cmp_luasnip.enable = true;
       luasnip.enable = true;
diff --git a/nixos/features/nas0.nix b/nixos/features/nas0.nix
new file mode 100644
index 0000000..692710b
--- /dev/null
+++ b/nixos/features/nas0.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, ... }: {
+  sops.secrets.smb_credentials = {
+    sopsFile = ../../../secrets/default.yaml;
+  };
+
+  fileSystems."/mnt/nas0" = {
+    device = "//nas0.hoki-porgy.ts.net/main/";
+    fsType = "cifs";
+    options = let
+      automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
+    in [
+      "${automount_opts},X-mount.mkdir,credentials=${config.sops.secrets.smb_credentials.path},uid=1000,gid=100"
+    ];
+  };
+
+  environment.systemPackages = [
+    pkgs.cifs-utils
+    pkgs.samba
+  ]
+}
diff --git a/nixos/features/plasma6.nix b/nixos/features/plasma6.nix
index f2aaca2..497df49 100644
--- a/nixos/features/plasma6.nix
+++ b/nixos/features/plasma6.nix
@@ -3,6 +3,10 @@
   #   inputs.kde2nix.nixosModules.plasma6
   # ];
 
+  services.desktopManager = {
+    plasma6.enable = true;
+  };
+
   services.xserver = {
     enable = true;
     
@@ -10,12 +14,8 @@
       sddm.enable = true;
     };
     
-    desktopManager = {
-      xterm.enable = false;
-      plasma6.enable = true;
-    };
 
-    layout = "us";
-    xkbVariant = "";
+    xkb.layout = "us";
+    xkb.variant = "";
   };
 }
diff --git a/nixos/features/podman.nix b/nixos/features/podman.nix
index 3b35a72..a441ded 100644
--- a/nixos/features/podman.nix
+++ b/nixos/features/podman.nix
@@ -15,5 +15,4 @@
     interfaces.podman0.allowedUDPPorts = [ 53 ];
     trustedInterfaces = [ "podman0" ];
   };
-  
 }
diff --git a/nixos/hosts/aerial/default.nix b/nixos/hosts/aerial/default.nix
index 5b084fe..15eeb46 100644
--- a/nixos/hosts/aerial/default.nix
+++ b/nixos/hosts/aerial/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, config, ... }: {
   imports = [
     ./hardware-configuration.nix
     ../../client.nix
@@ -13,6 +13,7 @@
     ../../features/bluetooth.nix
     ../../features/no-rgb.nix
     ../../features/telemetry
+    ../../features/nas0.nix
   ];
 
   home-manager.users.noe = import ../../../home-manager/noe/hosts/aerial.nix;
diff --git a/secrets/default.yaml b/secrets/default.yaml
index 1e022cc..5a00da4 100644
--- a/secrets/default.yaml
+++ b/secrets/default.yaml
@@ -1,5 +1,6 @@
 #ENC[AES256_GCM,data:L8kvdjZ9X/02Eg==,iv:ogyrJgDGw2Y/++iSKiTPHRP24WP4uOSrl6i/4NR29VA=,tag:4B27juuNHO+IEbFwlqENOQ==,type:comment]
 tailscale_auth_key: ENC[AES256_GCM,data:sU0xOu7XemgR9HX5wLgstuuXViIOCNQa13csXU6hj/pHcKGd2uIYW2M6GDqSxnEEnbX4NYCO1flAQ0ccRQ==,iv:IWHLBBVB7E6vlpPqX0oEQ94eWsfe9BrE4FIZ4cvVdzs=,tag:19IwEOFVW0I4pc9no6bc+w==,type:str]
+smb_credentials: ENC[AES256_GCM,data:O/e3JChdO3msxD6kS1D3l0W2hfA4/3mFtYFC1MinfUAcGUcYM920MA==,iv:Xru9Ige4/gRvJ2LWqCvnuBCnZf+E+Xu3Ba5f2eeoXzk=,tag:0+1CaTUf0Z4mXZTYbCjNpA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -141,8 +142,8 @@ sops:
             ZnlFNzBwYUQ3OWVjVmVGa3prNFIvS00K8pUo3fOzxez4W2bY5QFitjiwboXgo4+z
             cZBoYXp8FJgxmuqndy6D6NH81j/QiQphz8sgLH7fllZKKYjNT6LLZg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-27T00:47:48Z"
-    mac: ENC[AES256_GCM,data:ODOesbH5wdv7/q3CgI4sZ8WTHDmIw/5MW9THMTVcSjCVjVDgJA93Os6jKEIcPx8idT/WCynC7Q43zpIV74/QDc/ypNQhj+PSjOUfidCf/bF+4hHuAwqxCye4rhYYhsubg1KXiC3+dO1QzQSPb5gIwUnD9vN6VQyH0sX/dvaVXw0=,iv:JF7vUX0RhBWyMD1NxW7ENIs90klw1FLt3dzQTlL5+T0=,tag:FJC7vWWEteBNHBWcYWv6AQ==,type:str]
+    lastmodified: "2024-03-31T06:49:34Z"
+    mac: ENC[AES256_GCM,data:1bMWUaJdcUfHknidzCUTcAdweOZhGlBKq20mF/kjWJ1uR7AvGax9Vr/1cMVDDCfAkS5hOGo47oHqGDooTk2eATGVM0ilO/yO3jxCsV+qUsmunbpb5LKOaYLR4tw4Fb863tsCmy87LefTRHPudtQfNhZ4EwGgh0jKfUvcG/5L3tE=,iv:wR2QVuNGcj0ltqzizx6AB5NIbfawWeHs4p0k0jJFpUI=,tag:Ho3mGPWthbJgdSAtNNw+sA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1