diff --git a/base.nix b/base.nix index 5f0bd65..b9eb202 100644 --- a/base.nix +++ b/base.nix @@ -19,6 +19,7 @@ tmux psmisc unzip + ripgrep ]; environment.variables.EDITOR = "vim"; diff --git a/hosts/flynode/default.nix b/hosts/flynode/default.nix index 132834a..4d1b902 100644 --- a/hosts/flynode/default.nix +++ b/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 diff --git a/roles/caddy.nix b/roles/caddy.nix index bd75c54..7646899 100644 --- a/roles/caddy.nix +++ b/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"; }; diff --git a/roles/docker.nix b/roles/docker.nix new file mode 100644 index 0000000..a878015 --- /dev/null +++ b/roles/docker.nix @@ -0,0 +1,3 @@ +{ + virtualisation.docker.enable = true; +} diff --git a/users/nolan/default.nix b/users/nolan/default.nix index 6a81de4..62f580b 100644 --- a/users/nolan/default.nix +++ b/users/nolan/default.nix @@ -14,6 +14,7 @@ "pipewire" "pulse-access" "podman" + "docker" ]; shell = pkgs.fish; }; diff --git a/users/nolan/desktop.nix b/users/nolan/desktop.nix index 0625371..cd153cd 100644 --- a/users/nolan/desktop.nix +++ b/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 = { - # enable = true; - # settings = { - # user = { - # name = "Nolan Darilek"; - # email = "nolan@thewordnerd.info"; - # }; - # }; - # }; + jujutsu = { + enable = true; + settings = { + user = { + name = "Nolan Darilek"; + email = "nolan@thewordnerd.info"; + }; + }; + }; obs-studio = { enable = true; plugins = with pkgs.obs-studio-plugins; [