From 2bf8b148a8fafd57f33e3c8516eab8bfa9260aba Mon Sep 17 00:00:00 2001 From: devhell Date: Thu, 14 May 2020 19:34:06 +0100 Subject: machines/{eir,hildr}: Remove docker/service I think I'll switch to `podman` now. I was never a fan of docker needing a daemon to begin with. --- machines/devhell/eir.nix | 2 -- machines/devhell/hildr.nix | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/machines/devhell/eir.nix b/machines/devhell/eir.nix index 43aea6e7..a70d0e3b 100644 --- a/machines/devhell/eir.nix +++ b/machines/devhell/eir.nix @@ -61,8 +61,6 @@ useNetworkd = true; }; - virtualisation.docker.enable = false; - nix = { maxJobs = lib.mkDefault 4; extraOptions = '' diff --git a/machines/devhell/hildr.nix b/machines/devhell/hildr.nix index 5e67a0aa..f36206af 100644 --- a/machines/devhell/hildr.nix +++ b/machines/devhell/hildr.nix @@ -56,7 +56,7 @@ # XXX Make networkd ignore virtual network interfaces systemd.network.networks."99-libvirt" = { - matchConfig.Name = "virbr* vnet* docker*"; + matchConfig.Name = "virbr* vnet*"; linkConfig.Unmanaged = true; }; @@ -75,8 +75,6 @@ cpuFreqGovernor = "powersave"; }; - virtualisation.docker.enable = true; - nix = { maxJobs = lib.mkDefault 4; extraOptions = '' @@ -203,7 +201,6 @@ environment.systemPackages = with pkgs; [ aircrackng cdrtools - docker dvdplusrwtools horst ipmitool -- cgit 1.4.1