base.nix

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

hosts/flynode/default.nix

@@ -16,8 +16,7 @@
     ../../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/docker.nix

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

users/nolan/default.nix

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

users/nolan/desktop.nix

@@ -9,6 +9,8 @@
       podman-desktop
       devpod
       gjs
+      unstable.fractal
+      unstable.element-desktop
       discord
       spotify
       thunderbird
@@ -42,15 +44,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; [