diff --git a/etc/makepkg.conf b/etc/makepkg.conf deleted file mode 100644 index 0e20a07..0000000 --- a/etc/makepkg.conf +++ /dev/null @@ -1,159 +0,0 @@ -#!/hint/bash -# -# /etc/makepkg.conf -# - -######################################################################### -# SOURCE ACQUISITION -######################################################################### -# -#-- The download utilities that makepkg should use to acquire sources -# Format: 'protocol::agent' -DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u' - 'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' - 'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'rsync::/usr/bin/rsync --no-motd -z %u %o' - 'scp::/usr/bin/scp -C %u %o') - -# Other common tools: -# /usr/bin/snarf -# /usr/bin/lftpget -c -# /usr/bin/wget - -#-- The package required by makepkg to download VCS sources -# Format: 'protocol::package' -VCSCLIENTS=('bzr::breezy' - 'fossil::fossil' - 'git::git' - 'hg::mercurial' - 'svn::subversion') - -######################################################################### -# ARCHITECTURE, COMPILE FLAGS -######################################################################### -# -CARCH="x86_64" -CHOST="x86_64-pc-linux-gnu" - -#-- Compiler and Linker Flags -#CPPFLAGS="" -CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \ - -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ - -fstack-clash-protection -fcf-protection" -CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS" -LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" -LTOFLAGS="-flto=auto" -RUSTFLAGS="-C opt-level=2" -#-- Make Flags: change this for DistCC/SMP systems -MAKEFLAGS="-j$(nproc)" -#-- Debugging flags -DEBUG_CFLAGS="-g" -DEBUG_CXXFLAGS="$DEBUG_CFLAGS" -#DEBUG_RUSTFLAGS="-C debuginfo=2" - -######################################################################### -# BUILD ENVIRONMENT -######################################################################### -# -# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign) -# A negated environment option will do the opposite of the comments below. -# -#-- distcc: Use the Distributed C/C++/ObjC compiler -#-- color: Colorize output messages -#-- ccache: Use ccache to cache compilation -#-- check: Run the check() function if present in the PKGBUILD -#-- sign: Generate PGP signature file -# -BUILDENV=(!distcc color !ccache check !sign) -# -#-- If using DistCC, your MAKEFLAGS will also need modification. In addition, -#-- specify a space-delimited list of hosts running in the DistCC cluster. -#DISTCC_HOSTS="" -# -#-- Specify a directory for package building. -#BUILDDIR=/tmp/makepkg - -######################################################################### -# GLOBAL PACKAGE OPTIONS -# These are default values for the options=() settings -######################################################################### -# -# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto) -# A negated option will do the opposite of the comments below. -# -#-- strip: Strip symbols from binaries/libraries -#-- docs: Save doc directories specified by DOC_DIRS -#-- libtool: Leave libtool (.la) files in packages -#-- staticlibs: Leave static library (.a) files in packages -#-- emptydirs: Leave empty directories in packages -#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip -#-- purge: Remove files specified by PURGE_TARGETS -#-- debug: Add debugging flags as specified in DEBUG_* variables -#-- lto: Add compile flags for building with link time optimization -# -OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug !lto) - -#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2 -INTEGRITY_CHECK=(sha256) -#-- Options to be used when stripping binaries. See `man strip' for details. -STRIP_BINARIES="--strip-all" -#-- Options to be used when stripping shared libraries. See `man strip' for details. -STRIP_SHARED="--strip-unneeded" -#-- Options to be used when stripping static libraries. See `man strip' for details. -STRIP_STATIC="--strip-debug" -#-- Manual (man and info) directories to compress (if zipman is specified) -MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) -#-- Doc directories to remove (if !docs is specified) -DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) -#-- Files to be removed from all packages (if purge is specified) -PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) -#-- Directory to store source code in for debug packages -DBGSRCDIR="/usr/src/debug" - -######################################################################### -# PACKAGE OUTPUT -######################################################################### -# -# Default: put built package and cached source in build directory -# -#-- Destination: specify a fixed directory where all packages will be placed -#PKGDEST=/home/packages -#-- Source cache: specify a fixed directory where source files will be cached -#SRCDEST=/home/sources -#-- Source packages: specify a fixed directory where all src packages will be placed -#SRCPKGDEST=/home/srcpackages -#-- Log files: specify a fixed directory where all log files will be placed -#LOGDEST=/home/makepkglogs -#-- Packager: name/email of the person or organization building packages -#PACKAGER="John Doe " -#-- Specify a key to use for package signing -#GPGKEY="" - -######################################################################### -# COMPRESSION DEFAULTS -######################################################################### -# -COMPRESSGZ=(gzip -c -f -n) -COMPRESSBZ2=(bzip2 -c -f) -COMPRESSXZ=(xz -c -z -) -COMPRESSZST=(zstd -c -z -q --threads=0 -) -COMPRESSLRZ=(lrzip -q) -COMPRESSLZO=(lzop -q) -COMPRESSZ=(compress -c -f) -COMPRESSLZ4=(lz4 -q) -COMPRESSLZ=(lzip -c -f) - -######################################################################### -# EXTENSION DEFAULTS -######################################################################### -# -PKGEXT='.pkg.tar.zst' -SRCEXT='.src.tar.gz' - -######################################################################### -# OTHER -######################################################################### -# -#-- Command used to run pacman as root, instead of trying sudo and su -#PACMAN_AUTH=() diff --git a/install.sh b/install.sh index d77aa32..182acdf 100755 --- a/install.sh +++ b/install.sh @@ -25,12 +25,10 @@ install -pm644 -Dt /etc/pacman.d/conf.d \ "$DIR/etc/pacman/55-multilib-repository.conf" \ "$DIR/etc/pacman/60-aurutils-repository.conf" \ "$DIR/etc/pacman/99-options.conf" -install -pm644 "$DIR/etc/makepkg.conf" /etc/makepkg.conf # Remove packages one by one because pacman doesn't handle uninstalled packages # gracefully packages_to_remove=( - eog # replaced by loupe ) for pkg in "${packages_to_remove[@]}"; do @@ -193,12 +191,10 @@ packages=( gvfs-smb sushi # Previewer for nautilus evince # Document viewer - loupe # image viewer - geary # light mail client + eog # Image viewer simple-scan seahorse # Credential manager baobab # Disk space analyser - gnome-firmware # fwupd for gnome # Multimedia for gnome gst-plugins-good gst-plugins-bad @@ -470,12 +466,6 @@ aur_packages=( qtscrcpy # Android screen display cinny-desktop-bin # Lightweight Matrix client iotas # Note taking with Nextcloud Sync - denaro # personal finance manager - errands # todo list - impression # create bootable drives - pika-backup # backups with borgbackup - tuba # fediverse client (GoToSocial) - trayscale # tailscale cli GUI wrapper ) aur_optdeps=( diff --git a/private_dot_ssh/private_config b/private_dot_ssh/private_config index cda3e9b..5d685fd 100644 --- a/private_dot_ssh/private_config +++ b/private_dot_ssh/private_config @@ -30,25 +30,6 @@ Host code.strobel.one IdentityFile ~/.ssh/id_ed25519_sk_yk5nano ## HomeNet -Host odroid - HostName 192.168.178.152 - User tobias - # FIDO2 - IdentityFile ~/.ssh/id_ed25519_sk_yk5nano -Host odroid-unlock - HostName 192.168.178.156 - User root - # FIDO2 - IdentityFile ~/.ssh/id_ed25519_sk_yk5nano - StrictHostKeyChecking no - UserKnownHostsFile /dev/null -Host archiso - HostName 192.168.178.153 - User root - PasswordAuthentication yes - StrictHostKeyChecking no - UserKnownHostsFile /dev/null - Host helios #HostName 192.168.178.20 HostName space.home.strobel.one diff --git a/run_once_flatpak-applications.sh b/run_once_flatpak-applications.sh index a0f89ca..f9f4699 100644 --- a/run_once_flatpak-applications.sh +++ b/run_once_flatpak-applications.sh @@ -3,13 +3,13 @@ set -e exec 2> >(while read line; do echo -e "\e[01;31m$line\e[0m"; done) -flatpak install --noninteractive org.gnome.World.PikaBackup # to be removed -flatpak remove --noninteractive org.gnome.Loupe -flatpak remove --noninteractive dev.deedles.Trayscale +flatpak install --noninteractive org.gnome.World.PikaBackup +flatpak install --noninteractive org.gnome.Loupe +flatpak install --noninteractive dev.deedles.Trayscale flatpak install --noninteractive com.belmoussaoui.ReadItLater -flatpak remove --noninteractive dev.geopjr.Tuba +flatpak install --noninteractive dev.geopjr.Tuba flatpak install --noninteractive com.github.tchx84.Flatseal -flatpak remove --noninteractive org.gnome.Firmware -flatpak remove --noninteractive io.github.mrvladus.List -flatpak remove --noninteractive org.gnome.Geary -flatpak remove --noninteractive io.gitlab.adhami3310.Impression +flatpak install --noninteractive org.gnome.Firmware +flatpak install --noninteractive io.github.mrvladus.List +flatpak install --noninteractive org.gnome.Geary +flatpak install --noninteractive io.gitlab.adhami3310.Impression