From 5481cdb3620d746dfb9efcadbeb91f17d3f9c8b3 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Mon, 16 Dec 2024 10:44:00 -0600
Subject: [PATCH] Install jujutsu, disable emacs, bat for pager

---
 flake.nix                        |  2 +-
 modules/home-manager/default.nix | 19 +++++++--
 modules/nixos/default.nix        | 67 +++++++++++++++-----------------
 templates/rust/flake.nix         |  6 +--
 4 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/flake.nix b/flake.nix
index dc82b5f..5c9a851 100644
--- a/flake.nix
+++ b/flake.nix
@@ -89,7 +89,7 @@
     forSystems = nixpkgs.lib.genAttrs systems;
     pkgsFor = system: (import nixpkgs {inherit system;}).extend overlays.default;
     genPkgs = func: (forSystems (system: func (pkgsFor system)));
-    pkg = callee: overrides: genPkgs (pkgs: pkgs.callPackage callee overrides);
+    # pkg = callee: overrides: genPkgs (pkgs: pkgs.callPackage callee overrides);
 
     unstable = {
       forSystems = nixpkgs-unstable.lib.genAttrs systems;
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 2c0102b..6452b8c 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -39,7 +39,7 @@
 
   emacs = {pkgs, ...}: {
     programs.emacs = {
-      enable = true;
+      enable = false;
       /*
       extraConfig = ''
       '';
@@ -84,6 +84,7 @@
       bat
       homeManagerModules.helix
       git
+      jujutsu
       zellij
       htop
 
@@ -112,7 +113,7 @@
 
       packages = with pkgs; [
         # tools I use when editing nix code
-        kanidm
+        # kanidm
         nil
         alejandra
         gnupg
@@ -132,7 +133,7 @@
       # https://github.com/lotabout/skim/issues/494
       enable = false;
       enableFishIntegration = true;
-      defaultOptions = ["--no-clear-start" "--color=16"];
+      defaultOptions = ["--no-clear-start" "--color=16" "--height=20"];
     };
 
     programs.atuin = {
@@ -362,6 +363,18 @@
     };
   };
 
+  jujutsu = {...}: {
+    programs.jujutsu = {
+      enable = true;
+      settings = {
+        user = {
+          email = "daniel@lyte.dev";
+          name = "Daniel Flanagan";
+        };
+      };
+    };
+  };
+
   git = {lib, ...}: let
     email = lib.mkDefault "daniel@lyte.dev";
   in {
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index c0f1311..a3bc043 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -107,8 +107,6 @@
     environment = {
       variables = {
         VISUAL = "hx";
-        PAGER = "less";
-        MANPAGER = "less";
       };
 
       systemPackages = with pkgs; [
@@ -197,22 +195,9 @@
     };
   };
 
-  less-pager = {pkgs, ...}: {
-    environment = {
-      systemPackages = [
-        pkgs.less
-      ];
-      variables = {
-        PAGER = "less";
-        MANPAGER = "less";
-      };
-    };
-  };
-
   helix-text-editor = {pkgs, ...}: {
     environment = {
       systemPackages = [
-        pkgs.less
         helix.packages.${pkgs.system}.helix
       ];
       variables = {
@@ -252,30 +237,36 @@
 
   my-favorite-default-system-apps = {pkgs, ...}: {
     imports = with nixosModules; [
-      less-pager
       helix-text-editor
       zellij-multiplexer
       fish-shell
     ];
 
-    environment.systemPackages = with pkgs; [
-      curl
-      dua
-      eza # TODO: needs shell aliases
-      fd
-      file
-      iputils
-      nettools
-      /*
-      nodePackages.bash-language-server # just pull in as needed?
-      shellcheck
-      shfmt
-      */
-      killall
-      ripgrep
-      rsync
-      sd
-    ];
+    environment = {
+      variables = {
+        PAGER = "bat --style=plain";
+        MANPAGER = "bat --style=plain";
+      };
+      systemPackages = with pkgs; [
+        curl
+        dua
+        bat
+        eza
+        fd
+        file
+        iputils
+        nettools
+        /*
+        nodePackages.bash-language-server # just pull in as needed?
+        shellcheck
+        shfmt
+        */
+        killall
+        ripgrep
+        rsync
+        sd
+      ];
+    };
 
     programs = {
       traceroute.enable = true;
@@ -462,7 +453,11 @@
     };
   };
 
-  development-tools = {pkgs, ...}: {
+  development-tools = {
+    pkgs,
+    lib,
+    ...
+  }: {
     imports = with nixosModules; [
       postgres
       podman
@@ -543,7 +538,7 @@
       };
 
       programs.jujutsu = {
-        enable = false; # disabling for now due to CVE
+        enable = lib.mkDefault true;
       };
 
       programs.k9s = {
diff --git a/templates/rust/flake.nix b/templates/rust/flake.nix
index b053683..03a065f 100644
--- a/templates/rust/flake.nix
+++ b/templates/rust/flake.nix
@@ -20,16 +20,12 @@
         src = ./.;
         hooks = {
           alejandra.enable = true;
-          # NOTE: These do not work well with `nix flake check` due to pure environments
-          # https://github.com/cachix/git-hooks.nix/issues/452
-          /*
           cargo-check.enable = true;
           clippy = {
             enable = true;
             packageOverrides.cargo = pkgs.cargo;
             packageOverrides.clippy = pkgs.rustPackages.clippy;
           };
-          */
           rustfmt = {
             enable = true;
             packageOverrides.rustfmt = pkgs.rustfmt;
@@ -40,7 +36,7 @@
 
     packages = genPkgs (pkgs: {
       my-package = pkgs.rustPlatform.buildRustPackage {
-        pname = "kodotag";
+        pname = "my-package";
         version = "0.1.0";
 
         /*