diff --git a/conf.yml b/conf.yml index 08641db..a8b00ab 100644 --- a/conf.yml +++ b/conf.yml @@ -12,7 +12,6 @@ ~/.config/kitty: ~/.config/aerc: ~/.config/mako: - ~/.config/git: ~/.config/waybar: ~/.config/i3status-rust: ~/.config/rofi: diff --git a/git/config b/git/config deleted file mode 100644 index 5dbe5ab..0000000 --- a/git/config +++ /dev/null @@ -1,25 +0,0 @@ -[init] - defaultBranch = main - -[user] - email = hi@cything.io - name = cy - signingkey = 1200FBE36C2ADE2E - -[core] - pager = delta - -[interactive] - diffFilter = delta --color-only - -[delta] - navigate = true - -[merge] - conflictstype = diff3 - -[diff] - colorMoved = default - -[credential] - helper = store diff --git a/nix/flake.lock b/nix/flake.lock index 504bf67..718606d 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1733951607, - "narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=", + "lastModified": 1734043726, + "narHash": "sha256-e9YAMReFV1fDPcZLFC2pa4k/8TloSXeX0z2VysNMAoA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e5b2d9e8014b5572e3367937a329e7053458d34", + "rev": "3066cc58f552421a2c5414e78407fa5603405b1e", "type": "github" }, "original": { diff --git a/nix/home.nix b/nix/home.nix index 89014f4..2573f2a 100644 --- a/nix/home.nix +++ b/nix/home.nix @@ -32,4 +32,11 @@ home.sessionVariables = { ANKI_WAYLAND = "1"; }; + + programs.git = { + enable = true; + userName = "cy"; + userEmail = "hi@cything.io"; + delta.enable = true; + }; }