From fd3237464e3eb8474422f4480539b345423db08e Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Fri, 9 Aug 2024 23:39:45 -0600 Subject: [PATCH] distrobox --- hosts/workstation/configuration.nix | 7 ++----- modules/servers.nix | 8 +++++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix index 5dc5c08..43e6f5b 100644 --- a/hosts/workstation/configuration.nix +++ b/hosts/workstation/configuration.nix @@ -6,6 +6,7 @@ ../../pkgs/obs-studio.nix ]; my = { + enableContainers = true; emacs.enable = true; apps = { art.enable = true; @@ -76,6 +77,7 @@ groups.nixremote.gid = 555; users = { jawz.packages = with pkgs; [ + distrobox # install packages from other os gocryptfs # encrypted filesystem! shhh!!! torrenttools # create torrent files from the terminal! vcsi # video thumbnails for torrents, can I replace it with ^? @@ -130,9 +132,4 @@ directoryRoot = "/resilio"; }; }; - virtualisation.podman = { - enable = true; - dockerCompat = true; - defaultNetwork.settings.dns_enabled = true; - }; } diff --git a/modules/servers.nix b/modules/servers.nix index 0084370..ae657e2 100644 --- a/modules/servers.nix +++ b/modules/servers.nix @@ -24,7 +24,7 @@ let proxy_http_version 1.1; ''; }; - enableDocker = lib.any (opt: opt) [ + enableContainers = lib.any (opt: opt) [ config.my.servers.collabora.enable config.my.servers.ryot.enable config.my.servers.lidarr.enable @@ -103,8 +103,10 @@ in { default = "CaptainJawZ@protonmail.com"; description = "localhost smtp email"; }; + enableContainers = lib.mkEnableOption "enable"; }; config = { + my.enableContainers = lib.mkDefault false; my.servers = { jellyfin = { enable = lib.mkDefault false; @@ -143,7 +145,7 @@ in { virtualisation = { containers.enable = true; oci-containers.backend = "podman"; - podman = lib.mkIf enableDocker { + podman = lib.mkIf enableContainers { enable = true; dockerCompat = true; dockerSocket.enable = true; @@ -155,7 +157,7 @@ in { }; }; }; - security.acme = lib.mkIf config.services.nginx.enable { + security.acme = lib.mkIf (config.services.nginx.enable || config.my.enableContainers) { acceptTerms = true; defaults.email = config.my.email; };