From 57b9557b02f0ad481491d7929173d721013e9b5d Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Sat, 4 Oct 2025 16:02:31 +0100 Subject: [PATCH 1/3] docker: init --- common/default.nix | 2 ++ common/docker.nix | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 common/docker.nix diff --git a/common/default.nix b/common/default.nix index 6b78942..2517156 100644 --- a/common/default.nix +++ b/common/default.nix @@ -3,7 +3,9 @@ ./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 new file mode 100644 index 0000000..c33c246 --- /dev/null +++ b/common/docker.nix @@ -0,0 +1,11 @@ +{ 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"; + }; +} From 6a76a54503e9bf50620d77932e77623a730ad2bd Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Sat, 4 Oct 2025 16:04:12 +0100 Subject: [PATCH 2/3] qenya/vscode: Install Docker extension --- home/qenya/vscode.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/qenya/vscode.nix b/home/qenya/vscode.nix index 1bfce37..87c2dec 100644 --- a/home/qenya/vscode.nix +++ b/home/qenya/vscode.nix @@ -14,6 +14,7 @@ in enableUpdateCheck = false; extensions = with pkgs.vscode-extensions; [ ms-python.black-formatter + ms-azuretools.vscode-docker mkhl.direnv dbaeumer.vscode-eslint golang.go From a5c6a9a7da4cb3a8c772e727fabc7f9490340d2e Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Sat, 4 Oct 2025 16:04:19 +0100 Subject: [PATCH 3/3] tohru: Install Docker --- hosts/tohru/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hosts/tohru/default.nix b/hosts/tohru/default.nix index f9ee12c..52f2c6a 100644 --- a/hosts/tohru/default.nix +++ b/hosts/tohru/default.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, inputs, ... }: let - inherit (lib) mkForce; + inherit (lib) mkIf mkForce; in { imports = [ @@ -37,6 +37,7 @@ in users.users.qenya.extraGroups = [ "networkmanager" # UI wifi configuration "dialout" # access to serial ports + "docker" ]; nixpkgs.overlays = [ inputs.scoutshonour.overlays.default ]; @@ -64,6 +65,7 @@ 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"; }