flake.nix

@@ -123,7 +123,6 @@
         (import ./overlays/neovim-plugins.nix inputs)
         (import ./overlays/lib.nix)
         (import ./overlays/calibre-web.nix)
-        (import ./overlays/gh-cli.nix)
       ];
 
       # System types to support.

hosts/lookingglass/default.nix

@@ -31,7 +31,7 @@ darwin.lib.darwinSystem {
       neovim.enable = true;
       mail.enable = true;
       mail.aerc.enable = true;
-      mail.himalaya.enable = false;
+      mail.himalaya.enable = true;
       kitty.enable = true;
       discord.enable = true;
       firefox.enable = true;

modules/common/applications/default.nix

@@ -7,6 +7,7 @@
     ./firefox.nix
     ./kitty.nix
     ./media.nix
+    ./nautilus.nix
     ./obsidian.nix
     ./qbittorrent.nix
     ./slack.nix

modules/common/shell/fish/functions/git-push-upstream.fish

@@ -0,0 +1,4 @@
+set -l branch (git branch 2>/dev/null | grep '^\*' | colrm 1 2)
+and set -l command "git push --set-upstream origin $branch"
+and commandline -r $command
+and commandline -f execute

modules/common/shell/git.nix

@@ -51,6 +51,7 @@ in {
         gcae = "git commit --amend";
         gu = "git pull";
         gp = "git push";
+        gpp = "git-push-upstream";
         gl = "git log --graph --decorate --oneline -20";
         gll = "git log --graph --decorate --oneline";
         gco = "git checkout";
@@ -113,6 +114,10 @@ in {
           git-history = {
             body = builtins.readFile ./fish/functions/git-history.fish;
           };
+          git-push-upstream = {
+            description = "Create upstream branch";
+            body = builtins.readFile ./fish/functions/git-push-upstream.fish;
+          };
           uncommitted = {
             description = "Find uncommitted git repos";
             body = builtins.readFile ./fish/functions/uncommitted.fish;

modules/nixos/applications/default.nix

@@ -1,5 +1,5 @@
 { ... }: {
 
-  imports = [ ./calibre.nix ./nautilus.nix ];
+  imports = [ ./calibre.nix ];
 
 }

overlays/gh-cli.nix

@@ -1,12 +0,0 @@
-# Testing: https://github.com/cli/cli/issues/5011#issuecomment-1576931518
-
-_final: prev: {
-  gh = prev.gh.overrideAttrs (old: {
-    src = prev.fetchFromGitHub {
-      owner = "cli";
-      repo = "cli";
-      rev = "420f63c3ec660d27182b713bd18459e7376f0a7a";
-      sha256 = "sha256-ik4YCQBTr9637dofrh/AcgoOBa8Bx9F+brUMpC8u5U8=";
-    };
-  });
-}