Updates
This commit is contained in:
Stephan Raabe
parent
7f424bd949
commit
e1d245edda
101
1-install.sh
101
1-install.sh
@ -1,14 +1,13 @@
|
||||
#!/bin/bash
|
||||
# ___ _ _ _
|
||||
# __| | ___ | |_ / _(_) | ___ ___
|
||||
# / _` |/ _ \| __| |_| | |/ _ \/ __|
|
||||
# | (_| | (_) | |_| _| | | __/\__ \
|
||||
# \__,_|\___/ \__|_| |_|_|\___||___/
|
||||
# |_ _|_ __ ___| |_ __ _| | |
|
||||
# | || '_ \/ __| __/ _` | | |
|
||||
# | || | | \__ \ || (_| | | |
|
||||
# |___|_| |_|___/\__\__,_|_|_|
|
||||
#
|
||||
# by Stephan Raabe (2023)
|
||||
# ------------------------------------------------------
|
||||
# Install Script for dotfiles and configuration
|
||||
# yay must be installed
|
||||
# -----------------------------------------------------
|
||||
# Install Script for required packages
|
||||
# ------------------------------------------------------
|
||||
|
||||
# ------------------------------------------------------
|
||||
@ -17,19 +16,14 @@
|
||||
source $(dirname "$0")/scripts/library.sh
|
||||
clear
|
||||
echo " ___ _ _ _ "
|
||||
echo " __| | ___ | |_ / _(_) | ___ ___ "
|
||||
echo " / _' |/ _ \| __| |_| | |/ _ \/ __| "
|
||||
echo "| (_| | (_) | |_| _| | | __/\__ \ "
|
||||
echo " \__,_|\___/ \__|_| |_|_|\___||___/ "
|
||||
echo " |_ _|_ __ ___| |_ __ _| | | "
|
||||
echo " | || _ \/ __| __/ _ | | | "
|
||||
echo " | || | | \__ \ || (_| | | | "
|
||||
echo " |___|_| |_|___/\__\__,_|_|_| "
|
||||
echo " "
|
||||
echo "by Stephan Raabe (2023)"
|
||||
echo "-------------------------------------"
|
||||
echo ""
|
||||
echo "The script will not remove any folders or files."
|
||||
echo "Symbolic links will be created instead when the folder or files doesn't exists."
|
||||
echo "If you want to overwrite your configuration please remove the correspondig folder in your .config first."
|
||||
echo "(For example ~/.config/qtile, etc.)"
|
||||
echo ""
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Check if yay is installed
|
||||
@ -66,9 +60,50 @@ done
|
||||
echo ""
|
||||
echo "-> Install main packages"
|
||||
|
||||
packagesPacman=("picom" "alacritty" "rofi" "rofi-calc" "chromium" "scrot" "nitrogen" "dunst" "starship" "slock" "neovim" "mpv" "freerdp" "xfce4-power-manager" "thunar" "mousepad" "ttf-font-awesome" "ttf-fira-sans" "ttf-fira-code" "ttf-firacode-nerd" "figlet" "lxappearance" "breeze" "breeze-gtk" "vlc" "exa" "python-pip" "python-psutil" "python-rich" "python-click" "xdg-desktop-portal-gtk" "pavucontrol" "tumbler" "xautolock" "blueman");
|
||||
packagesPacman=(
|
||||
"picom"
|
||||
"alacritty"
|
||||
"rofi"
|
||||
"rofi-calc"
|
||||
"chromium"
|
||||
"scrot"
|
||||
"nitrogen"
|
||||
"dunst"
|
||||
"starship"
|
||||
"slock"
|
||||
"neovim"
|
||||
"mpv"
|
||||
"freerdp"
|
||||
"xfce4-power-manager"
|
||||
"thunar"
|
||||
"mousepad"
|
||||
"ttf-font-awesome"
|
||||
"ttf-fira-sans"
|
||||
"ttf-fira-code"
|
||||
"ttf-firacode-nerd"
|
||||
"figlet"
|
||||
"lxappearance"
|
||||
"breeze"
|
||||
"breeze-gtk"
|
||||
"vlc"
|
||||
"exa"
|
||||
"python-pip"
|
||||
"python-psutil"
|
||||
"python-rich"
|
||||
"python-click"
|
||||
"xdg-desktop-portal-gtk"
|
||||
"pavucontrol"
|
||||
"tumbler"
|
||||
"xautolock"
|
||||
"blueman"
|
||||
);
|
||||
|
||||
packagesYay=("brave-bin" "pfetch" "bibata-cursor-theme" "trizen");
|
||||
packagesYay=(
|
||||
"brave-bin"
|
||||
"pfetch"
|
||||
"bibata-cursor-theme"
|
||||
"trizen"
|
||||
);
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Install required packages
|
||||
@ -87,19 +122,6 @@ fi
|
||||
|
||||
clear
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Create .config folder
|
||||
# ------------------------------------------------------
|
||||
echo ""
|
||||
echo "-> Install .config folder"
|
||||
|
||||
if [ -d ~/.config ]; then
|
||||
echo ".config folder already exists."
|
||||
else
|
||||
mkdir ~/.config
|
||||
echo ".config folder created."
|
||||
fi
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Remove pywal folder from .config
|
||||
# ------------------------------------------------------
|
||||
@ -109,21 +131,6 @@ if [ -d ~/.config/wal/ ]; then
|
||||
echo "~/.config/wal/ removed."
|
||||
fi
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Create symbolic links
|
||||
# ------------------------------------------------------
|
||||
echo ""
|
||||
echo "-> Install symbolic links"
|
||||
|
||||
_installSymLink ~/.config/picom ~/dotfiles/picom/ ~/.config
|
||||
_installSymLink ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config
|
||||
_installSymLink ~/.config/rofi ~/dotfiles/rofi/ ~/.config
|
||||
_installSymLink ~/.config/vim ~/dotfiles/vim/ ~/.config
|
||||
_installSymLink ~/.config/nvim ~/dotfiles/nvim/ ~/.config
|
||||
_installSymLink ~/.config/dunst ~/dotfiles/dunst/ ~/.config
|
||||
_installSymLink ~/.config/wal ~/dotfiles/wal/ ~/.config
|
||||
_installSymLink ~/.config/starship.toml ~/dotfiles/starship/starship.toml ~/.config/starship.toml
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Install .bashrc
|
||||
# ------------------------------------------------------
|
||||
@ -134,6 +141,7 @@ while true; do
|
||||
case $yn in
|
||||
[Yy]* )
|
||||
rm ~/.bashrc
|
||||
_installSymLink ~/.bashrc ~/dotfiles/.bashrc ~/.bashrc
|
||||
echo ".bashrc removed"
|
||||
break;;
|
||||
[Nn]* )
|
||||
@ -142,7 +150,6 @@ while true; do
|
||||
* ) echo "Please answer yes or no.";;
|
||||
esac
|
||||
done
|
||||
_installSymLink ~/.bashrc ~/dotfiles/.bashrc ~/.bashrc
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Install Theme, Icons and Cursor
|
||||
|
||||
@ -46,9 +46,19 @@ echo ""
|
||||
# ------------------------------------------------------
|
||||
echo ""
|
||||
echo "-> Install main packages"
|
||||
packagesPacman=("hyprland" "xdg-desktop-portal-hyprland" "waybar" "grim" "slurp");
|
||||
packagesPacman=(
|
||||
"hyprland"
|
||||
"xdg-desktop-portal-hyprland"
|
||||
"waybar"
|
||||
"grim"
|
||||
"slurp"
|
||||
);
|
||||
|
||||
packagesYay=("swww" "swaylock-effects" "wlogout");
|
||||
packagesYay=(
|
||||
"swww"
|
||||
"swaylock-effects"
|
||||
"wlogout"
|
||||
);
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Install required packages
|
||||
@ -56,36 +66,6 @@ packagesYay=("swww" "swaylock-effects" "wlogout");
|
||||
_installPackagesPacman "${packagesPacman[@]}";
|
||||
_installPackagesYay "${packagesYay[@]}";
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Install qtile configuration
|
||||
# ------------------------------------------------------
|
||||
echo ""
|
||||
echo "-> Install Hyprland configuration"
|
||||
while true; do
|
||||
read -p "Do you want to install/replace the Hyprland configuration? (Yy/Nn): " yn
|
||||
case $yn in
|
||||
[Yy]* )
|
||||
if [ -d ~/.config/hypr/ ]; then
|
||||
rm -r ~/.config/hypr/
|
||||
fi
|
||||
_installSymLink ~/.config/hypr ~/dotfiles/hypr/ ~/.config
|
||||
break;;
|
||||
[Nn]* )
|
||||
echo "Installation/Replacement of Hyprland configuration skipped."
|
||||
break;;
|
||||
* ) echo "Please answer yes or no.";;
|
||||
esac
|
||||
done
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Create symbolic links
|
||||
# ------------------------------------------------------
|
||||
echo ""
|
||||
echo "-> Create symbolic links"
|
||||
_installSymLink ~/.config/waybar ~/dotfiles/waybar/ ~/.config
|
||||
_installSymLink ~/.config/swaylock ~/dotfiles/swaylock/ ~/.config
|
||||
_installSymLink ~/.config/wlogout ~/dotfiles/wlogout/ ~/.config
|
||||
|
||||
echo ""
|
||||
echo "-> Start swww"
|
||||
swww init
|
||||
|
||||
@ -45,43 +45,14 @@ echo ""
|
||||
echo ""
|
||||
echo "-> Install main packages"
|
||||
|
||||
packagesPacman=("qtile" "polybar");
|
||||
packagesPacman=(
|
||||
"qtile"
|
||||
"polybar"
|
||||
);
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Install required packages
|
||||
# ------------------------------------------------------
|
||||
_installPackagesPacman "${packagesPacman[@]}";
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Install qtile configuration
|
||||
# ------------------------------------------------------
|
||||
echo ""
|
||||
echo "-> Install Qtile configuration"
|
||||
while true; do
|
||||
read -p "Do you want to install/replace the Qtile configuration? (Yy/Nn): " yn
|
||||
case $yn in
|
||||
[Yy]* )
|
||||
if [ -d ~/.config/qtile/ ]; then
|
||||
rm -r ~/.config/qtile/
|
||||
fi
|
||||
_installSymLink ~/.config/qtile ~/dotfiles/qtile/ ~/.config
|
||||
break;;
|
||||
[Nn]* )
|
||||
echo "Installation/Replacement of Qtile configuration skipped."
|
||||
break;;
|
||||
* ) echo "Please answer yes or no.";;
|
||||
esac
|
||||
done
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Create symbolic links
|
||||
# ------------------------------------------------------
|
||||
echo "-> Create symbolic links"
|
||||
_installSymLink ~/.config/polybar ~/dotfiles/polybar/ ~/.config
|
||||
|
||||
if [ -f ~/.xinitrc ]; then
|
||||
rm ~/.xinitrc
|
||||
fi
|
||||
ln -s ~/dotfiles/qtile/.xinitrc ~/.xinitrc
|
||||
|
||||
echo "DONE!"
|
||||
|
||||
92
3-dotfiles.sh
Executable file
92
3-dotfiles.sh
Executable file
@ -0,0 +1,92 @@
|
||||
#!/bin/bash
|
||||
# _ _ __ _ _
|
||||
# __| | ___ | |_ / _(_) | ___ ___
|
||||
# / _` |/ _ \| __| |_| | |/ _ \/ __|
|
||||
# | (_| | (_) | |_| _| | | __/\__ \
|
||||
# \__,_|\___/ \__|_| |_|_|\___||___/
|
||||
#
|
||||
# by Stephan Raabe (2023)
|
||||
# ------------------------------------------------------
|
||||
# Install Script for dotfiles and configuration
|
||||
# yay must be installed
|
||||
# ------------------------------------------------------
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Load Library
|
||||
# ------------------------------------------------------
|
||||
source $(dirname "$0")/scripts/library.sh
|
||||
clear
|
||||
echo " _ _ __ _ _ "
|
||||
echo " __| | ___ | |_ / _(_) | ___ ___ "
|
||||
echo " / _' |/ _ \| __| |_| | |/ _ \/ __| "
|
||||
echo "| (_| | (_) | |_| _| | | __/\__ \ "
|
||||
echo " \__,_|\___/ \__|_| |_|_|\___||___/ "
|
||||
echo " "
|
||||
echo "by Stephan Raabe (2023)"
|
||||
echo "-------------------------------------"
|
||||
echo ""
|
||||
echo "The script will ask for permission to remove the following existing folders and files."
|
||||
echo "But you can decide to keep your local versions by answering with No (Nn)."
|
||||
echo "Symbolic links will be created from ~/dotfiles into your home and .config directories."
|
||||
echo ""
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Confirm Start
|
||||
# ------------------------------------------------------
|
||||
while true; do
|
||||
read -p "DO YOU WANT TO START THE INSTALLATION NOW? (Yy/Nn): " yn
|
||||
case $yn in
|
||||
[Yy]* )
|
||||
echo "Installation started."
|
||||
break;;
|
||||
[Nn]* )
|
||||
exit;
|
||||
break;;
|
||||
* ) echo "Please answer yes or no.";;
|
||||
esac
|
||||
done
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Create .config folder
|
||||
# ------------------------------------------------------
|
||||
echo ""
|
||||
echo "-> Check existing .config folder"
|
||||
|
||||
if [ -d ~/.config ]; then
|
||||
echo ".config folder already exists."
|
||||
else
|
||||
mkdir ~/.config
|
||||
echo ".config folder created."
|
||||
fi
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Create symbolic links
|
||||
# ------------------------------------------------------
|
||||
echo ""
|
||||
echo "-> Install dotfiles with symbolic links"
|
||||
|
||||
_installSymLink ~/.config/picom ~/dotfiles/picom/ ~/.config
|
||||
_installSymLink ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config
|
||||
_installSymLink ~/.config/ranger ~/dotfiles/ranger/ ~/.config
|
||||
_installSymLink ~/.config/rofi ~/dotfiles/rofi/ ~/.config
|
||||
_installSymLink ~/.config/vim ~/dotfiles/vim/ ~/.config
|
||||
_installSymLink ~/.config/nvim ~/dotfiles/nvim/ ~/.config
|
||||
_installSymLink ~/.config/dunst ~/dotfiles/dunst/ ~/.config
|
||||
_installSymLink ~/.config/wal ~/dotfiles/wal/ ~/.config
|
||||
_installSymLink ~/.config/starship.toml ~/dotfiles/starship/starship.toml ~/.config/starship.toml
|
||||
_installSymLink ~/.config/hypr ~/dotfiles/hypr/ ~/.config
|
||||
_installSymLink ~/.config/waybar ~/dotfiles/waybar/ ~/.config
|
||||
_installSymLink ~/.config/swaylock ~/dotfiles/swaylock/ ~/.config
|
||||
_installSymLink ~/.config/wlogout ~/dotfiles/wlogout/ ~/.config
|
||||
_installSymLink ~/.config/qtile ~/dotfiles/qtile/ ~/.config
|
||||
_installSymLink ~/.config/polybar ~/dotfiles/polybar/ ~/.config
|
||||
_installSymLink ~/.xinitrc ~/dotfiles/qtile/.xinitrc ~/.xinitrc
|
||||
_installSymLink ~/.gtkrc-2.0 ~/dotfiles/.gtkrc-2.0 ~/.gtkrc-2.0
|
||||
_installSymLink ~/.config/gtk-3.0 ~/dotfiles/gtk-3.0/ ~/.config/
|
||||
_installSymLink ~/.Xresources ~/dotfiles/.Xresources ~/.Xresources
|
||||
_installSymLink ~/.icons ~/dotfiles/.icons/ ~/
|
||||
|
||||
# ------------------------------------------------------
|
||||
# DONE
|
||||
# ------------------------------------------------------
|
||||
echo "DONE! Please reboot your system!"
|
||||
@ -24,7 +24,6 @@ exec-once = swww init
|
||||
exec-once = ~/dotfiles/scripts/updatewal-swww.sh
|
||||
exec-once = dunst
|
||||
exec-once = ~/dotfiles/hypr/gtk.sh
|
||||
exec-once = ~/dotfiles/scripts/autolock.sh &
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Load pywal color file
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
# _ _ _ _
|
||||
# | \ | | ___ ___ _ __ ___ _ _| |_| |_
|
||||
# | \| |/ _ \/ _ \| '_ ` _ \| | | | __| __|
|
||||
# | |\ | __/ (_) | | | | | | |_| | |_| |_
|
||||
# |_| \_|\___|\___/|_| |_| |_|\__,_|\__|\__|
|
||||
#
|
||||
# by Stephan Raabe (2023)
|
||||
# -----------------------------------------------------
|
||||
|
||||
source ~/private/neomutt/mailbox
|
||||
|
||||
# EDITOR
|
||||
set editor = vim
|
||||
set sort_aux = last-date-received
|
||||
set sort = reverse-threads
|
||||
|
||||
# FORWARD EMAIL WITH ATTACHEMENTS
|
||||
set mime_forward
|
||||
set mime_forward_rest=yes
|
||||
|
||||
#SIDEBAR
|
||||
set sidebar_visible
|
||||
|
||||
@ -87,20 +87,36 @@ _installSymLink() {
|
||||
symlink="$1";
|
||||
linksource="$2";
|
||||
linktarget="$3";
|
||||
|
||||
while true; do
|
||||
read -p "DO YOU WANT TO INSTALL ${symlink}? (Yy/Nn): " yn
|
||||
case $yn in
|
||||
[Yy]* )
|
||||
if [ -L "${symlink}" ]; then
|
||||
echo "Link ${symlink} exists already."
|
||||
rm ${symlink}
|
||||
ln -s ${linksource} ${linktarget}
|
||||
echo "Symlink ${symlink} created."
|
||||
else
|
||||
if [ -d ${symlink} ]; then
|
||||
echo "Directory ${symlink}/ exists."
|
||||
rm -rf ${symlink}/
|
||||
ln -s ${linksource} ${linktarget}
|
||||
echo "Symlink for directory ${symlink}/ created."
|
||||
else
|
||||
if [ -f ${symlink} ]; then
|
||||
echo "File ${symlink} exists."
|
||||
rm ${symlink}
|
||||
ln -s ${linksource} ${linktarget}
|
||||
echo "Symlink to file ${symlink} created."
|
||||
else
|
||||
ln -s ${linksource} ${linktarget}
|
||||
echo "Link ${linksource} -> ${linktarget} created."
|
||||
echo "New symlink ${linksource} -> ${linktarget} created."
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
break;;
|
||||
[Nn]* )
|
||||
# exit;
|
||||
break;;
|
||||
* ) echo "Please answer yes or no.";;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
[global]
|
||||
# Your Spotify account name.
|
||||
username = ""
|
||||
|
||||
# Your Spotify account password.
|
||||
password = ""
|
||||
@ -1,20 +0,0 @@
|
||||
@define-color foreground {foreground};
|
||||
@define-color background {background};
|
||||
@define-color cursor {cursor};
|
||||
|
||||
@define-color color0 {color0};
|
||||
@define-color color1 {color1};
|
||||
@define-color color2 {color2};
|
||||
@define-color color3 {color3};
|
||||
@define-color color4 {color4};
|
||||
@define-color color5 {color5};
|
||||
@define-color color6 {color6};
|
||||
@define-color color7 {color7};
|
||||
@define-color color8 {color8};
|
||||
@define-color color9 {color9};
|
||||
@define-color color10 {color10};
|
||||
@define-color color11 {color11};
|
||||
@define-color color12 {color12};
|
||||
@define-color color13 {color13};
|
||||
@define-color color14 {color14};
|
||||
@define-color color15 {color15};
|
||||
@ -1,20 +1,20 @@
|
||||
@define-color foreground #bfbfbf;
|
||||
@define-color background #000000;
|
||||
@define-color cursor #bfbfbf;
|
||||
@define-color foreground #bfbfc0;
|
||||
@define-color background #000103;
|
||||
@define-color cursor #bfbfc0;
|
||||
|
||||
@define-color color0 #000000;
|
||||
@define-color color1 #97444B;
|
||||
@define-color color2 #186593;
|
||||
@define-color color3 #537390;
|
||||
@define-color color4 #2C8DAA;
|
||||
@define-color color5 #5D95AA;
|
||||
@define-color color6 #4DAFD2;
|
||||
@define-color color7 #bfbfbf;
|
||||
@define-color color8 #3f3f3f;
|
||||
@define-color color9 #97444B;
|
||||
@define-color color10 #186593;
|
||||
@define-color color11 #537390;
|
||||
@define-color color12 #2C8DAA;
|
||||
@define-color color13 #5D95AA;
|
||||
@define-color color14 #4DAFD2;
|
||||
@define-color color15 #bfbfbf;
|
||||
@define-color color0 #000103;
|
||||
@define-color color1 #046C90;
|
||||
@define-color color2 #037197;
|
||||
@define-color color3 #4F788D;
|
||||
@define-color color4 #188AA6;
|
||||
@define-color color5 #058BB2;
|
||||
@define-color color6 #10A7CF;
|
||||
@define-color color7 #bfbfc0;
|
||||
@define-color color8 #3f4042;
|
||||
@define-color color9 #046C90;
|
||||
@define-color color10 #037197;
|
||||
@define-color color11 #4F788D;
|
||||
@define-color color12 #188AA6;
|
||||
@define-color color13 #058BB2;
|
||||
@define-color color14 #10A7CF;
|
||||
@define-color color15 #bfbfc0;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user