diff --git a/hosts/default.nix b/hosts/default.nix
index 0984725..79af885 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -4,11 +4,11 @@ let
   inherit (self) lib;
 in {
   # Vali
-  vali = lib.nixosSystem {
+  mars = lib.nixosSystem {
     system = "x86_64-linux";
     specialArgs = { inherit lib inputs self; };
     modules = [
-        ./vali
+        ./vali/mars
         ../modules
         inputs.home-manager.nixosModules.home-manager
         inputs.agenix.nixosModules.default
diff --git a/hosts/vali/configuration.nix b/hosts/vali/mars/configuration.nix
similarity index 95%
rename from hosts/vali/configuration.nix
rename to hosts/vali/mars/configuration.nix
index a0c74e3..f031fe9 100644
--- a/hosts/vali/configuration.nix
+++ b/hosts/vali/mars/configuration.nix
@@ -9,8 +9,9 @@
   myOptions = {
       other = {
           system = {
-              hostname = "nixos";
+              hostname = "mars";
               username = "vali";
+              gitPath = "/home/vali/Git/nichts";
           };
           home-manager = {
               enable = true;
diff --git a/hosts/vali/default.nix b/hosts/vali/mars/default.nix
similarity index 100%
rename from hosts/vali/default.nix
rename to hosts/vali/mars/default.nix
diff --git a/hosts/vali/hardware-configuration.nix b/hosts/vali/mars/hardware-configuration.nix
similarity index 100%
rename from hosts/vali/hardware-configuration.nix
rename to hosts/vali/mars/hardware-configuration.nix
diff --git a/hosts/vali/i3.nix b/hosts/vali/mars/i3.nix
similarity index 94%
rename from hosts/vali/i3.nix
rename to hosts/vali/mars/i3.nix
index 58b2bfc..8805701 100644
--- a/hosts/vali/i3.nix
+++ b/hosts/vali/mars/i3.nix
@@ -7,7 +7,7 @@ in {
   config = mkIf cfg.enable {
     services.xserver = {
       enable = true;
-      layout =  "de";
+      xkb.layout =  "de";
       windowManager = {
           bspwm.enable = true;
           i3.enable = true;
diff --git a/hosts/vali/profile.nix b/hosts/vali/mars/profile.nix
similarity index 100%
rename from hosts/vali/profile.nix
rename to hosts/vali/mars/profile.nix
diff --git a/hosts/vali/programs.nix b/hosts/vali/mars/programs.nix
similarity index 100%
rename from hosts/vali/programs.nix
rename to hosts/vali/mars/programs.nix