diff --git a/lumina/files/_base/usr/etc/containers/containers.conf.d/eternal-runtimes.conf b/lumina/files/_base/etc/containers/containers.conf.d/eternal-runtimes.conf similarity index 100% rename from lumina/files/_base/usr/etc/containers/containers.conf.d/eternal-runtimes.conf rename to lumina/files/_base/etc/containers/containers.conf.d/eternal-runtimes.conf diff --git a/lumina/files/_base/usr/etc/containers/registries.conf.d/001-zot-quadlet-mirror.conf b/lumina/files/_base/etc/containers/registries.conf.d/001-zot-quadlet-mirror.conf similarity index 100% rename from lumina/files/_base/usr/etc/containers/registries.conf.d/001-zot-quadlet-mirror.conf rename to lumina/files/_base/etc/containers/registries.conf.d/001-zot-quadlet-mirror.conf diff --git a/lumina/files/_base/usr/etc/containers/registries.conf.d/002-zot-quadlet.conf b/lumina/files/_base/etc/containers/registries.conf.d/002-zot-quadlet.conf similarity index 100% rename from lumina/files/_base/usr/etc/containers/registries.conf.d/002-zot-quadlet.conf rename to lumina/files/_base/etc/containers/registries.conf.d/002-zot-quadlet.conf diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/_config/glance-default.yaml b/lumina/files/_base/etc/containers/systemd/users/_config/glance-default.yaml similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/_config/glance-default.yaml rename to lumina/files/_base/etc/containers/systemd/users/_config/glance-default.yaml diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/_config/milvus-etcd.yaml b/lumina/files/_base/etc/containers/systemd/users/_config/milvus-etcd.yaml similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/_config/milvus-etcd.yaml rename to lumina/files/_base/etc/containers/systemd/users/_config/milvus-etcd.yaml diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/_config/prometheus.yml b/lumina/files/_base/etc/containers/systemd/users/_config/prometheus.yml similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/_config/prometheus.yml rename to lumina/files/_base/etc/containers/systemd/users/_config/prometheus.yml diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/_config/redpanda-console.yml b/lumina/files/_base/etc/containers/systemd/users/_config/redpanda-console.yml similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/_config/redpanda-console.yml rename to lumina/files/_base/etc/containers/systemd/users/_config/redpanda-console.yml diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/_config/redpanda-server.yml b/lumina/files/_base/etc/containers/systemd/users/_config/redpanda-server.yml similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/_config/redpanda-server.yml rename to lumina/files/_base/etc/containers/systemd/users/_config/redpanda-server.yml diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/_config/zot-config.yaml b/lumina/files/_base/etc/containers/systemd/users/_config/zot-config.yaml similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/_config/zot-config.yaml rename to lumina/files/_base/etc/containers/systemd/users/_config/zot-config.yaml diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/cloudbeaver.container b/lumina/files/_base/etc/containers/systemd/users/cloudbeaver.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/cloudbeaver.container rename to lumina/files/_base/etc/containers/systemd/users/cloudbeaver.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/cockroachdb/cockroachdb.container b/lumina/files/_base/etc/containers/systemd/users/cockroachdb/cockroachdb.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/cockroachdb/cockroachdb.container rename to lumina/files/_base/etc/containers/systemd/users/cockroachdb/cockroachdb.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/cockroachdb/cockroachdb.volume b/lumina/files/_base/etc/containers/systemd/users/cockroachdb/cockroachdb.volume similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/cockroachdb/cockroachdb.volume rename to lumina/files/_base/etc/containers/systemd/users/cockroachdb/cockroachdb.volume diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/cyberchef.container b/lumina/files/_base/etc/containers/systemd/users/cyberchef.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/cyberchef.container rename to lumina/files/_base/etc/containers/systemd/users/cyberchef.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/dynamodb/dynamodb.container b/lumina/files/_base/etc/containers/systemd/users/dynamodb/dynamodb.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/dynamodb/dynamodb.container rename to lumina/files/_base/etc/containers/systemd/users/dynamodb/dynamodb.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/dynamodb/dynamodb.volume b/lumina/files/_base/etc/containers/systemd/users/dynamodb/dynamodb.volume similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/dynamodb/dynamodb.volume rename to lumina/files/_base/etc/containers/systemd/users/dynamodb/dynamodb.volume diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/elasticmq.container b/lumina/files/_base/etc/containers/systemd/users/elasticmq.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/elasticmq.container rename to lumina/files/_base/etc/containers/systemd/users/elasticmq.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/eternal.network b/lumina/files/_base/etc/containers/systemd/users/eternal.network similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/eternal.network rename to lumina/files/_base/etc/containers/systemd/users/eternal.network diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/excalidraw.container b/lumina/files/_base/etc/containers/systemd/users/excalidraw.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/excalidraw.container rename to lumina/files/_base/etc/containers/systemd/users/excalidraw.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/glance.container b/lumina/files/_base/etc/containers/systemd/users/glance.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/glance.container rename to lumina/files/_base/etc/containers/systemd/users/glance.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/influxdb/influxdb.container b/lumina/files/_base/etc/containers/systemd/users/influxdb/influxdb.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/influxdb/influxdb.container rename to lumina/files/_base/etc/containers/systemd/users/influxdb/influxdb.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/influxdb/influxdb.volume b/lumina/files/_base/etc/containers/systemd/users/influxdb/influxdb.volume similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/influxdb/influxdb.volume rename to lumina/files/_base/etc/containers/systemd/users/influxdb/influxdb.volume diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/invoke-ai/invoke-ai.container b/lumina/files/_base/etc/containers/systemd/users/invoke-ai/invoke-ai.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/invoke-ai/invoke-ai.container rename to lumina/files/_base/etc/containers/systemd/users/invoke-ai/invoke-ai.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/invoke-ai/invoke-ai.volume b/lumina/files/_base/etc/containers/systemd/users/invoke-ai/invoke-ai.volume similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/invoke-ai/invoke-ai.volume rename to lumina/files/_base/etc/containers/systemd/users/invoke-ai/invoke-ai.volume diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/jupyter-notebook/jupyter-notebook.container b/lumina/files/_base/etc/containers/systemd/users/jupyter-notebook/jupyter-notebook.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/jupyter-notebook/jupyter-notebook.container rename to lumina/files/_base/etc/containers/systemd/users/jupyter-notebook/jupyter-notebook.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/jupyter-notebook/jupyter-notebook.volume b/lumina/files/_base/etc/containers/systemd/users/jupyter-notebook/jupyter-notebook.volume similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/jupyter-notebook/jupyter-notebook.volume rename to lumina/files/_base/etc/containers/systemd/users/jupyter-notebook/jupyter-notebook.volume diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/keycloak.container b/lumina/files/_base/etc/containers/systemd/users/keycloak.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/keycloak.container rename to lumina/files/_base/etc/containers/systemd/users/keycloak.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/localstack/localstack.container b/lumina/files/_base/etc/containers/systemd/users/localstack/localstack.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/localstack/localstack.container rename to lumina/files/_base/etc/containers/systemd/users/localstack/localstack.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/localstack/localstack.volume b/lumina/files/_base/etc/containers/systemd/users/localstack/localstack.volume similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/localstack/localstack.volume rename to lumina/files/_base/etc/containers/systemd/users/localstack/localstack.volume diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/mailpit.container b/lumina/files/_base/etc/containers/systemd/users/mailpit.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/mailpit.container rename to lumina/files/_base/etc/containers/systemd/users/mailpit.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/milvus/milvus.container b/lumina/files/_base/etc/containers/systemd/users/milvus/milvus.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/milvus/milvus.container rename to lumina/files/_base/etc/containers/systemd/users/milvus/milvus.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/milvus/milvus.volume b/lumina/files/_base/etc/containers/systemd/users/milvus/milvus.volume similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/milvus/milvus.volume rename to lumina/files/_base/etc/containers/systemd/users/milvus/milvus.volume diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/minio/minio.container b/lumina/files/_base/etc/containers/systemd/users/minio/minio.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/minio/minio.container rename to lumina/files/_base/etc/containers/systemd/users/minio/minio.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/minio/minio.volume b/lumina/files/_base/etc/containers/systemd/users/minio/minio.volume similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/minio/minio.volume rename to lumina/files/_base/etc/containers/systemd/users/minio/minio.volume diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/neo4j/neo4j.container b/lumina/files/_base/etc/containers/systemd/users/neo4j/neo4j.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/neo4j/neo4j.container rename to lumina/files/_base/etc/containers/systemd/users/neo4j/neo4j.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/neo4j/neo4j.volume b/lumina/files/_base/etc/containers/systemd/users/neo4j/neo4j.volume similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/neo4j/neo4j.volume rename to lumina/files/_base/etc/containers/systemd/users/neo4j/neo4j.volume diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/ollama/ollama-web.container b/lumina/files/_base/etc/containers/systemd/users/ollama/ollama-web.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/ollama/ollama-web.container rename to lumina/files/_base/etc/containers/systemd/users/ollama/ollama-web.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/ollama/ollama.container b/lumina/files/_base/etc/containers/systemd/users/ollama/ollama.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/ollama/ollama.container rename to lumina/files/_base/etc/containers/systemd/users/ollama/ollama.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/ollama/ollama.volume b/lumina/files/_base/etc/containers/systemd/users/ollama/ollama.volume similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/ollama/ollama.volume rename to lumina/files/_base/etc/containers/systemd/users/ollama/ollama.volume diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/owasp-zap.container b/lumina/files/_base/etc/containers/systemd/users/owasp-zap.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/owasp-zap.container rename to lumina/files/_base/etc/containers/systemd/users/owasp-zap.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/postgres/postgres.container b/lumina/files/_base/etc/containers/systemd/users/postgres/postgres.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/postgres/postgres.container rename to lumina/files/_base/etc/containers/systemd/users/postgres/postgres.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/postgres/postgres.volume b/lumina/files/_base/etc/containers/systemd/users/postgres/postgres.volume similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/postgres/postgres.volume rename to lumina/files/_base/etc/containers/systemd/users/postgres/postgres.volume diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/prometheus.container b/lumina/files/_base/etc/containers/systemd/users/prometheus.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/prometheus.container rename to lumina/files/_base/etc/containers/systemd/users/prometheus.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/qdrant/qdrant.container b/lumina/files/_base/etc/containers/systemd/users/qdrant/qdrant.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/qdrant/qdrant.container rename to lumina/files/_base/etc/containers/systemd/users/qdrant/qdrant.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/qdrant/qdrant.volume b/lumina/files/_base/etc/containers/systemd/users/qdrant/qdrant.volume similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/qdrant/qdrant.volume rename to lumina/files/_base/etc/containers/systemd/users/qdrant/qdrant.volume diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/redpanda/redpanda-console.container b/lumina/files/_base/etc/containers/systemd/users/redpanda/redpanda-console.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/redpanda/redpanda-console.container rename to lumina/files/_base/etc/containers/systemd/users/redpanda/redpanda-console.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/redpanda/redpanda-server.container b/lumina/files/_base/etc/containers/systemd/users/redpanda/redpanda-server.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/redpanda/redpanda-server.container rename to lumina/files/_base/etc/containers/systemd/users/redpanda/redpanda-server.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/redpanda/redpanda.volume b/lumina/files/_base/etc/containers/systemd/users/redpanda/redpanda.volume similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/redpanda/redpanda.volume rename to lumina/files/_base/etc/containers/systemd/users/redpanda/redpanda.volume diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/scylladb.container b/lumina/files/_base/etc/containers/systemd/users/scylladb.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/scylladb.container rename to lumina/files/_base/etc/containers/systemd/users/scylladb.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/surrealdb/surrealdb.container b/lumina/files/_base/etc/containers/systemd/users/surrealdb/surrealdb.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/surrealdb/surrealdb.container rename to lumina/files/_base/etc/containers/systemd/users/surrealdb/surrealdb.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/surrealdb/surrealdb.volume b/lumina/files/_base/etc/containers/systemd/users/surrealdb/surrealdb.volume similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/surrealdb/surrealdb.volume rename to lumina/files/_base/etc/containers/systemd/users/surrealdb/surrealdb.volume diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/valkey/valkey.container b/lumina/files/_base/etc/containers/systemd/users/valkey/valkey.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/valkey/valkey.container rename to lumina/files/_base/etc/containers/systemd/users/valkey/valkey.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/valkey/valkey.volume b/lumina/files/_base/etc/containers/systemd/users/valkey/valkey.volume similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/valkey/valkey.volume rename to lumina/files/_base/etc/containers/systemd/users/valkey/valkey.volume diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/vault.container b/lumina/files/_base/etc/containers/systemd/users/vault.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/vault.container rename to lumina/files/_base/etc/containers/systemd/users/vault.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/verdaccio/verdaccio.container b/lumina/files/_base/etc/containers/systemd/users/verdaccio/verdaccio.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/verdaccio/verdaccio.container rename to lumina/files/_base/etc/containers/systemd/users/verdaccio/verdaccio.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/verdaccio/verdaccio.volume b/lumina/files/_base/etc/containers/systemd/users/verdaccio/verdaccio.volume similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/verdaccio/verdaccio.volume rename to lumina/files/_base/etc/containers/systemd/users/verdaccio/verdaccio.volume diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/web-check.container b/lumina/files/_base/etc/containers/systemd/users/web-check.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/web-check.container rename to lumina/files/_base/etc/containers/systemd/users/web-check.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/zot/zot.container b/lumina/files/_base/etc/containers/systemd/users/zot/zot.container similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/zot/zot.container rename to lumina/files/_base/etc/containers/systemd/users/zot/zot.container diff --git a/lumina/files/_base/usr/etc/containers/systemd/users/zot/zot.volume b/lumina/files/_base/etc/containers/systemd/users/zot/zot.volume similarity index 100% rename from lumina/files/_base/usr/etc/containers/systemd/users/zot/zot.volume rename to lumina/files/_base/etc/containers/systemd/users/zot/zot.volume diff --git a/lumina/files/_base/usr/etc/distrobox/distrobox.conf b/lumina/files/_base/etc/distrobox/distrobox.conf similarity index 100% rename from lumina/files/_base/usr/etc/distrobox/distrobox.conf rename to lumina/files/_base/etc/distrobox/distrobox.conf diff --git a/lumina/files/_base/usr/etc/docker/daemon.json b/lumina/files/_base/etc/docker/daemon.json similarity index 100% rename from lumina/files/_base/usr/etc/docker/daemon.json rename to lumina/files/_base/etc/docker/daemon.json diff --git a/lumina/files/_base/usr/etc/eternal/charm/mods.yml b/lumina/files/_base/etc/eternal/charm/mods.yml similarity index 100% rename from lumina/files/_base/usr/etc/eternal/charm/mods.yml rename to lumina/files/_base/etc/eternal/charm/mods.yml diff --git a/lumina/files/_base/usr/etc/eternal/setup-manager/system.d/nix.sh b/lumina/files/_base/etc/eternal/setup-manager/system.d/nix.sh similarity index 100% rename from lumina/files/_base/usr/etc/eternal/setup-manager/system.d/nix.sh rename to lumina/files/_base/etc/eternal/setup-manager/system.d/nix.sh diff --git a/lumina/files/_base/usr/etc/eternal/setup-manager/system.d/user-groups.sh b/lumina/files/_base/etc/eternal/setup-manager/system.d/user-groups.sh similarity index 100% rename from lumina/files/_base/usr/etc/eternal/setup-manager/system.d/user-groups.sh rename to lumina/files/_base/etc/eternal/setup-manager/system.d/user-groups.sh diff --git a/lumina/files/_base/usr/etc/eternal/setup-manager/user.d/vscode.sh b/lumina/files/_base/etc/eternal/setup-manager/user.d/vscode.sh similarity index 100% rename from lumina/files/_base/usr/etc/eternal/setup-manager/user.d/vscode.sh rename to lumina/files/_base/etc/eternal/setup-manager/user.d/vscode.sh diff --git a/lumina/files/_base/usr/etc/eternal/vscode/settings.json b/lumina/files/_base/etc/eternal/vscode/settings.json similarity index 100% rename from lumina/files/_base/usr/etc/eternal/vscode/settings.json rename to lumina/files/_base/etc/eternal/vscode/settings.json diff --git a/lumina/files/_base/usr/etc/polkit-1/rules.d/100-libvirt-acl.rules b/lumina/files/_base/etc/polkit-1/rules.d/100-libvirt-acl.rules similarity index 100% rename from lumina/files/_base/usr/etc/polkit-1/rules.d/100-libvirt-acl.rules rename to lumina/files/_base/etc/polkit-1/rules.d/100-libvirt-acl.rules diff --git a/lumina/files/_base/usr/etc/profile.d/brew.sh b/lumina/files/_base/etc/profile.d/brew.sh similarity index 100% rename from lumina/files/_base/usr/etc/profile.d/brew.sh rename to lumina/files/_base/etc/profile.d/brew.sh diff --git a/lumina/files/_base/usr/etc/ssh/sshd_conf.d/02-password-authentication.conf b/lumina/files/_base/etc/ssh/sshd_conf.d/02-password-authentication.conf similarity index 100% rename from lumina/files/_base/usr/etc/ssh/sshd_conf.d/02-password-authentication.conf rename to lumina/files/_base/etc/ssh/sshd_conf.d/02-password-authentication.conf diff --git a/lumina/files/_base/usr/etc/zsh/zshrc b/lumina/files/_base/etc/zsh/zshrc similarity index 100% rename from lumina/files/_base/usr/etc/zsh/zshrc rename to lumina/files/_base/etc/zsh/zshrc diff --git a/lumina/files/_base/usr/share/user-tmpfiles.d/eternal-mods.conf b/lumina/files/_base/usr/share/user-tmpfiles.d/eternal-mods.conf index 0cb5989..6fcd04b 100644 --- a/lumina/files/_base/usr/share/user-tmpfiles.d/eternal-mods.conf +++ b/lumina/files/_base/usr/share/user-tmpfiles.d/eternal-mods.conf @@ -1 +1 @@ -C %h/.config/mods/mods.yml - - - - /usr/etc/eternal/charm/mods.yml +C %h/.config/mods/mods.yml - - - - /etc/eternal/charm/mods.yml diff --git a/lumina/files/_base/usr/share/user-tmpfiles.d/eternal-vscode.conf b/lumina/files/_base/usr/share/user-tmpfiles.d/eternal-vscode.conf index f42a45a..2752916 100644 --- a/lumina/files/_base/usr/share/user-tmpfiles.d/eternal-vscode.conf +++ b/lumina/files/_base/usr/share/user-tmpfiles.d/eternal-vscode.conf @@ -1 +1 @@ -C %h/.config/Code/User/settings.json - - - - /usr/etc/eternal/vscode/settings.json +C %h/.config/Code/User/settings.json - - - - /etc/eternal/vscode/settings.json diff --git a/lumina/files/_silverblue/usr/etc/dconf/db/local.d/01-system b/lumina/files/_silverblue/etc/dconf/db/local.d/01-system similarity index 100% rename from lumina/files/_silverblue/usr/etc/dconf/db/local.d/01-system rename to lumina/files/_silverblue/etc/dconf/db/local.d/01-system diff --git a/lumina/files/_silverblue/usr/etc/dconf/db/local.d/02-dock b/lumina/files/_silverblue/etc/dconf/db/local.d/02-dock similarity index 100% rename from lumina/files/_silverblue/usr/etc/dconf/db/local.d/02-dock rename to lumina/files/_silverblue/etc/dconf/db/local.d/02-dock diff --git a/lumina/files/_silverblue/usr/etc/dconf/db/local.d/03-favorites b/lumina/files/_silverblue/etc/dconf/db/local.d/03-favorites similarity index 100% rename from lumina/files/_silverblue/usr/etc/dconf/db/local.d/03-favorites rename to lumina/files/_silverblue/etc/dconf/db/local.d/03-favorites diff --git a/lumina/files/_silverblue/usr/etc/dconf/db/local.d/04-shortcuts b/lumina/files/_silverblue/etc/dconf/db/local.d/04-shortcuts similarity index 100% rename from lumina/files/_silverblue/usr/etc/dconf/db/local.d/04-shortcuts rename to lumina/files/_silverblue/etc/dconf/db/local.d/04-shortcuts diff --git a/lumina/files/_silverblue/usr/etc/dconf/db/local.d/05-background b/lumina/files/_silverblue/etc/dconf/db/local.d/05-background similarity index 100% rename from lumina/files/_silverblue/usr/etc/dconf/db/local.d/05-background rename to lumina/files/_silverblue/etc/dconf/db/local.d/05-background diff --git a/lumina/files/_silverblue/usr/etc/dconf/db/local.d/06-terminal b/lumina/files/_silverblue/etc/dconf/db/local.d/06-terminal similarity index 100% rename from lumina/files/_silverblue/usr/etc/dconf/db/local.d/06-terminal rename to lumina/files/_silverblue/etc/dconf/db/local.d/06-terminal diff --git a/lumina/files/_silverblue/usr/etc/dconf/db/local.d/07-security b/lumina/files/_silverblue/etc/dconf/db/local.d/07-security similarity index 100% rename from lumina/files/_silverblue/usr/etc/dconf/db/local.d/07-security rename to lumina/files/_silverblue/etc/dconf/db/local.d/07-security diff --git a/lumina/files/_silverblue/usr/etc/dconf/db/local.d/08-search b/lumina/files/_silverblue/etc/dconf/db/local.d/08-search similarity index 100% rename from lumina/files/_silverblue/usr/etc/dconf/db/local.d/08-search rename to lumina/files/_silverblue/etc/dconf/db/local.d/08-search diff --git a/lumina/files/_silverblue/usr/etc/dconf/db/local.d/locks/01-system b/lumina/files/_silverblue/etc/dconf/db/local.d/locks/01-system similarity index 100% rename from lumina/files/_silverblue/usr/etc/dconf/db/local.d/locks/01-system rename to lumina/files/_silverblue/etc/dconf/db/local.d/locks/01-system diff --git a/lumina/files/_silverblue/usr/etc/dconf/db/local.d/locks/07-security b/lumina/files/_silverblue/etc/dconf/db/local.d/locks/07-security similarity index 100% rename from lumina/files/_silverblue/usr/etc/dconf/db/local.d/locks/07-security rename to lumina/files/_silverblue/etc/dconf/db/local.d/locks/07-security diff --git a/lumina/files/_silverblue/usr/etc/dconf/profile/user b/lumina/files/_silverblue/etc/dconf/profile/user similarity index 100% rename from lumina/files/_silverblue/usr/etc/dconf/profile/user rename to lumina/files/_silverblue/etc/dconf/profile/user diff --git a/lumina/scripts/_base/002-setup-manager-permissions.sh b/lumina/scripts/_base/002-setup-manager-permissions.sh index c6ffbf4..9cc0777 100644 --- a/lumina/scripts/_base/002-setup-manager-permissions.sh +++ b/lumina/scripts/_base/002-setup-manager-permissions.sh @@ -2,5 +2,5 @@ set -euox pipefail -chmod +x /usr/etc/eternal/setup-manager/system.d/* -chmod +x /usr/etc/eternal/setup-manager/user.d/* +chmod +x /etc/eternal/setup-manager/system.d/* +chmod +x /etc/eternal/setup-manager/user.d/* diff --git a/lumina/scripts/_base/999-dryrun-gen-quadlets.sh b/lumina/scripts/_base/999-dryrun-gen-quadlets.sh index 759e635..89d2285 100644 --- a/lumina/scripts/_base/999-dryrun-gen-quadlets.sh +++ b/lumina/scripts/_base/999-dryrun-gen-quadlets.sh @@ -4,5 +4,5 @@ set -euo pipefail # Test Quadlets # To avoid incredibly long outputs, we redirect the output to /dev/null and log only errors -QUADLET_UNIT_DIRS=/usr/etc/containers/systemd /usr/lib/systemd/system-generators/podman-system-generator --dryrun > /dev/null 2>>error.log -QUADLET_UNIT_DIRS=/usr/etc/containers/systemd/users /usr/lib/systemd/system-generators/podman-system-generator --user --dryrun > /dev/null 2>>error.log +QUADLET_UNIT_DIRS=/etc/containers/systemd /usr/lib/systemd/system-generators/podman-system-generator --dryrun > /dev/null 2>>error.log +QUADLET_UNIT_DIRS=/etc/containers/systemd/users /usr/lib/systemd/system-generators/podman-system-generator --user --dryrun > /dev/null 2>>error.log