From f00e5b45d9735ef8b81ca5987e5d890748fbae6f Mon Sep 17 00:00:00 2001
From: Ribbon <ribbon_45@proton.me>
Date: Fri, 1 Aug 2025 12:12:56 -0300
Subject: [PATCH] Unify dev variants and use dev-redox meta-package

---
 config/aarch64/dev-redox.toml | 20 -------------
 config/dev-redox.toml         | 56 -----------------------------------
 config/dev.toml               | 52 +-------------------------------
 config/i686/dev-redox.toml    | 14 ---------
 config/x86_64/dev-redox.toml  | 14 ---------
 5 files changed, 1 insertion(+), 155 deletions(-)
 delete mode 100644 config/aarch64/dev-redox.toml
 delete mode 100644 config/dev-redox.toml
 delete mode 100644 config/i686/dev-redox.toml
 delete mode 100644 config/x86_64/dev-redox.toml

diff --git a/config/aarch64/dev-redox.toml b/config/aarch64/dev-redox.toml
deleted file mode 100644
index 89bba21e..00000000
--- a/config/aarch64/dev-redox.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Configuration for Redox development
-
-include = ["../dev-redox.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# see ci.toml for error reasons
-gdbserver = "ignore"
-gnu-binutils = "ignore"
-mesa = "ignore"
-mesa-glu = "ignore"
-mpc = "ignore"
-strace = "ignore"
diff --git a/config/dev-redox.toml b/config/dev-redox.toml
deleted file mode 100644
index 745aac65..00000000
--- a/config/dev-redox.toml
+++ /dev/null
@@ -1,56 +0,0 @@
-# Configuration for Redox development
-
-include = ["desktop.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 20000
-# Do not prompt if settings are not defined
-prompt = false
-
-# Package settings
-[packages]
-dev-essential = {}
-redox-tests = {}
-
-[[files]]
-path = "/home/user/test.rs"
-data = """
-fn main() {
-    println!("Hello, Redox!");
-}
-"""
-
-[[files]]
-path = "/home/user/test.c"
-data = """
-#include <stdio.h>
-
-int main(void) {
-	printf("Hello, Redox!\\n");
-}
-"""
-
-[[files]]
-path = "/home/user/test.cpp"
-data = """
-#include <iostream>
-
-int main()
-{
-   std::cout << "Hello, Redox!" << std::endl;
-}
-"""
-
-[[files]]
-path = "/home/user/test.py"
-data = """
-print("Hello, Redox!")
-"""
-
-[[files]]
-path = "/home/user/test.lua"
-data = """
-print("Hello, Redox!")
-"""
diff --git a/config/dev.toml b/config/dev.toml
index d9dc0115..c3fa5bf9 100644
--- a/config/dev.toml
+++ b/config/dev.toml
@@ -11,57 +11,7 @@ prompt = false
 
 # Package settings
 [packages]
-acid = {}
-autoconf = {}
-automake = {}
-cargo = {}
-crates-io-index = {}
-exampled = {}
-gcc13 = {}
-gdbserver = {}
-gnu-binutils = {}
-gnu-grep = {}
-gnu-make = {}
-libffi = {}
-libgmp = {}
-libiconv = {}
-libjpeg = {}
-libogg = {}
-liborbital = {}
-libpng = {}
-libsodium = {}
-libvorbis = {}
-libxml2 = {}
-llvm18 = {}
-lua54 = {}
-mesa = {}
-mesa-glu = {}
-nasm = {}
-ncurses = {}
-nghttp2 = {}
-openssl1 = {}
-orbclient = {}
-patch = {}
-pcre = {}
-pkg-config = {}
-resist = {}
-ripgrep = {}
-rust = {}
-sdl-gfx = {}
-sdl1 = {}
-sdl1-image = {}
-sdl1-mixer = {}
-sdl1-ttf = {}
-sdl2 = {}
-sdl2-gears = {}
-sdl2-image = {}
-sdl2-mixer = {}
-sdl2-ttf = {}
-sed = {}
-strace = {}
-terminfo = {}
-xz = {}
-zlib = {}
+dev-redox = {}
 
 [[files]]
 path = "/home/user/test.rs"
diff --git a/config/i686/dev-redox.toml b/config/i686/dev-redox.toml
deleted file mode 100644
index 655a72b2..00000000
--- a/config/i686/dev-redox.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for Redox development
-
-include = ["../dev-redox.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
\ No newline at end of file
diff --git a/config/x86_64/dev-redox.toml b/config/x86_64/dev-redox.toml
deleted file mode 100644
index 655a72b2..00000000
--- a/config/x86_64/dev-redox.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for Redox development
-
-include = ["../dev-redox.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
\ No newline at end of file