From 1ff8760f6584fb3542534a2042021107e66eb5d2 Mon Sep 17 00:00:00 2001 From: 34n0 <34n0@immerda.ch> Date: Tue, 28 Nov 2023 00:17:30 +0100 Subject: [PATCH] refactor: :truck: rm fonts module mv other modules into common-* files #54 #55 --- config/common-bling.yml | 13 ++++++++ config/common-files.yml | 6 ++++ config/common-scripts.yml | 6 ++++ config/recipe-kinoite-main.yml | 39 ++--------------------- config/recipe-kinoite-nvidia.yml | 39 ++--------------------- config/recipe-silverblue-main.yml | 48 +++-------------------------- config/recipe-silverblue-nvidia.yml | 40 ++---------------------- 7 files changed, 38 insertions(+), 153 deletions(-) create mode 100644 config/common-bling.yml create mode 100644 config/common-files.yml create mode 100644 config/common-scripts.yml diff --git a/config/common-bling.yml b/config/common-bling.yml new file mode 100644 index 0000000..0ef3e27 --- /dev/null +++ b/config/common-bling.yml @@ -0,0 +1,13 @@ +type: bling # configure what to pull in from ublue-os/bling +install: + - justfiles # add "!include /usr/share/ublue-os/just/100-bling.just" + # in your custom.just (added by default) or local justfile + - laptop + # - ublue-update # https://github.com/ublue-os/ublue-update + # - 1password # install 1Password (stable) and `op` CLI tool + # - dconf-update-service # a service unit that updates the dconf db on boot + # - devpod # https://devpod.sh/ as an rpm + # - gnome-vrr # enables gnome-vrr for your image + # - container-tools # installs container-related tools onto /usr/bin: kind, kubectx, docker-compose and kubens + # - laptop # installs TLP and configures your system for laptop usage + # - flatpaksync # allows synchronization of user-installed flatpaks, see separate documentation section \ No newline at end of file diff --git a/config/common-files.yml b/config/common-files.yml new file mode 100644 index 0000000..593bd06 --- /dev/null +++ b/config/common-files.yml @@ -0,0 +1,6 @@ +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 diff --git a/config/common-scripts.yml b/config/common-scripts.yml new file mode 100644 index 0000000..cec819e --- /dev/null +++ b/config/common-scripts.yml @@ -0,0 +1,6 @@ +type: script +scripts: + # this sets up the proper policy & signing files for signed images to work + - signing.sh + - cron.sh + - chromium.sh \ No newline at end of file diff --git a/config/recipe-kinoite-main.yml b/config/recipe-kinoite-main.yml index c64b39a..5ac0623 100644 --- a/config/recipe-kinoite-main.yml +++ b/config/recipe-kinoite-main.yml @@ -11,44 +11,11 @@ image-version: 39 # you can include multiple instances of the same module modules: - - 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 + - from-file: common-files.yml # common packages last - from-file: kinoite-packages.yml - from-file: common-packages.yml - - - type: fonts - fonts: - nerd-fonts: - - FiraCode # don't add "Nerd Font" suffix. - - Hack - - SourceCodePro - - Terminus - - JetBrainsMono - - NerdFontsSymbolsOnly - google-fonts: - - Roboto - - Open Sans - - - type: bling # configure what to pull in from ublue-os/bling - install: - - justfiles # add "!include /usr/share/ublue-os/just/bling.just" - # in your custom.just (added by default) or local justfile - - laptop - - # - ublue-update # https://github.com/ublue-os/ublue-update - # - dconf-update-service # a service unit that updates the dconf db on boot - # - devpod # https://devpod.sh/ as an rpm - - - type: script - scripts: - # this sets up the proper policy & signing files for signed images to work - - signing.sh - - cron.sh - - chromium.sh \ No newline at end of file + - from-file: common-bling.yml + - from-file: common-scripts.yml \ No newline at end of file diff --git a/config/recipe-kinoite-nvidia.yml b/config/recipe-kinoite-nvidia.yml index 24bfefa..9c1310a 100644 --- a/config/recipe-kinoite-nvidia.yml +++ b/config/recipe-kinoite-nvidia.yml @@ -11,44 +11,11 @@ image-version: 39 # you can include multiple instances of the same module modules: - - 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/ as that is the proper "distro" config directory on ostree - # read more in the files module's README + - from-file: common-files.yml # common packages last - from-file: kinoite-packages.yml - from-file: common-packages.yml - - type: bling # configure what to pull in from ublue-os/bling - install: - - justfiles # add "!include /usr/share/ublue-os/just/bling.just" - # in your custom.just (added by default) or local justfile - - laptop - # - ublue-update # https://github.com/ublue-os/ublue-update - # - dconf-update-service # a service unit that updates the dconf db on boot - # - devpod # https://devpod.sh/ as an rpm - - - - type: fonts - fonts: - nerd-fonts: - - FiraCode # don't add "Nerd Font" suffix. - - Hack - - SourceCodePro - - Terminus - - JetBrainsMono - - NerdFontsSymbolsOnly - google-fonts: - - Roboto - - Open Sans - - - - type: script - scripts: - # this sets up the proper policy & signing files for signed images to work - - signing.sh - - cron.sh - - chromium.sh \ No newline at end of file + - from-file: common-bling.yml + - from-file: common-scripts.yml \ No newline at end of file diff --git a/config/recipe-silverblue-main.yml b/config/recipe-silverblue-main.yml index 8e727aa..bbcc542 100644 --- a/config/recipe-silverblue-main.yml +++ b/config/recipe-silverblue-main.yml @@ -10,52 +10,12 @@ image-version: 39 # latest is also supported if you want new updates ASAP # module configuration, executed in order # you can include multiple instances of the same module modules: - - type: files - files: - - usr: /usr # copy static configurations - # - # copies config/files/usr into your image's /usr - # - # configuration you wish to end up in /etc/ on the booted system - # should be added into /usr/etc/ as that is the proper "distro" - # config directory on ostree. Read more in the files module's README + + - from-file: common-files.yml # common packages last - from-file: silverblue-packages.yml - from-file: common-packages.yml - - type: bling # configure what to pull in from ublue-os/bling - install: - - justfiles # add "!include /usr/share/ublue-os/just/100-bling.just" - # in your custom.just (added by default) or local justfile - - laptop - # - ublue-update # https://github.com/ublue-os/ublue-update - # - 1password # install 1Password (stable) and `op` CLI tool - # - dconf-update-service # a service unit that updates the dconf db on boot - # - devpod # https://devpod.sh/ as an rpm - # - gnome-vrr # enables gnome-vrr for your image - # - container-tools # installs container-related tools onto /usr/bin: kind, kubectx, docker-compose and kubens - # - laptop # installs TLP and configures your system for laptop usage - # - flatpaksync # allows synchronization of user-installed flatpaks, see separate documentation section - - - - type: fonts - fonts: - nerd-fonts: - - FiraCode # don't add "Nerd Font" suffix. - - Hack - - SourceCodePro - - Terminus - - JetBrainsMono - - NerdFontsSymbolsOnly - google-fonts: - - Roboto - - Open Sans - - - - type: script - scripts: - # this sets up the proper policy & signing files for signed images to work - - signing.sh - - cron.sh - - chromium.sh \ No newline at end of file + - from-file: common-bling.yml + - from-file: common-scripts.yml \ No newline at end of file diff --git a/config/recipe-silverblue-nvidia.yml b/config/recipe-silverblue-nvidia.yml index 1c00edc..3ddb98d 100644 --- a/config/recipe-silverblue-nvidia.yml +++ b/config/recipe-silverblue-nvidia.yml @@ -11,45 +11,11 @@ image-version: 39 # you can include multiple instances of the same module modules: - - 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/ as that is the proper "distro" config directory on ostree - # read more in the files module's README + - from-file: common-files.yml # common packages last - from-file: silverblue-packages.yml - from-file: common-packages.yml - - type: bling # configure what to pull in from ublue-os/bling - install: - - justfiles # add "!include /usr/share/ublue-os/just/bling.just" - # in your custom.just (added by default) or local justfile - - laptop - # - ublue-update # https://github.com/ublue-os/ublue-update - # - dconf-update-service # a service unit that updates the dconf db on boot - # - devpod # https://devpod.sh/ as an rpm - - - - type: fonts - fonts: - nerd-fonts: - - FiraCode # don't add "Nerd Font" suffix. - - Hack - - SourceCodePro - - Terminus - - JetBrainsMono - - NerdFontsSymbolsOnly - google-fonts: - - Roboto - - Open Sans - - - - - type: script - scripts: - # this sets up the proper policy & signing files for signed images to work - - signing.sh - - cron.sh - - chromium.sh \ No newline at end of file + - from-file: common-bling.yml + - from-file: common-scripts.yml \ No newline at end of file