Merge remote-tracking branch 'refs/remotes/origin/main'

base.nix

@@ -19,6 +19,7 @@
     tmux
     psmisc
     unzip
+    ripgrep
   ];
 
   environment.variables.EDITOR = "vim";

hosts/flynode/default.nix

@@ -16,7 +16,8 @@
     ../../roles/networkmanager.nix
     ../../roles/nix-ld.nix
     ../../roles/tailscale.nix
-    ../../roles/podman.nix
+    # ../../roles/podman.nix
+    ../../roles/docker.nix
     ../../roles/syncthing.nix
     ../../roles/printing.nix
     ../../roles/gnome.nix

roles/caddy.nix

@@ -11,7 +11,7 @@
       plugins = [
         "github.com/tailscale/caddy-tailscale@v0.0.0-20250508175905-642f61fea3cc"
       ];
-      hash = "sha256-Kbqr7spiL8/UvT0HtCm0Ufh5Nm1VYDjyNWPCd1Yxyxc=";
+      hash = "sha256-K4K3qxN1TQ1Ia3yVLNfIOESXzC/d6HhzgWpC1qkT22k=";
     };
     email = "nolan@thewordnerd.info";
   };

roles/docker.nix

@@ -0,0 +1,3 @@
+{
+  virtualisation.docker.enable = true;
+}

users/nolan/default.nix

@@ -14,6 +14,7 @@
       "pipewire"
       "pulse-access"
       "podman"
+      "docker"
     ];
     shell = pkgs.fish;
   };

users/nolan/desktop.nix

@@ -9,8 +9,6 @@
       podman-desktop
       devpod
       gjs
-      unstable.fractal
-      unstable.element-desktop
       discord
       spotify
       thunderbird
@@ -44,15 +42,15 @@
           credential.helper = "${pkgs.git.override { withLibsecret = true; }}/bin/git-credential-libsecret";
         };
       };
-      # jujutsu = {
+      jujutsu = {
-      #   enable = true;
+        enable = true;
-      #   settings = {
+        settings = {
-      #     user = {
+          user = {
-      #       name = "Nolan Darilek";
+            name = "Nolan Darilek";
-      #       email = "nolan@thewordnerd.info";
+            email = "nolan@thewordnerd.info";
-      #     };
+          };
-      #   };
+        };
-      # };
+      };
       obs-studio = {
         enable = true;
         plugins = with pkgs.obs-studio-plugins; [