diff --git a/recipes/nano b/recipes/nano
new file mode 100644
index 00000000..d4d72961
--- /dev/null
+++ b/recipes/nano
@@ -0,0 +1,18 @@
+name=nano
+revision=1
+from_source=nano
+imagedeps="base-devel"
+hostdeps="xgcc xbinutils"
+deps="mlibc ncurses"
+
+configure() {
+	${source_dir}/configure --host=x86_64-astral --prefix=${prefix}
+}
+
+build() {
+	make -j ${parallelism} LDFLAGS='-ltinfo'
+}
+
+install() {
+	make install DESTDIR=${dest_dir}
+}
diff --git a/recipes/vim b/recipes/vim
new file mode 100644
index 00000000..cb7cb912
--- /dev/null
+++ b/recipes/vim
@@ -0,0 +1,38 @@
+name=vim
+revision=1
+from_source=vim
+imagedeps="base-devel"
+hostdeps="xgcc xbinutils"
+deps="ncurses mlibc"
+
+configure() {
+	cp -rp ${source_dir}/* .
+	vim_cv_toupper_broken="no" \
+	ac_cv_small_wchar_t="no" \
+	ac_cv_func_sigsetjmp="no" \
+	vim_cv_terminfo="yes" \
+	vim_cv_tgetent="zero" \
+	vim_cv_tty_group="" \
+	vim_cv_tty_mode="0620" \
+	vim_cv_getcwd_broken="no" \
+	vim_cv_timer_create="no" \
+	vim_cv_timer_create_with_lrt="no" \
+	vim_cv_stat_ignores_slash="no" \
+	vim_cv_memmove_handles_overlap="yes" \
+	vim_cv_bcopy_handles_overlap="yes" \
+	vim_cv_memcpy_handles_overlap="yes" \
+	./configure --host=x86_64-astral --prefix=${prefix} --with-tlib=tinfo --disable-gtktest --disable-cion-cache-update --disable-desktop-database-update --disable-canberra --disable-selinux --disable-xsmp --disable-channel --disable-netbeans --enable-multibyte --disable-acl --disable-gpm --disable-sysmous --disable-nls --enable-gui="no" --without-x
+}
+
+build() {
+	make -j ${parallelism}
+}
+
+install() {
+	make install DESTDIR=${dest_dir}
+	
+	mkdir -p ${dest_dir}/bin
+	pushd ${dest_dir}/bin
+	ln -sv ${prefix}/bin/vim vi
+	popd
+}
diff --git a/source-recipes/nano b/source-recipes/nano
new file mode 100644
index 00000000..8f4ed57e
--- /dev/null
+++ b/source-recipes/nano
@@ -0,0 +1,10 @@
+name=nano
+version=6.4
+source_method=tarball
+tarball_url="https://ftp.gnu.org/gnu/nano/nano-${version}.tar.gz"
+tarball_sha512=340317fa2e068c5b10ea40c30298e972b406c5b81a987ec0a1fea73a516a09b02b6dcf96ed503236710a04889860369de5c462d555aaa9dbba9ff3a3735fde35
+hostdeps="autoconf automake libtool pkgconfig"
+
+regenerate() {
+        autoreconf -vfi
+}
diff --git a/source-recipes/vim b/source-recipes/vim
new file mode 100644
index 00000000..094f47ee
--- /dev/null
+++ b/source-recipes/vim
@@ -0,0 +1,9 @@
+name=vim
+version=9.0.1676
+source_method=tarball
+tarball_url="https://github.com/vim/vim/archive/refs/tags/v${version}.tar.gz"
+tarball_sha512=89e2e142d2dcbd162efd3f552ac745c2f2aaa905c08f8ffb88122feb53c9150a8906cfbfbba6203c186d7651276c8582ffc39c0b54f5bbf81e9a32546e7b1715
+
+regenerate() {
+        true
+}