home/natto: move around stuff

move git and zsh from hosts/satori and split services.nix

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>

hosts/satori/default.nix

@@ -10,6 +10,7 @@
       ./services.nix
       ./graphics.nix
       ./xorg.nix
+      ./wayland.nix
       ./nix.nix
     ];
   system.stateVersion = "21.05";

hosts/satori/pkgs.nix

@@ -31,42 +31,9 @@
       };
     };
 
-    git = {
-      enable = true;
-      package = pkgs.git.override {
-        doInstallCheck = false;
-        sendEmailSupport = true;
-        withManual = false;
-      };
-    };
 
-    zsh = {
-      enable = true;
-      histSize = 30000;
-      enableCompletion = true;
-      enableBashCompletion = true;
-      syntaxHighlighting.enable = true;
-      autosuggestions = {
-        enable = true;
-        highlightStyle = "fg=yellow,bold";
-      };
-      ohMyZsh.enable = true;
-    };
     adb.enable = true;
     light.enable = true;
-    /* proxychains = {
-      enable = true;
-      chain.type = "dynamic";
-      proxyDNS = true;
-      proxies = {
-        remilia = {
-          enable = true;
-          type = "socks5";
-          host = "127.0.0.1";
-          port = 2217;
-        };
-      };
-    }; */
     gamemode.enable = true;
     nm-applet.enable = true;
   };

hosts/satori/stuff.nix

@@ -19,6 +19,7 @@
       ];
     };
   };
+  console.useXkbConfig = true;
 
   fonts.fonts = with pkgs; [
     fira-mono

hosts/satori/xorg.nix

@@ -6,7 +6,6 @@
 #  '';
 #in
 {
-  console.useXkbConfig = true;
   services = {
     xserver = {
       enable = true;
@@ -35,8 +34,8 @@
           symbolsFile = ./colemak;
         };
       };
-      layout = "colemak";
-      xkbVariant = "dhz"; # trying to ditch DHz now
+      layout = "us";
+      xkbVariant = "colemak_dh"; # trying to ditch DHz now
       autoRepeatDelay = 320;
       autoRepeatInterval = 30;
     };