diff --git a/.dotbot.conf.yaml b/.dotbot.conf.yaml index bd90a41..65d26c0 100644 --- a/.dotbot.conf.yaml +++ b/.dotbot.conf.yaml @@ -8,7 +8,6 @@ - ~/.config/gh - ~/.config/gh-dash - ~/.config/lazydocker - - ~/.config/lazygit - ~/.config/tmux - ~/.gnupg @@ -21,7 +20,6 @@ ~/.config/gh/config.yml: github/gh/config.yml ~/.config/karabiner: karabiner ~/.config/lazydocker/config.yml: docker/lazydocker.yml - ~/.config/lazygit/config.yml: git/lazygit.yml ~/.config/lf: lf ~/.config/nvim: nvim ~/.config/oatmeal: oatmeal diff --git a/Brewfile b/Brewfile index e809f1a..424ca5d 100644 --- a/Brewfile +++ b/Brewfile @@ -239,8 +239,6 @@ brew "jpeg", link: true brew "jq" # Lazier way to manage everything docker brew "lazydocker" -# Simple terminal UI for git commands -brew "lazygit" # Terminal file manager brew "lf" # Access DVDs as block devices without the decryption diff --git a/git/lazygit.yml b/git/lazygit.yml deleted file mode 100644 index e8fa2bc..0000000 --- a/git/lazygit.yml +++ /dev/null @@ -1,16 +0,0 @@ -git: - overrideGpg: true - paging: - colorArg: always - pager: delta --dark --paging=never syntax-theme=Dracula -customCommands: - - key: "C" - command: "git cz c" - description: "commit with commitizen" - context: "files" - loadingText: "opening commitizen commit tool" - subprocess: true - - key: "W" - command: git commit --no-verify - context: "global" - subprocess: true diff --git a/nix/home/default.nix b/nix/home/default.nix index 06bd74b..43a8441 100644 --- a/nix/home/default.nix +++ b/nix/home/default.nix @@ -10,6 +10,7 @@ in ./ag ./bat ./ctags + ./lazygit ./ripgrep ./skhd ./yabai @@ -21,6 +22,9 @@ in # Let Home Manager install and manage itself. programs.home-manager.enable = true; + # Write into ~/.config + xdg.enable = true; + # TODO: First migrate all fonts # fonts.fontconfig.enable = true; diff --git a/nix/home/lazygit/default.nix b/nix/home/lazygit/default.nix new file mode 100644 index 0000000..db43b41 --- /dev/null +++ b/nix/home/lazygit/default.nix @@ -0,0 +1,32 @@ +{ ... }: + +{ + programs.lazygit = { + enable = true; + settings = { + git = { + overrideGpg = true; + paging = { + colorArg = "always"; + pager = "delta --dark --paging=never syntax-theme=Dracula"; + }; + }; + customCommands = [ + { + key = "C"; + command = "git cz c"; + description = "commit with commitizen"; + context = "files"; + loadingText = "opening commitizen commit tool"; + subprocess = true; + } + { + key = "W"; + command = "git commit --no-verify"; + context = "global"; + subprocess = true; + } + ]; + }; + }; +}