From f472e1cf609397e57720580afad19b8f90a26bf3 Mon Sep 17 00:00:00 2001 From: guusvanmeerveld Date: Wed, 8 Dec 2021 14:17:09 +0100 Subject: [PATCH] Created installer file --- dotfiles | 39 ++++++++++++++++++++++++++++ install-applications | 1 - install-packages | 1 - install-root.conf.yaml | 2 +- install.conf.yaml | 1 - install_scripts/install-applications | 12 +++++++++ install_scripts/install-packages | 3 +++ install_scripts/post-install | 23 ++++++++++++++++ install_scripts/pre-install | 4 +++ packs+apps.sh | 6 ----- packs.sh | 5 ---- post-install | 31 ---------------------- pre-install | 2 -- scripts/chuser.sh | 2 +- scripts/install-z.sh | 6 ++++- scripts/set_locale.sh | 6 ++--- 16 files changed, 91 insertions(+), 53 deletions(-) create mode 100755 dotfiles delete mode 100755 install-applications delete mode 100755 install-packages create mode 100755 install_scripts/install-applications create mode 100755 install_scripts/install-packages create mode 100755 install_scripts/post-install create mode 100755 install_scripts/pre-install delete mode 100755 packs+apps.sh delete mode 100755 packs.sh delete mode 100755 post-install delete mode 100755 pre-install diff --git a/dotfiles b/dotfiles new file mode 100755 index 0000000..a103f0e --- /dev/null +++ b/dotfiles @@ -0,0 +1,39 @@ +#!/bin/bash + +export DOTFILES=~/dotfiles +export EDITOR=micro + +case $1 in + edit) + $EDITOR $DOTFILES/config/$2 + ;; + + add) + echo " - $2" >> $DOTFILES/packages.conf.yaml + ;; + + install) + sudo pacman -Sy python --noconfirm + + SCRIPTS=$DOTFILES/install_scripts + + $SCRIPTS/pre-install + + $SCRIPTS/install-packages + + # if (( $3 == "applications" )) + # then + # $SCRIPTS/install-applications + # fi + + $SCRIPTS/post-install + + ;; + + *) + echo "Commands:" + echo " install installs the dotfiles" + echo " edit edit one of the config files" + echo " add add a package to the list" + ;; +esac \ No newline at end of file diff --git a/install-applications b/install-applications deleted file mode 100755 index 776e115..0000000 --- a/install-applications +++ /dev/null @@ -1 +0,0 @@ -./install -p dotbot-yay/yay.py -p dotbot-vscode/vscode.py -c applications.conf.yaml diff --git a/install-packages b/install-packages deleted file mode 100755 index 388e6a6..0000000 --- a/install-packages +++ /dev/null @@ -1 +0,0 @@ -./install -p dotbot-yay/yay.py -c packages.conf.yaml diff --git a/install-root.conf.yaml b/install-root.conf.yaml index a9bce92..03da1c8 100644 --- a/install-root.conf.yaml +++ b/install-root.conf.yaml @@ -11,6 +11,6 @@ # System /etc/pacman.conf: config/pacman.conf - /bin/code: /bin/codium + /bin/dotfiles: dotfiles /usr/share/icons/default/index.theme: config/cursors.theme diff --git a/install.conf.yaml b/install.conf.yaml index 16ffcac..73cbea8 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -16,7 +16,6 @@ # Shell ~/.config/kitty/kitty.conf: config/kitty.conf ~/.aliases: config/.aliases.sh - ~/.zshrc: config/.zshrc ~/gpg.conf: config/gpg.conf ~/.ssh/config: config/ssh ~/.xinitrc: config/.xinitrc diff --git a/install_scripts/install-applications b/install_scripts/install-applications new file mode 100755 index 0000000..e1198c6 --- /dev/null +++ b/install_scripts/install-applications @@ -0,0 +1,12 @@ +#!/bin/bash + +$DOTFILES/install -p dotbot-yay/yay.py -p dotbot-vscode/vscode.py -c applications.conf.yaml + +# Spotifyd +sudo systemctl enable spotifyd --machine=$USER@.host --user --now + +# Syncthing +sudo systemctl enable --now syncthing@$USER + +# Docker +sudo usermod -aG docker $USER \ No newline at end of file diff --git a/install_scripts/install-packages b/install_scripts/install-packages new file mode 100755 index 0000000..8be1544 --- /dev/null +++ b/install_scripts/install-packages @@ -0,0 +1,3 @@ +#!/bin/bash + +$DOTFILES/install -p dotbot-yay/yay.py -c packages.conf.yaml diff --git a/install_scripts/post-install b/install_scripts/post-install new file mode 100755 index 0000000..169a0bd --- /dev/null +++ b/install_scripts/post-install @@ -0,0 +1,23 @@ +#!/bin/bash + +# NetworkManager +sudo systemctl enable NetworkManager --now + +# Flutter +sudo gpasswd -a $USER flutterusers + +# sddm +sudo systemctl enable sddm +sudo cp $DOTFILES/themes/zune /usr/share/sddm/themes/ -r + +# Micro +micro -plugin install quoter filemanager + +# ZSH +$DOTFILES/scripts/install-z.sh + +# Update user +$DOTFILES/scripts/chuser.sh + +# Set locale +$DOTFILES/scripts/set_locale.sh diff --git a/install_scripts/pre-install b/install_scripts/pre-install new file mode 100755 index 0000000..cc54c9d --- /dev/null +++ b/install_scripts/pre-install @@ -0,0 +1,4 @@ +#!/bin/bash + +$DOTFILES/install +sudo $DOTFILES/install -c "install-root.conf.yaml" diff --git a/packs+apps.sh b/packs+apps.sh deleted file mode 100755 index f895897..0000000 --- a/packs+apps.sh +++ /dev/null @@ -1,6 +0,0 @@ -./pre-install - -./install-packages -./install-applications - -./post-install diff --git a/packs.sh b/packs.sh deleted file mode 100755 index 0827e53..0000000 --- a/packs.sh +++ /dev/null @@ -1,5 +0,0 @@ -./pre-install - -./install-packages - -./post-install diff --git a/post-install b/post-install deleted file mode 100755 index a42e9b9..0000000 --- a/post-install +++ /dev/null @@ -1,31 +0,0 @@ -sudo systemctl enable sddm - -# NetworkManager -sudo systemctl enable NetworkManager --now - -# Flutter -sudo gpasswd -a $USER flutterusers - -# Spotifyd -sudo systemctl enable spotifyd --machine=$USER@.host --user --now - -# Syncthing -sudo systemctl enable --now syncthing@$USER - -# sddm -sudo cp themes/zune /usr/share/sddm/themes/ -r - -# Micro -micro -plugin install quoter filemanager - -# Docker -sudo usermod -aG docker guus - -# ZSH -scripts/install-z.sh - -# Update user -scripts/chuser.sh - -# Set locale -scripts/set_locale.sh diff --git a/pre-install b/pre-install deleted file mode 100755 index e2246ad..0000000 --- a/pre-install +++ /dev/null @@ -1,2 +0,0 @@ -./install -sudo ./install -c "install-root.conf.yaml" diff --git a/scripts/chuser.sh b/scripts/chuser.sh index 96977be..c3024d6 100755 --- a/scripts/chuser.sh +++ b/scripts/chuser.sh @@ -1 +1 @@ -sudo chsh -s /bin/zsh guus +sudo chsh -s /bin/zsh $USER diff --git a/scripts/install-z.sh b/scripts/install-z.sh index 542130a..6c0225e 100755 --- a/scripts/install-z.sh +++ b/scripts/install-z.sh @@ -5,11 +5,15 @@ else sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended fi -mkdir -p ~/.oh-my-zsh/custom/plugins export PLUGINS=~/.oh-my-zsh/custom/plugins export THEMES=~/.oh-my-zsh/themes +mkdir -p $PLUGINS +mkdir -p $THEMES + +ln -sf $DOTFILES/config/.zshrc ~/.zshrc + # Install zsh-histdb git -C $PLUGINS/zsh-histdb pull || git clone https://github.com/larkery/zsh-histdb $PLUGINS/zsh-histdb diff --git a/scripts/set_locale.sh b/scripts/set_locale.sh index 2a0abce..5f6dccf 100755 --- a/scripts/set_locale.sh +++ b/scripts/set_locale.sh @@ -1,5 +1,5 @@ -echo 'en_NL.UTF-8' > /etc/locale.gen +sudo echo 'en_NL.UTF-8' > /etc/locale.gen -locale-gen +sudo locale-gen -localectl set-locale en_NL.UTF-8 +sudo localectl set-locale en_NL.UTF-8