arch-config/etc/arco-pacman.conf

@@ -0,0 +1,117 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg      = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+IgnorePkg   = grub packettracer
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+Color
+#NoProgressBar
+CheckSpace
+VerbosePkgLists
+ILoveCandy
+ParallelDownloads = 5
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repositories as required here.
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
+
+#[arcolinux_repo_testing]
+#SigLevel = Required DatabaseOptional
+#Include = /etc/pacman.d/arcolinux-mirrorlist
+
+[arcolinux_repo]
+SigLevel = Required DatabaseOptional
+Include = /etc/pacman.d/arcolinux-mirrorlist
+
+[arcolinux_repo_3party]
+SigLevel = Required DatabaseOptional
+Include = /etc/pacman.d/arcolinux-mirrorlist
+
+[arcolinux_repo_xlarge]
+SigLevel = Required DatabaseOptional
+Include = /etc/pacman.d/arcolinux-mirrorlist

arch-config/scripts/arch-config.sh

@@ -223,9 +223,14 @@ cat <<EOF
 EOF
 
 #copy folders
-cp -r "$tempdir/configs/arch-config/.config/" ~/
+cp -r ~/configs/arch-config/.config/ ~/
-cp -r "$tempdir/configs/arch-config/.local/" ~/
+cp -r ~/configs/arch-config/.local/ ~/
-cp -r "$tempdir/configs/arch-config/.ssh" ~/
+#cp -r ~/config/Dokumente ~/
+#cp -r ~/config/.mozilla/firefox/default-release/* ~/.mozilla/firefox/*.default-release/
+#cp -r ~/config/.easystroke ~/
+#cp -r ~/config/.elvish ~/
+#cp -r ~/configs/arch-config/.doom.d ~/
+cp -r ~/configs/arch-config/.ssh ~/
 
 # copy firefox only if "-f" or "--firefox" is given as argument
 if [[ copy_firefox -eq 1 ]]; then
@@ -233,7 +238,7 @@ if [[ copy_firefox -eq 1 ]]; then
         # NOTE check if firefox default-release directory exists. 1 is good, 0 is bad
         firefoxdir=$(find ~/.mozilla/firefox/ -name \*.default-release | wc -l)
         if [[ $firefoxdir -eq 1 ]]; then
-            cp -r "$tempdir/configs/arch-config/.mozilla/firefox/default-release/"* ~/.mozilla/firefox/*.default-release/
+            cp -r ~/configs/arch-config/.mozilla/firefox/default-release/* ~/.mozilla/firefox/*.default-release/
         else
             echo "Please launch firefox and then update the config again"
         fi
@@ -243,36 +248,43 @@ if [[ copy_firefox -eq 1 ]]; then
 fi
 
 #copy single files
-cp -r "$tempdir/configs/arch-config/.face" ~/
+#cp -r ~/configs/arch-config/.bashrc ~/
-cp -r "$tempdir/configs/arch-config/.gtkrc-2.0" ~/
+cp -r ~/configs/arch-config/.face ~/
-cp -r "$tempdir/configs/arch-config/.gitconfig" ~/
+cp -r ~/configs/arch-config/.gtkrc-2.0 ~/
-cp -r "$tempdir/configs/arch-config/.xinitrc" ~/
+cp -r ~/configs/arch-config/.gitconfig ~/
-cp -r "$tempdir/configs/arch-config/.kopiaignore" ~/
+#cp -r ~/configs/arch-config/.tmux.conf ~/
+cp -r ~/configs/arch-config/.xinitrc ~/
+cp -r ~/configs/arch-config/.kopiaignore ~/
 echo Copied files
 
 # make .xinitrc executable
 chmod +x ~/.xinitrc
 
 #copy scripts
-cp -r "$tempdir/configs/arch-config/scripts/" ~/
+cp -r ~/configs/arch-config/scripts/ ~/
+
+# copy cache
+#cp -r ~/configs/arch-config/.cache ~/
 
 #copy stuff to /etc
-sudo cp -r "$tempdir/configs/arch-config/etc" /
+sudo cp -r ~/configs/arch-config/etc /
 
 echo Copied folders
 
 # NOTE Distro specific stuff
-# TODO simplify for Arch only
 distro=$(cat /etc/*-release | grep "^ID=")
+if [ "$distro" == "ID=arcolinux" ]; then
+    sudo mv /etc/arco-pacman.conf /etc/pacman.conf
+fi
 if [ "$distro" == "ID=arch" ]; then
     sudo mv /etc/arch-pacman.conf /etc/pacman.conf
 fi
 
 #copy usr stuff
-sudo cp -r "$tempdir/configs/arch-config/usr" /
+sudo cp -r ~/configs/arch-config/usr /
 
-# copy xresources for sway
+# copy xresources
-cp "$tempdir/configs/arch-config/.Xdefaults" ~/
+cp ~/configs/arch-config/.Xdefaults ~/
 
 echo
 cat <<EOF
@@ -282,7 +294,6 @@ cat <<EOF
 EOF
 
 # lupusregina
-# TODO analyse parts necessary for Wayland with Alita
 if [ "$(hostname)" == "lupusregina" ]; then
     echo "Applying overrides for $(hostname)"
     # polybar dpi
@@ -308,14 +319,14 @@ EOF
 seltheme="$(cat "$HOME/.seltheme")"
 if [[ "$seltheme" == "nyarch" ]]; then
     #cp -r "./themes/nyarch/i3" "$HOME/.config/"
-    cp "$tempdir/configs/arch-themes/nyarch/sway/color" "$HOME/.config/sway/config.d/"
+    cp "$HOME/configs/arch-themes/nyarch/sway/color" "$HOME/.config/sway/config.d/"
     #cp -r "$HOME/configs/arch-themes/nyarch/polybar" "$HOME/.config/"
     #cp -r "./themes/nyarch/neofetch/lowpoly_flamegirl_blue.txt" "$HOME/.config/neofetch/lowpoly_flamegirl.txt"
     #cp "./themes/.fehbg-nyarch" "$HOME/.fehbg"
     #sed -i 's/^NAME=".*"/NAME="Rawrch Linyux"/' /etc/os-release
 elif [[ "$seltheme" == "space-pink" ]]; then
     #cp -r "./themes/space-pink/i3" "$HOME/.config/"
-    cp "$tempdir/configs/arch-themes/space-pink/sway/color" "$HOME/.config/sway/config.d/"
+    cp "$HOME/configs/arch-themes/space-pink/sway/color" "$HOME/.config/sway/config.d/"
     #cp -r "$HOME/configs/arch-themes/space-pink/polybar" "$HOME/.config/"
     #cp -r "./themes/space-pink/neofetch/lowpoly_flamegirl_orange.txt" "$HOME/.config/neofetch/lowpoly_flamegirl.txt"
     #cp "./themes/.fehbg-space-pink" "$HOME/.fehbg"
@@ -347,7 +358,7 @@ EOF
 echo "Installing bash cat"
 git clone https://github.com/RealStickman/bash-cat-with-cat.git &>/dev/null
 cp ./bash-cat-with-cat/cat.sh "$HOME/scripts/pieces/cat.sh"
-#rm -rf ./bash-cat-with-cat
+rm -rf ./bash-cat-with-cat
 
 : '
 echo
@@ -402,9 +413,9 @@ if [[ $(pacman -Q | grep vmware-workstation) ]]; then
 fi
 
 # FIXME temporary
-#if [ -f "/etc/pipewire/pipewire.conf" ]; then
+if [ -f "/etc/pipewire/pipewire.conf" ]; then
-#    sudo rm "/etc/pipewire/pipewire.conf"
+    sudo rm "/etc/pipewire/pipewire.conf"
-#fi
+fi
 
 # enable fstrim timer
 sudo systemctl enable fstrim.timer