summary refs log tree commit diff
path: root/host/Rory-nginx/services/containers/pluralcontactbotpoc
diff options
context:
space:
mode:
Diffstat (limited to 'host/Rory-nginx/services/containers/pluralcontactbotpoc')
-rwxr-xr-xhost/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix12
-rwxr-xr-xhost/Rory-nginx/services/containers/pluralcontactbotpoc/root.nix23
-rwxr-xr-xhost/Rory-nginx/services/containers/pluralcontactbotpoc/services/conduit.nix8
-rwxr-xr-xhost/Rory-nginx/services/containers/pluralcontactbotpoc/services/nginx.nix7
-rwxr-xr-xhost/Rory-nginx/services/containers/pluralcontactbotpoc/services/pantalaimon.nix7
5 files changed, 8 insertions, 49 deletions
diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix
index 4ddffeb..837ae11 100755
--- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix
+++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix
@@ -1,9 +1,4 @@
-{
-  pkgs,
-  lib,
-  conduit,
-  ...
-}:
+{ conduit, ... }:
 
 {
   privateNetwork = true;
@@ -19,7 +14,10 @@
       ...
     }:
     {
-      imports = [ ./root.nix ];
+      imports = [
+        ./root.nix
+        ../shared.nix
+      ];
       environment.etc."resolv.conf".text = ''
         nameserver 8.8.8.8
         nameserver 8.4.4.8
diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/root.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/root.nix
index a9929d2..7e7c355 100755
--- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/root.nix
+++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/root.nix
@@ -1,8 +1,4 @@
 {
-  config,
-  pkgs,
-  lib,
-  conduit,
   ...
 }:
 
@@ -13,23 +9,4 @@
     ./services/pantalaimon.nix
   ];
 
-  environment.systemPackages = with pkgs; [
-    wget
-    neofetch
-    lnav
-    zsh
-    git
-    lsd
-    htop
-    btop
-    duf
-    kitty.terminfo
-    neovim
-    tmux
-    jq
-    yq
-    pv
-    dig
-    cloud-utils
-  ];
 }
diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/conduit.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/conduit.nix
index bbc042c..db9df9a 100755
--- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/conduit.nix
+++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/conduit.nix
@@ -1,10 +1,4 @@
-{
-  config,
-  pkgs,
-  lib,
-  conduit,
-  ...
-}:
+{ pkgs, conduit, ... }:
 
 {
   services.matrix-conduit = {
diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/nginx.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/nginx.nix
index 0f9fad4..9d8041a 100755
--- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/nginx.nix
+++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/nginx.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
+{ pkgs, ... }:
 
 {
   services = {
diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/pantalaimon.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/pantalaimon.nix
index da95e76..335176f 100755
--- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/pantalaimon.nix
+++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/pantalaimon.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
+{ ... }:
 
 {
   services.pantalaimon-headless = {