mirror of https://git.jolheiser.com/dotnix.git
chore: firefox bookmark dir, better exa override, and git insteadOf
Signed-off-by: jolheiser <john.olheiser@gmail.com>teamcity
parent
84d1244bdc
commit
39b11d2092
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
{lib, ...}: {
|
||||
programs.exa = {
|
||||
enable = true;
|
||||
# These don't affect nushell currently
|
||||
|
@ -8,7 +8,7 @@
|
|||
programs.nushell.shellAliases = {
|
||||
exa = "exa --git --icons";
|
||||
ls = "exa";
|
||||
ll = "exa -l";
|
||||
ll = lib.mkForce "exa -l";
|
||||
la = "exa -a";
|
||||
lt = "exa --tree";
|
||||
lla = "exa -la";
|
||||
|
|
|
@ -26,20 +26,25 @@
|
|||
};
|
||||
bookmarks = [
|
||||
{
|
||||
name = "Gitea";
|
||||
name = "Toolbar";
|
||||
toolbar = true;
|
||||
bookmarks = [
|
||||
{
|
||||
name = "gitea";
|
||||
tags = ["gitea"];
|
||||
keyword = "gitea";
|
||||
url = "https://github.com/go-gitea/gitea";
|
||||
}
|
||||
{
|
||||
name = "jojodev";
|
||||
tags = ["gitea"];
|
||||
keyword = "jojodev";
|
||||
url = "https://git.jojodev.com";
|
||||
name = "Gitea";
|
||||
bookmarks = [
|
||||
{
|
||||
name = "gitea";
|
||||
tags = ["gitea"];
|
||||
keyword = "gitea";
|
||||
url = "https://github.com/go-gitea/gitea";
|
||||
}
|
||||
{
|
||||
name = "jojodev";
|
||||
tags = ["gitea"];
|
||||
keyword = "jojodev";
|
||||
url = "https://git.jojodev.com";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
13
apps/git.nix
13
apps/git.nix
|
@ -1,5 +1,9 @@
|
|||
{config, ...}: let
|
||||
key = "0xB853ADA5DA7BBF7A";
|
||||
insteadOf = prefix: domain: {
|
||||
"https://${domain}/".insteadOf = "${prefix}:";
|
||||
"git@${domain}:".insteadOf = "ssh:${prefix}:";
|
||||
};
|
||||
in {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
|
@ -19,6 +23,7 @@ in {
|
|||
cb = "checkout -b";
|
||||
fu = "fetch upstream";
|
||||
fo = "fetch origin";
|
||||
dh = "diff HEAD";
|
||||
};
|
||||
lfs.enable = true;
|
||||
ignores = [".idea/"];
|
||||
|
@ -27,6 +32,14 @@ in {
|
|||
merge.conflictstyle = "diff3";
|
||||
diff.colorMoved = "default";
|
||||
core.editor = "hx";
|
||||
push = {
|
||||
default = "current";
|
||||
gpgSign = "if-asked";
|
||||
};
|
||||
url =
|
||||
insteadOf "gh" "github.com"
|
||||
// insteadOf "jojo" "git.jojodev.com"
|
||||
// insteadOf "tea" "gitea.com";
|
||||
};
|
||||
delta = {
|
||||
enable = true;
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
find = "fd";
|
||||
df = "duf";
|
||||
du = "dust -b -d 1";
|
||||
# ll = "ls -al"; # Handled by exa
|
||||
ll = "ls -al";
|
||||
};
|
||||
extraConfig = ''
|
||||
use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/bitwarden-cli/bitwarden-cli-completions.nu *
|
||||
|
|
Loading…
Reference in New Issue