chore: stop relying on /usr/etc -> /etc merge (#281)

Stop using /usr/etc
rsturla · Aug 10, 2024 · f73426f · f73426f
1 parent 21667e4
commit f73426f
Show file tree

Hide file tree

Showing 84 changed files with 6 additions and 6 deletions.
diff --git a/...s/containers.conf.d/eternal-runtimes.conf → ...s/containers.conf.d/eternal-runtimes.conf b/...s/containers.conf.d/eternal-runtimes.conf → ...s/containers.conf.d/eternal-runtimes.conf
diff --git a/...stries.conf.d/001-zot-quadlet-mirror.conf → ...stries.conf.d/001-zot-quadlet-mirror.conf b/...stries.conf.d/001-zot-quadlet-mirror.conf → ...stries.conf.d/001-zot-quadlet-mirror.conf
diff --git a/...rs/registries.conf.d/002-zot-quadlet.conf → ...rs/registries.conf.d/002-zot-quadlet.conf b/...rs/registries.conf.d/002-zot-quadlet.conf → ...rs/registries.conf.d/002-zot-quadlet.conf
diff --git a/...systemd/users/_config/glance-default.yaml → ...systemd/users/_config/glance-default.yaml b/...systemd/users/_config/glance-default.yaml → ...systemd/users/_config/glance-default.yaml
diff --git a/...rs/systemd/users/_config/milvus-etcd.yaml → ...rs/systemd/users/_config/milvus-etcd.yaml b/...rs/systemd/users/_config/milvus-etcd.yaml → ...rs/systemd/users/_config/milvus-etcd.yaml
diff --git a/...ners/systemd/users/_config/prometheus.yml → ...ners/systemd/users/_config/prometheus.yml b/...ners/systemd/users/_config/prometheus.yml → ...ners/systemd/users/_config/prometheus.yml
diff --git a/...ystemd/users/_config/redpanda-console.yml → ...ystemd/users/_config/redpanda-console.yml b/...ystemd/users/_config/redpanda-console.yml → ...ystemd/users/_config/redpanda-console.yml
diff --git a/...systemd/users/_config/redpanda-server.yml → ...systemd/users/_config/redpanda-server.yml b/...systemd/users/_config/redpanda-server.yml → ...systemd/users/_config/redpanda-server.yml
diff --git a/...ers/systemd/users/_config/zot-config.yaml → ...ers/systemd/users/_config/zot-config.yaml b/...ers/systemd/users/_config/zot-config.yaml → ...ers/systemd/users/_config/zot-config.yaml
diff --git a/...iners/systemd/users/cloudbeaver.container → ...iners/systemd/users/cloudbeaver.container b/...iners/systemd/users/cloudbeaver.container → ...iners/systemd/users/cloudbeaver.container
diff --git a/...d/users/cockroachdb/cockroachdb.container → ...d/users/cockroachdb/cockroachdb.container b/...d/users/cockroachdb/cockroachdb.container → ...d/users/cockroachdb/cockroachdb.container
diff --git a/...temd/users/cockroachdb/cockroachdb.volume → ...temd/users/cockroachdb/cockroachdb.volume b/...temd/users/cockroachdb/cockroachdb.volume → ...temd/users/cockroachdb/cockroachdb.volume
diff --git a/...tainers/systemd/users/cyberchef.container → ...tainers/systemd/users/cyberchef.container b/...tainers/systemd/users/cyberchef.container → ...tainers/systemd/users/cyberchef.container
diff --git a/...systemd/users/dynamodb/dynamodb.container → ...systemd/users/dynamodb/dynamodb.container b/...systemd/users/dynamodb/dynamodb.container → ...systemd/users/dynamodb/dynamodb.container
diff --git a/...rs/systemd/users/dynamodb/dynamodb.volume → ...rs/systemd/users/dynamodb/dynamodb.volume b/...rs/systemd/users/dynamodb/dynamodb.volume → ...rs/systemd/users/dynamodb/dynamodb.volume
diff --git a/...tainers/systemd/users/elasticmq.container → ...tainers/systemd/users/elasticmq.container b/...tainers/systemd/users/elasticmq.container → ...tainers/systemd/users/elasticmq.container
diff --git a/.../containers/systemd/users/eternal.network → .../containers/systemd/users/eternal.network b/.../containers/systemd/users/eternal.network → .../containers/systemd/users/eternal.network
diff --git a/...ainers/systemd/users/excalidraw.container → ...ainers/systemd/users/excalidraw.container b/...ainers/systemd/users/excalidraw.container → ...ainers/systemd/users/excalidraw.container
diff --git a/...containers/systemd/users/glance.container → ...containers/systemd/users/glance.container b/...containers/systemd/users/glance.container → ...containers/systemd/users/glance.container
diff --git a/...systemd/users/influxdb/influxdb.container → ...systemd/users/influxdb/influxdb.container b/...systemd/users/influxdb/influxdb.container → ...systemd/users/influxdb/influxdb.container
diff --git a/...rs/systemd/users/influxdb/influxdb.volume → ...rs/systemd/users/influxdb/influxdb.volume b/...rs/systemd/users/influxdb/influxdb.volume → ...rs/systemd/users/influxdb/influxdb.volume
diff --git a/...stemd/users/invoke-ai/invoke-ai.container → ...stemd/users/invoke-ai/invoke-ai.container b/...stemd/users/invoke-ai/invoke-ai.container → ...stemd/users/invoke-ai/invoke-ai.container
diff --git a/.../systemd/users/invoke-ai/invoke-ai.volume → .../systemd/users/invoke-ai/invoke-ai.volume b/.../systemd/users/invoke-ai/invoke-ai.volume → .../systemd/users/invoke-ai/invoke-ai.volume
diff --git a/...pyter-notebook/jupyter-notebook.container → ...pyter-notebook/jupyter-notebook.container b/...pyter-notebook/jupyter-notebook.container → ...pyter-notebook/jupyter-notebook.container
diff --git a/.../jupyter-notebook/jupyter-notebook.volume → .../jupyter-notebook/jupyter-notebook.volume b/.../jupyter-notebook/jupyter-notebook.volume → .../jupyter-notebook/jupyter-notebook.volume
diff --git a/...ntainers/systemd/users/keycloak.container → ...ntainers/systemd/users/keycloak.container b/...ntainers/systemd/users/keycloak.container → ...ntainers/systemd/users/keycloak.container
diff --git a/...emd/users/localstack/localstack.container → ...emd/users/localstack/localstack.container b/...emd/users/localstack/localstack.container → ...emd/users/localstack/localstack.container
diff --git a/...ystemd/users/localstack/localstack.volume → ...ystemd/users/localstack/localstack.volume b/...ystemd/users/localstack/localstack.volume → ...ystemd/users/localstack/localstack.volume
diff --git a/...ontainers/systemd/users/mailpit.container → ...ontainers/systemd/users/mailpit.container b/...ontainers/systemd/users/mailpit.container → ...ontainers/systemd/users/mailpit.container
diff --git a/...ers/systemd/users/milvus/milvus.container → ...ers/systemd/users/milvus/milvus.container b/...ers/systemd/users/milvus/milvus.container → ...ers/systemd/users/milvus/milvus.container
diff --git a/...ainers/systemd/users/milvus/milvus.volume → ...ainers/systemd/users/milvus/milvus.volume b/...ainers/systemd/users/milvus/milvus.volume → ...ainers/systemd/users/milvus/milvus.volume
diff --git a/...iners/systemd/users/minio/minio.container → ...iners/systemd/users/minio/minio.container b/...iners/systemd/users/minio/minio.container → ...iners/systemd/users/minio/minio.container
diff --git a/...ntainers/systemd/users/minio/minio.volume → ...ntainers/systemd/users/minio/minio.volume b/...ntainers/systemd/users/minio/minio.volume → ...ntainers/systemd/users/minio/minio.volume
diff --git a/...iners/systemd/users/neo4j/neo4j.container → ...iners/systemd/users/neo4j/neo4j.container b/...iners/systemd/users/neo4j/neo4j.container → ...iners/systemd/users/neo4j/neo4j.container
diff --git a/...ntainers/systemd/users/neo4j/neo4j.volume → ...ntainers/systemd/users/neo4j/neo4j.volume b/...ntainers/systemd/users/neo4j/neo4j.volume → ...ntainers/systemd/users/neo4j/neo4j.volume
diff --git a/...systemd/users/ollama/ollama-web.container → ...systemd/users/ollama/ollama-web.container b/...systemd/users/ollama/ollama-web.container → ...systemd/users/ollama/ollama-web.container
diff --git a/...ers/systemd/users/ollama/ollama.container → ...ers/systemd/users/ollama/ollama.container b/...ers/systemd/users/ollama/ollama.container → ...ers/systemd/users/ollama/ollama.container
diff --git a/...ainers/systemd/users/ollama/ollama.volume → ...ainers/systemd/users/ollama/ollama.volume b/...ainers/systemd/users/ollama/ollama.volume → ...ainers/systemd/users/ollama/ollama.volume
diff --git a/...tainers/systemd/users/owasp-zap.container → ...tainers/systemd/users/owasp-zap.container b/...tainers/systemd/users/owasp-zap.container → ...tainers/systemd/users/owasp-zap.container
diff --git a/...systemd/users/postgres/postgres.container → ...systemd/users/postgres/postgres.container b/...systemd/users/postgres/postgres.container → ...systemd/users/postgres/postgres.container
diff --git a/...rs/systemd/users/postgres/postgres.volume → ...rs/systemd/users/postgres/postgres.volume b/...rs/systemd/users/postgres/postgres.volume → ...rs/systemd/users/postgres/postgres.volume
diff --git a/...ainers/systemd/users/prometheus.container → ...ainers/systemd/users/prometheus.container b/...ainers/systemd/users/prometheus.container → ...ainers/systemd/users/prometheus.container
diff --git a/...ers/systemd/users/qdrant/qdrant.container → ...ers/systemd/users/qdrant/qdrant.container b/...ers/systemd/users/qdrant/qdrant.container → ...ers/systemd/users/qdrant/qdrant.container
diff --git a/...ainers/systemd/users/qdrant/qdrant.volume → ...ainers/systemd/users/qdrant/qdrant.volume b/...ainers/systemd/users/qdrant/qdrant.volume → ...ainers/systemd/users/qdrant/qdrant.volume
diff --git a/...users/redpanda/redpanda-console.container → ...users/redpanda/redpanda-console.container b/...users/redpanda/redpanda-console.container → ...users/redpanda/redpanda-console.container
diff --git a/.../users/redpanda/redpanda-server.container → .../users/redpanda/redpanda-server.container b/.../users/redpanda/redpanda-server.container → .../users/redpanda/redpanda-server.container
diff --git a/...rs/systemd/users/redpanda/redpanda.volume → ...rs/systemd/users/redpanda/redpanda.volume b/...rs/systemd/users/redpanda/redpanda.volume → ...rs/systemd/users/redpanda/redpanda.volume
diff --git a/...ntainers/systemd/users/scylladb.container → ...ntainers/systemd/users/scylladb.container b/...ntainers/systemd/users/scylladb.container → ...ntainers/systemd/users/scylladb.container
diff --git a/...stemd/users/surrealdb/surrealdb.container → ...stemd/users/surrealdb/surrealdb.container b/...stemd/users/surrealdb/surrealdb.container → ...stemd/users/surrealdb/surrealdb.container
diff --git a/.../systemd/users/surrealdb/surrealdb.volume → .../systemd/users/surrealdb/surrealdb.volume b/.../systemd/users/surrealdb/surrealdb.volume → .../systemd/users/surrealdb/surrealdb.volume
diff --git a/...ers/systemd/users/valkey/valkey.container → ...ers/systemd/users/valkey/valkey.container b/...ers/systemd/users/valkey/valkey.container → ...ers/systemd/users/valkey/valkey.container
diff --git a/...ainers/systemd/users/valkey/valkey.volume → ...ainers/systemd/users/valkey/valkey.volume b/...ainers/systemd/users/valkey/valkey.volume → ...ainers/systemd/users/valkey/valkey.volume
diff --git a/.../containers/systemd/users/vault.container → .../containers/systemd/users/vault.container b/.../containers/systemd/users/vault.container → .../containers/systemd/users/vault.container
diff --git a/...stemd/users/verdaccio/verdaccio.container → ...stemd/users/verdaccio/verdaccio.container b/...stemd/users/verdaccio/verdaccio.container → ...stemd/users/verdaccio/verdaccio.container
diff --git a/.../systemd/users/verdaccio/verdaccio.volume → .../systemd/users/verdaccio/verdaccio.volume b/.../systemd/users/verdaccio/verdaccio.volume → .../systemd/users/verdaccio/verdaccio.volume
diff --git a/...tainers/systemd/users/web-check.container → ...tainers/systemd/users/web-check.container b/...tainers/systemd/users/web-check.container → ...tainers/systemd/users/web-check.container
diff --git a/...ontainers/systemd/users/zot/zot.container → ...ontainers/systemd/users/zot/zot.container b/...ontainers/systemd/users/zot/zot.container → ...ontainers/systemd/users/zot/zot.container
diff --git a/...c/containers/systemd/users/zot/zot.volume → ...c/containers/systemd/users/zot/zot.volume b/...c/containers/systemd/users/zot/zot.volume → ...c/containers/systemd/users/zot/zot.volume
diff --git a/...es/_base/usr/etc/distrobox/distrobox.conf → .../files/_base/etc/distrobox/distrobox.conf b/...es/_base/usr/etc/distrobox/distrobox.conf → .../files/_base/etc/distrobox/distrobox.conf
diff --git a/...na/files/_base/usr/etc/docker/daemon.json → lumina/files/_base/etc/docker/daemon.json b/...na/files/_base/usr/etc/docker/daemon.json → lumina/files/_base/etc/docker/daemon.json
diff --git a/...iles/_base/usr/etc/eternal/charm/mods.yml → ...na/files/_base/etc/eternal/charm/mods.yml b/...iles/_base/usr/etc/eternal/charm/mods.yml → ...na/files/_base/etc/eternal/charm/mods.yml
diff --git a/...etc/eternal/setup-manager/system.d/nix.sh → ...etc/eternal/setup-manager/system.d/nix.sh b/...etc/eternal/setup-manager/system.d/nix.sh → ...etc/eternal/setup-manager/system.d/nix.sh
diff --git a/...nal/setup-manager/system.d/user-groups.sh → ...nal/setup-manager/system.d/user-groups.sh b/...nal/setup-manager/system.d/user-groups.sh → ...nal/setup-manager/system.d/user-groups.sh
diff --git a/...tc/eternal/setup-manager/user.d/vscode.sh → ...tc/eternal/setup-manager/user.d/vscode.sh b/...tc/eternal/setup-manager/user.d/vscode.sh → ...tc/eternal/setup-manager/user.d/vscode.sh
diff --git a/...base/usr/etc/eternal/vscode/settings.json → ...es/_base/etc/eternal/vscode/settings.json b/...base/usr/etc/eternal/vscode/settings.json → ...es/_base/etc/eternal/vscode/settings.json
diff --git a/...tc/polkit-1/rules.d/100-libvirt-acl.rules → ...tc/polkit-1/rules.d/100-libvirt-acl.rules b/...tc/polkit-1/rules.d/100-libvirt-acl.rules → ...tc/polkit-1/rules.d/100-libvirt-acl.rules
diff --git a/lumina/files/_base/usr/etc/profile.d/brew.sh → lumina/files/_base/etc/profile.d/brew.sh b/lumina/files/_base/usr/etc/profile.d/brew.sh → lumina/files/_base/etc/profile.d/brew.sh
diff --git a/...hd_conf.d/02-password-authentication.conf → ...hd_conf.d/02-password-authentication.conf b/...hd_conf.d/02-password-authentication.conf → ...hd_conf.d/02-password-authentication.conf
diff --git a/lumina/files/_base/usr/etc/zsh/zshrc → lumina/files/_base/etc/zsh/zshrc b/lumina/files/_base/usr/etc/zsh/zshrc → 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
@@ -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
@@ -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/...erblue/usr/etc/dconf/db/local.d/01-system → ...silverblue/etc/dconf/db/local.d/01-system b/...erblue/usr/etc/dconf/db/local.d/01-system → ...silverblue/etc/dconf/db/local.d/01-system
diff --git a/...lverblue/usr/etc/dconf/db/local.d/02-dock → .../_silverblue/etc/dconf/db/local.d/02-dock b/...lverblue/usr/etc/dconf/db/local.d/02-dock → .../_silverblue/etc/dconf/db/local.d/02-dock
diff --git a/...lue/usr/etc/dconf/db/local.d/03-favorites → ...verblue/etc/dconf/db/local.d/03-favorites b/...lue/usr/etc/dconf/db/local.d/03-favorites → ...verblue/etc/dconf/db/local.d/03-favorites
diff --git a/...lue/usr/etc/dconf/db/local.d/04-shortcuts → ...verblue/etc/dconf/db/local.d/04-shortcuts b/...lue/usr/etc/dconf/db/local.d/04-shortcuts → ...verblue/etc/dconf/db/local.d/04-shortcuts
diff --git a/...ue/usr/etc/dconf/db/local.d/05-background → ...erblue/etc/dconf/db/local.d/05-background b/...ue/usr/etc/dconf/db/local.d/05-background → ...erblue/etc/dconf/db/local.d/05-background
diff --git a/...blue/usr/etc/dconf/db/local.d/06-terminal → ...lverblue/etc/dconf/db/local.d/06-terminal b/...blue/usr/etc/dconf/db/local.d/06-terminal → ...lverblue/etc/dconf/db/local.d/06-terminal
diff --git a/...blue/usr/etc/dconf/db/local.d/07-security → ...lverblue/etc/dconf/db/local.d/07-security b/...blue/usr/etc/dconf/db/local.d/07-security → ...lverblue/etc/dconf/db/local.d/07-security
diff --git a/...erblue/usr/etc/dconf/db/local.d/08-search → ...silverblue/etc/dconf/db/local.d/08-search b/...erblue/usr/etc/dconf/db/local.d/08-search → ...silverblue/etc/dconf/db/local.d/08-search
diff --git a/.../usr/etc/dconf/db/local.d/locks/01-system → ...blue/etc/dconf/db/local.d/locks/01-system b/.../usr/etc/dconf/db/local.d/locks/01-system → ...blue/etc/dconf/db/local.d/locks/01-system
diff --git a/...sr/etc/dconf/db/local.d/locks/07-security → ...ue/etc/dconf/db/local.d/locks/07-security b/...sr/etc/dconf/db/local.d/locks/07-security → ...ue/etc/dconf/db/local.d/locks/07-security
diff --git a/...es/_silverblue/usr/etc/dconf/profile/user → .../files/_silverblue/etc/dconf/profile/user b/...es/_silverblue/usr/etc/dconf/profile/user → .../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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -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
Original file line number	Diff line number	Diff line change
		@@ -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