fixed merge conflicts

This commit is contained in:
λmolinae 2025-06-06 20:52:10 -06:00
commit 7659c4198c
4 changed files with 58 additions and 15 deletions

View file

@ -7,6 +7,9 @@ tcc-libs-static,"Tiny C Compiler (static library)",D,
clang20,"C language family front-end for LLVM",D,
clang20-extra-tools,"Extra tools built using Clang's tooling APIs",D,
tinymist,"Language service for Typst",D,
neovim,"Vim-fork focused on extensibility and agility",D,
ripgrep,"ripgrep combines the usability of The Silver Searcher with the raw speed of grep",D,
gcompat,"GNU C Library compatibility layer for musl",D,
git,"Distributed version control system",D,
tar,"Utility used to store, backup, and transport files",D,
curl,"URL retrival utility and library",D,
@ -18,10 +21,7 @@ wlroots-dev,"Modular Wayland compositor library (development files)",D,
libxkbcommon-dev,"keyboard handling library (development files)",D,
wayland-protocols,"Protocols and protocol extensions complementing the Wayland core protocol",D,
pkgconf,"development framework configuration tools",D,
neovim,"Vim-fork focused on extensibility and agility",D,
fcft-dev,"Simple library for font loading and glyph rasterization using FontConfig, FreeType and pixman (development files)",D,
ripgrep,"ripgrep combines the usability of The Silver Searcher with the raw speed of grep",D,
alsa-lib-dev,"Advanced Linux Sound Architecture (ALSA) library (development files)",D,
file-dev,"File type identification utility (development files)",D,
openssl-dev,"Toolkit for Transport Layer Security (TLS) (development files)",D,

1 NAME DESCRIPTION GIT
7 clang20 C language family front-end for LLVM D
8 clang20-extra-tools Extra tools built using Clang's tooling APIs D
9 tinymist Language service for Typst D
10 neovim Vim-fork focused on extensibility and agility D
11 ripgrep ripgrep combines the usability of The Silver Searcher with the raw speed of grep D
12 gcompat GNU C Library compatibility layer for musl D
13 git Distributed version control system D
14 tar Utility used to store, backup, and transport files D
15 curl URL retrival utility and library D
21 libxkbcommon-dev keyboard handling library (development files) D
22 wayland-protocols Protocols and protocol extensions complementing the Wayland core protocol D
23 pkgconf development framework configuration tools D
neovim Vim-fork focused on extensibility and agility D
24 fcft-dev Simple library for font loading and glyph rasterization using FontConfig, FreeType and pixman (development files) D
ripgrep ripgrep combines the usability of The Silver Searcher with the raw speed of grep D
25 alsa-lib-dev Advanced Linux Sound Architecture (ALSA) library (development files) D
26 file-dev File type identification utility (development files) D
27 openssl-dev Toolkit for Transport Layer Security (TLS) (development files) D