add icecube and git config

hosts/icecube/home.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }: {
+  home.stateVersion = "24.05";
+  home.username = "jonathan";
+  home.homeDirectory = "/home/jonathan";
+
+  imports = [
+    ../../programs/nvim
+    ../../programs/zsh
+    ../../programs/tmux
+    ../../programs/git
+  ];
+}

hosts/kili/home.nix

@@ -9,16 +9,17 @@
     ../../programs/kanata
     ../../programs/kitty
     ../../programs/tmux
+    ../../programs/git
   ];
 
   # use the system-installed version of kitty on arch
   # something graphics related crashes otherwise
   programs.kitty.package = pkgs.stdenv.mkDerivation {
-      name = "kitty";
-      src = ./.;
-      installPhase = ''
-        mkdir -p $out/bin
-        echo "#!/usr/bin/env bash\nexec /usr/bin/kitty" > $out/bin/kitty;
-      '';
+    name = "kitty";
+    src = ./.;
+    installPhase = ''
+      mkdir -p $out/bin
+      echo "#!/usr/bin/env bash\nexec /usr/bin/kitty" > $out/bin/kitty;
+    '';
   };
 }

hosts/ori/home.nix

@@ -2,10 +2,11 @@
   home.stateVersion = "24.05";
   home.username = "jonathan";
   home.homeDirectory = "/home/jonathan";
-  imports = [ 
+  imports = [
     ../../programs/gnome
     ../../programs/nvim
     ../../programs/zsh
+    ../../programs/git
   ];
 
   home.packages = with pkgs; [
@@ -41,20 +42,4 @@
   programs.firefox = { enable = true; };
 
   services.syncthing = { enable = true; };
-
-  programs.git = {
-    enable = true;
-    extraConfig = {
-      init.defaultBranch = "main";
-      pull.rebase = false;
-      # merge.tool = "meld";
-      # mergetool.meld.cmd = ''
-      # ${pkgs.meld}/bin/meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
-      # '';
-      push = { autoSetupRemote = true; };
-    };
-    aliases = { amend = "commit --amend"; };
-    userName = "Jonathan Dönszelmann";
-    userEmail = "jonathan@donsz.nl";
-  };
 }