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