diff --git a/shared/core/default.nix b/shared/core/default.nix
index 8c33cba..f52127c 100644
--- a/shared/core/default.nix
+++ b/shared/core/default.nix
@@ -7,6 +7,7 @@
     ./gui.nix
     ./nix.nix
     ./ssh.nix
+    ./vpn.nix
   ];
 
   config = {
diff --git a/shared/core/vpn.nix b/shared/core/vpn.nix
new file mode 100644
index 0000000..631519c
--- /dev/null
+++ b/shared/core/vpn.nix
@@ -0,0 +1,9 @@
+{ ... }: {
+
+  services.tailscale = {
+    # TODO: configure declaratively
+    enable = true;
+    interfaceName = "ts0";
+  };
+
+}
diff --git a/shared/home/default.nix b/shared/home/default.nix
index 5d55f24..1abdad2 100644
--- a/shared/home/default.nix
+++ b/shared/home/default.nix
@@ -6,6 +6,7 @@
     ./bash.nix
     ./git.nix
     ./mpd.nix
+    ./xdg.nix
     ./programs.nix
     ./matrix.nix
     ./theme.nix
diff --git a/shared/home/xdg.nix b/shared/home/xdg.nix
new file mode 100644
index 0000000..110fb98
--- /dev/null
+++ b/shared/home/xdg.nix
@@ -0,0 +1,23 @@
+{ config, ... }: 
+
+let homeDir = config.home.homeDirectory;
+
+in {
+
+  xdg.userDirs = {
+    # Let Nix manage the XDG directories
+    enable = true;
+    createDirectories = true;
+    # Define the paths
+    download  = "/tmp";
+    music     = "${homeDir}/music";
+    documents = "${homeDir}/docs";
+    pictures  = "${homeDir}/pics";
+    # Disable generation of these
+    desktop     = null;
+    publicShare = null;
+    templates   = null;
+    videos      = null;
+  };
+
+}
\ No newline at end of file
diff --git a/system/lime/core.nix b/system/lime/core.nix
index ddd55d2..3483c80 100644
--- a/system/lime/core.nix
+++ b/system/lime/core.nix
@@ -7,6 +7,8 @@
     backups.enable = true;
   };
 
+  services.fprintd.enable = true;
+
   networking.hostName = "lime";
   networking.networkmanager.enable = true;
 
diff --git a/system/lime/home.nix b/system/lime/home.nix
index 7d5c541..1d3586c 100644
--- a/system/lime/home.nix
+++ b/system/lime/home.nix
@@ -8,4 +8,5 @@
       battery.name = "BAT0";
     };
   };
+  programs.iamb.enable = true;
 }
\ No newline at end of file