diff --git a/git/.gitconfig b/git/.gitconfig deleted file mode 100644 index fc37b7a..0000000 --- a/git/.gitconfig +++ /dev/null @@ -1,27 +0,0 @@ -[color] - ui = auto - diff = auto - status = auto - branch = auto -[alias] - lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative - st = status - remotes = remote -v - branches = branch -a - tags = tag - stashes = stash list - unstage = reset -q HEAD -- - discard = checkout -- - uncommit = reset --mixed HEAD~ - graph = log --graph -10 --branches --remotes --tags --format=format:'%Cgreen%h %Creset• %<(75,trunc)%s (%cN, %cr) %Cred%d' --date-order - dad = !curl https://icanhazdadjoke.com/ && git add -[push] - default = simple -[user] - email = yorick@yorickvanpelt.nl - name = Yorick van Pelt - signingkey = A36E70F9DC014A15 -[help] - autocorrect = 5 -[includeIf "gitdir:~/serokell/"] -path=~/serokell/.gitconfig diff --git a/install.sh b/install.sh index e360711..41c1f3f 100755 --- a/install.sh +++ b/install.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash #!nix-shell -i bash -p stow set -e -$(nix-build '' -A stow --no-out-link)/bin/stow -d `dirname $0` -t ~ nix git x gtk gpg mutt misc bash stow rofi +$(nix-build '' -A stow --no-out-link)/bin/stow -d `dirname $0` -t ~ nix x gtk gpg mutt misc bash stow rofi nix build -f. $(hostname -s) diff --git a/nix/.config/nixpkgs/home.nix b/nix/.config/nixpkgs/home.nix new file mode 100644 index 0000000..ef41992 --- /dev/null +++ b/nix/.config/nixpkgs/home.nix @@ -0,0 +1,32 @@ +{ + programs = { + home-manager = { + enable = true; + path = https://github.com/rycee/home-manager/archive/master.tar.gz; + }; + git = { + enable = true; + userName = "Yorick van Pelt"; + userEmail = "yorick@yorickvanpelt.nl"; + signing.key = "A36E70F9DC014A15"; + # signing.signByDefault = true; + extraConfig.help.autocorrect = 5; + extraConfig.push.default = "simple"; + extraConfig."includeIf \"gitdir:~/serokell/\"".path = "~/serokell/.gitconfig"; + aliases = { + lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"; + st = "status"; + remotes = "remote -v"; + branches = "branch -a"; + tags = "tag"; + stashes = "stash list"; + unstage = "reset -q HEAD --"; + discard = "checkout --"; + uncommit = "reset --mixed HEAD~"; + graph = "log --graph -10 --branches --remotes --tags --format=format:'%Cgreen%h %Creset• %<(75,trunc)%s (%cN, %cr) %Cred%d' --date-order "; + dad = "!curl https://icanhazdadjoke.com/ && git add"; + }; + }; + + }; +}