From 06a684fa32fb1cb7d46e0b3dc4ebbdb38c53c9dc Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 26 Jun 2025 21:20:09 -0500 Subject: [PATCH] refactor: abstacted records --- modules/config/default.nix | 108 +++++++++++++++++- modules/config/devices/config/ceres.nix | 9 +- modules/config/devices/config/deimos.nix | 4 +- modules/config/devices/config/mars.nix | 4 +- modules/config/devices/config/phobos.nix | 4 +- modules/config/devices/config/phone.nix | 4 +- .../devices/config/printers/printer0.nix | 7 +- .../devices/config/printers/printer1.nix | 8 +- modules/config/devices/config/synology.nix | 13 +-- modules/config/devices/default.nix | 56 +-------- modules/config/instances/config/acme.nix | 4 +- .../instances/config/audiobookshelf.nix | 4 +- modules/config/instances/config/caddy.nix | 4 +- modules/config/instances/config/forgejo.nix | 4 +- modules/config/instances/config/glance.nix | 4 +- modules/config/instances/config/jellyfin.nix | 4 +- modules/config/instances/config/kanboard.nix | 4 +- modules/config/instances/config/mastodon.nix | 4 +- modules/config/instances/config/matrix.nix | 4 +- modules/config/instances/config/minecraft.nix | 4 +- modules/config/instances/config/nextcloud.nix | 4 +- modules/config/instances/config/nginx.nix | 4 +- modules/config/instances/config/ollama.nix | 4 +- modules/config/instances/config/owncast.nix | 4 +- modules/config/instances/config/peertube.nix | 4 +- modules/config/instances/config/podgrab.nix | 4 +- modules/config/instances/config/postfix.nix | 4 +- .../config/instances/config/postgresql.nix | 4 +- modules/config/instances/config/samba.nix | 4 +- modules/config/instances/config/searx.nix | 4 +- modules/config/instances/config/smtp.nix | 4 +- modules/config/instances/config/syncthing.nix | 4 +- modules/config/instances/config/synology.nix | 4 +- .../instances/config/upRootNutrition.nix | 4 +- .../config/instances/config/vaultwarden.nix | 4 +- modules/config/instances/config/web.nix | 4 +- modules/config/instances/config/wireGuard.nix | 4 +- modules/config/instances/default.nix | 15 +-- modules/config/themes/default.nix | 56 ++++----- modules/config/users/config/user0.nix | 5 - modules/config/users/config/user1.nix | 5 - modules/config/users/default.nix | 7 +- 42 files changed, 211 insertions(+), 202 deletions(-) diff --git a/modules/config/default.nix b/modules/config/default.nix index adf4471..86e8df0 100755 --- a/modules/config/default.nix +++ b/modules/config/default.nix @@ -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; + }; } diff --git a/modules/config/devices/config/ceres.nix b/modules/config/devices/config/ceres.nix index d9e9bfb..4caeb4e 100755 --- a/modules/config/devices/config/ceres.nix +++ b/modules/config/devices/config/ceres.nix @@ -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; }; } diff --git a/modules/config/devices/config/deimos.nix b/modules/config/devices/config/deimos.nix index 06ee8d4..dfb252c 100755 --- a/modules/config/devices/config/deimos.nix +++ b/modules/config/devices/config/deimos.nix @@ -1,6 +1,6 @@ -{ devicesFunctions }: +{ moduleFunctions }: let - inherit (devicesFunctions) + inherit (moduleFunctions.devicesFunctions) ownerWriteOthersReadMask deimosIP ; diff --git a/modules/config/devices/config/mars.nix b/modules/config/devices/config/mars.nix index 532b5f1..0dc12d2 100755 --- a/modules/config/devices/config/mars.nix +++ b/modules/config/devices/config/mars.nix @@ -1,6 +1,6 @@ -{ devicesFunctions }: +{ moduleFunctions }: let - inherit (devicesFunctions) + inherit (moduleFunctions.devicesFunctions) ownerWriteOthersReadMask readWritePermissions marsIP diff --git a/modules/config/devices/config/phobos.nix b/modules/config/devices/config/phobos.nix index 95468a3..6e0c256 100755 --- a/modules/config/devices/config/phobos.nix +++ b/modules/config/devices/config/phobos.nix @@ -1,6 +1,6 @@ -{ devicesFunctions }: +{ moduleFunctions }: let - inherit (devicesFunctions) + inherit (moduleFunctions.devicesFunctions) ownerWriteOthersReadMask phobosIP ; diff --git a/modules/config/devices/config/phone.nix b/modules/config/devices/config/phone.nix index cf4684c..7360361 100755 --- a/modules/config/devices/config/phone.nix +++ b/modules/config/devices/config/phone.nix @@ -1,6 +1,6 @@ -{ devicesFunctions }: +{ moduleFunctions }: let - inherit (devicesFunctions) + inherit (moduleFunctions.devicesFunctions) phoneIP dummy ; diff --git a/modules/config/devices/config/printers/printer0.nix b/modules/config/devices/config/printers/printer0.nix index 9404b98..5a7a731 100755 --- a/modules/config/devices/config/printers/printer0.nix +++ b/modules/config/devices/config/printers/printer0.nix @@ -1,8 +1,7 @@ -{ devicesFunctions }: +{ moduleFunctions }: let - inherit (devicesFunctions) - dummy - ; + inherit (moduleFunctions.devicesFunctions) dummy; + in { name = dummy; diff --git a/modules/config/devices/config/printers/printer1.nix b/modules/config/devices/config/printers/printer1.nix index a5c5ff6..cfe9bea 100755 --- a/modules/config/devices/config/printers/printer1.nix +++ b/modules/config/devices/config/printers/printer1.nix @@ -1,9 +1,7 @@ -{ devicesFunctions }: +{ moduleFunctions }: let - inherit (devicesFunctions) - brotherIP - dummy - ; + inherit (moduleFunctions.devicesFunctions) brotherIP dummy; + in { name = dummy; diff --git a/modules/config/devices/config/synology.nix b/modules/config/devices/config/synology.nix index 6c6531a..36c4a49 100755 --- a/modules/config/devices/config/synology.nix +++ b/modules/config/devices/config/synology.nix @@ -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; }; } diff --git a/modules/config/devices/default.nix b/modules/config/devices/default.nix index b6222cd..dcf6546 100755 --- a/modules/config/devices/default.nix +++ b/modules/config/devices/default.nix @@ -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 ; }; }) diff --git a/modules/config/instances/config/acme.nix b/modules/config/instances/config/acme.nix index 0e95fd3..2ed281a 100755 --- a/modules/config/instances/config/acme.nix +++ b/modules/config/instances/config/acme.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) sslPath sopsPath ; diff --git a/modules/config/instances/config/audiobookshelf.nix b/modules/config/instances/config/audiobookshelf.nix index e78f45e..1d6eab9 100755 --- a/modules/config/instances/config/audiobookshelf.nix +++ b/modules/config/instances/config/audiobookshelf.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain0 servicePath sslPath diff --git a/modules/config/instances/config/caddy.nix b/modules/config/instances/config/caddy.nix index b8e3362..67414ee 100755 --- a/modules/config/instances/config/caddy.nix +++ b/modules/config/instances/config/caddy.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) sopsPath ; diff --git a/modules/config/instances/config/forgejo.nix b/modules/config/instances/config/forgejo.nix index 7a2c2e4..dd82743 100755 --- a/modules/config/instances/config/forgejo.nix +++ b/modules/config/instances/config/forgejo.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain3 servicePath sslPath diff --git a/modules/config/instances/config/glance.nix b/modules/config/instances/config/glance.nix index 1a8b2d8..783049d 100755 --- a/modules/config/instances/config/glance.nix +++ b/modules/config/instances/config/glance.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain0 servicePath sslPath diff --git a/modules/config/instances/config/jellyfin.nix b/modules/config/instances/config/jellyfin.nix index 3b07d10..4b6eb3e 100755 --- a/modules/config/instances/config/jellyfin.nix +++ b/modules/config/instances/config/jellyfin.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain0 servicePath sslPath diff --git a/modules/config/instances/config/kanboard.nix b/modules/config/instances/config/kanboard.nix index cf6cb40..045d1b1 100755 --- a/modules/config/instances/config/kanboard.nix +++ b/modules/config/instances/config/kanboard.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain0 servicePath sslPath diff --git a/modules/config/instances/config/mastodon.nix b/modules/config/instances/config/mastodon.nix index 474d2a9..589ad64 100755 --- a/modules/config/instances/config/mastodon.nix +++ b/modules/config/instances/config/mastodon.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain3 servicePath sslPath diff --git a/modules/config/instances/config/matrix.nix b/modules/config/instances/config/matrix.nix index c9c4c73..679708d 100755 --- a/modules/config/instances/config/matrix.nix +++ b/modules/config/instances/config/matrix.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) servicePath sopsPath ; diff --git a/modules/config/instances/config/minecraft.nix b/modules/config/instances/config/minecraft.nix index 08d5f56..e561368 100755 --- a/modules/config/instances/config/minecraft.nix +++ b/modules/config/instances/config/minecraft.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain0 servicePath sslPath diff --git a/modules/config/instances/config/nextcloud.nix b/modules/config/instances/config/nextcloud.nix index 76db639..6538cca 100755 --- a/modules/config/instances/config/nextcloud.nix +++ b/modules/config/instances/config/nextcloud.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain0 servicePath sslPath diff --git a/modules/config/instances/config/nginx.nix b/modules/config/instances/config/nginx.nix index 07e640c..bd5611a 100755 --- a/modules/config/instances/config/nginx.nix +++ b/modules/config/instances/config/nginx.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) sopsPath ; diff --git a/modules/config/instances/config/ollama.nix b/modules/config/instances/config/ollama.nix index 2262b14..b1bcd66 100755 --- a/modules/config/instances/config/ollama.nix +++ b/modules/config/instances/config/ollama.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain0 servicePath sslPath diff --git a/modules/config/instances/config/owncast.nix b/modules/config/instances/config/owncast.nix index 126edbd..a18ce48 100755 --- a/modules/config/instances/config/owncast.nix +++ b/modules/config/instances/config/owncast.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain1 servicePath sslPath diff --git a/modules/config/instances/config/peertube.nix b/modules/config/instances/config/peertube.nix index 21f54fb..81a4ab0 100755 --- a/modules/config/instances/config/peertube.nix +++ b/modules/config/instances/config/peertube.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain3 servicePath sslPath diff --git a/modules/config/instances/config/podgrab.nix b/modules/config/instances/config/podgrab.nix index 363218b..3635de6 100755 --- a/modules/config/instances/config/podgrab.nix +++ b/modules/config/instances/config/podgrab.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain0 servicePath sslPath diff --git a/modules/config/instances/config/postfix.nix b/modules/config/instances/config/postfix.nix index 59938df..e6ea5df 100755 --- a/modules/config/instances/config/postfix.nix +++ b/modules/config/instances/config/postfix.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain3 servicePath sslPath diff --git a/modules/config/instances/config/postgresql.nix b/modules/config/instances/config/postgresql.nix index 51d9042..a415d27 100755 --- a/modules/config/instances/config/postgresql.nix +++ b/modules/config/instances/config/postgresql.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) servicePath sopsPath ; diff --git a/modules/config/instances/config/samba.nix b/modules/config/instances/config/samba.nix index 2f672f1..52ff70f 100755 --- a/modules/config/instances/config/samba.nix +++ b/modules/config/instances/config/samba.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) sopsPath ; diff --git a/modules/config/instances/config/searx.nix b/modules/config/instances/config/searx.nix index be18191..82e793b 100755 --- a/modules/config/instances/config/searx.nix +++ b/modules/config/instances/config/searx.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain0 servicePath sslPath diff --git a/modules/config/instances/config/smtp.nix b/modules/config/instances/config/smtp.nix index 863b785..6480427 100755 --- a/modules/config/instances/config/smtp.nix +++ b/modules/config/instances/config/smtp.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) dummy ; in diff --git a/modules/config/instances/config/syncthing.nix b/modules/config/instances/config/syncthing.nix index cdfb9ae..3795acb 100755 --- a/modules/config/instances/config/syncthing.nix +++ b/modules/config/instances/config/syncthing.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain0 sslPath sopsPath diff --git a/modules/config/instances/config/synology.nix b/modules/config/instances/config/synology.nix index b18d264..3138ac0 100755 --- a/modules/config/instances/config/synology.nix +++ b/modules/config/instances/config/synology.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) sopsPath ; diff --git a/modules/config/instances/config/upRootNutrition.nix b/modules/config/instances/config/upRootNutrition.nix index 6e38aa0..3702b08 100755 --- a/modules/config/instances/config/upRootNutrition.nix +++ b/modules/config/instances/config/upRootNutrition.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain3 sslPath sopsPath diff --git a/modules/config/instances/config/vaultwarden.nix b/modules/config/instances/config/vaultwarden.nix index 3805bfd..5ea9dd2 100755 --- a/modules/config/instances/config/vaultwarden.nix +++ b/modules/config/instances/config/vaultwarden.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain0 servicePath sslPath diff --git a/modules/config/instances/config/web.nix b/modules/config/instances/config/web.nix index df59752..ce8c8dd 100755 --- a/modules/config/instances/config/web.nix +++ b/modules/config/instances/config/web.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) domain0 domain1 domain2 diff --git a/modules/config/instances/config/wireGuard.nix b/modules/config/instances/config/wireGuard.nix index c9509d1..19f748b 100755 --- a/modules/config/instances/config/wireGuard.nix +++ b/modules/config/instances/config/wireGuard.nix @@ -1,6 +1,6 @@ -{ instancesFunctions }: +{ moduleFunctions }: let - inherit (instancesFunctions) + inherit (moduleFunctions.instancesFunctions) sopsPath ; diff --git a/modules/config/instances/default.nix b/modules/config/instances/default.nix index f492911..8c3e57e 100755 --- a/modules/config/instances/default.nix +++ b/modules/config/instances/default.nix @@ -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 ; }; }) diff --git a/modules/config/themes/default.nix b/modules/config/themes/default.nix index 6620a8c..fc98e64 100755 --- a/modules/config/themes/default.nix +++ b/modules/config/themes/default.nix @@ -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); }; }; } diff --git a/modules/config/users/config/user0.nix b/modules/config/users/config/user0.nix index e68fd70..2d69fbc 100755 --- a/modules/config/users/config/user0.nix +++ b/modules/config/users/config/user0.nix @@ -1,9 +1,4 @@ { user0 }: -let - inherit - user0 - ; -in { name = "Nick"; aliases = { diff --git a/modules/config/users/config/user1.nix b/modules/config/users/config/user1.nix index d9d5e68..2921f50 100755 --- a/modules/config/users/config/user1.nix +++ b/modules/config/users/config/user1.nix @@ -1,9 +1,4 @@ { user1 }: -let - inherit - user1 - ; -in { name = "Streaming"; aliases = { diff --git a/modules/config/users/default.nix b/modules/config/users/default.nix index 96bc7e2..538ff13 100755 --- a/modules/config/users/default.nix +++ b/modules/config/users/default.nix @@ -1,8 +1,9 @@ +{ moduleFunctions }: let + inherit (moduleFunctions) usersFunctions; configPath = ./config; - - user0 = "nick"; - user1 = "streaming"; + user0 = usersFunctions.user0; + user1 = usersFunctions.user1; in { inherit