diff options
| author | Preston Pan <ret2pop@gmail.com> | 2025-03-13 11:37:10 -0700 |
|---|---|---|
| committer | Preston Pan <ret2pop@gmail.com> | 2025-03-13 11:37:10 -0700 |
| commit | 2a4c959ef00fea785633afe44be0af77d6441a4b (patch) | |
| tree | 0cd6505ee3c3969effe2bafadf0620de6fd9e2cb /nix/modules | |
| parent | ba6373ebfbcafc99ce7a4fa100b2a26fc3bc2731 (diff) | |
new flake lock
Diffstat (limited to 'nix/modules')
| -rw-r--r-- | nix/modules/configuration.nix | 1 | ||||
| -rw-r--r-- | nix/modules/home/default.nix | 7 | ||||
| -rw-r--r-- | nix/modules/kubo.nix | 4 | ||||
| -rw-r--r-- | nix/modules/murmur.nix | 12 | ||||
| -rw-r--r-- | nix/modules/nginx.nix | 1 | ||||
| -rw-r--r-- | nix/modules/secrets.nix | 1 |
6 files changed, 23 insertions, 3 deletions
diff --git a/nix/modules/configuration.nix b/nix/modules/configuration.nix index e8e3fb0..732f83c 100644 --- a/nix/modules/configuration.nix +++ b/nix/modules/configuration.nix @@ -17,6 +17,7 @@ ./gitweb.nix ./conduit.nix ./bitcoin.nix + ./murmur.nix ]; documentation = { diff --git a/nix/modules/home/default.nix b/nix/modules/home/default.nix index 4f1e7d4..fa18632 100644 --- a/nix/modules/home/default.nix +++ b/nix/modules/home/default.nix @@ -81,7 +81,11 @@ bear clang-tools ]) else []) - ++ + ++ + (if config.monorepo.profiles.workstation.enable then (with pkgs; [ + open-webui + ]) else []) + ++ (if config.monorepo.profiles.lang-js.enable then (with pkgs; [ nodejs bun @@ -165,6 +169,7 @@ kdenlive kicad reaper + murmur ]) else []); monorepo.profiles = { diff --git a/nix/modules/kubo.nix b/nix/modules/kubo.nix index 92dab0e..79aa9aa 100644 --- a/nix/modules/kubo.nix +++ b/nix/modules/kubo.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { services.kubo = { - enable = true; + enable = lib.mkDefault config.monorepo.profiles.workstation.enable; }; } diff --git a/nix/modules/murmur.nix b/nix/modules/murmur.nix new file mode 100644 index 0000000..463ee1d --- /dev/null +++ b/nix/modules/murmur.nix @@ -0,0 +1,12 @@ +{ lib, config, ... }: +{ + services.murmur = { + enable = lib.mkDefault config.monorepo.profiles.server.enable; + logFile = "/var/log/murmur.log"; + openFirewall = true; + hostName = "talk.nullring.xyz"; + welcometext = "Wecome to the Null Murmur instance!"; + registerName = "nullring"; + registerHostname = "talk.nullring.xyz"; + }; +} diff --git a/nix/modules/nginx.nix b/nix/modules/nginx.nix index a3906e2..e603759 100644 --- a/nix/modules/nginx.nix +++ b/nix/modules/nginx.nix @@ -59,6 +59,7 @@ }; "${config.monorepo.vars.remoteHost}" = { serverName = "${config.monorepo.vars.remoteHost}"; + serverAliases = [ "ret2pop.nullring.xyz" ]; root = "/var/www/ret2pop-website/"; addSSL = true; enableACME = true; diff --git a/nix/modules/secrets.nix b/nix/modules/secrets.nix index 2f8defc..f157e3e 100644 --- a/nix/modules/secrets.nix +++ b/nix/modules/secrets.nix @@ -5,6 +5,7 @@ age = { keyFile = "/home/${config.monorepo.vars.userName}/.ssh/keys.txt"; }; + secrets = { mail = { format = "yaml"; |