diff --git a/home/common/programs/default.nix b/home/common/programs/default.nix index 8b8dc79..da3d409 100644 --- a/home/common/programs/default.nix +++ b/home/common/programs/default.nix @@ -1,5 +1,5 @@ { lib, config, ... }: { - imports = [ ./zsh.nix ./neovim ./rust.nix ./git.nix ./solidity.nix ]; + imports = [ ./zsh.nix ./neovim ./rust.nix ./git ./solidity.nix ]; programs = { home-manager.enable = true; diff --git a/home/common/programs/git.nix b/home/common/programs/git.nix deleted file mode 100644 index 2181446..0000000 --- a/home/common/programs/git.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ pkgs, ... }: { - commitTemplate = builtins.toFile "git-commit-template.txt" '' - Change me - ''; - - programs.git = { - enable = true; - userName = "Miguel Palhas"; - userEmail = "mpalhas@gmail.com"; - aliases = { - ls = - "log --color --graph --oneline --decorate --topo-order --pretty=format:'%C(yellow)%d%Creset %Cgreen(%cr)%Creset %C(bold blue)[%an]%Creset %s %Cred(%h)%Creset' --abbrev-commit"; - ll = '' - log --reverse --pretty=format:"%C(yellow)%h%Cred%d\ %Creset%s%Cblue\ [%an]" --decorate --numstat''; - conf = "diff --name-only --diff-filter=U"; - ba = "branch -a"; - pb = "publish"; - ps = "push -u"; - pr = "pull-request"; - ppr = "push-pr"; - cpr = "close-pr"; - opr = "open-pr"; - f = "fetch"; - c = "commit --verbose"; - d = "diff"; - dc = "diff --cached"; - co = "checkout"; - s = "status -sb"; - b = "better-branch"; - rb = "rebase"; - rbc = "rebase --continue"; - }; - extraConfig = { - core = { - editor = "nvim"; - pager = "delta"; - }; - commit = { template = "${commitTemplate}"; }; - push = { default = "upstream"; }; - delta = { navigate = true; }; - "diff \"image\"" = { textconv = "mediainfo"; }; - "diff \"text\"" = { textconv = "fold -s -w80"; }; - }; - }; - - home.packages = with pkgs; [ delta mediainfo ]; - programs.gh.enable = true; -}