Home

dotnix @main - refs - log -
- 
https://git.jolheiser.com/dotnix.git
My nix dotfiles
tree log patch
chore: firefox bookmark dir, better exa override, and git insteadOf Signed-off-by: jolheiser <john.olheiser@gmail.com>
Signature
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEgqEQpE3xoo1QwJO/uFOtpdp7v3oFAmSwYAcACgkQuFOtpdp7 v3pepRAAjm4PaeeCPnKzCVh07fmeh1ydGKXUsSE4K0wn456KGnUVA1zF0szGVMjh f46oE9HUN9WsaC1MoDe3OqNjA1gsE5772kBFcfuLNvCbhi1/WX12/oQ7cmOPbjn9 Dqz1Y4FjARrPBX6MhIg12bofMcFFO0L80be0mTBoTVqrloKiMmRSWGRJRNcuqaFL 9fUdOwJtO9PS/nToySU7lIGdI3BzNFWGTBTNouyl0mDTWqJnFaHhDEtuw24uWVAg nkqOkoMyg2j8lNjXg+vyH1F8fHIK6ElWkeVRmYk4xYi0nAh8Gn4RP0zCqRJJ3rYs qv9Mt8ZujGnsHaaxEhHfIAEC78xl3pKqLmrUSnqT54WXUIrHD+pmKwBpgWc/OUkX BVF7AJ3O4y68xRrOHmM+NVazClJVu7nCH6rfJp/Vha/70pKqxXRbLsdwspC0humr k8KU8CGSF6VR6XoD8FvFhZAz59GZFgw8o0MJ6tSA8ZPIyPhimSj0WyYiWDkkniGT z1EFzx9m+kcOcPMLCxpP3np+U0tXvnbMF3gfI/ne+jM4gL8ucS9ktzMioxTiSjdI qJ770w4Sd6CKyFPsMvhSR0KQVJm84kj5DHqDAvubgOWwbU08K/QQHUXA6d3FZ3NB UGCwQzCYZnlZx1pLM98dqrQ4WPX4oJB6N4sa7cP/8qD/jhSDMwU= =Ptp6 -----END PGP SIGNATURE-----
jolheiser <john.olheiser@gmail.com>
1 year ago
4 changed files, 32 additions(+), 12 deletions(-)
M apps/exa.nix -> apps/exa.nix
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,5 @@
 {
+    # 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";
 {
-{
+  };
     la = "exa -a";
     lt = "exa --tree";
     lla = "exa -la";
M apps/firefox.nix -> apps/firefox.nix
diff --git a/apps/firefox.nix b/apps/firefox.nix
index c8c6543f219bffb4856950efd8989cb28fb260ac..0ce61898ae3d48563d91d755628a929da159cd38 100644
--- a/apps/firefox.nix
+++ b/apps/firefox.nix
@@ -26,25 +26,31 @@         ];
       };
       bookmarks = [
         {
-          name = "Gitea";
+          name = "Toolbar";
           toolbar = true;
           bookmarks = [
             {
-              name = "gitea";
+              name = "Gitea";
-    enable = true;
     profiles.default = {
+        bitwarden
-              keyword = "gitea";
+                {
-              url = "https://github.com/go-gitea/gitea";
+                  name = "gitea";
-            }
+                  tags = ["gitea"];
-    enable = true;
+      search.default = "DuckDuckGo";
   programs.firefox = {
+      search.default = "DuckDuckGo";
     enable = true;
-        bitwarden
-    enable = true;
+      search.default = "DuckDuckGo";
     profiles.default = {
-    enable = true;
+    profiles.default = {
         refined-github
+                  name = "jojodev";
+                  tags = ["gitea"];
+                  keyword = "jojodev";
+                  url = "https://git.jojodev.com";
+      search.default = "DuckDuckGo";
     profiles.default = {
+              ];
             }
           ];
         }
M apps/git.nix -> apps/git.nix
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;
M apps/nushell.nix -> apps/nushell.nix
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 *