2 Commits
Author SHA1 Message Date
wyj 7692ad3c41 update: add QT_IM_MODULE=fcitx env 2024-06-16 01:57:22 -04:00
wyj d3277bd7fc Merge branch 'upstream-main' into fcitx5 2024-06-13 21:28:51 -04:00
115 changed files with 1414 additions and 3730 deletions
+18
View File
@@ -13,6 +13,24 @@ if [[ $(_isInstalledPacman "ttf-ms-fonts") == 0 ]]; then
fi fi
fi fi
# Check for running NetworkManager.service
if [[ $(systemctl list-units --all -t service --full --no-legend "NetworkManager.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "NetworkManager.service" ]];then
echo ":: NetworkManager.service already running."
else
sudo systemctl enable NetworkManager.service
sudo systemctl start NetworkManager.service
echo ":: NetworkManager.service activated successfully."
fi
# Check for running bluetooth.service
if [[ $(systemctl list-units --all -t service --full --no-legend "bluetooth.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "bluetooth.service" ]];then
echo ":: bluetooth.service already running."
else
sudo systemctl enable bluetooth.service
sudo systemctl start bluetooth.service
echo ":: bluetooth.service activated successfully."
fi
if [ -d ~/dotfiles/hypr/settings/ ] ;then if [ -d ~/dotfiles/hypr/settings/ ] ;then
rm -rf ~/dotfiles/hypr/settings rm -rf ~/dotfiles/hypr/settings
echo ":: ~/dotfiles/hypr/settings removed." echo ":: ~/dotfiles/hypr/settings removed."
-6
View File
@@ -1,6 +0,0 @@
# ------------------------------------------------------
# install fish
# ------------------------------------------------------
packagesPacman=("fish");
packagesYay=();
source .install/install-packages.sh
-21
View File
@@ -1,21 +0,0 @@
# ------------------------------------------------------
# hidpi support
# ------------------------------------------------------
echo -e "${GREEN}"
figlet "hidpi"
echo -e "${NONE}"
hidpiconfirm="Do you want 2x hidpi scale?"
if gum confirm "$hidpiconfirm"; then
sed -i -E 's/size = [0-9]+(\.[0-9]+)?/size = 16/' ~/dotfiles-versions/$version/alacritty/alacritty.toml
sed -i -E 's/[0-9]+(\.[0-9]+)?/16/' ~/dotfiles-versions/$version/.settings/rofi-font.rasi
echo -e '\n# -----------------------------------------------------' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
echo -e '# HiDPI Scaling' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
echo -e '# -----------------------------------------------------' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
echo -e 'source = ~/dotfiles/hypr/conf/hidpi.conf' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
sed -i -E 's/1/2/' ~/dotfiles-versions/$version/hypr/conf/monitors/default.conf
sed -i -E 's/24/32/' ~/dotfiles-versions/$version/hypr/conf/cursor.conf
echo ":: finished hidpi patch."
fi
-10
View File
@@ -5,9 +5,6 @@
if [ -d ~/dotfiles-versions/$version/alacritty ]; then if [ -d ~/dotfiles-versions/$version/alacritty ]; then
_installSymLink alacritty ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config _installSymLink alacritty ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config
fi fi
if [ -d ~/dotfiles-versions/$version/kitty ]; then
_installSymLink kitty ~/.config/kitty ~/dotfiles/kitty/ ~/.config
fi
if [ -d ~/dotfiles-versions/$version/vim ]; then if [ -d ~/dotfiles-versions/$version/vim ]; then
_installSymLink vim ~/.config/vim ~/dotfiles/vim/ ~/.config _installSymLink vim ~/.config/vim ~/dotfiles/vim/ ~/.config
fi fi
@@ -46,12 +43,5 @@ fi
if [ -d ~/dotfiles-versions/$version/fastfetch ]; then if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
_installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config _installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config
fi fi
if [ -f ~/dotfiles-versions/$version/chrome-flags.conf ]; then
_installSymLink chrome-flags ~/.config/chrome-flags.conf ~/dotfiles/chrome-flags.conf ~/.config
fi
if [ -d ~/dotfiles-versions/$version/Vimix-hyprcursors ]; then
if [ ! -d ~/.local/share/icons ]; then mkdir -pv ~/.local/share/icons; fi
_installSymLink Vimix-hyprcursors ~/.local/share/icons/Vimix-hyprcursors ~/dotfiles/Vimix-hyprcursors ~/.local/share/icons/
fi
echo ":: Symbolic links created." echo ":: Symbolic links created."
echo echo
+35 -27
View File
@@ -1,57 +1,65 @@
packagesPacman=( packagesPacman=(
"pacman-contrib" "pacman-contrib"
"vim" "vim"
"bat" "bluez"
"fzf" "bluez-utils"
"zsh"
"fastfetch"
"ranger"
"btop"
"neovim" "neovim"
"wget" "wget"
"unzip" "unzip"
"alacritty" "alacritty"
"dunst" "chromium"
"dunst"
"starship" "starship"
"mpv" "mpv"
"thunar" "thunar"
"nautilus" "nautilus"
"noto-fonts" "mousepad"
"otf-font-awesome" "noto-fonts"
"ttf-fira-sans" "otf-font-awesome"
"ttf-fira-code" "ttf-fira-sans"
"ttf-firacode-nerd" "ttf-fira-code"
"ttf-firacode-nerd" "ttf-firacode-nerd"
"figlet" "figlet"
"vlc" "vlc"
"eza" "eza"
"python-pip" "python-pip"
"python-psutil" "python-psutil"
"python-rich" "python-rich"
"python-click"
"python-pywal" "python-pywal"
"pavucontrol" "python-gobject"
"tumbler" "pavucontrol"
"tumbler"
"papirus-icon-theme" "papirus-icon-theme"
"breeze-icons"
"polkit-gnome"
"brightnessctl"
"gum" "gum"
"man-pages" "man-pages"
"nm-connection-editor"
"gvfs" "gvfs"
"xdg-user-dirs" "xdg-user-dirs"
"xdg-desktop-portal-gtk" "xdg-desktop-portal-gtk"
"networkmanager"
"network-manager-applet"
"xarchiver" "xarchiver"
"thunar-archive-plugin" "thunar-archive-plugin"
"zip" "zip"
"fuse2" "fuse2"
"gtk4"
"libadwaita"
"xdg-desktop-portal" "xdg-desktop-portal"
"qalculate-gtk" "qalculate-gtk"
"imagemagick" "imagemagick"
"guvcview"
"jq" "jq"
"rofi-wayland" "rofi-wayland"
"fastfetch" "fastfetch"
"blueman"
); );
packagesYay=( packagesYay=(
"vimix-cursors" "bibata-cursor-theme"
"orchis-theme"
"trizen" "trizen"
"google-chrome" "pacseek"
); );
+3 -5
View File
@@ -3,17 +3,15 @@ packagesPacman=(
"hyprpaper" "hyprpaper"
"hyprlock" "hyprlock"
"hypridle" "hypridle"
"xdg-desktop-portal-hyprland" "xdg-desktop-portal-hyprland"
"waybar" "waybar"
"grim" "grim"
"slurp" "slurp"
"swappy" "swappy"
"cliphist" "cliphist"
"kitty"
); );
packagesYay=( packagesYay=(
"pyprland"
"wlogout" "wlogout"
"nwg-look" "nwg-look"
"eww" "eww"
-3
View File
@@ -35,7 +35,4 @@ fi
if [ -d ~/dotfiles-versions/$version/swappy ]; then if [ -d ~/dotfiles-versions/$version/swappy ]; then
_installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config
fi fi
if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
_installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config
fi
echo ":: Symbolic links created." echo ":: Symbolic links created."
+9 -17
View File
@@ -14,14 +14,6 @@ _showRestoreOptions() {
restorelist+="~/dotfiles/.bashrc " restorelist+="~/dotfiles/.bashrc "
selectedlist+="~/dotfiles/.bashrc," selectedlist+="~/dotfiles/.bashrc,"
fi fi
if [ -f ~/dotfiles/.zshrc ]; then
restorelist+="~/dotfiles/.zshrc "
selectedlist+="~/dotfiles/.zshrc,"
fi
if [ -f ~/dotfiles/.p10k.zsh ]; then
restorelist+="~/dotfiles/.p10k.zsh "
selectedlist+="~/dotfiles/.p10k.zsh,"
fi
if [ -d ~/dotfiles/.settings ]; then if [ -d ~/dotfiles/.settings ]; then
restorelist+="~/dotfiles/.settings " restorelist+="~/dotfiles/.settings "
selectedlist+="~/dotfiles/.settings," selectedlist+="~/dotfiles/.settings,"
@@ -32,7 +24,7 @@ _showRestoreOptions() {
then then
restorelist+="~/dotfiles/hypr/hypridle.conf " restorelist+="~/dotfiles/hypr/hypridle.conf "
selectedlist+="~/dotfiles/hypr/hypridle.conf," selectedlist+="~/dotfiles/hypr/hypridle.conf,"
fi fi
fi fi
if [ -f ~/dotfiles/hypr/conf/custom.conf ]; then if [ -f ~/dotfiles/hypr/conf/custom.conf ]; then
restorelist+="~/dotfiles/hypr/conf/custom.conf " restorelist+="~/dotfiles/hypr/conf/custom.conf "
@@ -83,13 +75,13 @@ _showRestoreOptions() {
fi fi
restoreselect=$(gum choose --no-limit --height 20 --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) " --selected="$selectedlist" $restorelist) restoreselect=$(gum choose --no-limit --height 20 --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) " --selected="$selectedlist" $restorelist)
if [ ! -z "$restoreselect" ] ;then if [ ! -z "$restoreselect" ] ;then
echo "Selected to restore:" echo "Selected to restore:"
echo "$restoreselect" echo "$restoreselect"
echo "" echo ""
confirmrestore=$(gum choose "Start restore" "Change restore" "Skip restore") confirmrestore=$(gum choose "Start restore" "Change restore" "Skip restore")
if [ "$confirmrestore" == "Start restore" ] ;then if [ "$confirmrestore" == "Start restore" ] ;then
_startRestore _startRestore
elif [ "$confirmrestore" == "Change restore" ]; then elif [ "$confirmrestore" == "Change restore" ]; then
_showRestoreOptions _showRestoreOptions
else else
echo ":: Restore skipped." echo ":: Restore skipped."
@@ -102,7 +94,7 @@ _showRestoreOptions() {
echo ":: Installation canceled." echo ":: Installation canceled."
exit exit
fi fi
if [ "$confirmrestore" == "Change restore" ]; then if [ "$confirmrestore" == "Change restore" ]; then
echo "" echo ""
_showRestoreOptions _showRestoreOptions
else else
@@ -143,11 +135,11 @@ _startRestore() {
cp ~/dotfiles/hypr/conf/keyboard.conf ~/dotfiles-versions/$version/hypr/conf/ cp ~/dotfiles/hypr/conf/keyboard.conf ~/dotfiles-versions/$version/hypr/conf/
echo ":: Hyprland keyboard.conf restored!" echo ":: Hyprland keyboard.conf restored!"
fi fi
fi fi
if [[ $restoreselect == *"~/dotfiles/hypr/conf/monitor.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then if [[ $restoreselect == *"~/dotfiles/hypr/conf/monitor.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
if [ -f ~/dotfiles/hypr/conf/monitor.conf ]; then if [ -f ~/dotfiles/hypr/conf/monitor.conf ]; then
cp ~/dotfiles/hypr/conf/monitor.conf ~/dotfiles-versions/$version/hypr/conf/ cp ~/dotfiles/hypr/conf/monitor.conf ~/dotfiles-versions/$version/hypr/conf/
echo ":: Hyprland monitor.conf restored!" echo ":: Hyprland monitor.conf restored!"
fi fi
fi fi
if [[ $restoreselect == *"~/dotfiles/hypr/conf/keybinding.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then if [[ $restoreselect == *"~/dotfiles/hypr/conf/keybinding.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
@@ -161,19 +153,19 @@ _startRestore() {
cp ~/dotfiles/hypr/conf/environment.conf ~/dotfiles-versions/$version/hypr/conf/ cp ~/dotfiles/hypr/conf/environment.conf ~/dotfiles-versions/$version/hypr/conf/
echo ":: Hyprland environment.conf restored!" echo ":: Hyprland environment.conf restored!"
fi fi
fi fi
if [[ $restoreselect == *"~/dotfiles/hypr/conf/layout.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then if [[ $restoreselect == *"~/dotfiles/hypr/conf/layout.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
if [ -f ~/dotfiles/hypr/conf/layout.conf ]; then if [ -f ~/dotfiles/hypr/conf/layout.conf ]; then
cp ~/dotfiles/hypr/conf/layout.conf ~/dotfiles-versions/$version/hypr/conf/ cp ~/dotfiles/hypr/conf/layout.conf ~/dotfiles-versions/$version/hypr/conf/
echo ":: Hyprland layout.conf restored!" echo ":: Hyprland layout.conf restored!"
fi fi
fi fi
if [[ $restoreselect == *"~/dotfiles/hypr/conf/windowrule.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then if [[ $restoreselect == *"~/dotfiles/hypr/conf/windowrule.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
if [ -f ~/dotfiles/hypr/conf/windowrule.conf ]; then if [ -f ~/dotfiles/hypr/conf/windowrule.conf ]; then
cp ~/dotfiles/hypr/conf/windowrule.conf ~/dotfiles-versions/$version/hypr/conf/ cp ~/dotfiles/hypr/conf/windowrule.conf ~/dotfiles-versions/$version/hypr/conf/
echo ":: Hyprland windowrule.conf restored!" echo ":: Hyprland windowrule.conf restored!"
fi fi
fi fi
if [[ $restoreselect == *"~/dotfiles/hypr/conf/animation.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then if [[ $restoreselect == *"~/dotfiles/hypr/conf/animation.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
if [ -f ~/dotfiles/hypr/conf/animation.conf ]; then if [ -f ~/dotfiles/hypr/conf/animation.conf ]; then
cp ~/dotfiles/hypr/conf/animation.conf ~/dotfiles-versions/$version/hypr/conf/ cp ~/dotfiles/hypr/conf/animation.conf ~/dotfiles-versions/$version/hypr/conf/
+7 -8
View File
@@ -5,17 +5,16 @@ echo -e "${GREEN}"
figlet "Wallpapers" figlet "Wallpapers"
echo -e "${NONE}" echo -e "${NONE}"
if [ ! -d ~/wallpaper ]; then if [ ! -d ~/wallpaper ]; then
echo "Do you want to download the wallpapers from repository https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ?" echo "Do you want to download the wallpapers from repository https://gitlab.com/stephan-raabe/wallpaper/ ?"
echo "If not, the script will install 3 default wallpapers in ~/wallpaper/" echo "If not, the script will install 3 default wallpapers in ~/wallpaper/"
echo "" echo ""
if gum confirm "Do you want to download the repository?" ;then if gum confirm "Do you want to download the repository?" ;then
# wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip
# unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/ unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
# if [ ! -d ~/wallpaper/ ]; then if [ ! -d ~/wallpaper/ ]; then
# mkdir ~/wallpaper mkdir ~/wallpaper
# fi fi
# cp ~/Downloads/wallpaper-main/* ~/wallpaper/ cp ~/Downloads/wallpaper-main/* ~/wallpaper/
git clone https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ~/wallpaper
echo "Wallpapers from the repository installed successfully." echo "Wallpapers from the repository installed successfully."
elif [ $? -eq 130 ]; then elif [ $? -eq 130 ]; then
exit 130 exit 130
-19
View File
@@ -1,19 +0,0 @@
# ------------------------------------------------------
# install zsh and zinit
# ------------------------------------------------------
packagesPacman=("zsh");
echo "Please select the zsh plugin manager:"
zsh_manager=$(gum choose --limit=1 --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) " "oh my zsh" "zinit")
if [[ "${zsh_manager}" == *"oh my zsh"* ]]; then
source .install/install-packages.sh
RUNZSH=no CHSH=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
git clone https://github.com/zdharma-continuum/fast-syntax-highlighting.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/fast-syntax-highlighting
_installSymLink zshrc ~/.zshrc ~/dotfiles/.zshrc_ohmyzsh ~/.zshrc
else
packagesYay=("zinit");
source .install/install-packages.sh
_installSymLink zshrc ~/.zshrc ~/dotfiles/.zshrc_zinit ~/.zshrc
fi
_installSymLink p10k ~/.p10k.zsh ~/dotfiles/.p10k.zsh ~/
-25
View File
@@ -1,25 +0,0 @@
# ------------------------------------------------------
# Select additional shell
# ------------------------------------------------------
echo -e "${GREEN}"
figlet "Zsh Fish"
echo -e "${NONE}"
echo "Please select if you want to install zsh or fish."
echo
zshfish=$(gum choose --no-limit --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) " "zsh" "fish")
if [ -z "${zshfish}" ] ;then
echo ":: No shell selected. Keep using bash."
else
echo "Please select your default shell."
echo
shell=$(echo -e "bash\n$zshfish" | gum choose --limit=1 --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) ")
if [[ $zshfish == *"zsh"* ]]; then
echo ":: zsh selected"
source .install/zsh.sh
fi
if [[ $zshfish == *"fish"* ]]; then
echo ":: fish selected"
source .install/fish.sh
fi
fi
-1718
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1 +1 @@
google-chrome-stable chromium
+1 -1
View File
@@ -1 +1 @@
~/dotfiles/.settings/terminal.sh -e vim mousepad
+1
View File
@@ -0,0 +1 @@
nm-connection-editor
-3
View File
@@ -1,3 +0,0 @@
* {
border-radius: 15px;
}
+1
View File
@@ -1,3 +1,4 @@
* { * {
border-width: 2px; border-width: 2px;
border-radius: 15px;
} }
+1
View File
@@ -0,0 +1 @@
alacritty -e pacseek
-80
View File
@@ -1,80 +0,0 @@
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
# Initialization code that may require console input (password prompts, [y/n]
# confirmations, etc.) must go above this block; everything else may go below.
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
fi
# -----------------------------------------------------
# Oh my zsh settings
# -----------------------------------------------------
# Path to your oh-my-zsh installation.
export ZSH="$HOME/.oh-my-zsh"
# ZSH_THEME="robbyrussell"
ZSH_THEME="powerlevel10k/powerlevel10k"
# Uncomment the following line to use hyphen-insensitive completion.
# Case-sensitive completion must be off. _ and - will be interchangeable.
# HYPHEN_INSENSITIVE="true"
zstyle ':omz:update' mode auto
# Uncomment the following line to display red dots whilst waiting for completion.
# You can also set it to another string to have that shown instead of the default red dots.
# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
COMPLETION_WAITING_DOTS="true"
# -----------------------------------------------------
# Plugins
# -----------------------------------------------------
plugins=(git colored-man-pages eza z sudo zsh-autosuggestions fast-syntax-highlighting)
source $ZSH/oh-my-zsh.sh
# -----------------------------------------------------
# Variables
# -----------------------------------------------------
export PATH=$HOME/.cargo/bin:$HOME/.local/bin:/usr/local/bin:$PATH
# export MANPATH="/usr/local/man:$MANPATH"
export LANG=en_US.UTF-8
export EDITOR='vim'
export MAKEFLAGS='-j$(nproc)'
export CFLAGS='-march=native -O2 -pipe'
# -----------------------------------------------------
# Alias
# -----------------------------------------------------
alias sshkoko="TERM=xterm-256color ssh ywang2020@koko-login.hpc.fau.edu"
alias wakemac="wakeonlan 18:C0:4D:8D:56:0E"
alias ls="eza --icons=auto"
alias githashselector="git log --oneline | gum filter | cut -d' ' -f1"
alias bat="bat --paging=never"
# fix ssh if in kitty
[ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
# -----------------------------------------------------
# evals
# -----------------------------------------------------
eval $(thefuck --alias)
eval "$(fzf --zsh)"
# -----------------------------------------------------
# PYWAL
# -----------------------------------------------------
cat ~/.cache/wal/sequences
# -----------------------------------------------------
# Custom
# -----------------------------------------------------
[[ ! -f ~/.custom.zsh ]] || source ~/.custom.zsh
# -----------------------------------------------------
# miscs
# -----------------------------------------------------
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
-62
View File
@@ -1,62 +0,0 @@
# ---------------------------------------------------
# Zinit and plugins
# ---------------------------------------------------
source /usr/share/zinit/zinit.zsh
# Load powerlevel10k theme
zinit ice depth"1" # git clone depth
zinit light romkatv/powerlevel10k
# Load plugins
zinit light zsh-users/zsh-autosuggestions
zinit light zdharma-continuum/fast-syntax-highlighting
# oh-my-zsh plugins
zi snippet OMZL::git.zsh
zi snippet OMZP::git
zi snippet OMZP::sudo
zi snippet OMZP::colored-man-pages
zi snippet OMZP::eza
zi snippet OMZP::z
# others
zplugin ice as"program" pick"bin/git-dsf"
zplugin light zdharma-continuum/zsh-diff-so-fancy
# ----------------------------------------------------
# Variables
# ----------------------------------------------------
export PATH=$HOME/bin:$HOME/.cargo/bin:$HOME/.local/bin:/usr/local/bin:$PATH
export EDITOR=vim
# ----------------------------------------------------
# Alias
# ----------------------------------------------------
alias sshkoko="TERM=xterm-256color ssh ywang2020@koko-login.hpc.fau.edu"
alias wakemac="wakeonlan 18:C0:4D:8D:56:0E"
alias eza="eza --icons=auto"
alias githashselector="git log --oneline | gum filter | cut -d' ' -f1"
alias bat="bat --paging=never"
# -----------------------------------------------------
# evals
# -----------------------------------------------------
eval $(thefuck --alias)
eval "$(fzf --zsh)"
# -----------------------------------------------------
# Miscs
# -----------------------------------------------------
# fix ssh if in kitty
[ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
# -----------------------------------------------------
# PYWAL
# -----------------------------------------------------
cat ~/.cache/wal/sequences
# -----------------------------------------------------
# Custom
# -----------------------------------------------------
[[ ! -f ~/.custom.zsh ]] || source ~/.custom.zsh
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-4
View File
@@ -1,4 +0,0 @@
name = Extracted Theme
description = Automatically extracted with hyprcursor-util
version = 0.1
cursors_directory = hyprcursors
+1 -4
View File
@@ -1,5 +1,5 @@
[font] [font]
size = 16.0 size = 12.0
[font.normal] [font.normal]
family = "FiraCode Nerd Font" family = "FiraCode Nerd Font"
@@ -11,6 +11,3 @@ opacity = 0.7
[window.padding] [window.padding]
x = 15 x = 15
y = 15 y = 15
[selection]
save_to_clipboard = true
-1
View File
@@ -1 +0,0 @@
--ozone-platform=wayland --enable-wayland-ime
+109 -164
View File
@@ -1,165 +1,110 @@
// Note that you must replace the image path to an existing image to display it. // Thanks to Bina
{ {
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
// "logo": { "logo": {
// "type": "iterm", "padding": {
// "source": "/Users/carter/Desktop/apple1.png", "top": 2
// "width": 28, }
// "height": 12 },
// }, "display": {
"display": { "separator": " ➜ "
// "separator": "  " },
"separator": " " "modules": [
}, "break",
"modules": [ "break",
{ "break",
"type": "host", {
"key": "╭─󰌢", "type": "os",
"keyColor": "green" "key": "OS ",
}, "keyColor": "31", // = color1
{ },
"type": "cpu", {
"key": "├─󰻠", "type": "kernel",
"keyColor": "green" "key": " ├  ",
}, "keyColor": "31",
{ },
"type": "gpu", {
"key": "├─󰍛", "type": "packages",
"keyColor": "green" "format": "{} (pacman)",
}, "key": " ├ 󰏖 ",
{ "keyColor": "31",
"type": "disk", },
"key": "├─", {
"keyColor": "green" "type": "shell",
}, "key": " └  ",
{ "keyColor": "31",
"type": "memory", },
"key": "├─󰑭", "break",
"keyColor": "green" {
}, "type": "wm",
{ "key": "WM ",
"type": "swap", "keyColor": "32",
"key": "├─󰓡", },
"keyColor": "green" {
}, "type": "wmtheme",
{ "key": " ├ 󰉼 ",
"type": "display", "keyColor": "32",
"key": "├─󰍹", },
"keyColor": "green" {
}, "type": "icons",
{ "key": " ├ 󰀻 ",
"type": "battery", "keyColor": "32",
"key": "├─", },
"keyColor": "green" {
}, "type": "cursor",
{ "key": " ├  ",
"type": "poweradapter", "keyColor": "32",
"key": "├─", },
"keyColor": "green" {
}, "type": "terminal",
{ "key": " ├  ",
"type": "gamepad", "keyColor": "32",
"key": "├─", },
"keyColor": "green" {
}, "type": "terminalfont",
{ "key": " └  ",
"type": "bluetooth", "keyColor": "32",
"key": "├─", },
"keyColor": "green" "break",
}, {
{ "type": "host",
"type": "sound", "format": "{5} {1} Type {2}",
"key": "╰─", "key": "PC ",
"keyColor": "green" "keyColor": "33",
}, },
"break", {
"type": "cpu",
{ "format": "{1} ({3}) @ {7} GHz",
"type": "shell", "key": " ├  ",
"key": "╭─", "keyColor": "33",
"keyColor": "yellow" },
}, {
{ "type": "gpu",
"type": "terminal", "format": "{1} {2} @ {12} GHz",
"key": "├─", "key": " ├ 󰢮 ",
"keyColor": "yellow" "keyColor": "33",
}, },
{ {
"type": "terminalfont", "type": "memory",
"key": "├─", "key": " ├  ",
"keyColor": "yellow" "keyColor": "33",
}, },
{ {
"type": "lm", "type": "swap",
"key": "├─󰧨", "key": " ├ 󰓡 ",
"keyColor": "yellow" "keyColor": "33",
}, },
{ {
"type": "de", "type": "disk",
"key": "├─", "key": " ├ 󰋊 ",
"keyColor": "yellow" "keyColor": "33",
}, },
{ {
"type": "wm", "type": "monitor",
"key": "├─", "key": " └  ",
"keyColor": "yellow" "keyColor": "33",
}, },
{ "break",
"type": "theme", "break",
"key": "├─󰉼", ]
"keyColor": "yellow" }
},
{
"type": "icons",
"key": "╰─󰀻",
"keyColor": "yellow"
},
"break",
{
"type": "title",
"key": "╭─",
"format": "{1}@{2}",
"keyColor": "blue"
},
{
"type": "os",
"key": "├─󰣇", // Just get your distro's logo off nerdfonts.com
"keyColor": "blue"
},
{
"type": "kernel",
"key": "├─",
"format": "{1} {2}",
"keyColor": "blue"
},
{
"type": "packages",
"key": "├─󰏖",
"keyColor": "blue"
},
{
"type": "uptime",
"key": "├─󰅐",
"keyColor": "blue"
},
{
"type": "media",
"key": "├─󰝚",
"keyColor": "blue"
},
{
"type": "localip",
"key": "╰─󰩟",
"compact": true,
"keyColor": "blue"
},
"break",
{
"type": "custom",
"format": " \u001b[90m󱓻 \u001b[31m󱓻 \u001b[32m󱓻 \u001b[33m󱓻 \u001b[34m󱓻 \u001b[35m󱓻 \u001b[36m󱓻 \u001b[37m󱓻 \u001b[38m󱓻 \u001b[39m󱓻"
}
]
}
+1 -1
View File
@@ -1 +1 @@
source = ~/dotfiles/hypr/conf/animations/animations-high.conf source = ~/dotfiles/hypr/conf/animations/animation-moving.conf
+3 -3
View File
@@ -29,8 +29,8 @@ exec-once = ~/dotfiles/hypr/scripts/ml4w-welcome-autostart.sh
# Start ewww daemon # Start ewww daemon
exec-once = ~/dotfiles/hypr/scripts/eww.sh exec-once = ~/dotfiles/hypr/scripts/eww.sh
exec-once = pypr
# Start autostart cleanup # Start autostart cleanup
exec-once = ~/dotfiles/hypr/scripts/cleanup.sh exec-once = ~/dotfiles/hypr/scripts/cleanup.sh
# Load configuration from ML4W Hyprland Settings App
exec = ~/.config/ml4w-hyprland-settings/hyprctl.sh
+1 -2
View File
@@ -1,2 +1 @@
exec-once = hyprctl setcursor Vimix-hyprcursors 24 exec-once = hyprctl setcursor Bibata-Modern-Ice 24
env = HYPRCURSOR_THEME,Vimix-hyprcursors
+2
View File
@@ -3,3 +3,5 @@ exec-once = fcitx5 -d --replace
exec-once = fcitx5-remote -r exec-once = fcitx5-remote -r
bind=$mainMod CTRL, E, exec, pkill fcitx5 -9;sleep 1;fcitx5 -d --replace; sleep 1;fcitx5-remote -r bind=$mainMod CTRL, E, exec, pkill fcitx5 -9;sleep 1;fcitx5 -d --replace; sleep 1;fcitx5-remote -r
env=QT_IM_MODULE,fcitx
-6
View File
@@ -1,6 +0,0 @@
xwayland {
force_zero_scaling = true
}
env = GDK_SCALE,2
env = QT_SCALE_FACTOR,2
+5 -11
View File
@@ -1,7 +1,7 @@
# ----------------------------------------------------- # -----------------------------------------------------
# Key bindings # Key bindings
# name: "Default" # name: "Default"
# ----------------------------------------------------- # -----------------------------------------------------
# SUPER KEY # SUPER KEY
$mainMod = SUPER $mainMod = SUPER
@@ -9,7 +9,7 @@ $mainMod = SUPER
# Applications # Applications
bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh
bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh
bind = $mainMod SHIFT, E, exec, emote bind = $mainMod, period, exec, emote
# Windows # Windows
bind = $mainMod, Q, killactive bind = $mainMod, Q, killactive
@@ -35,18 +35,15 @@ bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh
bind = $mainMod CTRL, Q, exec, wlogout bind = $mainMod CTRL, Q, exec, wlogout
bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh
bind = $mainMod CTRL, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh select bind = $mainMod CTRL, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh select
bind = $mainMod, SPACE, exec, rofi -show drun -replace -i bind = $mainMod CTRL, RETURN, exec, rofi -show drun -replace -i
bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh
bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh
bind = $mainMod CTRL, B, exec, ~/dotfiles/waybar/toggle.sh
bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh
bind = $mainMod CTRL, F, exec, ~/dotfiles/scripts/filemanager.sh
bind = $mainMod CTRL, C, exec, ~/dotfiles/scripts/cliphist.sh bind = $mainMod CTRL, C, exec, ~/dotfiles/scripts/cliphist.sh
bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh
bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh
bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage
bind = $mainMod CTRL, P, exec, hyprpicker -a
bind = $mainMod SHIFT, S, exec, ~/dotfiles/hypr/scripts/hyprshade.sh
bind = $mainMod ALT, G, exec, ~/dotfiles/hypr/scripts/gamemode.sh
# Workspaces # Workspaces
bind = $mainMod, 1, workspace, 1 bind = $mainMod, 1, workspace, 1
@@ -95,6 +92,3 @@ bind = $mainMod, P, submap, passthru
submap = passthru submap = passthru
bind = SUPER, Escape, submap, reset bind = SUPER, Escape, submap, reset
submap = reset submap = reset
# Pyprland
bind = $mainMod SHIFT, RETURN, exec, pypr toggle term
+3 -5
View File
@@ -3,17 +3,15 @@
# https://wiki.hyprland.org/Configuring/Variables/#input # https://wiki.hyprland.org/Configuring/Variables/#input
# ----------------------------------------------------- # -----------------------------------------------------
input { input {
kb_layout = us kb_layout = de
kb_variant = kb_variant =
kb_model = kb_model =
kb_options = kb_options =
numlock_by_default = true numlock_by_default = true
follow_mouse = 1 follow_mouse = 1
mouse_refocus=false mouse_refocus=false
touchpad { touchpad {
natural_scroll = true natural_scroll = false
disable_while_typing=true
tap-to-click=true
} }
sensitivity = 0 # -1.0 - 1.0, 0 means no modification. sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
} }
+1 -8
View File
@@ -12,12 +12,5 @@ master {
} }
gestures { gestures {
workspace_swipe=true workspace_swipe = true
workspace_swipe_fingers=3
workspace_swipe_distance=400
workspace_swipe_invert=true
workspace_swipe_min_speed_to_force=30
workspace_swipe_cancel_ratio=0.5
workspace_swipe_create_new=true
workspace_swipe_forever=true
} }
-2
View File
@@ -5,6 +5,4 @@
misc { misc {
disable_hyprland_logo = true disable_hyprland_logo = true
disable_splash_rendering = true disable_splash_rendering = true
enable_swallow = true
swallow_regex = ^(Alacritty)$
} }
-6
View File
@@ -1,6 +0,0 @@
# -----------------------------------------------------
# Monitor Setup
# name: "Default"
# -----------------------------------------------------
monitor=,preferred,auto,2
+1 -4
View File
@@ -4,7 +4,4 @@
# ----------------------------------------------------- # -----------------------------------------------------
monitor=DP-1,preferred,0x0,2 monitor=DP-1,preferred,0x0,2
monitor=HDMI-A-1,3840x2160,1920x-275,2,transform,1 monitor=HDMI-A-1,3840x2160,1920x-180,2,transform,1
workspace=1,monitor:DP-1
exec-once=hyprctl dispatch workspace 1
+2 -5
View File
@@ -1,6 +1,6 @@
# ----------------------------------------------------- # -----------------------------------------------------
# Window rules # Window rules
# ----------------------------------------------------- # -----------------------------------------------------
windowrule = tile,^(Microsoft-edge)$ windowrule = tile,^(Microsoft-edge)$
windowrule = tile,^(Brave-browser)$ windowrule = tile,^(Brave-browser)$
@@ -16,6 +16,3 @@ layerrule = blur, logout_dialog
windowrule = float,title=^(Mathematica)$ windowrule = float,title=^(Mathematica)$
windowrule = opacity 0.75, ^(Code)$ windowrule = opacity 0.75, ^(Code)$
windowrule = opacity 0.75, ^(code-url-handler)$
windowrule = float,^(QQ)$
windowrule = float,^(fdm)$
+31 -31
View File
@@ -1,48 +1,48 @@
# _ _ _ _ # _ _ _ _
# | | | |_ _ _ __ _ __| | __ _ _ __ __| | # | | | |_ _ _ __ _ __| | __ _ _ __ __| |
# | |_| | | | | '_ \| '__| |/ _` | '_ \ / _` | # | |_| | | | | '_ \| '__| |/ _` | '_ \ / _` |
# | _ | |_| | |_) | | | | (_| | | | | (_| | # | _ | |_| | |_) | | | | (_| | | | | (_| |
# |_| |_|\__, | .__/|_| |_|\__,_|_| |_|\__,_| # |_| |_|\__, | .__/|_| |_|\__,_|_| |_|\__,_|
# |___/|_| # |___/|_|
# #
# ----------------------------------------------------- # -----------------------------------------------------
# IMPORTANT: Don't overwrite ML4W configuration. # IMPORTANT: Don't overwrite ML4W configuration.
# Create your own custom configuration variation instead. # Create your own custom configuration variation instead.
# https://gitlab.com/stephan-raabe/dotfiles#hyprland-configuration-variations # https://gitlab.com/stephan-raabe/dotfiles#hyprland-configuration-variations
# ----------------------------------------------------- # -----------------------------------------------------
# Monitor # Monitor
# ----------------------------------------------------- # -----------------------------------------------------
source = ~/dotfiles/hypr/conf/monitor.conf source = ~/dotfiles/hypr/conf/monitor.conf
# ----------------------------------------------------- # -----------------------------------------------------
# Autostart # Autostart
# ----------------------------------------------------- # -----------------------------------------------------
source = ~/dotfiles/hypr/conf/autostart.conf source = ~/dotfiles/hypr/conf/autostart.conf
# ----------------------------------------------------- # -----------------------------------------------------
# Cursor # Cursor
# ----------------------------------------------------- # -----------------------------------------------------
source = ~/dotfiles/hypr/conf/cursor.conf source = ~/dotfiles/hypr/conf/cursor.conf
# ----------------------------------------------------- # -----------------------------------------------------
# Environment # Environment
# ----------------------------------------------------- # -----------------------------------------------------
source = ~/dotfiles/hypr/conf/environment.conf source = ~/dotfiles/hypr/conf/environment.conf
# ----------------------------------------------------- # -----------------------------------------------------
# Keyboard # Keyboard
# ----------------------------------------------------- # -----------------------------------------------------
source = ~/dotfiles/hypr/conf/keyboard.conf source = ~/dotfiles/hypr/conf/keyboard.conf
# ----------------------------------------------------- # -----------------------------------------------------
# Load pywal color file # Load pywal color file
# ----------------------------------------------------- # -----------------------------------------------------
source = ~/.cache/wal/colors-hyprland.conf source = ~/.cache/wal/colors-hyprland.conf
# ----------------------------------------------------- # -----------------------------------------------------
# Load configuration files # Load configuration files
# ----------------------------------------------------- # -----------------------------------------------------
source = ~/dotfiles/hypr/conf/window.conf source = ~/dotfiles/hypr/conf/window.conf
source = ~/dotfiles/hypr/conf/decoration.conf source = ~/dotfiles/hypr/conf/decoration.conf
source = ~/dotfiles/hypr/conf/layout.conf source = ~/dotfiles/hypr/conf/layout.conf
@@ -50,22 +50,22 @@ source = ~/dotfiles/hypr/conf/misc.conf
source = ~/dotfiles/hypr/conf/keybinding.conf source = ~/dotfiles/hypr/conf/keybinding.conf
source = ~/dotfiles/hypr/conf/windowrule.conf source = ~/dotfiles/hypr/conf/windowrule.conf
# ----------------------------------------------------- # -----------------------------------------------------
# Animation # Animation
# ----------------------------------------------------- # -----------------------------------------------------
source = ~/dotfiles/hypr/conf/animation.conf source = ~/dotfiles/hypr/conf/animation.conf
# ----------------------------------------------------- # -----------------------------------------------------
# Custom # Custom
# ----------------------------------------------------- # -----------------------------------------------------
source = ~/dotfiles/hypr/conf/custom.conf source = ~/dotfiles/hypr/conf/custom.conf
# ----------------------------------------------------- # -----------------------------------------------------
# ML4W Configuration # ML4W Configuration
# ----------------------------------------------------- # -----------------------------------------------------
source = ~/dotfiles/hypr/conf/ml4w.conf source = ~/dotfiles/hypr/conf/ml4w.conf
# ----------------------------------------------------- # -----------------------------------------------------
# Environment for xdg-desktop-portal-hyprland # Environment for xdg-desktop-portal-hyprland
# ----------------------------------------------------- # -----------------------------------------------------
exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-12
View File
@@ -1,12 +0,0 @@
[pyprland]
plugins = [
"scratchpads",
"magnify",
]
[scratchpads.term]
animation = "fromTop"
command = "kitty --class kitty-dropterm"
class = "kitty-dropterm"
size = "75% 60%"
+4 -4
View File
@@ -29,7 +29,7 @@ gsettings set "$gnome_schema" cursor-theme "$cursor_theme"
gsettings set "$gnome_schema" font-name "$font_name" gsettings set "$gnome_schema" font-name "$font_name"
gsettings set "$gnome_schema" color-scheme "prefer-dark" gsettings set "$gnome_schema" color-scheme "prefer-dark"
# if [ -f ~/dotfiles/hypr/conf/cursor.conf ] ;then if [ -f ~/dotfiles/hypr/conf/cursor.conf ] ;then
# echo "exec-once = hyprctl setcursor $cursor_theme $cursor_size" > ~/dotfiles/hypr/conf/cursor.conf echo "exec-once = hyprctl setcursor $cursor_theme $cursor_size" > ~/dotfiles/hypr/conf/cursor.conf
# hyprctl setcursor $cursor_theme $cursor_size hyprctl setcursor $cursor_theme $cursor_size
# fi fi
+1 -1
View File
@@ -42,4 +42,4 @@ case $choice in
notify-send "Screenshot created and copied to clipboard" "Mode: Fullscreen" notify-send "Screenshot created and copied to clipboard" "Mode: Fullscreen"
swappy -f "$DIR$NAME" swappy -f "$DIR$NAME"
;; ;;
esac esac
-2
View File
@@ -62,7 +62,6 @@ if [[ $profile == *"Qtile"* ]]; then
source .install/install-packages.sh source .install/install-packages.sh
fi fi
source .install/wallpaper.sh source .install/wallpaper.sh
source .install/hidpi.sh
source .install/displaymanager.sh source .install/displaymanager.sh
source .install/issue.sh source .install/issue.sh
source .install/restore.sh source .install/restore.sh
@@ -78,7 +77,6 @@ fi
if [[ $profile == *"Qtile"* ]]; then if [[ $profile == *"Qtile"* ]]; then
source .install/qtile-dotfiles.sh source .install/qtile-dotfiles.sh
fi fi
source .install/zshfish.sh
source .install/settings.sh source .install/settings.sh
source .install/apps.sh source .install/apps.sh
source .install/gtk.sh source .install/gtk.sh
-14
View File
@@ -1,14 +0,0 @@
font_family Fira Code Nerd Font
font_size 14.0
bold_font auto
italic_font auto
bold_italic_font auto
background_opacity 0.7
confirm_os_window_close 0
enable_audio_bell no
selection_foreground #000000
selection_background #F5FBFF
-1
View File
@@ -38,7 +38,6 @@ configuration {
/* ---- Load border width ---- */ /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi" @import "~/dotfiles/.settings/rofi-border.rasi"
@import "~/dotfiles/.settings/rofi-border-radius.rasi"
/* ---- Window ---- */ /* ---- Window ---- */
window { window {
-1
View File
@@ -39,7 +39,6 @@ configuration {
/* ---- Load border width ---- */ /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi" @import "~/dotfiles/.settings/rofi-border.rasi"
@import "~/dotfiles/.settings/rofi-border-radius.rasi"
/* ---- Window ---- */ /* ---- Window ---- */
window { window {
-1
View File
@@ -38,7 +38,6 @@ configuration {
/* ---- Load border width ---- */ /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi" @import "~/dotfiles/.settings/rofi-border.rasi"
@import "~/dotfiles/.settings/rofi-border-radius.rasi"
/* ---- Window ---- */ /* ---- Window ---- */
window { window {
-1
View File
@@ -38,7 +38,6 @@ configuration {
/* ---- Load border width ---- */ /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi" @import "~/dotfiles/.settings/rofi-border.rasi"
@import "~/dotfiles/.settings/rofi-border-radius.rasi"
/* ---- Window ---- */ /* ---- Window ---- */
window { window {
-1
View File
@@ -38,7 +38,6 @@ configuration {
/* ---- Load border width ---- */ /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi" @import "~/dotfiles/.settings/rofi-border.rasi"
@import "~/dotfiles/.settings/rofi-border-radius.rasi"
/* ---- Window ---- */ /* ---- Window ---- */
window { window {
-1
View File
@@ -38,7 +38,6 @@ configuration {
/* ---- Load border width ---- */ /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi" @import "~/dotfiles/.settings/rofi-border.rasi"
@import "~/dotfiles/.settings/rofi-border-radius.rasi"
/* ---- Window ---- */ /* ---- Window ---- */
window { window {
-1
View File
@@ -33,7 +33,6 @@ configuration {
/* ---- Load border width ---- */ /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi" @import "~/dotfiles/.settings/rofi-border.rasi"
@import "~/dotfiles/.settings/rofi-border-radius.rasi"
/* ---- Window ---- */ /* ---- Window ---- */
window { window {
-1
View File
@@ -39,7 +39,6 @@ configuration {
/* ---- Load border width ---- */ /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi" @import "~/dotfiles/.settings/rofi-border.rasi"
@import "~/dotfiles/.settings/rofi-border-radius.rasi"
/* ---- Window ---- */ /* ---- Window ---- */
window { window {
+1
View File
@@ -0,0 +1 @@
thunar
+42
View File
@@ -0,0 +1,42 @@
#!/bin/bash
# _____ _ _ _ __ _
# |_ _(_)_ __ ___ ___ ___| |__ (_)/ _| |_
# | | | | '_ ` _ \ / _ \/ __| '_ \| | |_| __|
# | | | | | | | | | __/\__ \ | | | | _| |_
# |_| |_|_| |_| |_|\___||___/_| |_|_|_| \__|
#
sleep 1
clear
figlet "Timeshift"
_isInstalledYay() {
package="$1";
check="$(yay -Qs --color always "${package}" | grep "local" | grep "${package} ")";
if [ -n "${check}" ] ; then
echo 0; #'0' means 'true' in Bash
return; #true
fi;
echo 1; #'1' means 'false' in Bash
return; #false
}
timeshift_installed=$(_isInstalledYay "timeshift")
grubbtrfs_installed=$(_isInstalledYay "grub-btrfs")
if [[ $timeshift_installed == "0" ]] ;then
echo ":: Timeshift is already installed"
else
if gum confirm "DO YOU WANT TO INSTALL Timeshift now?" ;then
yay -S timeshift
fi
fi
if [[ -d /boot/grub ]] && [[ $grubbtrfs_installed == "0" ]] ;then
echo ":: grub-btrfs is already installed"
else
echo ":: grub-btrfs is required to select a snapshot on grub bootloader."
if gum confirm "DO YOU WANT TO INSTALL grub-btrfs now?" ;then
yay -S grub-btrfs
fi
fi
sleep 3
+66
View File
@@ -0,0 +1,66 @@
#!/bin/bash
# ___ _ _ _ _ _ _ _
# |_ _|_ __ ___| |_ __ _| | | | | | |_ __ __| | __ _| |_ ___ ___
# | || '_ \/ __| __/ _` | | | | | | | '_ \ / _` |/ _` | __/ _ \/ __|
# | || | | \__ \ || (_| | | | | |_| | |_) | (_| | (_| | || __/\__ \
# |___|_| |_|___/\__\__,_|_|_| \___/| .__/ \__,_|\__,_|\__\___||___/
# |_|
# by Stephan Raabe (2024)
# -----------------------------------------------------
# Required: yay trizen timeshift btrfs-grub
# -----------------------------------------------------
sleep 1
clear
figlet "Updates"
echo
_isInstalledYay() {
package="$1";
check="$(yay -Qs --color always "${package}" | grep "local" | grep "${package} ")";
if [ -n "${check}" ] ; then
echo 0; #'0' means 'true' in Bash
return; #true
fi;
echo 1; #'1' means 'false' in Bash
return; #false
}
# ------------------------------------------------------
# Confirm Start
# ------------------------------------------------------
if gum confirm "DO YOU WANT TO START THE UPDATE NOW?" ;then
echo
echo ":: Update started."
elif [ $? -eq 130 ]; then
exit 130
else
echo
echo ":: Update canceled."
exit;
fi
if [[ $(_isInstalledYay "timeshift") == "0" ]] ;then
if gum confirm "DO YOU WANT TO CREATE A SNAPSHOT?" ;then
echo
c=$(gum input --placeholder "Enter a comment for the snapshot...")
sudo timeshift --create --comments "$c"
sudo timeshift --list
sudo grub-mkconfig -o /boot/grub/grub.cfg
echo ":: DONE. Snapshot $c created!"
echo
elif [ $? -eq 130 ]; then
echo ":: Snapshot canceled."
exit 130
else
echo ":: Snapshot canceled."
fi
echo
fi
yay
notify-send "Update complete"
echo
echo ":: Update complete"
sleep 2

Some files were not shown because too many files have changed in this diff Show More