diff --git a/configuration.nix b/configuration.nix
index c546c03..5a805d7 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -10,6 +10,7 @@
 }:
 
 {
+
   nix.settings.experimental-features = [
     "flakes"
     "nix-command"
@@ -17,7 +18,7 @@
   imports = [
     # Include the results of the hardware scan.
     ./system
-    ./user/marty.nix
+    ./user
 
   ];
   # programs.walker.enable = true;
diff --git a/hosts/marty-latitude/default.nix b/hosts/marty-latitude/default.nix
index 372b8ba..8e4975c 100644
--- a/hosts/marty-latitude/default.nix
+++ b/hosts/marty-latitude/default.nix
@@ -21,5 +21,10 @@
     };
   };
 
+  main-user = {
+    userName = "marty";
+    shell = pkgs.fish;
+  };
+
   imports = [ ./hardware.nix ];
 }
diff --git a/hosts/marty-latitude/home.nix b/hosts/marty-latitude/home.nix
index b19ffda..3f76cb3 100644
--- a/hosts/marty-latitude/home.nix
+++ b/hosts/marty-latitude/home.nix
@@ -80,6 +80,8 @@
   #
   home.sessionVariables = {
     EDITOR = "codium";
+    GTK_THEME = "Adwaita:dark";
+    TERM = "xterm-kitty";
   };
 
   development = {
diff --git a/system/networking.nix b/system/networking.nix
index adb96ce..cf33b26 100644
--- a/system/networking.nix
+++ b/system/networking.nix
@@ -9,6 +9,11 @@
       trustedInterfaces = [ "tailscale0" ];
     };
   };
+  services = {
+    tailscale = {
+      enable = true;
+    };
+  };
   hardware = {
     bluetooth = {
       enable = true;
diff --git a/user/default.nix b/user/default.nix
new file mode 100644
index 0000000..dbcee69
--- /dev/null
+++ b/user/default.nix
@@ -0,0 +1,46 @@
+{
+  config,
+  pkgs,
+  inputs,
+  lib,
+  ...
+}:
+
+{
+  options = {
+    main-user = {
+      userName = lib.mkOption {
+        default = "marty";
+        description = ''
+          main user name
+        ''
+      };
+      shell = lib.mkOption {
+        default = pkgs.fish;
+        description = ''
+          main user shell
+        ''
+      }
+    };
+  };
+
+  config = {
+    users.users.${config.main-user.userName} = {
+      isNormalUser = true;
+      description = "marty";
+      extraGroups = [
+        "networkmanager"
+        "wheel"
+        "video"
+        "audio"
+        "render"
+      ];
+      shell = pkgs.fish;
+    };
+
+    security.sudo = {
+      enable = true;
+      wheelNeedsPassword = true;
+    };
+  };
+}
diff --git a/user/marty.nix b/user/marty.nix
deleted file mode 100644
index 0cdb836..0000000
--- a/user/marty.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-
-{
-  users.users.marty = {
-    isNormalUser = true;
-    description = "marty";
-    extraGroups = [
-      "networkmanager"
-      "wheel"
-      "video"
-      "audio"
-      "render"
-    ];
-    shell = pkgs.fish;
-  };
-
-  security.sudo = {
-    enable = true;
-    wheelNeedsPassword = true;
-  };
-}