From adf4cf3e0e55dc5efb5348264e46322e17d3f694 Mon Sep 17 00:00:00 2001 From: Didier Date: Fri, 1 Sep 2023 01:39:58 +0200 Subject: [PATCH] stuff --- .gitignore | 2 - README.md | 10 -- distros/alpine/package.list | 1 - distros/alpine/pm.sh | 20 --- distros/alpine/root/etc/doas.conf | 1 - distros/alpine/sys-scripts/00-remove-sudo.sh | 5 - distros/any/package.list | 4 - distros/any/root/etc/sudoers | 4 - distros/arch/package.list | 2 - distros/arch/pm.sh | 22 ---- distros/arch/root/etc/pacman.conf | 31 ----- distros/arch/sys-scripts/00-reflector.sh | 12 -- distros/arch/user-scripts/00-yay.sh | 13 -- home/.config/alacritty/alacritty.yml | 10 -- home/.vimrc | 3 - skip_steps.sh | 7 - sync.sh | 132 ------------------- unlink.sh | 10 -- 18 files changed, 289 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.md delete mode 100644 distros/alpine/package.list delete mode 100644 distros/alpine/pm.sh delete mode 100644 distros/alpine/root/etc/doas.conf delete mode 100644 distros/alpine/sys-scripts/00-remove-sudo.sh delete mode 100644 distros/any/package.list delete mode 100644 distros/any/root/etc/sudoers delete mode 100644 distros/arch/package.list delete mode 100644 distros/arch/pm.sh delete mode 100644 distros/arch/root/etc/pacman.conf delete mode 100644 distros/arch/sys-scripts/00-reflector.sh delete mode 100644 distros/arch/user-scripts/00-yay.sh delete mode 100644 home/.config/alacritty/alacritty.yml delete mode 100644 home/.vimrc delete mode 100644 skip_steps.sh delete mode 100644 sync.sh delete mode 100644 unlink.sh diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e0318d4..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.idea/ -.dotfiles/ \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index e6074a3..0000000 --- a/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Dotfiles - -## `distros/` -This directory is meant to setup the distro to the liking of the user. -### `distros/*/root` -Contains files to overlay over the executing system. -### `distro/*/sys-scripts` -scripts that are ran as `root` -### `distro/*/user-scripts` -scripts that are ran as the user \ No newline at end of file diff --git a/distros/alpine/package.list b/distros/alpine/package.list deleted file mode 100644 index 9d32a57..0000000 --- a/distros/alpine/package.list +++ /dev/null @@ -1 +0,0 @@ -doas \ No newline at end of file diff --git a/distros/alpine/pm.sh b/distros/alpine/pm.sh deleted file mode 100644 index 7560ed9..0000000 --- a/distros/alpine/pm.sh +++ /dev/null @@ -1,20 +0,0 @@ -cmd="apk" -while getopts "icru" opt; do - case $opt in - i) - cmd="$cmd add" - ;; - u) - cmd="$cmd add" - ;; - r) - cmd="$cmd del" - ;; - c) - cmd="$cmd info -q" - ;; - esac -done -shift $((OPTIND-1)) - -$cmd $@ \ No newline at end of file diff --git a/distros/alpine/root/etc/doas.conf b/distros/alpine/root/etc/doas.conf deleted file mode 100644 index c50a253..0000000 --- a/distros/alpine/root/etc/doas.conf +++ /dev/null @@ -1 +0,0 @@ -permit persit wheel \ No newline at end of file diff --git a/distros/alpine/sys-scripts/00-remove-sudo.sh b/distros/alpine/sys-scripts/00-remove-sudo.sh deleted file mode 100644 index 2845cb8..0000000 --- a/distros/alpine/sys-scripts/00-remove-sudo.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# removes sudo - -apk del sudo \ No newline at end of file diff --git a/distros/any/package.list b/distros/any/package.list deleted file mode 100644 index 53b3000..0000000 --- a/distros/any/package.list +++ /dev/null @@ -1,4 +0,0 @@ -neofetch -git -vim -sudo \ No newline at end of file diff --git a/distros/any/root/etc/sudoers b/distros/any/root/etc/sudoers deleted file mode 100644 index e77799b..0000000 --- a/distros/any/root/etc/sudoers +++ /dev/null @@ -1,4 +0,0 @@ -root ALL=(ALL:ALL) ALL -%wheel ALL=(ALL:ALL) ALL -%root ALL=(ALL:ALL) NOPASSWD: ALL -@includedir /etc/sudoers.d diff --git a/distros/arch/package.list b/distros/arch/package.list deleted file mode 100644 index c3e02c8..0000000 --- a/distros/arch/package.list +++ /dev/null @@ -1,2 +0,0 @@ -reflector # for scripts/00-reflector.sh -alacritty # favourite terminal emulator \ No newline at end of file diff --git a/distros/arch/pm.sh b/distros/arch/pm.sh deleted file mode 100644 index 0fd802c..0000000 --- a/distros/arch/pm.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -cmd="pacman --noconfirm" -while getopts "icru" opt; do - case $opt in - i) - cmd="$cmd -S" - ;; - u) - cmd="$cmd -Syyu" - ;; - r) - cmd="$cmd -R" - ;; - c) - cmd="$cmd -Q" - ;; - esac -done -shift $((OPTIND-1)) - -$cmd $@ \ No newline at end of file diff --git a/distros/arch/root/etc/pacman.conf b/distros/arch/root/etc/pacman.conf deleted file mode 100644 index e63be35..0000000 --- a/distros/arch/root/etc/pacman.conf +++ /dev/null @@ -1,31 +0,0 @@ -[options] -HoldPkg = pacman glibc yay -Architecture = auto - -Color -CheckSpace -ParallelDownloads = 5 - -SigLevel = Required DatabaseOptional -LocalFileSigLevel = Optional - -#[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 - -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist - -[multilib] -Include = /etc/pacman.d/mirrorlist diff --git a/distros/arch/sys-scripts/00-reflector.sh b/distros/arch/sys-scripts/00-reflector.sh deleted file mode 100644 index 7d2aa9d..0000000 --- a/distros/arch/sys-scripts/00-reflector.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# Sets up fast mirrors on arch - -if ! pacman -Q reflector; then - echo "reflector was not installed" - exit 1 -fi - -cp /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak -reflector -c NL -f 10 --threads 4 --save /etc/pacman.d/mirrorlist -echo "Server = arch.neo.faulty.nl/$repo/os/$arch" >> /etc/pacman.d/mirrorlist \ No newline at end of file diff --git a/distros/arch/user-scripts/00-yay.sh b/distros/arch/user-scripts/00-yay.sh deleted file mode 100644 index 4ce4631..0000000 --- a/distros/arch/user-scripts/00-yay.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -# Installs yay. - -[ "$UID" = "0" ] || exit 0 - -yaytmpdir=$(mktemp -d) - -git clone https://aur.archlinux.org/yay $yaytmpdir -oldpwd=$(pwd) -cd $yaytmpdir -makepkg -si -cd $oldpwd diff --git a/home/.config/alacritty/alacritty.yml b/home/.config/alacritty/alacritty.yml deleted file mode 100644 index 3bc0096..0000000 --- a/home/.config/alacritty/alacritty.yml +++ /dev/null @@ -1,10 +0,0 @@ -bell: - animation: 'Ease' - duration: 50 - color: '#555555' -cursor: - style: - shape: 'Block' - blinking: 'On' - blink_interval: 500 - diff --git a/home/.vimrc b/home/.vimrc deleted file mode 100644 index 6f12643..0000000 --- a/home/.vimrc +++ /dev/null @@ -1,3 +0,0 @@ -set number -set relativenumber - diff --git a/skip_steps.sh b/skip_steps.sh deleted file mode 100644 index b6e9ee1..0000000 --- a/skip_steps.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -mkdir .dotfiles &>/dev/null - -for item in ${@:-update install_package_list run_system_scripts run_user_scripts link_home overlay}; do - echo "executed_step:$item" >> .dotfiles/pending_sync -done \ No newline at end of file diff --git a/sync.sh b/sync.sh deleted file mode 100644 index 89ed355..0000000 --- a/sync.sh +++ /dev/null @@ -1,132 +0,0 @@ -#!/bin/sh - -osreleaseprop() { - cat /etc/os-release | grep -e "^$1=" | sed 's/ID=//' -} - -elevated() { - s=${SUDO:-sudo} - if [ ! "$s" = "none" ]; then - if ! command -v $s &> /dev/null; then - echo "command \"$s\" not found" - exit 1 - fi - else - s="" - fi - $s $@ -} - -DISTRO=$(osreleaseprop ID) -if [ ! -d "distros/$DISTRO" ]; then - echo "$DISTRO is not supported." - exit 1 -fi - -pm() { - elevated "sh distros/$DISTRO/pm.sh $@" -} - -install_package_list() { - pkgs="" - [ -f "distros/${1:-$DISTRO}/package.list" ] || return 1 - for pkg in $(cat distros/${1:-$DISTRO}/package.list | sed 's/#.*$//'); do - pkgs="$pkgs $pkg" - done - pm -i $pkgs -} - -run_scripts() { - cmd=$1 - shift - case $cmd in - sys) - dir="distros/${1:-$DISTRO}/sys-scripts" - [ -d "$dir" ] || return - for s in $(ls $dir); do - echo "# running $dir/$s..." - elevated sh $dir/$s || exit 1 - done - ;; - user) - dir="distros/${1:-$DISTRO}/user-scripts" - [ -d "$dir" ] || return - for s in $(ls $dir); do - echo "# running $dir/$s..." - sh $dir/$s || exit 1 - done - ;; - esac -} - -overlay() { - [ -d "distros/${1:-$DISTRO}/root" ] || return 0 - elevated cp -r distros/${1:-$DISTRO}/root / -} - -__step_update() { - echo "# updating system..." - pm -u -} - -__step_install_package_list() { - echo "# installing package lists..." - install_package_list any - install_package_list -} - -__step_run_system_scripts() { - echo "# running system scripts..." - run_scripts sys any - run_scripts sys -} - -__step_run_user_scripts() { - echo "# running user scripts..." - run_scripts user any - run_scripts user -} - -__step_overlay() { - echo "# overlaying root directories..." - overlay any - overlay -} - -__step_link_home() { - echo "# linking all home files..." - trackingfile=".dotfiles/$(git rev-parse HEAD)-links" - for item in $(find ./home -type f); do - path=$(echo $item | sed "s/\.\/home//") - [ -z "$path" ] && continue - grep -q "$path" $trackingfile &> /dev/null && continue - path="$HOME$path" - mkdir -p $(dirname $path) &> /dev/null - ln $item $path && echo "$path" >> $trackingfile - done -} - -step() { - if ! grep -q "executed_step:$1" .dotfiles/pending_sync &> /dev/null; then - $(printf "__step_%s" "$1") - echo "executed_step:$1" >> .dotfiles/pending_sync - fi -} - -mkdir -p .dotfiles &> /dev/null -touch .dotfiles/pending_sync - -if [ -n "$1" ]; then - step $1 -else - echo "started_sync:$(date)" >> .dotfiles/log - step update - step install_package_list - step run_system_scripts - step run_user_scripts - step link_home - step overlay - echo "finished_sync:$(date)" >> .dotfiles/log -fi - -unlink .dotfiles/pending_sync diff --git a/unlink.sh b/unlink.sh deleted file mode 100644 index 44e593c..0000000 --- a/unlink.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -for linkfile in ${@:-$(find .dotfiles -type f -name *-links)}; do - echo "# processing linkfile $linkfile..." - for link in $(cat $linkfile); do - echo "# unlinking $link..." - unlink $link - done - rm -rf $linkfile -done \ No newline at end of file