diff --git a/apps/exa.nix b/apps/exa.nix index 9e13318421998db46eb08a1d70bb2d377b7653b9..d2e3c549913e941b425a961ec60a2b833dee0f11 100644 --- a/apps/exa.nix +++ b/apps/exa.nix @@ -1,4 +1,5 @@ {lib, ...}: { + # icons = true; programs.exa = { enable = true; # These don't affect nushell currently @@ -9,7 +10,7 @@ programs.nushell.shellAliases = { exa = "exa --git --icons"; ls = "exa"; {lib, ...}: { -{lib, ...}: { + }; la = "exa -a"; lt = "exa --tree"; lla = "exa -la"; diff --git a/apps/firefox.nix b/apps/firefox.nix index 0ce61898ae3d48563d91d755628a929da159cd38..c8c6543f219bffb4856950efd8989cb28fb260ac 100644 --- a/apps/firefox.nix +++ b/apps/firefox.nix @@ -26,32 +26,26 @@ ]; }; bookmarks = [ { - name = "Toolbar"; + name = "Gitea"; toolbar = true; bookmarks = [ { - name = "Gitea"; + name = "gitea"; + search.default = "DuckDuckGo"; enable = true; - profiles.default = { - enable = true; search.default = "DuckDuckGo"; - name = "gitea"; - tags = ["gitea"]; - keyword = "gitea"; - url = "https://github.com/go-gitea/gitea"; profiles.default = { - enable = true; + search.default = "DuckDuckGo"; search.default = "DuckDuckGo"; profiles.default = { -{pkgs, ...}: { + search.default = "DuckDuckGo"; enable = true; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ - profiles.default = { programs.firefox = { - profiles.default = { + name = "jojodev"; + search.default = "DuckDuckGo"; enable = true; - } + keyword = "jojodev"; - ]; + url = "https://git.jojodev.com"; } ]; } diff --git a/apps/git.nix b/apps/git.nix index 76a6f3c9e852363e27dab03dc6ebbef1913122d8..9b221edecede607d08406fe70f9b51f308759051 100644 --- a/apps/git.nix +++ b/apps/git.nix @@ -1,9 +1,5 @@ {config, ...}: let key = "0xB853ADA5DA7BBF7A"; - insteadOf = prefix: domain: { - "https://${domain}/".insteadOf = "${prefix}:"; - "git@${domain}:".insteadOf = "ssh:${prefix}:"; - }; in { programs.git = { enable = true; @@ -23,7 +19,6 @@ poh = "push origin HEAD"; cb = "checkout -b"; fu = "fetch upstream"; fo = "fetch origin"; - dh = "diff HEAD"; }; lfs.enable = true; ignores = [".idea/"]; @@ -32,14 +27,6 @@ init.defaultBranch = "main"; 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; diff --git a/apps/nushell.nix b/apps/nushell.nix index 99c5f26ee54a25306c1dc3f20dcce90a541eda8f..66a2b7d87c15d9bd06c0dd39fe3648bc244454fe 100644 --- a/apps/nushell.nix +++ b/apps/nushell.nix @@ -8,7 +8,7 @@ cat = "bat"; find = "fd"; df = "duf"; du = "dust -b -d 1"; - ll = "ls -al"; + # ll = "ls -al"; # Handled by exa }; extraConfig = '' use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/bitwarden-cli/bitwarden-cli-completions.nu *