Fuck around with secrets

home-manager/tuiapps/git.nix

@@ -1,7 +1,7 @@
 {
   # Enable git and config
   programs.git = let
-    secrets = import ../../nixos/common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     enable = true;
     lfs.enable = true;

nixos/server/acme.nix

@@ -1,6 +1,6 @@
 {
   security.acme = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in { 
     acceptTerms = true;
     defaults.email = secrets.jimEmail;

nixos/server/ddclient.nix

@@ -1,7 +1,7 @@
 {pkgs, ...}: {
   # DDClient for Dynamic IPs
   services.ddclient = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     enable = true;
     protocol = "cloudflare";

nixos/server/element.nix

@@ -1,7 +1,7 @@
 {
   # Configure the Element web server
   nixpkgs.config.element-web.conf = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     default_server_config = {
       "m.homeserver" = {

nixos/server/firewall.nix

@@ -4,8 +4,8 @@
 
   # Configure firewall
   networking = let
-    ips = import ../common/ips.nix;
+    ips = import ../modules/ips.nix;
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     firewall = {
       allowPing = false;

nixos/server/gitea.nix

@@ -1,6 +1,6 @@
 {
   services.gitea = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     enable = true;
     settings = {

nixos/server/lemmy.nix

@@ -1,6 +1,6 @@
 {
   services.lemmy = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     enable = true;
     nginx.enable = true;

nixos/server/mailserver.nix

@@ -1,5 +1,5 @@
 {pkgs, ...}: let
-  secrets = import ../common/secrets.nix;
+  secrets = import ../../../secrets.nix;
 in rec {
   # Mail server
   mailserver = rec {

nixos/server/mastodon.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   services.mastodon = let 
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     enable = true;
     localDomain = "social.${secrets.jimDomain}";

nixos/server/nextcloud.nix

@@ -1,5 +1,5 @@
 {pkgs, ...}: let
-  secrets = import ../common/secrets.nix;
+  secrets = import ../../../secrets.nix;
 in {
   services.nextcloud = {
     enable = true;

nixos/server/nfs.nix

@@ -1,7 +1,7 @@
 {
   # NFS server
   services.nfs.server = let 
-    ips = import ../common/ips.nix;
+    ips = import ../modules/ips.nix;
   in {
     enable = true;
     exports = ''

nixos/server/nginx.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   services.nginx = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     enable = true;
     package = (pkgs.nginx.override {

nixos/server/pufferpanel.nix

@@ -1,6 +1,6 @@
 {pkgs, lib, ...}: {
   services.pufferpanel = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     enable = true;
     environment = {

nixos/server/synapse.nix

@@ -1,6 +1,6 @@
 {pkgs, config, ...}: {
   services = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     # Synapse Matrix server
     matrix-synapse = with config.services.coturn; {

nixos/server/vaultwarden.nix

@@ -1,6 +1,6 @@
 {
   services.vaultwarden = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     enable = true;
     config = {