From b2ea3e2475dbc4365ff9c8618abece1429c348aa Mon Sep 17 00:00:00 2001 From: Michal Date: Sat, 23 Jul 2022 23:26:24 +0100 Subject: [PATCH 1/3] New Malachite 2.0.0 format --- packages-any/mlc.toml | 94 +++++++++++++++++++++++----------------- packages-armv7l/mlc.toml | 9 ---- packages-extra/mlc.toml | 50 +++++++++++++-------- packages-x86_64/mlc.toml | 40 +++++++++++------ workspace/mlc.toml | 66 ++++++++++++++++------------ 5 files changed, 151 insertions(+), 108 deletions(-) delete mode 100644 packages-armv7l/mlc.toml diff --git a/packages-any/mlc.toml b/packages-any/mlc.toml index 8503925..28ed080 100644 --- a/packages-any/mlc.toml +++ b/packages-any/mlc.toml @@ -1,43 +1,57 @@ +[base] mode = "repository" +smart_pull = true + +[mode.repository] name = "crystal-any" -repo = [ - "1::citrine", - "1::crystal-keyring", - "1::onyx", - "1::wallpapers", - "2::base", - "2::cinnamon-meta", - "2::crystal-dev", - "2::crystal-grub-theme", - "2::filesystem", - "2::gnome-apps-meta", - "2::lsb-release", - "2::neofetch", - "2::pfetch", - "2::pkg-warner", -# "2::whitesur-grub-theme", - "3::chrome-gnome-shell", - "3::ckbcomp", - "3::flutter", - "3::flutter-group-pacman-hook", - "3::iso-flag-png", - "3::mint-artwork-common", - "3::mint-backgrounds-uma", - "3::mint-themes", - "3::mint-x-icons", - "3::mint-y-icons", - "3::mintlocale", - "3::mkinitcpio-openswap", - "3::pix", - "3::python-xdg", - "3::timeshift", - "3::timeshift-autosnap", - "3::xplayer", - "3::xplayer-plparser", - "3::xviewer" -] -urls = [ - "https://github.com/crystal-linux/%repo%", - "https://github.com/crystal-linux/pkgbuild.%repo%", - "https://aur.archlinux.org/%repo%" +build_on_update = true + +[mode.repository.signing] +enabled = true +key = "" +on_gen = true + +[mode.workspace] + +[repositories] +repos = [ + "crs:citrine", + "crs:crystal-keyring", + "crs:onyx", + "crs:wallpapers", + "pkg:base", + "pkg:cinnamon-meta", + "pkg:crystal-dev", + "pkg:crystal-grub-theme", + "pkg:filesystem", + "pkg:gnome-apps-meta", + "pkg:lsb-release", + "pkg:neofetch", + "pkg:pfetch", + "pkg:pkg-warner", +# "pkg:whitesur-grub-theme", + "aur:chrome-gnome-shell", + "aur:ckbcomp", + "aur:flutter", + "aur:flutter-group-pacman-hook", + "aur:iso-flag-png", + "aur:mint-artwork-common", + "aur:mint-backgrounds-uma", + "aur:mint-themes", + "aur:mint-x-icons", + "aur:mint-y-icons", + "aur:mintlocale", + "aur:mkinitcpio-openswap", + "aur:pix", + "aur:python-xdg", + "aur:timeshift", + "aur:timeshift-autosnap", + "aur:xplayer", + "aur:xplayer-plparser", + "aur:xviewer" ] + +[repositories.urls] +crs = "https://github.com/crystal-linux/{}" +pkg = "https://github.com/crystal-linux/pkgbuild.{}" +aur = "https://aur.archlinux.org/{}" diff --git a/packages-armv7l/mlc.toml b/packages-armv7l/mlc.toml deleted file mode 100644 index c0ee8c6..0000000 --- a/packages-armv7l/mlc.toml +++ /dev/null @@ -1,9 +0,0 @@ -mode = "repository" -name = "crystal-armv7l" -repo = [ - "1::amethyst", - "1::malachite", -] -urls = [ - "https://github.com/crystal-linux/%repo%" -] diff --git a/packages-extra/mlc.toml b/packages-extra/mlc.toml index a2a54bf..d80891b 100644 --- a/packages-extra/mlc.toml +++ b/packages-extra/mlc.toml @@ -1,21 +1,35 @@ +[base] mode = "repository" +smart_pull = true + +[mode.repository] name = "crystal-extra" -repo = [ - "1::brave-bin", - "1::mullvad-vpn", - "1::mullvad-vpn-beta", - "1::mullvad-vpn-cli", - "1::microsoft-edge-stable-bin", - "1::microsoft-edge-beta-bin", - "1::microsoft-edge-dev-bin", - "1::google-chrome", - "1::google-chrome-beta", - "1::google-chrome-dev", - "1::ungoogled-chromium", - "1::jetbrains-toolbox", - "1::visual-studio-code-bin", - "1::polymc" -] -urls = [ - "https://aur.archlinux.org/%repo%" +build_on_update = true + +[mode.repository.signing] +enabled = true +key = "" +on_gen = true + +[mode.workspace] + +[repositories] +repos = [ + "aur:brave-bin", + "aur:mullvad-vpn", + "aur:mullvad-vpn-beta", + "aur:mullvad-vpn-cli", + "aur:microsoft-edge-stable-bin", + "aur:microsoft-edge-beta-bin", + "aur:microsoft-edge-dev-bin", + "aur:google-chrome", + "aur:google-chrome-beta", + "aur:google-chrome-dev", + "aur:ungoogled-chromium", + "aur:jetbrains-toolbox", + "aur:visual-studio-code-bin", + "aur:polymc" ] + +[repositories.urls] +aur = "https://aur.archlinux.org/{}" diff --git a/packages-x86_64/mlc.toml b/packages-x86_64/mlc.toml index 5ba8459..07a3b84 100644 --- a/packages-x86_64/mlc.toml +++ b/packages-x86_64/mlc.toml @@ -1,16 +1,30 @@ +[base] mode = "repository" +smart_pull = true + +[mode.repository] name = "crystal-x86_64" -repo = [ - "1::amethyst", - "1::jade", - "1::jade_gui", - "1::lapis", - "1::malachite", - "2::bsudo", - "2::grub", - "2::sudo" -] -urls = [ - "https://github.com/crystal-linux/%repo%", - "https://github.com/crystal-linux/pkgbuild.%repo%" +build_on_update = true + +[mode.repository.signing] +enabled = true +key = "" +on_gen = true + +[mode.workspace] + +[repositories] +repos = [ + "crs:amethyst", + "crs:jade", + "crs:jade_gui", + "crs:lapis", + "crs:malachite", + "pkg:bsudo", + "pkg:grub", + "pkg:sudo" ] + +[repositories.urls] +crs = "https://github.com/crystal-linux/{}" +pkg = "https://github.com/crystal-linux/pkgbuild.{}" diff --git a/workspace/mlc.toml b/workspace/mlc.toml index 82cd48c..1cb0de0 100644 --- a/workspace/mlc.toml +++ b/workspace/mlc.toml @@ -1,32 +1,42 @@ +[base] mode = "workspace" +smart_pull = true -repo = [ - "1::amethyst", - "1::branding", - "1::caveman", - "1::citrine", - "1::crystal-keyring", - "1::grub-theme", - "1::iso", - "1::jade", - "1::jade_gui", - "1::onyx", - "1::site", - "1::wallpapers", -# "1::packages-any", -# "1::packages-extra", -# "1::packages-x86_64", - "2::base", - "2::filesystem", - "2::gnome-apps-meta", - "2::grub", - "2::lsb-release", - "2::malachite", - "2::pkg-manager-warner", - "2::sudo" -] +[mode.repository] +name = "" +build_on_update = false + +[mode.repository.signing] +enabled = false +key = "" +on_gen = false -urls = [ - "ssh://git@github.com/crystal-linux/%repo%", - "ssh://git@github.com/crystal-linux/pkgbuild.%repo%" +[mode.workspace] + +[repositories] +repos = [ + "crs:amethyst", + "crs:branding", + "crs:caveman", + "crs:citrine", + "crs:crystal-keyring", + "crs:grub-theme", + "crs:iso", + "crs:jade", + "crs:jade_gui", + "crs:onyx", + "crs:site", + "crs:wallpapers", + "pkg:base", + "pkg:filesystem", + "pkg:gnome-apps-meta", + "pkg:grub", + "pkg:lsb-release", + "pkg:malachite", + "pkg:pkg-manager-warner", + "pkg:sudo" ] + +[repositories.urls] +crs = "ssh://git@github.com/crystal-linux/{}" +pkg = "ssh://git@github.com/crystal-linux/pkgbuild.{}" From 43aa9b669ea1eb055e91a2790902caad28769070 Mon Sep 17 00:00:00 2001 From: Michal Date: Sat, 23 Jul 2022 23:40:55 +0100 Subject: [PATCH 2/3] .gitignore and workspace fix --- .gitignore | 9 +++++++++ workspace/mlc.toml | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e693e4c --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +packages-x86_64/* +packages-any/* +packages-extra/* +workspace/* + +!packages-x86_64/mlc.toml +!packages-any/mlc.toml +!packages-extra/mlc.toml +!workspace/mlc.toml \ No newline at end of file diff --git a/workspace/mlc.toml b/workspace/mlc.toml index 1cb0de0..f87c0b9 100644 --- a/workspace/mlc.toml +++ b/workspace/mlc.toml @@ -24,6 +24,7 @@ repos = [ "crs:iso", "crs:jade", "crs:jade_gui", + "crs:malachite", "crs:onyx", "crs:site", "crs:wallpapers", @@ -32,8 +33,6 @@ repos = [ "pkg:gnome-apps-meta", "pkg:grub", "pkg:lsb-release", - "pkg:malachite", - "pkg:pkg-manager-warner", "pkg:sudo" ] From 747d6172b85eeaf75f77c25ea9ee19870dd83024 Mon Sep 17 00:00:00 2001 From: Michal Date: Fri, 29 Jul 2022 09:50:26 +0100 Subject: [PATCH 3/3] Fixed MLC config formatting --- packages-any/mlc.toml | 4 ---- packages-extra/mlc.toml | 3 --- packages-x86_64/mlc.toml | 5 +---- workspace/mlc.toml | 13 +++---------- 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/packages-any/mlc.toml b/packages-any/mlc.toml index 28ed080..29107d9 100644 --- a/packages-any/mlc.toml +++ b/packages-any/mlc.toml @@ -8,11 +8,8 @@ build_on_update = true [mode.repository.signing] enabled = true -key = "" on_gen = true -[mode.workspace] - [repositories] repos = [ "crs:citrine", @@ -29,7 +26,6 @@ repos = [ "pkg:neofetch", "pkg:pfetch", "pkg:pkg-warner", -# "pkg:whitesur-grub-theme", "aur:chrome-gnome-shell", "aur:ckbcomp", "aur:flutter", diff --git a/packages-extra/mlc.toml b/packages-extra/mlc.toml index d80891b..c37f4c5 100644 --- a/packages-extra/mlc.toml +++ b/packages-extra/mlc.toml @@ -8,11 +8,8 @@ build_on_update = true [mode.repository.signing] enabled = true -key = "" on_gen = true -[mode.workspace] - [repositories] repos = [ "aur:brave-bin", diff --git a/packages-x86_64/mlc.toml b/packages-x86_64/mlc.toml index 07a3b84..80072ce 100644 --- a/packages-x86_64/mlc.toml +++ b/packages-x86_64/mlc.toml @@ -8,16 +8,13 @@ build_on_update = true [mode.repository.signing] enabled = true -key = "" on_gen = true -[mode.workspace] - [repositories] repos = [ "crs:amethyst", "crs:jade", - "crs:jade_gui", + "crs:jade-gui", "crs:lapis", "crs:malachite", "pkg:bsudo", diff --git a/workspace/mlc.toml b/workspace/mlc.toml index f87c0b9..b66607e 100644 --- a/workspace/mlc.toml +++ b/workspace/mlc.toml @@ -2,16 +2,9 @@ mode = "workspace" smart_pull = true -[mode.repository] -name = "" -build_on_update = false - -[mode.repository.signing] -enabled = false -key = "" -on_gen = false - [mode.workspace] +git_info = true +colorblind = false [repositories] repos = [ @@ -23,7 +16,7 @@ repos = [ "crs:grub-theme", "crs:iso", "crs:jade", - "crs:jade_gui", + "crs:jade-gui", "crs:malachite", "crs:onyx", "crs:site",