diff --git a/base.nix b/base.nix index b9eb202..5f0bd65 100644 --- a/base.nix +++ b/base.nix @@ -19,7 +19,6 @@ tmux psmisc unzip - ripgrep ]; environment.variables.EDITOR = "vim"; diff --git a/hosts/flynode/default.nix b/hosts/flynode/default.nix index 4d1b902..132834a 100644 --- a/hosts/flynode/default.nix +++ b/hosts/flynode/default.nix @@ -16,8 +16,7 @@ ../../roles/networkmanager.nix ../../roles/nix-ld.nix ../../roles/tailscale.nix - # ../../roles/podman.nix - ../../roles/docker.nix + ../../roles/podman.nix ../../roles/syncthing.nix ../../roles/printing.nix ../../roles/gnome.nix diff --git a/roles/docker.nix b/roles/docker.nix deleted file mode 100644 index a878015..0000000 --- a/roles/docker.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - virtualisation.docker.enable = true; -} diff --git a/users/nolan/default.nix b/users/nolan/default.nix index 62f580b..6a81de4 100644 --- a/users/nolan/default.nix +++ b/users/nolan/default.nix @@ -14,7 +14,6 @@ "pipewire" "pulse-access" "podman" - "docker" ]; shell = pkgs.fish; }; diff --git a/users/nolan/desktop.nix b/users/nolan/desktop.nix index cd153cd..0625371 100644 --- a/users/nolan/desktop.nix +++ b/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 = { - 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; [