From 2aec0d341d971529bbd69dea8e3cab1f7b4b6e4c Mon Sep 17 00:00:00 2001 From: Artem Sheremet Date: Sat, 28 Mar 2026 22:36:57 +0100 Subject: [PATCH] Fix git config override --- .gitignore | 2 ++ flake.lock | 8 ++++---- flake.nix | 4 ---- 3 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..550c6a7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +# "nix build" default output symlink +/result diff --git a/flake.lock b/flake.lock index 36e6299..6289b10 100644 --- a/flake.lock +++ b/flake.lock @@ -63,11 +63,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1774719162, - "narHash": "sha256-YboCoVsXNlDd3froJ6KnYxuloJOJQwwz9vn8Qv/4Jxk=", + "lastModified": 1774734717, + "narHash": "sha256-mmIc5ZA+hWt9IfZolKOSFEHQc0//dNei3hy7V8yblCg=", "ref": "refs/heads/main", - "rev": "2abb541c71e28763727641b243757ccff78d17c9", - "revCount": 9, + "rev": "581b0c951d83f25a532cea8209eb302c18c7a826", + "revCount": 13, "type": "git", "url": "https://github.com/futureware-tech/nix.git" }, diff --git a/flake.nix b/flake.nix index 14c4a99..b08af86 100644 --- a/flake.nix +++ b/flake.nix @@ -77,10 +77,6 @@ type = lib.types.deferredModule; default = { }; }; - options.programs.git = lib.mkOption { - type = lib.types.deferredModule; - default = { }; - }; }) ./hosts/mars/darwin.nix ];