From 19ba7b9a5a31a9053c9aabb98b7e5a5114c64e1d Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sat, 9 Sep 2023 08:02:37 +0800 Subject: [PATCH] workflows/a-happy-gnome: restructure dconf config folder structure --- .../dconf/{ => db/a-happy-gnome-conf.d}/10-desktop.conf | 0 .../dconf/{ => db/a-happy-gnome-conf.d}/30-applications.conf | 0 .../dconf/{ => db/a-happy-gnome-conf.d}/30-keybindings.conf | 0 .../{ => db/a-happy-gnome-conf.d}/30-shell-extensions.conf | 0 .../workflows/a-happy-gnome/config/dconf/{ => profile}/user | 0 modules/nixos/workflows/a-happy-gnome/default.nix | 5 ++--- 6 files changed, 2 insertions(+), 3 deletions(-) rename modules/nixos/workflows/a-happy-gnome/config/dconf/{ => db/a-happy-gnome-conf.d}/10-desktop.conf (100%) rename modules/nixos/workflows/a-happy-gnome/config/dconf/{ => db/a-happy-gnome-conf.d}/30-applications.conf (100%) rename modules/nixos/workflows/a-happy-gnome/config/dconf/{ => db/a-happy-gnome-conf.d}/30-keybindings.conf (100%) rename modules/nixos/workflows/a-happy-gnome/config/dconf/{ => db/a-happy-gnome-conf.d}/30-shell-extensions.conf (100%) rename modules/nixos/workflows/a-happy-gnome/config/dconf/{ => profile}/user (100%) diff --git a/modules/nixos/workflows/a-happy-gnome/config/dconf/10-desktop.conf b/modules/nixos/workflows/a-happy-gnome/config/dconf/db/a-happy-gnome-conf.d/10-desktop.conf similarity index 100% rename from modules/nixos/workflows/a-happy-gnome/config/dconf/10-desktop.conf rename to modules/nixos/workflows/a-happy-gnome/config/dconf/db/a-happy-gnome-conf.d/10-desktop.conf diff --git a/modules/nixos/workflows/a-happy-gnome/config/dconf/30-applications.conf b/modules/nixos/workflows/a-happy-gnome/config/dconf/db/a-happy-gnome-conf.d/30-applications.conf similarity index 100% rename from modules/nixos/workflows/a-happy-gnome/config/dconf/30-applications.conf rename to modules/nixos/workflows/a-happy-gnome/config/dconf/db/a-happy-gnome-conf.d/30-applications.conf diff --git a/modules/nixos/workflows/a-happy-gnome/config/dconf/30-keybindings.conf b/modules/nixos/workflows/a-happy-gnome/config/dconf/db/a-happy-gnome-conf.d/30-keybindings.conf similarity index 100% rename from modules/nixos/workflows/a-happy-gnome/config/dconf/30-keybindings.conf rename to modules/nixos/workflows/a-happy-gnome/config/dconf/db/a-happy-gnome-conf.d/30-keybindings.conf diff --git a/modules/nixos/workflows/a-happy-gnome/config/dconf/30-shell-extensions.conf b/modules/nixos/workflows/a-happy-gnome/config/dconf/db/a-happy-gnome-conf.d/30-shell-extensions.conf similarity index 100% rename from modules/nixos/workflows/a-happy-gnome/config/dconf/30-shell-extensions.conf rename to modules/nixos/workflows/a-happy-gnome/config/dconf/db/a-happy-gnome-conf.d/30-shell-extensions.conf diff --git a/modules/nixos/workflows/a-happy-gnome/config/dconf/user b/modules/nixos/workflows/a-happy-gnome/config/dconf/profile/user similarity index 100% rename from modules/nixos/workflows/a-happy-gnome/config/dconf/user rename to modules/nixos/workflows/a-happy-gnome/config/dconf/profile/user diff --git a/modules/nixos/workflows/a-happy-gnome/default.nix b/modules/nixos/workflows/a-happy-gnome/default.nix index 969d7dc1..dbcd7aa6 100644 --- a/modules/nixos/workflows/a-happy-gnome/default.nix +++ b/modules/nixos/workflows/a-happy-gnome/default.nix @@ -14,9 +14,8 @@ let # We're combining all of the custom dconf database into a package to be installed. dconfConfig = pkgs.runCommand "install-a-happy-gnome-dconf-keyfiles" { } '' - install -Dm644 ${./config/dconf}/*.conf -t $out/etc/dconf/db/${name}-conf.d - install -Dm644 ${enabledExtensions} $out/etc/dconf/db/${name}-conf.d/90-enabled-extensions.conf - install -Dm644 ${./config/dconf/user} $out/etc/dconf/profile/user + mkdir -p $out/etc/dconf && cp --no-preserve=mode -r ${./config/dconf}/* $out/etc/dconf/ + install -Dm644 ${enabledExtensions} $out/etc/dconf/db/a-happy-gnome-conf.d/90-enabled-extensions.conf ''; in {