1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19

diff --git a/apps/exa.nix b/apps/exa.nix
index d2e3c549913e941b425a961ec60a2b833dee0f11..9e13318421998db46eb08a1d70bb2d377b7653b9 100644
--- a/apps/exa.nix
+++ b/apps/exa.nix
@@ -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";

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41

diff --git a/apps/firefox.nix b/apps/firefox.nix
index c8c6543f219bffb4856950efd8989cb28fb260ac..0ce61898ae3d48563d91d755628a929da159cd38 100644
--- a/apps/firefox.nix
+++ b/apps/firefox.nix
@@ -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";
+                }
+              ];
             }
           ];
         }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37

diff --git a/apps/git.nix b/apps/git.nix
index 9b221edecede607d08406fe70f9b51f308759051..76a6f3c9e852363e27dab03dc6ebbef1913122d8 100644
--- a/apps/git.nix
+++ b/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 @@       poh = "push origin HEAD";
       cb = "checkout -b";
       fu = "fetch upstream";
       fo = "fetch origin";
+      dh = "diff HEAD";
     };
     lfs.enable = true;
     ignores = [".idea/"];
@@ -27,6 +32,14 @@       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;

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13

diff --git a/apps/nushell.nix b/apps/nushell.nix
index 66a2b7d87c15d9bd06c0dd39fe3648bc244454fe..99c5f26ee54a25306c1dc3f20dcce90a541eda8f 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"; # Handled by exa
+      ll = "ls -al";
     };
     extraConfig = ''
       use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/bitwarden-cli/bitwarden-cli-completions.nu *