Noratrieb/nixos
1
0
Fork 0
mirror of https://github.com/Noratrieb/nixos.git synced 2026-01-14 11:45:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

update

Browse source
This commit is contained in:
nora 2025-10-26 22:02:21 +01:00
parent 90ca01089d
commit 06d1a6aa16
4 changed files with 58 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

55
home-manager/git.nix
View file

@ -2,32 +2,32 @@
programs.git = {
enable = true;
userEmail = "48135649+Noratrieb@users.noreply.github.com";
userName = "Noratrieb";
settings = {
user = {
name = "Noratrieb";
email = "48135649+Noratrieb@users.noreply.github.com";
};
alias = {
# simple aliases
c = "checkout";
st = "status";
p = "push";
rc = "rebase --continue";
ra = "rebase --abort";
amend = "commit --amend --no-edit";
# complex renames
hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\"";
fpush = "push --force-with-lease";
resq = "rebase --autosquash -i";
autosquash = "!${lib.getExe pkgs.git-revise} -i $(git merge-base HEAD origin/HEAD) --autosquash";
autosq = "autosquash";
pfush = "!echo \"hör uf ume z'pfusche und machs richtig\"";
sw = "!git checkout $(git branch --format \"%(refname:lstrip=2)\" | ${lib.getExe' pkgs.fzf "fzf"})";
# lol
build = "!cargo build";
};
aliases = {
# simple aliases
c = "checkout";
st = "status";
p = "push";
rc = "rebase --continue";
ra = "rebase --abort";
amend = "commit --amend --no-edit";
# complex renames
hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\"";
fpush = "push --force-with-lease";
resq = "rebase --autosquash -i";
autosquash = "!${lib.getExe pkgs.git-revise} -i $(git merge-base HEAD origin/HEAD) --autosquash";
autosq = "autosquash";
pfush = "!echo \"hör uf ume z'pfusche und machs richtig\"";
sw = "!git checkout $(git branch --format \"%(refname:lstrip=2)\" | ${lib.getExe' pkgs.fzf "fzf"})";
# lol
build = "!cargo build";
};
difftastic = {
enable = true;
};
extraConfig = {
# TODO: See https://jvns.ca/blog/2024/02/16/popular-git-config-options
core.autocrlf = false;
core.editor = "${lib.getExe pkgs.neovim}";
@ -46,4 +46,9 @@
"url \"git@gist.github.com:\"".pushInsteadOf = "https://gist.github.com/";
};
};
programs.difftastic = {
enable = true;
git.enable = true;
};
}

1
home-manager/vscode.nix
View file

@ -56,6 +56,7 @@
"terminal.integrated.stickyScroll.enabled" = false;
"chat.agent.enabled" = false;
"workbench.secondarySideBar.defaultVisibility" = "hidden"; # fuck you for this naming, this is just ai garbage
"chat.disableAIFeatures" = true;
};
extensions = with pkgs.vscode-extensions; [
bmalehorn.vscode-fish