diff --git a/containers/amethyst/flake.nix b/containers/amethyst/flake.nix
index 5b9817e..4865e29 100644
--- a/containers/amethyst/flake.nix
+++ b/containers/amethyst/flake.nix
@@ -9,7 +9,6 @@
nixosModule = { ... }:
let
name = "amethyst";
- fqdn = "amethyst.lava.moe";
subnet = "1";
in {
networking.nat = {
@@ -18,7 +17,7 @@
internalInterfaces = [ "ve-${name}" ];
};
- services.nginx.virtualHosts."${fqdn}" = {
+ services.nginx.virtualHosts."${name}.local.lava.moe" = {
useACMEHost = "lava.moe";
forceSSL = true;
locations."/".proxyPass = "http://[fd0d:1::${subnet}:2]:9091";
diff --git a/containers/beryllium/flake.nix b/containers/beryllium/flake.nix
index c6b6cae..adab4f0 100644
--- a/containers/beryllium/flake.nix
+++ b/containers/beryllium/flake.nix
@@ -9,7 +9,6 @@
nixosModule = { ... }:
let
name = "beryllium";
- fqdn = "beryllium.lava.moe";
subnet = "2";
in {
networking.nat = {
@@ -18,7 +17,7 @@
internalInterfaces = [ "ve-${name}" ];
};
- services.nginx.virtualHosts."${fqdn}" = {
+ services.nginx.virtualHosts."${name}.lava.moe" = {
useACMEHost = "lava.moe";
forceSSL = true;
locations."/".extraConfig = "return 302 'https://lava.moe';";
@@ -30,7 +29,7 @@
services.nginx.virtualHosts."lava.moe" = {
locations."= /.well-known/matrix/server".extraConfig =
let
- server = { "m.server" = "${fqdn}:443"; };
+ server = { "m.server" = "beryllium.lava.moe:443"; };
in ''
add_header Content-Type application/json;
return 200 '${builtins.toJSON server}';
@@ -38,7 +37,7 @@
locations."= /.well-known/matrix/client".extraConfig =
let
client = {
- "m.homeserver" = { "base_url" = "https://${fqdn}"; };
+ "m.homeserver" = { "base_url" = "https://beryllium.lava.moe"; };
# "m.identity_server" = { "base_url" = "https://vector.im"; };
};
in ''
@@ -52,6 +51,8 @@
containers.${name} = {
autoStart = true;
privateNetwork = true;
+ hostAddress = "10.30.${subnet}.1";
+ localAddress = "10.30.${subnet}.2";
hostAddress6 = "fd0d:1::${subnet}:1";
localAddress6 = "fd0d:1::${subnet}:2";
# privateUsers = "pick";
diff --git a/containers/citrine/configuration.nix b/containers/citrine/configuration.nix
index 996ffb2..05a099a 100644
--- a/containers/citrine/configuration.nix
+++ b/containers/citrine/configuration.nix
@@ -1,4 +1,4 @@
-{ config, fqdn, lib, ... }: {
+{ config, lib, ... }: {
system.stateVersion = "25.11";
networking.firewall.allowedTCPPorts = [ 22 3000 ];
networking.firewall.allowedUDPPorts = [ 22 3000 ];
@@ -13,8 +13,8 @@
settings = {
DEFAULT.APP_NAME = "Garden";
server = {
- DOMAIN = fqdn;
- ROOT_URL = "https://${fqdn}/";
+ DOMAIN = "garden.lava.moe";
+ ROOT_URL = "https://garden.lava.moe/";
HTTP_PORT = 3000;
START_SSH_SERVER = true;
BUILTIN_SSH_SERVER_USER = "git";
diff --git a/containers/citrine/flake.nix b/containers/citrine/flake.nix
index 5673c9e..17eef3e 100644
--- a/containers/citrine/flake.nix
+++ b/containers/citrine/flake.nix
@@ -6,7 +6,6 @@
outputs = { nixpkgs, catppuccin, ... }:
let
name = "citrine";
- fqdn = "garden.lava.moe";
subnetId = "3";
subnet = x: "fd0d:1::${subnetId}:${toString x}";
@@ -36,7 +35,7 @@
internalInterfaces = [ "ve-${name}" ];
};
- services.nginx.virtualHosts."${fqdn}" = {
+ services.nginx.virtualHosts."garden.lava.moe" = {
useACMEHost = "lava.moe";
forceSSL = true;
locations."/".proxyPass = "http://[${client}]:3000";
@@ -54,7 +53,6 @@
nixpkgs = nixpkgs;
ephemeral = true;
config = { imports = modules; };
- specialArgs = { inherit fqdn; };
bindMounts."persist" = {
hostPath = "/persist/containers/${name}";
diff --git a/containers/diamond/configuration.nix b/containers/diamond/configuration.nix
deleted file mode 100644
index 01b4311..0000000
--- a/containers/diamond/configuration.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ fqdn, ... }: {
- system.stateVersion = "25.11";
- systemd.tmpfiles.rules = [
- "d /persist/vaultwarden 755 vaultwarden vaultwarden"
- ];
- fileSystems."/var/lib/vaultwarden" = {
- device = "/persist/vaultwarden";
- fsType = "none";
- options = [ "bind" ];
- };
- networking.firewall.allowedTCPPorts = [ 8000 ];
- networking.firewall.allowedUDPPorts = [ 8000 ];
-
- services.vaultwarden = {
- enable = true;
- domain = fqdn;
- config = {
- DOMAIN = "https://${fqdn}";
- ROCKET_ADDRESS = "::";
- };
- };
-}
diff --git a/containers/diamond/flake.lock b/containers/diamond/flake.lock
deleted file mode 100644
index 88ab73f..0000000
--- a/containers/diamond/flake.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "nodes": {
- "nixpkgs": {
- "locked": {
- "lastModified": 1773282481,
- "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "root": {
- "inputs": {
- "nixpkgs": "nixpkgs"
- }
- }
- },
- "root": "root",
- "version": 7
-}
diff --git a/containers/diamond/flake.nix b/containers/diamond/flake.nix
deleted file mode 100644
index 13b6b1e..0000000
--- a/containers/diamond/flake.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- inputs = {
- nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
- };
- outputs = { nixpkgs, ... }:
- let
- name = "diamond";
- fqdn = "astransia.lava.moe";
- subnetId = "4";
-
- subnet = x: "fd0d:1::${subnetId}:${toString x}";
- host = subnet 1;
- client = subnet 2;
-
- modules = [
- ./configuration.nix
- ];
- in {
- nixosConfigurations.container = nixpkgs.lib.nixosSystem {
- inherit modules;
- };
- nixosModule = { ... }: {
- services.nginx.virtualHosts."${fqdn}" = {
- useACMEHost = "lava.moe";
- forceSSL = true;
- locations."/".proxyPass = "http://[${client}]:8000";
- listenAddresses = [ "10.0.0.1" "[fd0d::1]" ];
- };
-
- systemd.tmpfiles.rules = [ "d /persist/containers/${name} 755 root users" ];
- containers.${name} = {
- autoStart = true;
- privateNetwork = true;
- hostAddress6 = host;
- localAddress6 = client;
- # privateUsers = "pick";
- nixpkgs = nixpkgs;
- ephemeral = true;
- config = { imports = modules; };
- specialArgs = { inherit fqdn; };
-
- bindMounts."persist" = {
- hostPath = "/persist/containers/${name}";
- mountPoint = "/persist";
- isReadOnly = false;
- };
- # flake = "path:" + ./.;
- };
- };
- };
-}
diff --git a/containers/diamond/templates/base/footer_content.tmpl b/containers/diamond/templates/base/footer_content.tmpl
deleted file mode 100644
index a9238c3..0000000
--- a/containers/diamond/templates/base/footer_content.tmpl
+++ /dev/null
@@ -1,31 +0,0 @@
-
diff --git a/containers/diamond/templates/home.tmpl b/containers/diamond/templates/home.tmpl
deleted file mode 100644
index d460caf..0000000
--- a/containers/diamond/templates/home.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{template "base/head" .}}
-{{if not .IsSigned}}
-
-{{end}}
-
-
-
-

-
-
-
{{ctx.Locale.Tr "startpage.app_desc"}}
-
-
-
- {{template "home_forgejo" .}}
-
-{{template "base/footer" .}}
diff --git a/containers/emerald/configuration.nix b/containers/emerald/configuration.nix
deleted file mode 100644
index e3f8c57..0000000
--- a/containers/emerald/configuration.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ fqdn, shareFqdn, ... }: {
- system.stateVersion = "25.11";
- systemd.tmpfiles.rules = [
- "d /persist/music 755 navidrome navidrome"
- "d /persist/navidrome 755 navidrome navidrome"
- ];
- networking.firewall.allowedTCPPorts = [ 4533 ];
- networking.firewall.allowedUDPPorts = [ 4533 ];
-
- services.navidrome = {
- enable = true;
- environmentFile = "/binds/navidrome_env";
- settings = {
- Port = 4533;
- Address = "[::]";
- BaseUrl = "https://${fqdn}/";
- ShareURL = "https://${shareFqdn}";
- EnableSharing = true;
- DataFolder = "/persist/navidrome";
- MusicFolder = "/persist/music";
- };
- };
-}
diff --git a/containers/emerald/flake.lock b/containers/emerald/flake.lock
deleted file mode 100644
index 88ab73f..0000000
--- a/containers/emerald/flake.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "nodes": {
- "nixpkgs": {
- "locked": {
- "lastModified": 1773282481,
- "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "root": {
- "inputs": {
- "nixpkgs": "nixpkgs"
- }
- }
- },
- "root": "root",
- "version": 7
-}
diff --git a/containers/emerald/flake.nix b/containers/emerald/flake.nix
deleted file mode 100644
index 80f6dac..0000000
--- a/containers/emerald/flake.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{
- inputs = {
- nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
- };
- outputs = { nixpkgs, ... }:
- let
- name = "emerald";
- fqdn = "navia.lava.moe";
- shareFqdn = "muse.lava.moe";
- subnetId = "5";
-
- subnet = x: "fd0d:1::${subnetId}:${toString x}";
- host = subnet 1;
- client = subnet 2;
-
- subnet4 = x: "10.30.${subnetId}.${toString x}";
- host4 = subnet4 1;
- client4 = subnet4 2;
-
- modules = [
- ./configuration.nix
- ];
- in {
- nixosConfigurations.container = nixpkgs.lib.nixosSystem {
- inherit modules;
- };
- nixosModule = { config, ... }: {
- networking.nat = {
- enable = true;
- enableIPv6 = true;
- internalInterfaces = [ "ve-${name}" ];
- };
-
- services.nginx.virtualHosts."${fqdn}" = {
- useACMEHost = "lava.moe";
- forceSSL = true;
- locations."/".proxyPass = "http://[${client}]:4533";
- listenAddresses = [ "10.0.0.1" "[fd0d::1]" ];
- };
- services.nginx.virtualHosts."${shareFqdn}" = {
- useACMEHost = "lava.moe";
- forceSSL = true;
- locations."/".return = "404";
- locations."/share/".proxyPass = "http://[${client}]:4533";
- };
-
- systemd.tmpfiles.rules = [ "d /persist/containers/${name} 755 root users" ];
- containers.${name} = {
- autoStart = true;
- privateNetwork = true;
- hostAddress = host4;
- localAddress = client4;
- hostAddress6 = host;
- localAddress6 = client;
- # privateUsers = "pick";
- nixpkgs = nixpkgs;
- ephemeral = true;
- config = { imports = modules; };
- specialArgs = { inherit fqdn shareFqdn; };
-
- bindMounts."persist" = {
- hostPath = "/persist/containers/${name}";
- mountPoint = "/persist";
- isReadOnly = false;
- };
- bindMounts."navidrome_env" = {
- hostPath = config.age.secrets.navidrome_env.path;
- mountPoint = "/binds/navidrome_env";
- isReadOnly = true;
- };
- # flake = "path:" + ./.;
- };
- };
- };
-}
diff --git a/containers/fluorite/configuration.nix b/containers/fluorite/configuration.nix
deleted file mode 100644
index 14e39ff..0000000
--- a/containers/fluorite/configuration.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ ... }: {
- system.stateVersion = "25.11";
- systemd.tmpfiles.rules = [
- "d /persist/slskd/Downloads 755 slskd slskd"
- ];
- networking.firewall.allowedTCPPorts = [ 5030 50300 ];
- networking.firewall.allowedUDPPorts = [ 5030 50300 ];
-
- services.slskd = {
- enable = true;
- domain = null;
- environmentFile = "/binds/slskd_env";
- settings = {
- directories.downloads = "/persist/slskd/Downloads";
- shares.directories = [ "/binds/shared/" ];
- };
- };
-}
diff --git a/containers/fluorite/flake.lock b/containers/fluorite/flake.lock
deleted file mode 100644
index 88ab73f..0000000
--- a/containers/fluorite/flake.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "nodes": {
- "nixpkgs": {
- "locked": {
- "lastModified": 1773282481,
- "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "root": {
- "inputs": {
- "nixpkgs": "nixpkgs"
- }
- }
- },
- "root": "root",
- "version": 7
-}
diff --git a/containers/fluorite/flake.nix b/containers/fluorite/flake.nix
deleted file mode 100644
index 2fac909..0000000
--- a/containers/fluorite/flake.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- inputs = {
- nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
- };
- outputs = { nixpkgs, ... }:
- let
- name = "fluorite";
- fqdn = "fluorite.lava.moe";
- subnetId = "6";
-
- subnet = x: "fd0d:1::${subnetId}:${toString x}";
- host = subnet 1;
- client = subnet 2;
-
- subnet4 = x: "10.30.${subnetId}.${toString x}";
- host4 = subnet4 1;
- client4 = subnet4 2;
-
- modules = [
- ./configuration.nix
- ];
- in {
- nixosConfigurations.container = nixpkgs.lib.nixosSystem {
- inherit modules;
- };
- nixosModule = { config, ... }: {
- networking.nat = {
- enable = true;
- enableIPv6 = true;
- internalInterfaces = [ "ve-${name}" ];
- };
-
- services.nginx.virtualHosts."${fqdn}" = {
- useACMEHost = "lava.moe";
- forceSSL = true;
- locations."/".proxyPass = "http://[${client}]:5030";
- listenAddresses = [ "10.0.0.1" "[fd0d::1]" ];
- };
-
- systemd.tmpfiles.rules = [
- "d /persist/containers/${name} 755 root users"
- "d /persist/media/music 075 nobody users"
- ];
- containers.${name} = {
- autoStart = true;
- privateNetwork = true;
- hostAddress = host4;
- localAddress = client4;
- hostAddress6 = host;
- localAddress6 = client;
- # privateUsers = "pick";
- nixpkgs = nixpkgs;
- ephemeral = true;
- config = { imports = modules; };
- specialArgs = { inherit fqdn; };
-
- bindMounts."persist" = {
- hostPath = "/persist/containers/${name}";
- mountPoint = "/persist";
- isReadOnly = false;
- };
- bindMounts."shared" = {
- hostPath = "/persist/media/music";
- mountPoint = "/binds/shared";
- isReadOnly = true;
- };
- bindMounts."slskd_env" = {
- hostPath = config.age.secrets.slskd_env.path;
- mountPoint = "/binds/slskd_env";
- isReadOnly = true;
- };
- # flake = "path:" + ./.;
- };
- };
- };
-}
diff --git a/flake.lock b/flake.lock
index 2bd4720..1484f08 100644
--- a/flake.lock
+++ b/flake.lock
@@ -86,48 +86,6 @@
},
"parent": []
},
- "c-diamond": {
- "inputs": {
- "nixpkgs": "nixpkgs_7"
- },
- "locked": {
- "path": "./containers/diamond",
- "type": "path"
- },
- "original": {
- "path": "./containers/diamond",
- "type": "path"
- },
- "parent": []
- },
- "c-emerald": {
- "inputs": {
- "nixpkgs": "nixpkgs_8"
- },
- "locked": {
- "path": "./containers/emerald",
- "type": "path"
- },
- "original": {
- "path": "./containers/emerald",
- "type": "path"
- },
- "parent": []
- },
- "c-fluorite": {
- "inputs": {
- "nixpkgs": "nixpkgs_9"
- },
- "locked": {
- "path": "./containers/fluorite",
- "type": "path"
- },
- "original": {
- "path": "./containers/fluorite",
- "type": "path"
- },
- "parent": []
- },
"catppuccin": {
"inputs": {
"nixpkgs": "nixpkgs_5"
@@ -533,7 +491,7 @@
"nix-gaming": {
"inputs": {
"flake-parts": "flake-parts_2",
- "nixpkgs": "nixpkgs_10"
+ "nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1770778188,
@@ -616,54 +574,6 @@
"type": "github"
}
},
- "nixpkgs_10": {
- "locked": {
- "lastModified": 1770537093,
- "narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_11": {
- "locked": {
- "lastModified": 1770562336,
- "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_12": {
- "locked": {
- "lastModified": 1770019141,
- "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs_2": {
"locked": {
"lastModified": 1744536153,
@@ -746,27 +656,27 @@
},
"nixpkgs_7": {
"locked": {
- "lastModified": 1773282481,
- "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
+ "lastModified": 1770537093,
+ "narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
+ "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-unstable",
+ "ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
- "lastModified": 1773282481,
- "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
+ "lastModified": 1770562336,
+ "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
+ "rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
"type": "github"
},
"original": {
@@ -778,11 +688,11 @@
},
"nixpkgs_9": {
"locked": {
- "lastModified": 1773282481,
- "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
+ "lastModified": 1770019141,
+ "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
+ "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137",
"type": "github"
},
"original": {
@@ -834,7 +744,7 @@
"pastel": {
"inputs": {
"flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs_12",
+ "nixpkgs": "nixpkgs_9",
"pnpm2nix": "pnpm2nix"
},
"locked": {
@@ -897,9 +807,6 @@
"c-amethyst": "c-amethyst",
"c-beryllium": "c-beryllium",
"c-citrine": "c-citrine",
- "c-diamond": "c-diamond",
- "c-emerald": "c-emerald",
- "c-fluorite": "c-fluorite",
"catppuccin": "catppuccin_2",
"catppuccin-palette": "catppuccin-palette",
"fast-syntax-highlighting": "fast-syntax-highlighting",
@@ -908,7 +815,7 @@
"neovim-nightly": "neovim-nightly",
"nix-gaming": "nix-gaming",
"nix-index-database": "nix-index-database",
- "nixpkgs": "nixpkgs_11",
+ "nixpkgs": "nixpkgs_8",
"nvim-treesitter": "nvim-treesitter",
"pastel": "pastel",
"pure": "pure",
diff --git a/flake.nix b/flake.nix
index 8b91291..f8866db 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,9 +41,6 @@
c-amethyst.url = "path:./containers/amethyst";
c-beryllium.url = "path:./containers/beryllium";
c-citrine.url = "path:./containers/citrine";
- c-diamond.url = "path:./containers/diamond";
- c-emerald.url = "path:./containers/emerald";
- c-fluorite.url = "path:./containers/fluorite";
};
outputs = { self, agenix, catppuccin, nixpkgs, ... } @ inputs:
diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix
index 858a33b..aa4c81b 100644
--- a/hosts/anemone/default.nix
+++ b/hosts/anemone/default.nix
@@ -5,7 +5,6 @@
nixpkgs.overlays = [ inputs.neovim-nightly.overlays.default ];
age.secrets = {
- slskd_env.file = ../../secrets/slskd_env.age;
wg_anemone.file = ../../secrets/wg_anemone.age;
passwd.file = ../../secrets/passwd.age;
};
diff --git a/hosts/dandelion/default.nix b/hosts/dandelion/default.nix
index 58a0b80..3f87d87 100644
--- a/hosts/dandelion/default.nix
+++ b/hosts/dandelion/default.nix
@@ -5,7 +5,6 @@
age.secrets = {
acme_dns.file = ../../secrets/acme_dns.age;
- navidrome_env.file = ../../secrets/navidrome_env.age;
wg_dandelion.file = ../../secrets/wg_dandelion.age;
};
@@ -28,8 +27,6 @@
inputs.c-amethyst.nixosModule
inputs.c-beryllium.nixosModule
inputs.c-citrine.nixosModule
- inputs.c-diamond.nixosModule
- inputs.c-emerald.nixosModule
./filesystem.nix
./kernel.nix
diff --git a/secrets.nix b/secrets.nix
index b2d0d0e..4fc6c4a 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -10,8 +10,6 @@ in {
"secrets/wpa_conf.age".publicKeys = [ blossom rin ];
"secrets/acme_dns.age".publicKeys = [ dandelion hazel rin ];
- "secrets/navidrome_env.age".publicKeys = [ anemone dandelion rin ];
- "secrets/slskd_env.age".publicKeys = [ anemone dandelion rin ];
"secrets/warden_admin.age".publicKeys = [ rin ];
"secrets/wg_anemone.age".publicKeys = [ anemone rin ];
"secrets/wg_dandelion.age".publicKeys = [ dandelion rin ];
diff --git a/secrets/navidrome_env.age b/secrets/navidrome_env.age
deleted file mode 100644
index 6cb705c..0000000
Binary files a/secrets/navidrome_env.age and /dev/null differ
diff --git a/secrets/slskd_env.age b/secrets/slskd_env.age
deleted file mode 100644
index f0cb208..0000000
Binary files a/secrets/slskd_env.age and /dev/null differ