This commit is contained in:
nora 2023-06-04 21:56:51 +02:00
parent 94cb8c31d7
commit e44eed1620
2 changed files with 10 additions and 3 deletions

View file

@ -66,15 +66,14 @@
aliases = { aliases = {
hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\""; hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\"";
fpush = "push --force-with-lease"; fpush = "push --force-with-lease";
resq = "!rebase --autosquash -i $(git merge-base origin/master HEAD)"; resq = "!git rebase --autosquash -i $(git merge-base origin/master HEAD)";
}; };
difftastic = { difftastic = {
enable = true; enable = true;
}; };
extraConfig = { extraConfig = {
core.autocrlf = false; core.autocrlf = false;
# wants some sort of attribute set. pkgs.neovim doesnt work either :( core.editor = "nvim";
# editor = "nvim";
pull.ff = "only"; pull.ff = "only";
init.defaultBranch = "main"; init.defaultBranch = "main";
}; };
@ -104,6 +103,10 @@
name = "home-manager options"; name = "home-manager options";
url = "https://rycee.gitlab.io/home-manager/options.html"; url = "https://rycee.gitlab.io/home-manager/options.html";
} }
{
name = "nixpkgs search";
url = "https://search.nixos.org/packages";
}
]; ];
} }
]; ];
@ -117,6 +120,9 @@
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
jnoortheen.nix-ide jnoortheen.nix-ide
usernamehw.errorlens usernamehw.errorlens
ms-vscode.cmake-tools
ms-vscode.cpptools
eamodio.gitlens
]; ];
}; };

View file

@ -144,6 +144,7 @@
packages = with pkgs; [ packages = with pkgs; [
firefox firefox
vscode vscode
minecraft
home-manager home-manager
]; ];
shell = pkgs.fish; shell = pkgs.fish;