From 1475ab094c10871d4a041ffa3b6bfae213a86473 Mon Sep 17 00:00:00 2001 From: Charlotte Delenk Date: Fri, 8 Nov 2024 20:23:42 +0100 Subject: [PATCH] add git config --- machine/rainbow-resort/hardware.nix | 1 - users/darkkirb/default.nix | 1 + users/darkkirb/home-manager/default.nix | 5 +++++ users/darkkirb/home-manager/git.nix | 20 ++++++++++++++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 users/darkkirb/home-manager/default.nix create mode 100644 users/darkkirb/home-manager/git.nix diff --git a/machine/rainbow-resort/hardware.nix b/machine/rainbow-resort/hardware.nix index a6528c87..605ced23 100644 --- a/machine/rainbow-resort/hardware.nix +++ b/machine/rainbow-resort/hardware.nix @@ -43,5 +43,4 @@ "gccarch-skylake-avx512" "ca-derivations" ]; - } diff --git a/users/darkkirb/default.nix b/users/darkkirb/default.nix index 32a676a1..38cb287d 100644 --- a/users/darkkirb/default.nix +++ b/users/darkkirb/default.nix @@ -18,5 +18,6 @@ }; home-manager.users.darkkirb.sops.age.keyFile = config.sops.secrets."users/users/darkkirb/age-key".path; home-manager.users.darkkirb.home.persistence.default.directories = ["sources" "Games"]; + home-manager.users.darkkirb.imports = [./home-manager]; environment.impermanence.users = ["darkkirb"]; } diff --git a/users/darkkirb/home-manager/default.nix b/users/darkkirb/home-manager/default.nix new file mode 100644 index 00000000..6add50f8 --- /dev/null +++ b/users/darkkirb/home-manager/default.nix @@ -0,0 +1,5 @@ +{...}: { + imports = [ + ./git.nix + ]; +} diff --git a/users/darkkirb/home-manager/git.nix b/users/darkkirb/home-manager/git.nix new file mode 100644 index 00000000..86bb9518 --- /dev/null +++ b/users/darkkirb/home-manager/git.nix @@ -0,0 +1,20 @@ +{pkgs, systemConfig, ...}: { + programs.git = { + enable = true; + package = + if systemConfig.isGraphical + then pkgs.gitAndTools.gitFull + else pkgs.git; + lfs.enable = true; + userEmail = "lotte@chir.rs"; + userName = "Charlotte 🦝 Delenk"; + extraConfig = { + init.defaultBranch = "main"; + merge.conflictstyle = "diff3"; + push.autoSetupRemote = true; + rerere.enabled = true; + }; + delta.enable = true; + }; +} +