From da8982551c9654a6b3005c000c526c5c14da99e1 Mon Sep 17 00:00:00 2001 From: Michal Date: Sat, 3 Sep 2022 22:57:13 +0100 Subject: [PATCH 1/6] Update mlc.toml Signed-off-by: Michal --- packages-x86_64/mlc.toml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages-x86_64/mlc.toml b/packages-x86_64/mlc.toml index 0ea3bea..60bbb45 100644 --- a/packages-x86_64/mlc.toml +++ b/packages-x86_64/mlc.toml @@ -13,13 +13,12 @@ on_gen = true [repositories] repos = [ "pkg:amethyst", - "crs:jade", - "crs:jade-gui", - "crs:malachite", + "pkg:jade", + "pkg:jade-gui", + "pkg:malachite", "pkg:grub", "pkg:zramd", ] [repositories.urls] -crs = "https://github.com/crystal-linux/{}" pkg = "https://github.com/crystal-linux/pkgbuild.{}" From cc067608d48b66d715faba414e6407e6ecdc7cc7 Mon Sep 17 00:00:00 2001 From: Michal Date: Sat, 3 Sep 2022 22:58:44 +0100 Subject: [PATCH 2/6] Update mlc.toml Signed-off-by: Michal --- packages-any/mlc.toml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/packages-any/mlc.toml b/packages-any/mlc.toml index 63d2f35..b30c30e 100644 --- a/packages-any/mlc.toml +++ b/packages-any/mlc.toml @@ -12,10 +12,10 @@ on_gen = true [repositories] repos = [ - "crs:crystal-keyring", - "crs:onyx", - "crs:wallpapers", - "crs:grub-theme", + "pkg:crystal-keyring", + "pkg:onyx", + "pkg:wallpapers", + "pkg:grub-theme", "pkg:base", "pkg:crystal-dev", "pkg:filesystem", @@ -23,11 +23,9 @@ repos = [ "pkg:neofetch", "pkg:pfetch", "pkg:pkg-warner", - "aur:timeshift", - "aur:timeshift-autosnap", + "pkg:timeshift", + "pkg:timeshift-autosnap", ] [repositories.urls] -crs = "https://github.com/crystal-linux/{}" pkg = "https://github.com/crystal-linux/pkgbuild.{}" -aur = "https://aur.archlinux.org/{}" From f4661ca251863f678b1b1f5d05d8ed79920d4c5f Mon Sep 17 00:00:00 2001 From: Michal Date: Sat, 3 Sep 2022 23:03:06 +0100 Subject: [PATCH 3/6] Update mlc.toml Signed-off-by: Michal --- packages-any/mlc.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages-any/mlc.toml b/packages-any/mlc.toml index b30c30e..228bd11 100644 --- a/packages-any/mlc.toml +++ b/packages-any/mlc.toml @@ -23,9 +23,10 @@ repos = [ "pkg:neofetch", "pkg:pfetch", "pkg:pkg-warner", - "pkg:timeshift", - "pkg:timeshift-autosnap", + "aur:timeshift", + "aur:timeshift-autosnap", ] [repositories.urls] pkg = "https://github.com/crystal-linux/pkgbuild.{}" +aur = "https://aur.archlinux.org/{}" From cc8ee403290c409fd5031ef5b635287cd1080edf Mon Sep 17 00:00:00 2001 From: Michal Date: Sat, 3 Sep 2022 23:05:50 +0100 Subject: [PATCH 4/6] Delete mlc.toml Signed-off-by: Michal --- packages-extra/mlc.toml | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 packages-extra/mlc.toml diff --git a/packages-extra/mlc.toml b/packages-extra/mlc.toml deleted file mode 100644 index c37f4c5..0000000 --- a/packages-extra/mlc.toml +++ /dev/null @@ -1,32 +0,0 @@ -[base] -mode = "repository" -smart_pull = true - -[mode.repository] -name = "crystal-extra" -build_on_update = true - -[mode.repository.signing] -enabled = true -on_gen = true - -[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/{}" From 9aa6ecd3a09d740ea8c6fdc8c94c9ba508ad1297 Mon Sep 17 00:00:00 2001 From: Michal S Date: Sat, 3 Sep 2022 23:17:29 +0100 Subject: [PATCH 5/6] Repository name refactor --- packages-any/mlc.toml | 32 -------------------------------- packages-x86_64/mlc.toml | 24 ------------------------ workspace/mlc.toml | 32 -------------------------------- 3 files changed, 88 deletions(-) delete mode 100644 packages-any/mlc.toml delete mode 100644 packages-x86_64/mlc.toml delete mode 100644 workspace/mlc.toml diff --git a/packages-any/mlc.toml b/packages-any/mlc.toml deleted file mode 100644 index 228bd11..0000000 --- a/packages-any/mlc.toml +++ /dev/null @@ -1,32 +0,0 @@ -[base] -mode = "repository" -smart_pull = true - -[mode.repository] -name = "crystal-any" -build_on_update = true - -[mode.repository.signing] -enabled = true -on_gen = true - -[repositories] -repos = [ - "pkg:crystal-keyring", - "pkg:onyx", - "pkg:wallpapers", - "pkg:grub-theme", - "pkg:base", - "pkg:crystal-dev", - "pkg:filesystem", - "pkg:lsb-release", - "pkg:neofetch", - "pkg:pfetch", - "pkg:pkg-warner", - "aur:timeshift", - "aur:timeshift-autosnap", -] - -[repositories.urls] -pkg = "https://github.com/crystal-linux/pkgbuild.{}" -aur = "https://aur.archlinux.org/{}" diff --git a/packages-x86_64/mlc.toml b/packages-x86_64/mlc.toml deleted file mode 100644 index 60bbb45..0000000 --- a/packages-x86_64/mlc.toml +++ /dev/null @@ -1,24 +0,0 @@ -[base] -mode = "repository" -smart_pull = true - -[mode.repository] -name = "crystal-x86_64" -build_on_update = true - -[mode.repository.signing] -enabled = true -on_gen = true - -[repositories] -repos = [ - "pkg:amethyst", - "pkg:jade", - "pkg:jade-gui", - "pkg:malachite", - "pkg:grub", - "pkg:zramd", -] - -[repositories.urls] -pkg = "https://github.com/crystal-linux/pkgbuild.{}" diff --git a/workspace/mlc.toml b/workspace/mlc.toml deleted file mode 100644 index 93b3c2a..0000000 --- a/workspace/mlc.toml +++ /dev/null @@ -1,32 +0,0 @@ -[base] -mode = "workspace" -smart_pull = true - -[mode.workspace] -git_info = true -colorblind = false - -[repositories] -repos = [ - "crs:amethyst", - "crs:branding", - "crs:caveman", - "crs:crystal-keyring", - "crs:grub-theme", - "crs:iso", - "crs:jade", - "crs:jade-gui", - "crs:malachite", - "crs:onyx", - "crs:site", - "crs:wallpapers", - "crs:pkg-manager-warner", - "pkg:base", - "pkg:filesystem", - "pkg:grub", - "pkg:lsb-release", -] - -[repositories.urls] -crs = "ssh://git@github.com/crystal-linux/{}" -pkg = "ssh://git@github.com/crystal-linux/pkgbuild.{}" From f7edda894d7ce73aea154e1b0a49c975c623f5e1 Mon Sep 17 00:00:00 2001 From: Michal S Date: Sat, 3 Sep 2022 23:36:53 +0100 Subject: [PATCH 6/6] More refactoring stuff --- .gitignore | 12 ++++-------- any/mlc.toml | 32 ++++++++++++++++++++++++++++++++ x86_64/mlc.toml | 24 ++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 8 deletions(-) create mode 100644 any/mlc.toml create mode 100644 x86_64/mlc.toml diff --git a/.gitignore b/.gitignore index e693e4c..b3bd1a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,5 @@ -packages-x86_64/* -packages-any/* -packages-extra/* -workspace/* +x86_64/* +any/* -!packages-x86_64/mlc.toml -!packages-any/mlc.toml -!packages-extra/mlc.toml -!workspace/mlc.toml \ No newline at end of file +!x86_64/mlc.toml +!any/mlc.toml diff --git a/any/mlc.toml b/any/mlc.toml new file mode 100644 index 0000000..228bd11 --- /dev/null +++ b/any/mlc.toml @@ -0,0 +1,32 @@ +[base] +mode = "repository" +smart_pull = true + +[mode.repository] +name = "crystal-any" +build_on_update = true + +[mode.repository.signing] +enabled = true +on_gen = true + +[repositories] +repos = [ + "pkg:crystal-keyring", + "pkg:onyx", + "pkg:wallpapers", + "pkg:grub-theme", + "pkg:base", + "pkg:crystal-dev", + "pkg:filesystem", + "pkg:lsb-release", + "pkg:neofetch", + "pkg:pfetch", + "pkg:pkg-warner", + "aur:timeshift", + "aur:timeshift-autosnap", +] + +[repositories.urls] +pkg = "https://github.com/crystal-linux/pkgbuild.{}" +aur = "https://aur.archlinux.org/{}" diff --git a/x86_64/mlc.toml b/x86_64/mlc.toml new file mode 100644 index 0000000..60bbb45 --- /dev/null +++ b/x86_64/mlc.toml @@ -0,0 +1,24 @@ +[base] +mode = "repository" +smart_pull = true + +[mode.repository] +name = "crystal-x86_64" +build_on_update = true + +[mode.repository.signing] +enabled = true +on_gen = true + +[repositories] +repos = [ + "pkg:amethyst", + "pkg:jade", + "pkg:jade-gui", + "pkg:malachite", + "pkg:grub", + "pkg:zramd", +] + +[repositories.urls] +pkg = "https://github.com/crystal-linux/pkgbuild.{}"