refactor: 🚚 rm fonts module mv other modules into common-* files

#54 #55
This commit is contained in:
34n0
2023-11-28 00:17:30 +01:00
committed by qoijjj
parent 68c0e5d304
commit 1ff8760f65
7 changed files with 38 additions and 153 deletions

13
config/common-bling.yml Normal file
View File

@@ -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

6
config/common-files.yml Normal file
View File

@@ -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

View File

@@ -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

View File

@@ -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
- from-file: common-bling.yml
- from-file: common-scripts.yml

View File

@@ -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
- from-file: common-bling.yml
- from-file: common-scripts.yml

View File

@@ -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
- from-file: common-bling.yml
- from-file: common-scripts.yml

View File

@@ -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
- from-file: common-bling.yml
- from-file: common-scripts.yml