From 3b40dc0b41ca48d30361dfb05960fb840cc26d08 Mon Sep 17 00:00:00 2001 From: qoijjj <129108030+qoijjj@users.noreply.github.com> Date: Thu, 23 May 2024 12:56:18 -0700 Subject: [PATCH] feat: disable all vscode telem by default for dx images --- .../files/dx/usr/etc/skel/.config/Code/User/settings.json | 6 ++++++ config/scripts/disableubluesystemsetup.sh | 8 -------- recipes/asus/recipe-aurora-dx-asus-nvidia-userns.yml | 1 + recipes/asus/recipe-aurora-dx-asus-userns.yml | 1 + recipes/common/bluefin-scripts.yml | 3 +-- recipes/common/common-files.yml | 5 +---- recipes/common/dx-files.yml | 3 +++ recipes/common/kinoite-files.yml | 5 +---- recipes/common/server-files.yml | 5 +---- recipes/general/recipe-aurora-dx-main-userns.yml | 1 + recipes/general/recipe-aurora-dx-nvidia-userns.yml | 1 + .../general/recipe-aurora-dx-surface-nvidia-userns.yml | 1 + recipes/general/recipe-aurora-dx-surface-userns.yml | 1 + recipes/general/recipe-bluefin-dx-main-userns.yml | 1 + recipes/general/recipe-bluefin-dx-nvidia-userns.yml | 1 + 15 files changed, 21 insertions(+), 22 deletions(-) create mode 100644 config/files/dx/usr/etc/skel/.config/Code/User/settings.json delete mode 100644 config/scripts/disableubluesystemsetup.sh create mode 100644 recipes/common/dx-files.yml diff --git a/config/files/dx/usr/etc/skel/.config/Code/User/settings.json b/config/files/dx/usr/etc/skel/.config/Code/User/settings.json new file mode 100644 index 0000000..a0947ec --- /dev/null +++ b/config/files/dx/usr/etc/skel/.config/Code/User/settings.json @@ -0,0 +1,6 @@ +{ + "window.titleBarStyle": "custom", + "editor.fontFamily": "'Cascadia Code', 'Droid Sans Mono', 'monospace', monospace", + "telemetry.telemetryLevel": "off", + "gitlens.telemetry.enabled": false +} diff --git a/config/scripts/disableubluesystemsetup.sh b/config/scripts/disableubluesystemsetup.sh deleted file mode 100644 index 83fffa3..0000000 --- a/config/scripts/disableubluesystemsetup.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Tell build process to exit if there are any errors. -set -oue pipefail - -echo "Disabling ublue-system-setup" -systemctl disable ublue-system-setup -systemctl mask ublue-system-setup diff --git a/recipes/asus/recipe-aurora-dx-asus-nvidia-userns.yml b/recipes/asus/recipe-aurora-dx-asus-nvidia-userns.yml index 0cba8aa..1ece03b 100644 --- a/recipes/asus/recipe-aurora-dx-asus-nvidia-userns.yml +++ b/recipes/asus/recipe-aurora-dx-asus-nvidia-userns.yml @@ -19,6 +19,7 @@ modules: - from-file: common/bluefin-scripts.yml - from-file: common/kinoite-files.yml - from-file: common/common-files.yml + - from-file: common/dx-files.yml - from-file: common/common-scripts.yml - type: secureblue-signing - type: yafti diff --git a/recipes/asus/recipe-aurora-dx-asus-userns.yml b/recipes/asus/recipe-aurora-dx-asus-userns.yml index c952a8f..7e07a90 100644 --- a/recipes/asus/recipe-aurora-dx-asus-userns.yml +++ b/recipes/asus/recipe-aurora-dx-asus-userns.yml @@ -19,6 +19,7 @@ modules: - from-file: common/bluefin-scripts.yml - from-file: common/kinoite-files.yml - from-file: common/common-files.yml + - from-file: common/dx-files.yml - from-file: common/common-scripts.yml - type: secureblue-signing - type: yafti diff --git a/recipes/common/bluefin-scripts.yml b/recipes/common/bluefin-scripts.yml index 7eb0026..9161608 100644 --- a/recipes/common/bluefin-scripts.yml +++ b/recipes/common/bluefin-scripts.yml @@ -1,4 +1,3 @@ type: script scripts: - - disabletailscale.sh - - disableubluesystemsetup.sh \ No newline at end of file + - disabletailscale.sh \ No newline at end of file diff --git a/recipes/common/common-files.yml b/recipes/common/common-files.yml index 593bd06..ab8f843 100644 --- a/recipes/common/common-files.yml +++ b/recipes/common/common-files.yml @@ -1,6 +1,3 @@ type: files files: - - usr: /usr # copy static configurations - # configuration you wish to end up in /etc/ on the booted system should be - # added into /usr/etc/ (under /config/files) as that is the proper "distro" - # config directory on ostree read more in the files module's README \ No newline at end of file + - usr: /usr \ No newline at end of file diff --git a/recipes/common/dx-files.yml b/recipes/common/dx-files.yml new file mode 100644 index 0000000..3edca02 --- /dev/null +++ b/recipes/common/dx-files.yml @@ -0,0 +1,3 @@ +type: files +files: + - dx/usr: /usr \ No newline at end of file diff --git a/recipes/common/kinoite-files.yml b/recipes/common/kinoite-files.yml index 62bbd2c..9a77b15 100644 --- a/recipes/common/kinoite-files.yml +++ b/recipes/common/kinoite-files.yml @@ -1,6 +1,3 @@ type: files files: - - kinoite/usr: /usr # copy static configurations - # configuration you wish to end up in /etc/ on the booted system should be - # added into /usr/etc/ (under /config/files) as that is the proper "distro" - # config directory on ostree read more in the files module's README \ No newline at end of file + - kinoite/usr: /usr \ No newline at end of file diff --git a/recipes/common/server-files.yml b/recipes/common/server-files.yml index 4b5de7f..ff10ed9 100644 --- a/recipes/common/server-files.yml +++ b/recipes/common/server-files.yml @@ -1,6 +1,3 @@ type: files files: - - server/usr: /usr # copy static configurations - # configuration you wish to end up in /etc/ on the booted system should be - # added into /usr/etc/ (under /config/files) as that is the proper "distro" - # config directory on ostree read more in the files module's README \ No newline at end of file + - server/usr: /usr \ No newline at end of file diff --git a/recipes/general/recipe-aurora-dx-main-userns.yml b/recipes/general/recipe-aurora-dx-main-userns.yml index 5dc7d27..807d6de 100644 --- a/recipes/general/recipe-aurora-dx-main-userns.yml +++ b/recipes/general/recipe-aurora-dx-main-userns.yml @@ -19,6 +19,7 @@ modules: - from-file: common/bluefin-scripts.yml - from-file: common/kinoite-files.yml - from-file: common/common-files.yml + - from-file: common/dx-files.yml - from-file: common/common-scripts.yml - type: secureblue-signing - type: yafti diff --git a/recipes/general/recipe-aurora-dx-nvidia-userns.yml b/recipes/general/recipe-aurora-dx-nvidia-userns.yml index 99685e9..f649668 100644 --- a/recipes/general/recipe-aurora-dx-nvidia-userns.yml +++ b/recipes/general/recipe-aurora-dx-nvidia-userns.yml @@ -19,6 +19,7 @@ modules: - from-file: common/bluefin-scripts.yml - from-file: common/kinoite-files.yml - from-file: common/common-files.yml + - from-file: common/dx-files.yml - from-file: common/common-scripts.yml - type: secureblue-signing - type: yafti diff --git a/recipes/general/recipe-aurora-dx-surface-nvidia-userns.yml b/recipes/general/recipe-aurora-dx-surface-nvidia-userns.yml index 4a1b18e..a7104ac 100644 --- a/recipes/general/recipe-aurora-dx-surface-nvidia-userns.yml +++ b/recipes/general/recipe-aurora-dx-surface-nvidia-userns.yml @@ -19,6 +19,7 @@ modules: - from-file: common/bluefin-scripts.yml - from-file: common/kinoite-files.yml - from-file: common/common-files.yml + - from-file: common/dx-files.yml - from-file: common/common-scripts.yml - type: secureblue-signing - type: yafti diff --git a/recipes/general/recipe-aurora-dx-surface-userns.yml b/recipes/general/recipe-aurora-dx-surface-userns.yml index 8ef4413..efa27dd 100644 --- a/recipes/general/recipe-aurora-dx-surface-userns.yml +++ b/recipes/general/recipe-aurora-dx-surface-userns.yml @@ -19,6 +19,7 @@ modules: - from-file: common/bluefin-scripts.yml - from-file: common/kinoite-files.yml - from-file: common/common-files.yml + - from-file: common/dx-files.yml - from-file: common/common-scripts.yml - type: secureblue-signing - type: yafti diff --git a/recipes/general/recipe-bluefin-dx-main-userns.yml b/recipes/general/recipe-bluefin-dx-main-userns.yml index 3582b34..f1ed90d 100644 --- a/recipes/general/recipe-bluefin-dx-main-userns.yml +++ b/recipes/general/recipe-bluefin-dx-main-userns.yml @@ -17,6 +17,7 @@ modules: - from-file: common/gui-scripts.yml - from-file: common/bluefin-scripts.yml - from-file: common/common-files.yml + - from-file: common/dx-files.yml - from-file: common/common-scripts.yml - type: secureblue-signing - type: yafti \ No newline at end of file diff --git a/recipes/general/recipe-bluefin-dx-nvidia-userns.yml b/recipes/general/recipe-bluefin-dx-nvidia-userns.yml index 7869e4a..f4f49b8 100644 --- a/recipes/general/recipe-bluefin-dx-nvidia-userns.yml +++ b/recipes/general/recipe-bluefin-dx-nvidia-userns.yml @@ -17,6 +17,7 @@ modules: - from-file: common/gui-scripts.yml - from-file: common/bluefin-scripts.yml - from-file: common/common-files.yml + - from-file: common/dx-files.yml - from-file: common/common-scripts.yml - type: secureblue-signing - type: yafti \ No newline at end of file