3 files changed, 30 insertions, 4 deletions
diff --git a/users/fcuny/common.nix b/users/fcuny/common.nix
index 62ebb80..7bad304 100644
--- a/users/fcuny/common.nix
+++ b/users/fcuny/common.nix
@@ -13,8 +13,8 @@
     EDITOR = "vim";
   };
 
-  programs.go = {
-    enable = true;
-    goPath = "workspace/go";
-  };
+  import = [
+    ./git.nix
+    ./go.nix
+  ]
 }
diff --git a/users/fcuny/git.nix b/users/fcuny/git.nix
new file mode 100644
index 0000000..adaf626
--- /dev/null
+++ b/users/fcuny/git.nix
@@ -0,0 +1,20 @@
+{
+  programs.git = {
+    enable = true;
+    aliases = {
+      s = "status --short --branch";
+      amend = "commit --amend --no-edit";
+    };
+    extraConfig = {
+      core.whitespace = "trailing-space,space-before-tab";
+      color.ui = "true";
+      push.default = "simple";
+      init.defaultBranch = "main";
+      branch.autosetuprebase = "remote";
+      branch.sort = "authordate";
+    };
+    userName = "Franck Cuny";
+    userEmail = "franck@fcuny.net";
+    ignores = [ "*.o" "*.pyc" "*.pyo" "*.elc" "*~" ".direnv/*" "\\#*\\#" ".\\#" ];
+  };
+}
diff --git a/users/fcuny/go.nix b/users/fcuny/go.nix
new file mode 100644
index 0000000..990b2ae
--- /dev/null
+++ b/users/fcuny/go.nix
@@ -0,0 +1,6 @@
+{
+  programs.go = {
+    enable = true;
+    goPath = "workspace/go";
+  };
+}