From 3e79c3506428d07e474ec6f3d83823a0f24a6e94 Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Wed, 2 Aug 2023 15:54:19 +0200 Subject: [PATCH] small changes (too lazy) --- hosts/chmura/configuration.nix | 26 +++++++++++++++++++------- hosts/chmura/default.nix | 2 ++ hosts/default.nix | 4 ++++ 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/hosts/chmura/configuration.nix b/hosts/chmura/configuration.nix index 26cd1638..9d84f2cf 100644 --- a/hosts/chmura/configuration.nix +++ b/hosts/chmura/configuration.nix @@ -26,9 +26,14 @@ programs.zsh.enable = true; + programs.direnv = { + enable = true; + nix-direnv.enable = true; + }; + users.users.chmura = { isNormalUser = true; - extraGroups = ["wheel"]; + extraGroups = [ "wheel" "docker" ]; shell = pkgs.zsh; packages = with pkgs; [ curl @@ -39,7 +44,8 @@ ntfy btop - podman-compose + docker + docker-compose nodePackages_latest.pnpm nodePackages_latest.prisma prisma-engines @@ -47,6 +53,8 @@ pkg-config direnv nix-direnv + + git-annex ]; }; @@ -79,14 +87,18 @@ root * ${./trollface.pl} file_server ''; + virtualHosts."test.jacekpoz.pl".extraConfig = '' + reverse_proxy * localhost:3001 + ''; }; virtualisation = { - podman = { - enable = true; - dockerCompat = true; - }; - oci-containers.backend = "podman"; + #podman = { + # enable = true; + # dockerCompat = true; + #}; + #oci-containers.backend = "podman"; + docker.enable = true; }; networking.firewall.allowedTCPPorts = [ 80 443 22 ]; diff --git a/hosts/chmura/default.nix b/hosts/chmura/default.nix index 8f756a92..04bd24fe 100644 --- a/hosts/chmura/default.nix +++ b/hosts/chmura/default.nix @@ -2,10 +2,12 @@ _: { imports = [ ./conduit.nix ./configuration.nix + #./freshrss.nix ./grafana.nix ./hardware-configuration.nix ./i2pd.nix #./minecraft + #./qbittorrent.nix #./wireguard.nix ]; } diff --git a/hosts/default.nix b/hosts/default.nix index c54e35c9..f63cfbd7 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -26,6 +26,10 @@ in { modules = [ {networking.hostName = "chmura";} ./chmura + #] + #++ [ + # home-manager + # home-configs ]; }; }