From d488882f452e8761a4b8843fa1e8d709510b7583 Mon Sep 17 00:00:00 2001 From: MoritzBoehme Date: Sun, 31 Oct 2021 19:45:06 +0100 Subject: [PATCH] added forgit --- flake.lock | 17 +++++++++++++++++ flake.nix | 4 ++++ modules/cli/git.nix | 1 + modules/cli/zsh.nix | 8 ++++++++ 4 files changed, 30 insertions(+) diff --git a/flake.lock b/flake.lock index c836aa5..60c132a 100644 --- a/flake.lock +++ b/flake.lock @@ -48,6 +48,22 @@ "type": "github" } }, + "forgit-git": { + "flake": false, + "locked": { + "lastModified": 1635245145, + "narHash": "sha256-jbrn8cIHQFmceofCVA1TjRPQL5hRdGFgxLfeIZE6Z7k=", + "owner": "wfxr", + "repo": "forgit", + "rev": "b727321f2bd3d79c1dae805441261c45888cbb41", + "type": "github" + }, + "original": { + "owner": "wfxr", + "repo": "forgit", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": "nixpkgs_2" @@ -144,6 +160,7 @@ "inputs": { "agenix": "agenix", "emacs-overlay": "emacs-overlay", + "forgit-git": "forgit-git", "home-manager": "home-manager", "nixpkgs": "nixpkgs_3", "nur": "nur", diff --git a/flake.nix b/flake.nix index cdf68e8..4f94a7a 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,10 @@ url = "github:jonaburg/picom"; flake = false; }; + forgit-git = { + url = "github:wfxr/forgit"; + flake = false; + }; }; outputs = inputs@{ self, agenix, home-manager, nixpkgs, utils, ... }: diff --git a/modules/cli/git.nix b/modules/cli/git.nix index cb82899..c6ce386 100644 --- a/modules/cli/git.nix +++ b/modules/cli/git.nix @@ -7,6 +7,7 @@ let userName = "MoritzBoehme"; userEmail = "mr.x@moritzboeh.me"; extraConfig = { init.defaultBranch = "main"; }; + delta.enable = true; }; }); in { home-manager.users.moritz = { ... }: (base "/home/moritz"); } diff --git a/modules/cli/zsh.nix b/modules/cli/zsh.nix index 3c5ff60..80f3cc8 100644 --- a/modules/cli/zsh.nix +++ b/modules/cli/zsh.nix @@ -16,9 +16,17 @@ let enableAutosuggestions = true; enableCompletion = true; initExtra = ''export DIRENV_LOG_FORMAT=""''; + plugins = [{ + name = "forgit"; + src = inputs.forgit-git; + }]; }; exa.enable = true; bat.enable = true; + fzf = { + enable = true; + enableZshIntegration = true; + }; starship = { enable = true;