diff --git a/pkg/tdpeuter/PKGBUILD b/pkg/tdpeuter/PKGBUILD index 4b79d2b..d0a83c9 100644 --- a/pkg/tdpeuter/PKGBUILD +++ b/pkg/tdpeuter/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Tibo De Peuter pkgbase=tdpeuter pkgname=(tdpeuter-base tdpeuter-dev tdpeuter-desktop tdpeuter-me) -pkgver=0.0.9 +pkgver=0.0.10 pkgrel=1 pkgdesc="Sysconfig for my systems" arch=(any) @@ -13,7 +13,7 @@ package_tdpeuter-base() { install=tdpeuter-base.install depends=( - base linux linux-firmware + base linux linux-firmware vim ) # Networking @@ -60,7 +60,7 @@ package_tdpeuter-desktop() { # To move dotfiles around depends+=( - stow + fzf stow ) # Base of sway desktop diff --git a/pkg/tdpeuter/pkg/tdpeuter-base/.BUILDINFO b/pkg/tdpeuter/pkg/tdpeuter-base/.BUILDINFO index 515aa98..68674de 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-base/.BUILDINFO +++ b/pkg/tdpeuter/pkg/tdpeuter-base/.BUILDINFO @@ -1,11 +1,11 @@ format = 2 pkgname = tdpeuter-base pkgbase = tdpeuter -pkgver = 0.0.9-1 +pkgver = 0.0.10-1 pkgarch = any -pkgbuild_sha256sum = 734a7d457f8125ad4f6d3db3657f4ea1ef3a108eaaa5aa52601b001cbc837af4 +pkgbuild_sha256sum = c68c480901478bded6cbb4ddb3bf6c5ebbfdf9261623c66b4b9db04f5d13036a packager = Unknown Packager -builddate = 1666811966 +builddate = 1666813262 builddir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter startdir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter buildtool = makepkg @@ -631,10 +631,10 @@ installed = systemd-251.7-1-x86_64 installed = systemd-libs-251.7-1-x86_64 installed = systemd-sysvcompat-251.7-1-x86_64 installed = tar-1.34-1-x86_64 -installed = tdpeuter-base-0.0.8-1-any -installed = tdpeuter-desktop-0.0.8-1-any -installed = tdpeuter-dev-0.0.8-1-any -installed = tdpeuter-me-0.0.8-1-any +installed = tdpeuter-base-0.0.9-1-any +installed = tdpeuter-desktop-0.0.9-1-any +installed = tdpeuter-dev-0.0.9-1-any +installed = tdpeuter-me-0.0.9-1-any installed = termshark-2.4.0-1-x86_64 installed = texinfo-6.8-2-x86_64 installed = thin-provisioning-tools-0.9.0-1-x86_64 diff --git a/pkg/tdpeuter/pkg/tdpeuter-base/.INSTALL b/pkg/tdpeuter/pkg/tdpeuter-base/.INSTALL index 41f01f3..a39be1b 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-base/.INSTALL +++ b/pkg/tdpeuter/pkg/tdpeuter-base/.INSTALL @@ -3,6 +3,6 @@ post_install() { systemctl enable --now NetworkManager.service >&2 echo "Fixing locale" - sed -i "s/^#\(nl_BE.UTF-8 UTF-8\)/\1/g" "/etc/locale.gen" + sed -i "s/^#\(nl_BE.UTF-8 UTF-8\)$/\1/g" "/etc/locale.gen" locale-gen } diff --git a/pkg/tdpeuter/pkg/tdpeuter-base/.MTREE b/pkg/tdpeuter/pkg/tdpeuter-base/.MTREE index c01dd96..b3605de 100644 Binary files a/pkg/tdpeuter/pkg/tdpeuter-base/.MTREE and b/pkg/tdpeuter/pkg/tdpeuter-base/.MTREE differ diff --git a/pkg/tdpeuter/pkg/tdpeuter-base/.PKGINFO b/pkg/tdpeuter/pkg/tdpeuter-base/.PKGINFO index 897ff5b..e1a775c 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-base/.PKGINFO +++ b/pkg/tdpeuter/pkg/tdpeuter-base/.PKGINFO @@ -2,10 +2,10 @@ # using fakeroot version 1.29 pkgname = tdpeuter-base pkgbase = tdpeuter -pkgver = 0.0.9-1 +pkgver = 0.0.10-1 pkgdesc = Sysconfig for my systems url = https://git.depeuter.tk/tdpeuter/arch-pkgs -builddate = 1666811966 +builddate = 1666813262 packager = Unknown Packager size = 0 arch = any @@ -14,4 +14,5 @@ group = tdpeuter depend = base depend = linux depend = linux-firmware +depend = vim depend = networkmanager diff --git a/pkg/tdpeuter/pkg/tdpeuter-desktop/.BUILDINFO b/pkg/tdpeuter/pkg/tdpeuter-desktop/.BUILDINFO index a9f7621..b59d36e 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-desktop/.BUILDINFO +++ b/pkg/tdpeuter/pkg/tdpeuter-desktop/.BUILDINFO @@ -1,11 +1,11 @@ format = 2 pkgname = tdpeuter-desktop pkgbase = tdpeuter -pkgver = 0.0.9-1 +pkgver = 0.0.10-1 pkgarch = any -pkgbuild_sha256sum = 734a7d457f8125ad4f6d3db3657f4ea1ef3a108eaaa5aa52601b001cbc837af4 +pkgbuild_sha256sum = c68c480901478bded6cbb4ddb3bf6c5ebbfdf9261623c66b4b9db04f5d13036a packager = Unknown Packager -builddate = 1666811966 +builddate = 1666813262 builddir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter startdir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter buildtool = makepkg @@ -631,10 +631,10 @@ installed = systemd-251.7-1-x86_64 installed = systemd-libs-251.7-1-x86_64 installed = systemd-sysvcompat-251.7-1-x86_64 installed = tar-1.34-1-x86_64 -installed = tdpeuter-base-0.0.8-1-any -installed = tdpeuter-desktop-0.0.8-1-any -installed = tdpeuter-dev-0.0.8-1-any -installed = tdpeuter-me-0.0.8-1-any +installed = tdpeuter-base-0.0.9-1-any +installed = tdpeuter-desktop-0.0.9-1-any +installed = tdpeuter-dev-0.0.9-1-any +installed = tdpeuter-me-0.0.9-1-any installed = termshark-2.4.0-1-x86_64 installed = texinfo-6.8-2-x86_64 installed = thin-provisioning-tools-0.9.0-1-x86_64 diff --git a/pkg/tdpeuter/pkg/tdpeuter-desktop/.INSTALL b/pkg/tdpeuter/pkg/tdpeuter-desktop/.INSTALL index db319ab..e20f31a 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-desktop/.INSTALL +++ b/pkg/tdpeuter/pkg/tdpeuter-desktop/.INSTALL @@ -8,6 +8,7 @@ post_install() { post_upgrade() { install_software + install_fonts >&2 echo "Moving to dotfile directory" cd /usr/share/tdpeuter/arch-pkgs/ @@ -29,18 +30,40 @@ pre_remove() { install_software() { cd - >&2 echo "Installing sway-git" - git clone https://aur.archlinux.org/sway-git.git - cd sway-git + >&2 echo "Installing betterbird" + git clone https://aur.archlinux.org/betterbird-bin.git + cd betterbird-bin + git pull makepkg - pacman -U sway-git + pacman -U betterbird-bin cd >&2 echo "Installing hamsket" git clone https://aur.archlinux.org/hamsket-bin.git cd hamsket-bin + git pull makepkg pacman -U hamsket-bin cd + >&2 echo "Installing sway-git" + git clone https://aur.archlinux.org/sway-git.git + cd sway-git + git pull + makepkg + pacman -U sway-git + cd + +} + +install_fonts() { + mkdir -p /usr/local/share/fonts + + >&2 echo "Installing letter (font)" + git clone https://github.com/tdpeuter/letter.git + cd letter + cp ttf/* /usr/local/share/fonts/ttf/letter/ + cp ttf-unhinted/* /usr/local/share/fonts/ttf-unhinted/letter/ + cp woff2/* /usr/local/share/fonts/woff2/letter/ + cd } diff --git a/pkg/tdpeuter/pkg/tdpeuter-desktop/.MTREE b/pkg/tdpeuter/pkg/tdpeuter-desktop/.MTREE index 0fb3854..b5a8ced 100644 Binary files a/pkg/tdpeuter/pkg/tdpeuter-desktop/.MTREE and b/pkg/tdpeuter/pkg/tdpeuter-desktop/.MTREE differ diff --git a/pkg/tdpeuter/pkg/tdpeuter-desktop/.PKGINFO b/pkg/tdpeuter/pkg/tdpeuter-desktop/.PKGINFO index 0f7342c..16a2b26 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-desktop/.PKGINFO +++ b/pkg/tdpeuter/pkg/tdpeuter-desktop/.PKGINFO @@ -2,16 +2,17 @@ # using fakeroot version 1.29 pkgname = tdpeuter-desktop pkgbase = tdpeuter -pkgver = 0.0.9-1 +pkgver = 0.0.10-1 pkgdesc = Sysconfig for my systems url = https://git.depeuter.tk/tdpeuter/arch-pkgs -builddate = 1666811966 +builddate = 1666813262 packager = Unknown Packager size = 0 arch = any license = GPL group = tdpeuter depend = tdpeuter-base +depend = fzf depend = stow depend = alacritty depend = brightnessctl diff --git a/pkg/tdpeuter/pkg/tdpeuter-dev/.BUILDINFO b/pkg/tdpeuter/pkg/tdpeuter-dev/.BUILDINFO index 79bb132..fc7e054 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-dev/.BUILDINFO +++ b/pkg/tdpeuter/pkg/tdpeuter-dev/.BUILDINFO @@ -1,11 +1,11 @@ format = 2 pkgname = tdpeuter-dev pkgbase = tdpeuter -pkgver = 0.0.9-1 +pkgver = 0.0.10-1 pkgarch = any -pkgbuild_sha256sum = 734a7d457f8125ad4f6d3db3657f4ea1ef3a108eaaa5aa52601b001cbc837af4 +pkgbuild_sha256sum = c68c480901478bded6cbb4ddb3bf6c5ebbfdf9261623c66b4b9db04f5d13036a packager = Unknown Packager -builddate = 1666811966 +builddate = 1666813262 builddir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter startdir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter buildtool = makepkg @@ -631,10 +631,10 @@ installed = systemd-251.7-1-x86_64 installed = systemd-libs-251.7-1-x86_64 installed = systemd-sysvcompat-251.7-1-x86_64 installed = tar-1.34-1-x86_64 -installed = tdpeuter-base-0.0.8-1-any -installed = tdpeuter-desktop-0.0.8-1-any -installed = tdpeuter-dev-0.0.8-1-any -installed = tdpeuter-me-0.0.8-1-any +installed = tdpeuter-base-0.0.9-1-any +installed = tdpeuter-desktop-0.0.9-1-any +installed = tdpeuter-dev-0.0.9-1-any +installed = tdpeuter-me-0.0.9-1-any installed = termshark-2.4.0-1-x86_64 installed = texinfo-6.8-2-x86_64 installed = thin-provisioning-tools-0.9.0-1-x86_64 diff --git a/pkg/tdpeuter/pkg/tdpeuter-dev/.MTREE b/pkg/tdpeuter/pkg/tdpeuter-dev/.MTREE index e18b210..12a40ab 100644 Binary files a/pkg/tdpeuter/pkg/tdpeuter-dev/.MTREE and b/pkg/tdpeuter/pkg/tdpeuter-dev/.MTREE differ diff --git a/pkg/tdpeuter/pkg/tdpeuter-dev/.PKGINFO b/pkg/tdpeuter/pkg/tdpeuter-dev/.PKGINFO index 6d56c3d..78bf6fd 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-dev/.PKGINFO +++ b/pkg/tdpeuter/pkg/tdpeuter-dev/.PKGINFO @@ -2,10 +2,10 @@ # using fakeroot version 1.29 pkgname = tdpeuter-dev pkgbase = tdpeuter -pkgver = 0.0.9-1 +pkgver = 0.0.10-1 pkgdesc = Sysconfig for my systems url = https://git.depeuter.tk/tdpeuter/arch-pkgs -builddate = 1666811966 +builddate = 1666813262 packager = Unknown Packager size = 0 arch = any diff --git a/pkg/tdpeuter/pkg/tdpeuter-me/.BUILDINFO b/pkg/tdpeuter/pkg/tdpeuter-me/.BUILDINFO index 1b9bacc..5f241c5 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-me/.BUILDINFO +++ b/pkg/tdpeuter/pkg/tdpeuter-me/.BUILDINFO @@ -1,11 +1,11 @@ format = 2 pkgname = tdpeuter-me pkgbase = tdpeuter -pkgver = 0.0.9-1 +pkgver = 0.0.10-1 pkgarch = any -pkgbuild_sha256sum = 734a7d457f8125ad4f6d3db3657f4ea1ef3a108eaaa5aa52601b001cbc837af4 +pkgbuild_sha256sum = c68c480901478bded6cbb4ddb3bf6c5ebbfdf9261623c66b4b9db04f5d13036a packager = Unknown Packager -builddate = 1666811966 +builddate = 1666813262 builddir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter startdir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter buildtool = makepkg @@ -631,10 +631,10 @@ installed = systemd-251.7-1-x86_64 installed = systemd-libs-251.7-1-x86_64 installed = systemd-sysvcompat-251.7-1-x86_64 installed = tar-1.34-1-x86_64 -installed = tdpeuter-base-0.0.8-1-any -installed = tdpeuter-desktop-0.0.8-1-any -installed = tdpeuter-dev-0.0.8-1-any -installed = tdpeuter-me-0.0.8-1-any +installed = tdpeuter-base-0.0.9-1-any +installed = tdpeuter-desktop-0.0.9-1-any +installed = tdpeuter-dev-0.0.9-1-any +installed = tdpeuter-me-0.0.9-1-any installed = termshark-2.4.0-1-x86_64 installed = texinfo-6.8-2-x86_64 installed = thin-provisioning-tools-0.9.0-1-x86_64 diff --git a/pkg/tdpeuter/pkg/tdpeuter-me/.MTREE b/pkg/tdpeuter/pkg/tdpeuter-me/.MTREE index 5ebe001..8dd0e0a 100644 Binary files a/pkg/tdpeuter/pkg/tdpeuter-me/.MTREE and b/pkg/tdpeuter/pkg/tdpeuter-me/.MTREE differ diff --git a/pkg/tdpeuter/pkg/tdpeuter-me/.PKGINFO b/pkg/tdpeuter/pkg/tdpeuter-me/.PKGINFO index 5176a62..5878334 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-me/.PKGINFO +++ b/pkg/tdpeuter/pkg/tdpeuter-me/.PKGINFO @@ -2,10 +2,10 @@ # using fakeroot version 1.29 pkgname = tdpeuter-me pkgbase = tdpeuter -pkgver = 0.0.9-1 +pkgver = 0.0.10-1 pkgdesc = Sysconfig for my systems url = https://git.depeuter.tk/tdpeuter/arch-pkgs -builddate = 1666811966 +builddate = 1666813262 packager = Unknown Packager size = 0 arch = any diff --git a/pkg/tdpeuter/tdpeuter-base-0.0.10-1-any.pkg.tar.zst b/pkg/tdpeuter/tdpeuter-base-0.0.10-1-any.pkg.tar.zst new file mode 100644 index 0000000..461f693 Binary files /dev/null and b/pkg/tdpeuter/tdpeuter-base-0.0.10-1-any.pkg.tar.zst differ diff --git a/pkg/tdpeuter/tdpeuter-base.install b/pkg/tdpeuter/tdpeuter-base.install index 41f01f3..a39be1b 100644 --- a/pkg/tdpeuter/tdpeuter-base.install +++ b/pkg/tdpeuter/tdpeuter-base.install @@ -3,6 +3,6 @@ post_install() { systemctl enable --now NetworkManager.service >&2 echo "Fixing locale" - sed -i "s/^#\(nl_BE.UTF-8 UTF-8\)/\1/g" "/etc/locale.gen" + sed -i "s/^#\(nl_BE.UTF-8 UTF-8\)$/\1/g" "/etc/locale.gen" locale-gen } diff --git a/pkg/tdpeuter/tdpeuter-desktop-0.0.10-1-any.pkg.tar.zst b/pkg/tdpeuter/tdpeuter-desktop-0.0.10-1-any.pkg.tar.zst new file mode 100644 index 0000000..69a200d Binary files /dev/null and b/pkg/tdpeuter/tdpeuter-desktop-0.0.10-1-any.pkg.tar.zst differ diff --git a/pkg/tdpeuter/tdpeuter-desktop.install b/pkg/tdpeuter/tdpeuter-desktop.install index db319ab..e20f31a 100644 --- a/pkg/tdpeuter/tdpeuter-desktop.install +++ b/pkg/tdpeuter/tdpeuter-desktop.install @@ -8,6 +8,7 @@ post_install() { post_upgrade() { install_software + install_fonts >&2 echo "Moving to dotfile directory" cd /usr/share/tdpeuter/arch-pkgs/ @@ -29,18 +30,40 @@ pre_remove() { install_software() { cd - >&2 echo "Installing sway-git" - git clone https://aur.archlinux.org/sway-git.git - cd sway-git + >&2 echo "Installing betterbird" + git clone https://aur.archlinux.org/betterbird-bin.git + cd betterbird-bin + git pull makepkg - pacman -U sway-git + pacman -U betterbird-bin cd >&2 echo "Installing hamsket" git clone https://aur.archlinux.org/hamsket-bin.git cd hamsket-bin + git pull makepkg pacman -U hamsket-bin cd + >&2 echo "Installing sway-git" + git clone https://aur.archlinux.org/sway-git.git + cd sway-git + git pull + makepkg + pacman -U sway-git + cd + +} + +install_fonts() { + mkdir -p /usr/local/share/fonts + + >&2 echo "Installing letter (font)" + git clone https://github.com/tdpeuter/letter.git + cd letter + cp ttf/* /usr/local/share/fonts/ttf/letter/ + cp ttf-unhinted/* /usr/local/share/fonts/ttf-unhinted/letter/ + cp woff2/* /usr/local/share/fonts/woff2/letter/ + cd } diff --git a/pkg/tdpeuter/tdpeuter-dev-0.0.10-1-any.pkg.tar.zst b/pkg/tdpeuter/tdpeuter-dev-0.0.10-1-any.pkg.tar.zst new file mode 100644 index 0000000..4e3dba7 Binary files /dev/null and b/pkg/tdpeuter/tdpeuter-dev-0.0.10-1-any.pkg.tar.zst differ diff --git a/pkg/tdpeuter/tdpeuter-me-0.0.10-1-any.pkg.tar.zst b/pkg/tdpeuter/tdpeuter-me-0.0.10-1-any.pkg.tar.zst new file mode 100644 index 0000000..5064367 Binary files /dev/null and b/pkg/tdpeuter/tdpeuter-me-0.0.10-1-any.pkg.tar.zst differ diff --git a/pkg/tdpeuter/tdpeuter.db b/pkg/tdpeuter/tdpeuter.db index ddbfbf7..cea491a 100644 Binary files a/pkg/tdpeuter/tdpeuter.db and b/pkg/tdpeuter/tdpeuter.db differ diff --git a/pkg/tdpeuter/tdpeuter.db.tar.gz b/pkg/tdpeuter/tdpeuter.db.tar.gz index ddbfbf7..cea491a 100644 Binary files a/pkg/tdpeuter/tdpeuter.db.tar.gz and b/pkg/tdpeuter/tdpeuter.db.tar.gz differ diff --git a/pkg/tdpeuter/tdpeuter.db.tar.gz.old b/pkg/tdpeuter/tdpeuter.db.tar.gz.old index 32eabf2..ddbfbf7 100644 Binary files a/pkg/tdpeuter/tdpeuter.db.tar.gz.old and b/pkg/tdpeuter/tdpeuter.db.tar.gz.old differ diff --git a/pkg/tdpeuter/tdpeuter.files b/pkg/tdpeuter/tdpeuter.files index e5e5d50..d53dfb4 100644 Binary files a/pkg/tdpeuter/tdpeuter.files and b/pkg/tdpeuter/tdpeuter.files differ diff --git a/pkg/tdpeuter/tdpeuter.files.tar.gz b/pkg/tdpeuter/tdpeuter.files.tar.gz index e5e5d50..d53dfb4 100644 Binary files a/pkg/tdpeuter/tdpeuter.files.tar.gz and b/pkg/tdpeuter/tdpeuter.files.tar.gz differ diff --git a/pkg/tdpeuter/tdpeuter.files.tar.gz.old b/pkg/tdpeuter/tdpeuter.files.tar.gz.old index 0771cc4..e5e5d50 100644 Binary files a/pkg/tdpeuter/tdpeuter.files.tar.gz.old and b/pkg/tdpeuter/tdpeuter.files.tar.gz.old differ