Update inputs, add lazygit, clean up git aliases (#183)

* Update tools and Zed settings

* Update secrets input, Zed settings tweaks

* Quick updates to Justfile and EditorConfig

* Update git aliases, add lazygit

Author: ethnt

.editorconfig

@@ -8,13 +8,6 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[*.bash]
-indent_style = table
-
-[*.gpg]
-insert_final_newline = false
-end_of_line = crlf
-
 [Justfile]
 indent_style = space
 indent_size = 4

Justfile

@@ -1,10 +1,7 @@
 hostname := `hostname`
-username := `whoami`
-
 cachix-cache-name := "tilde"
 attic-cache-name := "tilde"
 cache-jobs := "5"
-
 nh-build-flags := "--out-link result"
 
 default:

flake.lock

@@ -4,32 +4,47 @@
   programs.git = {
     enable = true;
 
-    settings = let
-      delta = lib.getExe pkgs.delta;
-      git = lib.getExe config.programs.git.package;
-      fzf = lib.getExe pkgs.fzf;
-      gh = lib.getExe pkgs.gh;
-      superprune = pkgs.writeShellScript "git-alias-superprune" ''
-        echo 'Fetching remote then deleting branches that are gone. This may take a moment'
-
-        ${git} fetch -p
-
-        gone=$(git for-each-ref --format '%(refname) %(upstream:track)' refs/heads | awk '$2 == "[gone]" {sub("refs/heads/", "", $1); print $1}')
-        for branch in $gone; do
-          ${git} branch -D $branch;
-        done;
-      '';
-      co = pkgs.writeShellScript "git-alias-co" ''
-        ${git} checkout "$(${git} branch --sort="-committerdate" | ${fzf} | tr -d '[:space:]')";
-      '';
-      wipe = pkgs.writeShellScript "git-alias-wipe" ''
-        ${git} add .
-        ${git} stash
-      '';
+    settings = let delta = lib.getExe pkgs.delta;
     in {
       user.name = "Ethan Turkeltaub";
 
-      alias = {
+      alias = let
+        gh = lib.getExe pkgs.gh;
+        mkGitShellScript = { name, text, extraRuntimeInputs ? [ ] }:
+          lib.getExe (pkgs.writeShellApplication {
+            inherit name text;
+
+            runtimeInputs = [ config.programs.git.package ]
+              ++ extraRuntimeInputs;
+          });
+        superprune = mkGitShellScript {
+          name = "git-alias-superprune";
+          text = ''
+            echo 'Fetching remote then deleting branches that are gone. This may take a moment'
+
+            git fetch -p
+
+            gone=$(git for-each-ref --format '%(refname) %(upstream:track)' refs/heads | awk '$2 == "[gone]" {sub("refs/heads/", "", $1); print $1}')
+            for branch in $gone; do
+              git branch -D "$branch";
+            done;
+          '';
+        };
+        co = mkGitShellScript {
+          name = "git-alias-co";
+          extraRuntimeInputs = [ pkgs.fzf ];
+          text = ''
+            git checkout "$(git branch --sort="-committerdate" | fzf | tr -d '[:space:]')";
+          '';
+        };
+        wipe = mkGitShellScript {
+          name = "git-alias-wipe";
+          text = ''
+            git add .
+            git stash
+          '';
+        };
+      in {
         s = "status";
         superprune = "!sh ${superprune}";
         co = "!sh ${co}";

modules/profiles/home/git/common.nix

@@ -0,0 +1,6 @@
+{
+  programs.lazygit = {
+    enable = true;
+    enableFishIntegration = true;
+  };
+}

modules/profiles/home/lazygit.nix

@@ -3,10 +3,9 @@
     comma
     curl
     curlie
-    dogdns
+    doggo
     fd
     gnused
-    graphite-cli
     htop
     httpie
     jq
@@ -16,6 +15,7 @@
     nixd
     nix-index
     nix-output-monitor
+    pgcli
     ripgrep
     tldr
   ];
@@ -26,9 +26,5 @@
 
     # Alias `man` to `batman`
     man = lib.getExe' pkgs.bat-extras.batman "batman";
-
-    # Alias `ctop` to use correct `$TERM`
-    ctop =
-      ''TERM="(string-replace tmux screen $TERM)" ${lib.getExe pkgs.ctop}'';
   };
 }

modules/profiles/home/tools/common.nix

@@ -1,7 +1,8 @@
 { pkgs, lib, ... }: {
   programs.zed-editor = {
     enable = true;
-    extensions = [ "nix" "nord" ];
+    extensions =
+      [ "haskell" "html" "just" "log" "nix" "nord" "sql" "starlark" ];
     userSettings = {
       # Keymaps
       base_keymap = "Atom";
@@ -26,6 +27,9 @@
       # Git
       git.inline_blame.enabled = false;
 
+      # File associations
+      file_types = { "Haskell" = [ "ghci" ]; };
+
       # Language-specific
       languages = {
         Nix = {
@@ -46,7 +50,6 @@
       };
 
       # AI
-      show_completions_on_input = false;
       show_edit_predictions = false;
     };
   };

modules/profiles/home/zed-editor.nix

@@ -13,6 +13,7 @@ with profiles;
     fzf
     ghostty
     helix
+    lazygit
     navi
     paths
     rippkgs

modules/suites/home.nix

@@ -1,5 +1,5 @@
 { pkgs, ... }: {
-  home.packages = with pkgs; [ graphite-cli fnm mkcert ];
+  home.packages = with pkgs; [ fnm mkcert ];
 
   programs.fish.interactiveShellInit = let fnm = pkgs.lib.getExe pkgs.fnm;
   in ''