diff --git a/daily-use-pcs/setup-git.bash b/daily-use-pcs/setup-git.bash deleted file mode 100755 index a7f57f7..0000000 --- a/daily-use-pcs/setup-git.bash +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env bash -# Modify constants as needed -GIT_NAME="askiiart" -GIT_EMAIL="dev@askiiart.net" -KEY_ID="CFCF6723A8ED791C5FD25CB5858969DCCC2E792D" - -# Note: This waits until enter is pressed -# read -p "Press Enter to continue" < /dev/tty - -if [ $(whoami) == "root" ]; then - echo "Run as a normal user, not root" - exit 1 -fi - -command_exists() { type "$1" &>/dev/null; } - -if command_exists "apt-get"; then - sudo apt-get install git -y -elif command_exists "yum"; then - sudo yum install git -y -elif command_exists "rpm-ostree" && ! command_exists "git"; then - rpm-ostree install git -y - read -p "Press enter to reboot, then run do-everything.bash again" - reboot -elif command_exists "pacman"; then - sudo pacman -S git --noconfirm --needed -elif command_exists "zypp"; then - sudo zypper install git -y -elif command_exists "emerge"; then - sudo echo Not yet supported, exiting... -elif command_exists "apk"; then - sudo apk add git -elif command_exists "xbps-install"; then - sudo xbps-install git -else - echo "Unsupported: unknown package manager and distro" -fi - -############################################ -# Do GPG key stuff for commit verification # -############################################ -git config --global user.name "${GIT_NAME}" -git config --global user.email "${GIT_EMAIL}" -git config --global commit.gpgsign true -git config --global user.signingkey ${KEY_ID} - -# other git settings -git config --global init.defaultBranch main - -# From https://superuser.com/a/954639 -# Archived at https://web.archive.org/web/20230606153856/https://superuser.com/a/954639 -echo Fixing .gnupg/ permissions -# Set ownership to your own user and primary group -chown -R "$USER:$(id -gn)" ~/.gnupg -# Set permissions to read, write, execute for only yourself, no others -chmod 700 ~/.gnupg -# Set permissions to read, write for only yourself, no others -chmod 600 ~/.gnupg/* -# Fixes dirmngr stuff (for Arch) -sudo chmod 700 $(ls -d $HOME/.gnupg/*/) diff --git a/do-everything.bash b/do-everything.bash index f7cbeb1..23d4f46 100755 --- a/do-everything.bash +++ b/do-everything.bash @@ -5,11 +5,6 @@ command_exists() { type "$1" &>/dev/null; } chmod 700 ./distro-specific.bash ./distro-specific.bash -cd ./daily-use-pcs -chmod 700 ./setup-git.bash -./setup-git.bash -cd .. - cd install-stuff/ chmod 700 ./*.bash ./install-claws-mail.bash @@ -30,11 +25,10 @@ cd ./dotfiles chmod 700 run-distro-de-script.sh ./run-distro-de-script.sh chmod 700 restore.sh -./restore.sh +#./restore.sh cd .. ./device-specific.sh -./dotfiles/run-distro-de-script.sh if command_exists "rpm-ostree"; then read -p "Press enter to reboot" diff --git a/dotfiles b/dotfiles index 378dd53..13719b0 160000 --- a/dotfiles +++ b/dotfiles @@ -1 +1 @@ -Subproject commit 378dd535145954be0e101d8358890e79ddb7b601 +Subproject commit 13719b00dac736285c63631a0f3a7ab7a00090a8 diff --git a/install-stuff/install-misc.sh b/install-stuff/install-misc.sh index 8d16beb..8d1af06 100755 --- a/install-stuff/install-misc.sh +++ b/install-stuff/install-misc.sh @@ -12,7 +12,7 @@ if command_exists "apt-get"; then sudo apt-get install kitty -y echo "Please install SchildiChat, nvim/neovim" elif command_exists "dnf"; then - sudo dnf install kitty neovim gcc gnome-hexgl drawing make vlc freeglut ncdu gcolor3 rustup p7zip mosh krita podman podman-docker podman-compose gajim progress yt-dlp genisoimage zstd iperf3 keepassxc python3-pip ffmpegthumbnailer linuxconsoletools bind-utils hyfetch fastfetch nmap unrar-free restic gparted bsdtar android-tools httpd-tools digikam edid-decode hexchat htop minetest fuse-sshfs syncthing nasm sysstat openshot HandBrake HandBrake-gui electrum feather obs-studio fuse-libs pandoc -y + sudo dnf install kitty neovim gcc gnome-hexgl drawing make vlc freeglut ncdu gcolor3 rustup p7zip mosh krita podman podman-docker podman-compose gajim progress yt-dlp genisoimage zstd iperf3 keepassxc python3-pip ffmpegthumbnailer linuxconsoletools bind-utils hyfetch fastfetch nmap unrar-free restic gparted bsdtar android-tools httpd-tools digikam edid-decode hexchat htop minetest fuse-sshfs syncthing nasm sysstat openshot HandBrake HandBrake-gui electrum feather obs-studio fuse-libs pandoc wtype -y sudo dnf install ffmpeg --allowerasing sudo systemctl enable --now syncthing@askiiart @@ -35,6 +35,8 @@ elif command_exists "dnf"; then # Install DwarFS sudo dnf copr enable jc141/DwarFS sudo dnf install dwarfs + + sudo dnf install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm elif command_exists "rpm-ostree"; then rpm-ostree install kitty neovim gcc gnome-hexgl drawing make vlc freeglut ncdu gcolor3 rustup clippy p7zip mosh krita podman podman-docker podman-compose gajim progress yt-dlp genisoimage zstd iperf3 -y --allow-inactive