refactor: abstacted records

This commit is contained in:
Nick 2025-06-26 21:20:09 -05:00
parent 64572cb106
commit 06a684fa32
42 changed files with 211 additions and 202 deletions

View file

@ -176,10 +176,106 @@ in
};
};
config = {
people = import ./users;
services = import ./instances;
machines = import ./devices;
aesthetics = import ./themes;
};
config =
let
moduleFunctions = {
devicesFunctions = {
ownerWriteOthersReadMask = [
"fmask=0022"
"dmask=0022"
];
ownerExclusiveReadWriteMask = [
"fmask=0077"
"dmask=0077"
];
readWritePermissions = [
"rw"
];
sambaPermissions = [
"rw"
"gid=100"
"vers=3.0"
"x-systemd.automount"
"x-systemd.requires=network-online.target"
];
sshfsOptions = [
"allow_other"
"_netdev"
"x-systemd.automount"
"reconnect"
"user"
"ServerAliveInterval=15"
"IdentityFile=/var/run/secrets/ssh/private"
];
fileModeAndDirMode = [
"file_mode=0644"
"dir_mode=0755"
];
userIdForUser0 = [
"uid=1000"
];
userIdForUser1 = [
"uid=1002"
];
dummy = [
];
ceresStorageDriveName = "NAS1";
ceresIP = "192.168.50.140";
deimosIP = "192.168.50.142";
marsIP = "192.168.50.218";
phoneIP = "192.168.50.243";
phobosIP = "192.168.50.180";
synologyIP = "192.168.50.210";
brotherIP = "192.168.50.195";
externalIP = "24.76.173.0";
};
instancesFunctions = {
domain0 = "cloudbert.fun";
domain1 = "the-nutrivore.social";
domain2 = "the-nutrivore.com";
domain3 = "uprootnutrition.com";
servicePath = "/mnt/media/NAS1";
sopsPath = "/var/lib/secrets";
sslPath = "/var/lib/acme";
varLib = "/var/lib";
dummy = "";
};
themesFunctions = {
brogrammer = "brogrammer";
catppuccin-frappe = "catppuccin-frappe";
catppuccin-latte = "catppuccin-latte";
catppuccin-macchiato = "catppuccin-macchiato";
catppuccin-mocha = "catppuccin-mocha";
chalk = "chalk";
deep-oceanic-next = "deep-oceanic-next";
dracula = "dracula";
espresso = "espresso";
flat = "flat";
framer = "framer";
github = "github";
hardcore = "hardcore";
one-black = "one-black";
one-dark = "one-dark";
one-light = "one light";
sparky = "sparky";
};
usersFunctions = {
user0 = "nick";
user0Label = "Nick";
user1 = "streaming";
user1Label = "Streaming";
};
};
inheritFunctions = { inherit moduleFunctions; };
in
{
people = import ./users inheritFunctions;
services = import ./instances inheritFunctions;
machines = import ./devices inheritFunctions;
aesthetics = import ./themes inheritFunctions;
};
}

View file

@ -1,6 +1,6 @@
{ devicesFunctions }:
{ moduleFunctions }:
let
inherit (devicesFunctions)
inherit (moduleFunctions.devicesFunctions)
sshfsOptions
fileModeAndDirMode
ceresStorageDriveName
@ -10,6 +10,9 @@ let
userIdForUser0
ceresIP
;
inherit (moduleFunctions.usersFunctions) user0;
inherit (moduleFunctions.devicesFunctions) externalIP;
ceresName = "ceres";
in
{
@ -36,7 +39,7 @@ in
};
remote0 = {
mount = "/mnt/media/remote";
device = "nick@24.76.173.0:/mnt/media/${ceresStorageDriveName}";
device = "${user0}@${externalIP}:/mnt/media/${ceresStorageDriveName}";
options = sshfsOptions;
};
}

View file

@ -1,6 +1,6 @@
{ devicesFunctions }:
{ moduleFunctions }:
let
inherit (devicesFunctions)
inherit (moduleFunctions.devicesFunctions)
ownerWriteOthersReadMask
deimosIP
;

View file

@ -1,6 +1,6 @@
{ devicesFunctions }:
{ moduleFunctions }:
let
inherit (devicesFunctions)
inherit (moduleFunctions.devicesFunctions)
ownerWriteOthersReadMask
readWritePermissions
marsIP

View file

@ -1,6 +1,6 @@
{ devicesFunctions }:
{ moduleFunctions }:
let
inherit (devicesFunctions)
inherit (moduleFunctions.devicesFunctions)
ownerWriteOthersReadMask
phobosIP
;

View file

@ -1,6 +1,6 @@
{ devicesFunctions }:
{ moduleFunctions }:
let
inherit (devicesFunctions)
inherit (moduleFunctions.devicesFunctions)
phoneIP
dummy
;

View file

@ -1,8 +1,7 @@
{ devicesFunctions }:
{ moduleFunctions }:
let
inherit (devicesFunctions)
dummy
;
inherit (moduleFunctions.devicesFunctions) dummy;
in
{
name = dummy;

View file

@ -1,9 +1,7 @@
{ devicesFunctions }:
{ moduleFunctions }:
let
inherit (devicesFunctions)
brotherIP
dummy
;
inherit (moduleFunctions.devicesFunctions) brotherIP dummy;
in
{
name = dummy;

View file

@ -1,15 +1,12 @@
{ devicesFunctions }:
{ moduleFunctions }:
let
inherit (devicesFunctions)
inherit (moduleFunctions.devicesFunctions)
sambaPermissions
userIdForUser0
userIdForUser1
synologyIP
;
user0 = "nick";
user1 = "streaming";
user0Name = "Nick";
inherit (moduleFunctions.usersFunctions) user0 user0Label user1;
synologyName = "synology";
in
{
@ -24,13 +21,13 @@ in
# Nick Home Folder
folder0 = {
mount = "/mnt/media/${synologyName}/${user0}";
device = "//${synologyIP}/homes/${user0Name}";
device = "//${synologyIP}/homes/${user0Label}";
options = sambaPermissions ++ userIdForUser0;
};
# Streaming Folder
folder1 = {
mount = "/mnt/media/${synologyName}/${user1}";
device = "//${synologyIP}/homes/${user0Name}";
device = "//${synologyIP}/homes/${user0Label}";
options = sambaPermissions ++ userIdForUser1;
};
}

View file

@ -1,64 +1,16 @@
{ moduleFunctions }:
let
configPath = ./config;
printerPath = configPath + /printers;
devicesFunctions = {
ownerWriteOthersReadMask = [
"fmask=0022"
"dmask=0022"
];
ownerExclusiveReadWriteMask = [
"fmask=0077"
"dmask=0077"
];
readWritePermissions = [
"rw"
];
sambaPermissions = [
"rw"
"gid=100"
"vers=3.0"
"x-systemd.automount"
"x-systemd.requires=network-online.target"
];
sshfsOptions = [
"allow_other"
"_netdev"
"x-systemd.automount"
"reconnect"
"user"
"ServerAliveInterval=15"
"IdentityFile=/var/run/secrets/ssh/private"
];
fileModeAndDirMode = [
"file_mode=0644"
"dir_mode=0755"
];
userIdForUser0 = [
"uid=1000"
];
userIdForUser1 = [
"uid=1002"
];
dummy = [
];
ceresStorageDriveName = "NAS1";
ceresIP = "192.168.50.140";
deimosIP = "192.168.50.142";
marsIP = "192.168.50.218";
phoneIP = "192.168.50.243";
phobosIP = "192.168.50.180";
synologyIP = "192.168.50.210";
brotherIP = "192.168.50.195";
};
deviceswithFunctions = builtins.listToAttrs (
map
(name: {
name = builtins.substring 0 (builtins.stringLength name - 4) name;
value = import (configPath + "/${name}") {
inherit
devicesFunctions
moduleFunctions
;
};
})
@ -75,7 +27,7 @@ let
name = builtins.substring 0 (builtins.stringLength name - 4) name;
value = import (printerPath + "/${name}") {
inherit
devicesFunctions
moduleFunctions
;
};
})

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
sslPath
sopsPath
;

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain0
servicePath
sslPath

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
sopsPath
;

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain3
servicePath
sslPath

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain0
servicePath
sslPath

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain0
servicePath
sslPath

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain0
servicePath
sslPath

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain3
servicePath
sslPath

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
servicePath
sopsPath
;

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain0
servicePath
sslPath

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain0
servicePath
sslPath

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
sopsPath
;

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain0
servicePath
sslPath

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain1
servicePath
sslPath

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain3
servicePath
sslPath

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain0
servicePath
sslPath

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain3
servicePath
sslPath

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
servicePath
sopsPath
;

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
sopsPath
;

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain0
servicePath
sslPath

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
dummy
;
in

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain0
sslPath
sopsPath

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
sopsPath
;

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain3
sslPath
sopsPath

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain0
servicePath
sslPath

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
domain0
domain1
domain2

View file

@ -1,6 +1,6 @@
{ instancesFunctions }:
{ moduleFunctions }:
let
inherit (instancesFunctions)
inherit (moduleFunctions.instancesFunctions)
sopsPath
;

View file

@ -1,25 +1,14 @@
{ moduleFunctions }:
let
configPath = ./config;
instancesFunctions = {
domain0 = "cloudbert.fun";
domain1 = "the-nutrivore.social";
domain2 = "the-nutrivore.com";
domain3 = "uprootnutrition.com";
servicePath = "/mnt/media/NAS1";
sopsPath = "/var/lib/secrets";
sslPath = "/var/lib/acme";
varLib = "/var/lib";
dummy = "";
};
instances = builtins.listToAttrs (
map
(name: {
name = builtins.substring 0 (builtins.stringLength name - 4) name;
value = import (configPath + "/${name}") {
inherit
instancesFunctions
moduleFunctions
;
};
})

View file

@ -1,23 +1,7 @@
{ moduleFunctions }:
let
currentTheme0 = catppuccin-macchiato;
brogrammer = "brogrammer";
catppuccin-frappe = "catppuccin-frappe";
catppuccin-latte = "catppuccin-latte";
catppuccin-macchiato = "catppuccin-macchiato";
catppuccin-mocha = "catppuccin-mocha";
chalk = "chalk";
deep-oceanic-next = "deep-oceanic-next";
dracula = "dracula";
espresso = "espresso";
flat = "flat";
framer = "framer";
github = "github";
hardcore = "hardcore";
one-black = "one-black";
one-dark = "one-dark";
one-light = "one light";
sparky = "sparky";
inherit (moduleFunctions) themesFunctions;
currentTheme0 = themesFunctions.catppuccin-macchiato;
in
{
@ -48,23 +32,23 @@ in
onePath = /one;
in
{
${brogrammer} = import (palettePath + /brogrammer);
${catppuccin-frappe} = import (palettePath + catppuccinPath + /frappe);
${catppuccin-latte} = import (palettePath + catppuccinPath + /latte);
${catppuccin-macchiato} = import (palettePath + catppuccinPath + /macchiato);
${catppuccin-mocha} = import (palettePath + catppuccinPath + /mocha);
${chalk} = import (palettePath + /chalk);
${deep-oceanic-next} = import (palettePath + /deep-oceanic-next);
${dracula} = import (palettePath + /dracula);
${espresso} = import (palettePath + /espresso);
${flat} = import (palettePath + /flat);
${framer} = import (palettePath + /framer);
${github} = import (palettePath + /github);
${hardcore} = import (palettePath + /hardcore);
${one-black} = import (palettePath + onePath + /black);
${one-dark} = import (palettePath + onePath + /dark);
${one-light} = import (palettePath + onePath + /light);
${sparky} = import (palettePath + /sparky);
${themesFunctions.brogrammer} = import (palettePath + /brogrammer);
${themesFunctions.catppuccin-frappe} = import (palettePath + catppuccinPath + /frappe);
${themesFunctions.catppuccin-latte} = import (palettePath + catppuccinPath + /latte);
${themesFunctions.catppuccin-macchiato} = import (palettePath + catppuccinPath + /macchiato);
${themesFunctions.catppuccin-mocha} = import (palettePath + catppuccinPath + /mocha);
${themesFunctions.chalk} = import (palettePath + /chalk);
${themesFunctions.deep-oceanic-next} = import (palettePath + /deep-oceanic-next);
${themesFunctions.dracula} = import (palettePath + /dracula);
${themesFunctions.espresso} = import (palettePath + /espresso);
${themesFunctions.flat} = import (palettePath + /flat);
${themesFunctions.framer} = import (palettePath + /framer);
${themesFunctions.github} = import (palettePath + /github);
${themesFunctions.hardcore} = import (palettePath + /hardcore);
${themesFunctions.one-black} = import (palettePath + onePath + /black);
${themesFunctions.one-dark} = import (palettePath + onePath + /dark);
${themesFunctions.one-light} = import (palettePath + onePath + /light);
${themesFunctions.sparky} = import (palettePath + /sparky);
};
};
}

View file

@ -1,9 +1,4 @@
{ user0 }:
let
inherit
user0
;
in
{
name = "Nick";
aliases = {

View file

@ -1,9 +1,4 @@
{ user1 }:
let
inherit
user1
;
in
{
name = "Streaming";
aliases = {

View file

@ -1,8 +1,9 @@
{ moduleFunctions }:
let
inherit (moduleFunctions) usersFunctions;
configPath = ./config;
user0 = "nick";
user1 = "streaming";
user0 = usersFunctions.user0;
user1 = usersFunctions.user1;
in
{
inherit