From 2a4c959ef00fea785633afe44be0af77d6441a4b Mon Sep 17 00:00:00 2001 From: Preston Pan Date: Thu, 13 Mar 2025 11:37:10 -0700 Subject: [PATCH] new flake lock --- journal/20250308.org | 11 +++++++++++ journal/20250310.org | 18 ++++++++++++++++++ journal/20250311.org | 12 ++++++++++++ nix/flake.nix | 1 + nix/modules/configuration.nix | 1 + nix/modules/home/default.nix | 7 ++++++- nix/modules/kubo.nix | 4 ++-- nix/modules/murmur.nix | 12 ++++++++++++ nix/modules/nginx.nix | 1 + nix/modules/secrets.nix | 1 + nix/pyproject.toml | 1 + nix/systems/spontaneity/default.nix | 18 +++++++++++++++++- 12 files changed, 83 insertions(+), 4 deletions(-) create mode 100644 journal/20250308.org create mode 100644 journal/20250310.org create mode 100644 journal/20250311.org create mode 100644 nix/modules/murmur.nix diff --git a/journal/20250308.org b/journal/20250308.org new file mode 100644 index 0000000..91dfdca --- /dev/null +++ b/journal/20250308.org @@ -0,0 +1,11 @@ +#+TITLE: Daily Journal +#+STARTUP: showeverything +#+DESCRIPTION: My daily journal entry +#+AUTHOR: Preston Pan +#+HTML_HEAD: +#+html_head: +#+html_head: +#+options: broken-links:t +* Saturday, 08 March 2025 +** 01:27 +Whoops. I forgot what I was going to journal about. diff --git a/journal/20250310.org b/journal/20250310.org new file mode 100644 index 0000000..15e0901 --- /dev/null +++ b/journal/20250310.org @@ -0,0 +1,18 @@ +#+TITLE: Daily Journal +#+STARTUP: showeverything +#+DESCRIPTION: My daily journal entry +#+AUTHOR: Preston Pan +#+HTML_HEAD: +#+html_head: +#+html_head: +#+options: broken-links:t +* Monday, 10 March 2025 +** 01:08 +I want to learn how to spot weld batteries together or basically just +make my own battery packs from the cells. This is because I want to +have more knowledge of how to create batteries for my ebike. Speaking +of, my ebike build is done. +** 23:23 +I am currently trying to fix some low-level activities for my +life. For instance, I will do a lot of chores today before I +sleep. Additionally I aim to go on a run and exercise. diff --git a/journal/20250311.org b/journal/20250311.org new file mode 100644 index 0000000..9c2a7d3 --- /dev/null +++ b/journal/20250311.org @@ -0,0 +1,12 @@ +#+TITLE: Daily Journal +#+STARTUP: showeverything +#+DESCRIPTION: My daily journal entry +#+AUTHOR: Preston Pan +#+HTML_HEAD: +#+html_head: +#+html_head: +#+options: broken-links:t +* Tuesday, 11 March 2025 +** 00:34 +I just ordered the parts for the valetudo flashing using the breakout +PCB. I am also trying to think through future plans and exercise. diff --git a/nix/flake.nix b/nix/flake.nix index b34b77e..048663c 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -112,6 +112,7 @@ poetry shell }; zones = { "ret2pop.net." = nixos-dns.utils.octodns.generateZoneAttrs [ "cloudflare" ]; + "nullring.xyz." = nixos-dns.utils.octodns.generateZoneAttrs [ "cloudflare" ]; }; }; }; 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"; diff --git a/nix/pyproject.toml b/nix/pyproject.toml index 957e977..458298b 100644 --- a/nix/pyproject.toml +++ b/nix/pyproject.toml @@ -5,6 +5,7 @@ description = "My Monorepo" authors = ["Preston Pan "] license = "MIT" readme = "README.md" +package-mode = false [tool.poetry.dependencies] python = "^3.12" diff --git a/nix/systems/spontaneity/default.nix b/nix/systems/spontaneity/default.nix index c64448a..bb5a92b 100644 --- a/nix/systems/spontaneity/default.nix +++ b/nix/systems/spontaneity/default.nix @@ -28,11 +28,27 @@ a.data = "66.42.84.130"; aaaa.data = "2001:19f0:5401:10d0:5400:5ff:fe4a:7794"; }; + "nullring.xyz" = { + a.data = "144.202.92.209"; + aaaa.data = "2001:19f0:8000:1c38:5400:04ff:fecf:58cd"; + }; }; subDomains = { - "${config.monorepo.vars.remoteHost}" = {}; + "${config.monorepo.vars.remoteHost}" = {}; "matrix.${config.monorepo.vars.remoteHost}" = {}; "www.${config.monorepo.vars.remoteHost}" = {}; + + "nullring.xyz" = {}; + "git.nullring.xyz" = {}; + "social.nullring.xyz" = {}; + "talk.nullring.xyz" = { + a.data = "66.42.84.130"; + aaaa.data = "2001:19f0:5401:10d0:5400:5ff:fe4a:7794"; + }; + "ret2pop.nullring.xyz" = { + a.data = "66.42.84.130"; + aaaa.data = "2001:19f0:5401:10d0:5400:5ff:fe4a:7794"; + }; }; }; }; -- 2.50.1