From dd2fdd984c5732e36b679453d50ea634a96f3117 Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Sat, 24 Feb 2024 23:31:30 +0300 Subject: [PATCH] Docker : Move config to nix. --- .config/bash/module/Export.sh | 3 --- .config/linux/system/module/Docker.nix | 8 +++++++- .gitignore | 4 ---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.config/bash/module/Export.sh b/.config/bash/module/Export.sh index e94d484..2f8842c 100644 --- a/.config/bash/module/Export.sh +++ b/.config/bash/module/Export.sh @@ -3,6 +3,3 @@ export PATH=$( find -L ${HOME}/app/bin/ -type d -printf ":%p" 2> /dev/null ):${P # Bash modules. export BASH_MODULE_PATH="${HOME}/.config/bash/module" - -# Docker config. -export DOCKER_CONFIG="${HOME}/.config/docker" diff --git a/.config/linux/system/module/Docker.nix b/.config/linux/system/module/Docker.nix index ddc3bb3..5450d6d 100644 --- a/.config/linux/system/module/Docker.nix +++ b/.config/linux/system/module/Docker.nix @@ -1,3 +1,9 @@ -{ ... }: { +{ environment, ... }: { virtualisation.docker.enable = true; + environment.variables.DOCKER_CONFIG = "/etc/docker.json"; + environment.etc."docker.json".text = '' + { + "detachKeys": "ctrl-z" + } + ''; } diff --git a/.gitignore b/.gitignore index 9e0ca5c..135ef6b 100644 --- a/.gitignore +++ b/.gitignore @@ -66,10 +66,6 @@ !/.config/bash/ !/.config/bash/** -# Docker config. -!/.config/docker/ -!/.config/docker/** - # MangoHud config. !/.config/MangoHud/ !/.config/MangoHud/**