Cleanup and update stuff
This commit is contained in:
parent
8364becef3
commit
b9d5b166f4
GPG key ID:
13AD60C237A28DFE
25 changed files with 253 additions and 93 deletions
39
arch-X11/PKGBUILD
Normal file
39
arch-X11/PKGBUILD
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
# Maintainer: Tobias Reisinger <tobias@msrg.cc>
|
||||
# shellcheck disable=SC2034
|
||||
pkgname=serguzim-system-X11
|
||||
pkgver=1
|
||||
pkgrel=1
|
||||
epoch=
|
||||
pkgdesc=""
|
||||
arch=("any")
|
||||
url="https://git.serguzim.me/serguzim/system"
|
||||
license=("unknown")
|
||||
groups=()
|
||||
depends=(
|
||||
### XORG
|
||||
"xorg-server" "xorg-server-xvfb" "xorg-xfd" "xorg-xinit"
|
||||
"xorg-xinput" "xorg-xlsclients" "xorg-xmodmap"
|
||||
"numlockx"
|
||||
|
||||
### APPLICATIONS
|
||||
"bspwm"
|
||||
#"sxhkd" "polybar"
|
||||
)
|
||||
source=(
|
||||
"etc_X11_xorg.conf.d_10-keyboard.conf"
|
||||
"etc_X11_xorg.conf.d_50-mouse-acceleration.conf"
|
||||
)
|
||||
sha256sums=(
|
||||
"SKIP"
|
||||
"SKIP"
|
||||
)
|
||||
backup=()
|
||||
|
||||
. ../utils.sh
|
||||
|
||||
package() {
|
||||
_system_install "etc/X11/xorg.conf.d/10-keyboard.conf"
|
||||
_system_install "etc/X11/xorg.conf.d/50-mouse-acceleration.conf"
|
||||
}
|
||||
|
||||
# vim: ft=sh
|
||||
|
|
@ -32,25 +32,15 @@ sha256sums=(
|
|||
)
|
||||
backup=()
|
||||
|
||||
_sed_path() {
|
||||
echo "$1" | sed -e "s/\//_/g"
|
||||
}
|
||||
|
||||
_install() {
|
||||
temp_pkg=$1
|
||||
temp_src=$(_sed_path "$temp_pkg")
|
||||
# shellcheck disable=SC2154
|
||||
install "-Dm${2:-644}" "${srcdir}/${temp_src}" "${pkgdir}/${temp_pkg}"
|
||||
}
|
||||
|
||||
. ../utils.sh
|
||||
|
||||
package() {
|
||||
_install "boot/loader/entries/portable.conf" "755"
|
||||
_install "boot/loader/loader.conf" "755"
|
||||
_system_install "boot/loader/entries/portable.conf" "755"
|
||||
_system_install "boot/loader/loader.conf" "755"
|
||||
|
||||
_install "etc/fstab"
|
||||
_install "etc/hostname"
|
||||
_install "etc/systemd/network/20-wired.network"
|
||||
_system_install "etc/fstab"
|
||||
_system_install "etc/hostname"
|
||||
_system_install "etc/systemd/network/20-wired.network"
|
||||
}
|
||||
|
||||
# vim: ft=sh
|
||||
|
|
|
|||
|
|
@ -36,27 +36,17 @@ sha256sums=(
|
|||
)
|
||||
backup=()
|
||||
|
||||
_sed_path() {
|
||||
echo "$1" | sed -e "s/\//_/g"
|
||||
}
|
||||
|
||||
_install() {
|
||||
temp_pkg=$1
|
||||
temp_src=$(_sed_path "$temp_pkg")
|
||||
# shellcheck disable=SC2154
|
||||
install "-Dm${2:-644}" "${srcdir}/${temp_src}" "${pkgdir}/${temp_pkg}"
|
||||
}
|
||||
|
||||
. ../utils.sh
|
||||
|
||||
package() {
|
||||
_install "boot/loader/entries/arch.conf" "755"
|
||||
_install "boot/loader/loader.conf" "755"
|
||||
_system_install "boot/loader/entries/arch.conf" "755"
|
||||
_system_install "boot/loader/loader.conf" "755"
|
||||
|
||||
_install "etc/fstab"
|
||||
_install "etc/hostname"
|
||||
_install "etc/systemd/network/20-wired.network"
|
||||
_install "etc/systemd/system/ckb-next-daemon.service"
|
||||
_install "etc/udev/rules.d/42-logitech-unify-permissions.rules"
|
||||
_system_install "etc/fstab"
|
||||
_system_install "etc/hostname"
|
||||
_system_install "etc/systemd/network/20-wired.network"
|
||||
_system_install "etc/systemd/system/ckb-next-daemon.service"
|
||||
_system_install "etc/udev/rules.d/42-logitech-unify-permissions.rules"
|
||||
}
|
||||
|
||||
# vim: ft=sh
|
||||
|
|
|
|||
|
|
@ -2,4 +2,4 @@ title Arch Linux Portalo
|
|||
linux /vmlinuz-linux
|
||||
initrd /intel-ucode.img
|
||||
initrd /initramfs-linux.img
|
||||
options root="LABEL=arch_portalo" rw quiet splash acpi_enforce_resources=lax mitigations=off
|
||||
options root="LABEL=arch_portalo" rw quiet splash acpi_enforce_resources=lax
|
||||
|
|
|
|||
28
arch-wayland/PKGBUILD
Normal file
28
arch-wayland/PKGBUILD
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
# Maintainer: Tobias Reisinger <tobias@msrg.cc>
|
||||
# shellcheck disable=SC2034
|
||||
pkgname=serguzim-system-wayland
|
||||
pkgver=1
|
||||
pkgrel=1
|
||||
epoch=
|
||||
pkgdesc=""
|
||||
arch=("any")
|
||||
url="https://git.serguzim.me/serguzim/system"
|
||||
license=("unknown")
|
||||
groups=()
|
||||
makedepends=()
|
||||
depends=(
|
||||
### WAYLAND
|
||||
"hyprland" "waybar-hyprland"
|
||||
)
|
||||
source=()
|
||||
sha256sums=()
|
||||
backup=()
|
||||
|
||||
. ../utils.sh
|
||||
|
||||
package() {
|
||||
# do nothing
|
||||
x=0
|
||||
}
|
||||
|
||||
# vim: ft=sh
|
||||
1
arch-wayland/etc_locale.conf
Normal file
1
arch-wayland/etc_locale.conf
Normal file
|
|
@ -0,0 +1 @@
|
|||
LANG=en_US.UTF-8
|
||||
73
arch-wayland/etc_mkinitcpio.conf
Normal file
73
arch-wayland/etc_mkinitcpio.conf
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
# vim:set ft=sh
|
||||
# MODULES
|
||||
# The following modules are loaded before any boot hooks are
|
||||
# run. Advanced users may wish to specify all system modules
|
||||
# in this array. For instance:
|
||||
# MODULES=(usbhid xhci_hcd)
|
||||
MODULES=()
|
||||
|
||||
# BINARIES
|
||||
# This setting includes any additional binaries a given user may
|
||||
# wish into the CPIO image. This is run last, so it may be used to
|
||||
# override the actual binaries included by a given hook
|
||||
# BINARIES are dependency parsed, so you may safely ignore libraries
|
||||
BINARIES=()
|
||||
|
||||
# FILES
|
||||
# This setting is similar to BINARIES above, however, files are added
|
||||
# as-is and are not parsed in any way. This is useful for config files.
|
||||
FILES=()
|
||||
|
||||
# HOOKS
|
||||
# This is the most important setting in this file. The HOOKS control the
|
||||
# modules and scripts added to the image, and what happens at boot time.
|
||||
# Order is important, and it is recommended that you do not change the
|
||||
# order in which HOOKS are added. Run 'mkinitcpio -H <hook name>' for
|
||||
# help on a given hook.
|
||||
# 'base' is _required_ unless you know precisely what you are doing.
|
||||
# 'udev' is _required_ in order to automatically load modules
|
||||
# 'filesystems' is _required_ unless you specify your fs modules in MODULES
|
||||
# Examples:
|
||||
## This setup specifies all modules in the MODULES setting above.
|
||||
## No RAID, lvm2, or encrypted root is needed.
|
||||
# HOOKS=(base)
|
||||
#
|
||||
## This setup will autodetect all modules for your system and should
|
||||
## work as a sane default
|
||||
# HOOKS=(base udev autodetect modconf block filesystems fsck)
|
||||
#
|
||||
## This setup will generate a 'full' image which supports most systems.
|
||||
## No autodetection is done.
|
||||
# HOOKS=(base udev modconf block filesystems fsck)
|
||||
#
|
||||
## This setup assembles a mdadm array with an encrypted root file system.
|
||||
## Note: See 'mkinitcpio -H mdadm_udev' for more information on RAID devices.
|
||||
# HOOKS=(base udev modconf keyboard keymap consolefont block mdadm_udev encrypt filesystems fsck)
|
||||
#
|
||||
## This setup loads an lvm2 volume group.
|
||||
# HOOKS=(base udev modconf block lvm2 filesystems fsck)
|
||||
#
|
||||
## NOTE: If you have /usr on a separate partition, you MUST include the
|
||||
# usr and fsck hooks.
|
||||
HOOKS=(base udev autodetect modconf kms keyboard consolefont block filesystems fsck)
|
||||
|
||||
# COMPRESSION
|
||||
# Use this to compress the initramfs image. By default, zstd compression
|
||||
# is used. Use 'cat' to create an uncompressed image.
|
||||
#COMPRESSION="zstd"
|
||||
#COMPRESSION="gzip"
|
||||
#COMPRESSION="bzip2"
|
||||
#COMPRESSION="lzma"
|
||||
#COMPRESSION="xz"
|
||||
#COMPRESSION="lzop"
|
||||
#COMPRESSION="lz4"
|
||||
|
||||
# COMPRESSION_OPTIONS
|
||||
# Additional options for the compressor
|
||||
#COMPRESSION_OPTIONS=()
|
||||
|
||||
# MODULES_DECOMPRESS
|
||||
# Decompress kernel modules during initramfs creation.
|
||||
# Enable to speedup boot process, disable to save RAM
|
||||
# during early userspace. Switch (yes/no).
|
||||
#MODULES_DECOMPRESS="yes"
|
||||
1
arch-wayland/etc_pacman.conf
Normal file
1
arch-wayland/etc_pacman.conf
Normal file
|
|
@ -0,0 +1 @@
|
|||
Include = /etc/pacman.d/default.conf
|
||||
28
arch-wayland/etc_pacman.d_default.conf
Normal file
28
arch-wayland/etc_pacman.d_default.conf
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
[options]
|
||||
HoldPkg = pacman glibc
|
||||
Architecture = auto
|
||||
|
||||
NoExtract = etc/pacman.d/mirrorlist
|
||||
|
||||
UseSyslog
|
||||
Color
|
||||
CheckSpace
|
||||
VerbosePkgLists
|
||||
ParallelDownloads = 5
|
||||
ILoveCandy
|
||||
|
||||
SigLevel = Required DatabaseOptional
|
||||
LocalFileSigLevel = Optional
|
||||
|
||||
[core]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[extra]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[multilib]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[home_ungoogled_chromium_Arch]
|
||||
SigLevel = Required TrustAll
|
||||
Server = https://download.opensuse.org/repositories/home:/ungoogled_chromium/Arch/$arch
|
||||
9
arch-wayland/etc_pacman.d_hooks_95-systemd-boot.hook
Normal file
9
arch-wayland/etc_pacman.d_hooks_95-systemd-boot.hook
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
[Trigger]
|
||||
Type = Package
|
||||
Operation = Upgrade
|
||||
Target = systemd
|
||||
|
||||
[Action]
|
||||
Description = Gracefully upgrading systemd-boot...
|
||||
When = PostTransaction
|
||||
Exec = /usr/bin/systemctl restart systemd-boot-update.service
|
||||
5
arch-wayland/etc_sddm.conf.d_10-general.conf
Normal file
5
arch-wayland/etc_sddm.conf.d_10-general.conf
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
[General]
|
||||
Numlock=on
|
||||
|
||||
DisplayServer=wayland
|
||||
GreeterEnvironment=QT_WAYLAND_SHELL_INTEGRATION=layer-shell
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
[Autologin]
|
||||
User=tobias
|
||||
Session=bspwm
|
||||
Session=hyprland
|
||||
2
arch-wayland/etc_sysctl.d_90-serguzim-overrides.conf
Normal file
2
arch-wayland/etc_sysctl.d_90-serguzim-overrides.conf
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
kernel.sysrq = 1
|
||||
vm.max_map_count = 2147483642
|
||||
2
arch-wayland/etc_vconsole.conf
Normal file
2
arch-wayland/etc_vconsole.conf
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
KEYMAP=de
|
||||
FONT=eurlatgr
|
||||
5
arch-wayland/etc_xdg_reflector_reflector.conf
Normal file
5
arch-wayland/etc_xdg_reflector_reflector.conf
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
--save /etc/pacman.d/mirrorlist
|
||||
--protocol https
|
||||
--country Germany,Denmark,Netherlands,Belgium,Luxembourg,France,Austria,Czechia,Poland
|
||||
--latest 10
|
||||
--sort score
|
||||
|
|
@ -11,28 +11,23 @@ license=("unknown")
|
|||
groups=()
|
||||
makedepends=(
|
||||
"mkinitcpio" # initramfs
|
||||
"xdg-desktop-portal-gtk" # xdg-desktop-portal-impl
|
||||
"xdg-desktop-portal-hyprland" # xdg-desktop-portal-impl
|
||||
"wireplumber" # pipewire-session-manager
|
||||
"pipewire-jack" # libjack.so
|
||||
)
|
||||
depends=(
|
||||
### BASE
|
||||
"base"
|
||||
"base" "base-devel"
|
||||
"linux" "linux-firmware" "linux-headers"
|
||||
"man-db" "man-pages" "usbutils" "sudo"
|
||||
"mlocate" "vim"
|
||||
"exfat-utils" "logrotate" "udisks2"
|
||||
|
||||
"zsh" "htop" "git" "wireguard-tools"
|
||||
"zsh" "htop" "git" "tailscale"
|
||||
"cups" "cups-pdf"
|
||||
"docker" "docker-buildx" "docker-compose"
|
||||
"pcsclite"
|
||||
|
||||
### BASE-DEVEL
|
||||
"archlinux-keyring" "autoconf" "automake" "binutils" "bison" "debugedit"
|
||||
"fakeroot" "file" "findutils" "flex" "gawk" "gcc" "gettext" "grep" "groff"
|
||||
"gzip" "libtool" "m4" "make" "pacman" "patch" "pkgconf" "sed" "sudo"
|
||||
"texinfo" "which"
|
||||
|
||||
### OTHER PACKAGE MANAGERS
|
||||
"flatpak" "nix" "paru-bin"
|
||||
|
||||
|
|
@ -47,18 +42,12 @@ depends=(
|
|||
"ttf-dejavu" "ttf-droid" "ttf-liberation" "ttf-opensans" "ttf-roboto"
|
||||
"gnu-free-fonts"
|
||||
|
||||
### XORG
|
||||
"xorg-server" "xorg-server-xvfb" "xorg-xfd" "xorg-xinit"
|
||||
"xorg-xinput" "xorg-xlsclients" "xorg-xmodmap"
|
||||
### GRAPHICAL
|
||||
"vulkan-tools"
|
||||
"mesa-vdpau" "libva-mesa-driver" "opencl-mesa"
|
||||
"numlockx"
|
||||
|
||||
### APPLICATIONS
|
||||
"sddm"
|
||||
#"bemenu" "bemenu-x11" "j4-dmenu-desktop"
|
||||
"bspwm"
|
||||
#"sxhkd" "polybar"
|
||||
"pipewire-pulse" "wireplumber" "vorbis-tools" "alsa-utils"
|
||||
"gst-plugins-good" "gst-plugins-good" "gst-plugins-bad" "gst-plugins-ugly"
|
||||
"polkit-gnome"
|
||||
|
|
@ -67,9 +56,9 @@ depends=(
|
|||
#"thunar" "tumbler" "ffmpegthumbnailer"
|
||||
#"gtkspell"
|
||||
"thunderbird"
|
||||
"qutebrowser" "python-adblock" "python-pynacl" "pdfjs-legacy"
|
||||
"qutebrowser-qt6-git" "python-adblock" "python-pynacl" "pdfjs-legacy"
|
||||
"ungoogled-chromium" "firefox"
|
||||
"chromium-widevine" "qt5-webengine-widevine"
|
||||
"chromium-widevine" "qt6-webengine-widevine"
|
||||
#"kdeconnect" "keepassxc"
|
||||
"syncthing"
|
||||
)
|
||||
|
|
@ -79,13 +68,11 @@ source=(
|
|||
"etc_pacman.conf"
|
||||
"etc_pacman.d_default.conf"
|
||||
"etc_pacman.d_hooks_95-systemd-boot.hook"
|
||||
"etc_sddm.conf.d_autologin.conf"
|
||||
"etc_sddm.conf.d_general.conf"
|
||||
"etc_sysctl.d_90-sysrq.conf"
|
||||
"etc_sddm.conf.d_10-general.conf"
|
||||
"etc_sddm.conf.d_80-autologin.conf"
|
||||
"etc_sysctl.d_90-serguzim-overrides.conf"
|
||||
"etc_vconsole.conf"
|
||||
"etc_xdg_reflector_reflector.conf"
|
||||
"etc_X11_xorg.conf.d_10-keyboard.conf"
|
||||
"etc_X11_xorg.conf.d_50-mouse-acceleration.conf"
|
||||
)
|
||||
sha256sums=(
|
||||
"SKIP"
|
||||
|
|
@ -98,38 +85,24 @@ sha256sums=(
|
|||
"SKIP"
|
||||
"SKIP"
|
||||
"SKIP"
|
||||
"SKIP"
|
||||
"SKIP"
|
||||
)
|
||||
backup=(
|
||||
"boot/loader/loader.conf"
|
||||
)
|
||||
|
||||
_sed_path() {
|
||||
echo "$1" | sed -e "s/\//_/g"
|
||||
}
|
||||
|
||||
_install() {
|
||||
temp_pkg=$1
|
||||
temp_src=$(_sed_path "$temp_pkg")
|
||||
# shellcheck disable=SC2154
|
||||
install "-Dm${2:-644}" "${srcdir}/${temp_src}" "${pkgdir}/${temp_pkg}"
|
||||
}
|
||||
|
||||
. ../utils.sh
|
||||
|
||||
package() {
|
||||
_install "etc/locale.conf"
|
||||
_install "etc/mkinitcpio.conf"
|
||||
_install "etc/pacman.conf"
|
||||
_install "etc/pacman.d/default.conf"
|
||||
_install "etc/pacman.d/hooks/95-systemd-boot.hook"
|
||||
_install "etc/sddm.conf.d/autologin.conf"
|
||||
_install "etc/sddm.conf.d/general.conf"
|
||||
_install "etc/sysctl.d/90-sysrq.conf"
|
||||
_install "etc/vconsole.conf"
|
||||
_install "etc/X11/xorg.conf.d/10-keyboard.conf"
|
||||
_install "etc/X11/xorg.conf.d/50-mouse-acceleration.conf"
|
||||
_install "etc/xdg/reflector/reflector.conf"
|
||||
_system_install "etc/locale.conf"
|
||||
_system_install "etc/mkinitcpio.conf"
|
||||
_system_install "etc/pacman.conf"
|
||||
_system_install "etc/pacman.d/default.conf"
|
||||
_system_install "etc/pacman.d/hooks/95-systemd-boot.hook"
|
||||
_system_install "etc/sddm.conf.d/10-general.conf"
|
||||
_system_install "etc/sddm.conf.d/80-autologin.conf"
|
||||
_system_install "etc/sysctl.d/90-serguzim-overrides.conf"
|
||||
_system_install "etc/vconsole.conf"
|
||||
_system_install "etc/xdg/reflector/reflector.conf"
|
||||
}
|
||||
|
||||
# vim: ft=sh
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
[options]
|
||||
HoldPkg = pacman glibc
|
||||
HoldPkg = pacman glibc
|
||||
Architecture = auto
|
||||
|
||||
NoExtract = etc/pacman.d/mirrorlist
|
||||
NoExtract = etc/pacman.d/mirrorlist
|
||||
|
||||
UseSyslog
|
||||
Color
|
||||
|
|
@ -11,7 +11,7 @@ VerbosePkgLists
|
|||
ParallelDownloads = 5
|
||||
ILoveCandy
|
||||
|
||||
SigLevel = Required DatabaseOptional
|
||||
SigLevel = Required DatabaseOptional
|
||||
LocalFileSigLevel = Optional
|
||||
|
||||
[core]
|
||||
|
|
@ -20,9 +20,6 @@ Include = /etc/pacman.d/mirrorlist
|
|||
[extra]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[community]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[multilib]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
|
|
|
|||
5
arch/etc_sddm.conf.d_10-general.conf
Normal file
5
arch/etc_sddm.conf.d_10-general.conf
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
[General]
|
||||
Numlock=on
|
||||
|
||||
DisplayServer=wayland
|
||||
GreeterEnvironment=QT_WAYLAND_SHELL_INTEGRATION=layer-shell
|
||||
3
arch/etc_sddm.conf.d_80-autologin.conf
Normal file
3
arch/etc_sddm.conf.d_80-autologin.conf
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
[Autologin]
|
||||
User=tobias
|
||||
Session=hyprland
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[General]
|
||||
Numlock=on
|
||||
2
arch/etc_sysctl.d_90-serguzim-overrides.conf
Normal file
2
arch/etc_sysctl.d_90-serguzim-overrides.conf
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
kernel.sysrq = 1
|
||||
vm.max_map_count = 2147483642
|
||||
|
|
@ -1 +0,0 @@
|
|||
kernel.sysrq = 1
|
||||
10
utils.sh
Normal file
10
utils.sh
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
_system_sed_path() {
|
||||
echo "$1" | sed -e "s/\//_/g"
|
||||
}
|
||||
|
||||
_system_install() {
|
||||
temp_pkg=$1
|
||||
temp_src=$(_system_sed_path "$temp_pkg")
|
||||
# shellcheck disable=SC2154
|
||||
install "-Dm${2:-644}" "${srcdir}/${temp_src}" "${pkgdir}/${temp_pkg}"
|
||||
}
|
||||
Loading…
Reference in a new issue