diff --git a/common/default.nix b/common/default.nix index 2517156..6b78942 100644 --- a/common/default.nix +++ b/common/default.nix @@ -3,9 +3,7 @@ ./base-graphical ./base-server ./users - ./boot.nix - ./docker.nix ./gpg.nix ./home-manager.nix ./misc.nix diff --git a/common/docker.nix b/common/docker.nix deleted file mode 100644 index c33c246..0000000 --- a/common/docker.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - virtualisation.docker.daemon.settings = { - userland-proxy = false; - experimental = true; - metrics-addr = "0.0.0.0:9323"; - ipv6 = true; - fixed-cidr-v6 = "fd00::/80"; - }; -} diff --git a/home/qenya/vscode.nix b/home/qenya/vscode.nix index 87c2dec..1bfce37 100644 --- a/home/qenya/vscode.nix +++ b/home/qenya/vscode.nix @@ -14,7 +14,6 @@ in enableUpdateCheck = false; extensions = with pkgs.vscode-extensions; [ ms-python.black-formatter - ms-azuretools.vscode-docker mkhl.direnv dbaeumer.vscode-eslint golang.go diff --git a/hosts/tohru/default.nix b/hosts/tohru/default.nix index 52f2c6a..f9ee12c 100644 --- a/hosts/tohru/default.nix +++ b/hosts/tohru/default.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, inputs, ... }: let - inherit (lib) mkIf mkForce; + inherit (lib) mkForce; in { imports = [ @@ -37,7 +37,6 @@ in users.users.qenya.extraGroups = [ "networkmanager" # UI wifi configuration "dialout" # access to serial ports - "docker" ]; nixpkgs.overlays = [ inputs.scoutshonour.overlays.default ]; @@ -65,7 +64,6 @@ in programs.evolution.enable = true; # not in home-manager yet; not declaratively configurable yet programs.steam.enable = true; - virtualisation.docker.enable = true; system.stateVersion = "23.11"; }