From be404e994ca22463d097ee230546c17ab6f9f250 Mon Sep 17 00:00:00 2001 From: JeremyStarTM Date: Fri, 15 Mar 2024 01:57:43 +0100 Subject: [PATCH] Do stuff --- .gitignore | 1 + {lone-files => archlinux}/makepkg.conf | 0 archlinux/mkinitcpio.conf | 7 +++++++ archlinux/pacman.conf | 19 +++++++++++++++++++ archlinux/pacman.d/chaotic-mirrorlist | 5 +++++ archlinux/pacman.d/mirrorlist | 1 + archlinux/paru.conf | 15 +++++++++++++++ install.sh | 19 +++++++++++++++++-- lone-files/locale.conf | 1 + lone-files/locale.gen | 2 ++ lone-files/sudo.conf | 1 + lone-files/vconsole.conf | 1 + uninstall.sh | 14 +++++++++++++- 13 files changed, 83 insertions(+), 3 deletions(-) rename {lone-files => archlinux}/makepkg.conf (100%) create mode 100644 archlinux/mkinitcpio.conf create mode 100644 archlinux/pacman.conf create mode 100644 archlinux/pacman.d/chaotic-mirrorlist create mode 100644 archlinux/pacman.d/mirrorlist create mode 100644 archlinux/paru.conf create mode 100644 lone-files/locale.conf create mode 100644 lone-files/locale.gen create mode 100644 lone-files/sudo.conf create mode 100644 lone-files/vconsole.conf diff --git a/.gitignore b/.gitignore index 6ac048f..bd228d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ # Ignore repositories jstmbash +archlinux/pacman.d/gnupg diff --git a/lone-files/makepkg.conf b/archlinux/makepkg.conf similarity index 100% rename from lone-files/makepkg.conf rename to archlinux/makepkg.conf diff --git a/archlinux/mkinitcpio.conf b/archlinux/mkinitcpio.conf new file mode 100644 index 0000000..893517c --- /dev/null +++ b/archlinux/mkinitcpio.conf @@ -0,0 +1,7 @@ +# vim:set ft=sh +MODULES=(amdgpu video btrfs) +BINARIES=(mc nano lsblk lspci lsusb) +FILES=() +HOOKS=(base udev autodetect microcode modconf kms keyboard keymap consolefont block encrypt filesystems fsck) +COMPRESSION="zstd" +MODULES_DECOMPRESS="yes" diff --git a/archlinux/pacman.conf b/archlinux/pacman.conf new file mode 100644 index 0000000..adbb9a6 --- /dev/null +++ b/archlinux/pacman.conf @@ -0,0 +1,19 @@ +# Configuration +[options] +HoldPkg = pacman glibc +Architecture = auto +Color +CheckSpace +ParallelDownloads = 30 +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional + +# Repositories +[core] +Include = /etc/pacman.d/mirrorlist +[extra] +Include = /etc/pacman.d/mirrorlist +[multilib] +Include = /etc/pacman.d/mirrorlist +[chaotic-aur] +Include = /etc/pacman.d/chaotic-mirrorlist diff --git a/archlinux/pacman.d/chaotic-mirrorlist b/archlinux/pacman.d/chaotic-mirrorlist new file mode 100644 index 0000000..641d6a9 --- /dev/null +++ b/archlinux/pacman.d/chaotic-mirrorlist @@ -0,0 +1,5 @@ +Server = https://de-2-mirror.chaotic.cx/$repo/$arch +Server = https://de-3-mirror.chaotic.cx/$repo/$arch +Server = https://de-4-mirror.chaotic.cx/$repo/$arch +Server = https://de-5-mirror.chaotic.cx/$repo/$arch +Server = https://de-6-mirror.chaotic.cx/$repo/$arch diff --git a/archlinux/pacman.d/mirrorlist b/archlinux/pacman.d/mirrorlist new file mode 100644 index 0000000..276ad02 --- /dev/null +++ b/archlinux/pacman.d/mirrorlist @@ -0,0 +1 @@ +Server = https://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch diff --git a/archlinux/paru.conf b/archlinux/paru.conf new file mode 100644 index 0000000..9a94c40 --- /dev/null +++ b/archlinux/paru.conf @@ -0,0 +1,15 @@ +[options] +PgpFetch +Devel +Provides +DevelSuffixes = -git -cvs -svn -bzr -darcs -always -hg -fossil +SudoLoop +BatchInstall +CombinedUpgrade +CleanAfter + +KeepRepoCache + +[bin] +FileManager = mc +Sudo = sudo diff --git a/install.sh b/install.sh index cc44454..049b3da 100755 --- a/install.sh +++ b/install.sh @@ -33,8 +33,20 @@ link "jstmbash" "etc/jstmbash" link "lone-files/jstmbash.config.env" "etc/jstmbash.env" link "lone-files/bashrc" "etc/bash.bashrc" -# makepkg -link "lone-files/makepkg.conf" "etc/makepkg.conf" +# locales & stuff +link "lone-files/locale.gen" "etc/locale.gen" +link "lone-files/locale.conf" "etc/locale.conf" +link "lone-files/vconsole.conf" "etc/vconsole.conf" + +# arch linux related +link "archlinux/pacman.conf" "etc/pacman.conf" +link "archlinux/pacman.d" "etc/pacman.d" +link "archlinux/paru.conf" "etc/paru.conf" +link "archlinux/makepkg.conf" "etc/makepkg.conf" +link "archlinux/mkinitcpio.conf" "etc/mkinitcpio.conf" + +# programs +link "lone-files/sudo.conf" "etc/sudo.conf" # punktdateien scripts link "bin/updatechecker" "usr/local/bin/sysdotfiles-updatechecker" @@ -42,3 +54,6 @@ link "bin/updater" "usr/local/bin/sysdotfiles-updater" # write install file echo "pls don't remove" > "/etc/.jstm_sysdotfiles" + +# regenerate locales +locale-gen diff --git a/lone-files/locale.conf b/lone-files/locale.conf new file mode 100644 index 0000000..1b35333 --- /dev/null +++ b/lone-files/locale.conf @@ -0,0 +1 @@ +LANG=de_DE.UTF-8 diff --git a/lone-files/locale.gen b/lone-files/locale.gen new file mode 100644 index 0000000..1c35703 --- /dev/null +++ b/lone-files/locale.gen @@ -0,0 +1,2 @@ +en_US.UTF-8 UTF-8 +de_DE.UTF-8 UTF-8 diff --git a/lone-files/sudo.conf b/lone-files/sudo.conf new file mode 100644 index 0000000..8c445e5 --- /dev/null +++ b/lone-files/sudo.conf @@ -0,0 +1 @@ +Defaults insults diff --git a/lone-files/vconsole.conf b/lone-files/vconsole.conf new file mode 100644 index 0000000..c1e444e --- /dev/null +++ b/lone-files/vconsole.conf @@ -0,0 +1 @@ +KEYMAP=de-latin1 diff --git a/uninstall.sh b/uninstall.sh index 0828eb9..281dc83 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -20,8 +20,20 @@ unlink "etc/jstmbash" unlink "etc/jstmbash.env" unlink "etc/bash.bashrc" -# makepkg +# locales & stuff +unlink "etc/locale.gen" +unlink "etc/locale.conf" +unlink "etc/vconsole.conf" + +# arch linux related +unlink "etc/pacman.conf" +unlink "etc/pacman.d" +unlink "etc/paru.conf" unlink "etc/makepkg.conf" +unlink "etc/mkinitcpio.conf" + +# programs +unlink "etc/sudo.conf" # punktdateien scripts unlink "usr/local/bin/sysdotfiles-updatechecker"