13 Commits
Author SHA1 Message Date
wyj f176886688 fix: install ohmyzsh only if haven't 2024-08-25 10:39:27 -04:00
wyj 0c738fdb67 fix: add powerlevel10k install 2024-08-21 21:03:13 -04:00
wyj 526979a9f9 fix: alsp fix kitten ssh in zinit 2024-08-18 00:23:22 -04:00
wyj adab24d93f update: zshrc 2024-08-11 01:44:58 -04:00
wyj d5051c5c96 Merge branch 'upstream-main' into zshfish 2024-06-13 21:29:08 -04:00
wyj 6c3bef60c6 fix: fix 2024-06-07 04:35:16 -04:00
wyj ce02d5357b fix: fix 2024-06-07 04:14:05 -04:00
wyj 113c023b3c fix: fix 2024-06-07 04:08:43 -04:00
wyj f85d049cbd fix: fix 2024-06-07 04:05:41 -04:00
wyj 49fd73e67b update: add choice between oh my zsh and zinit 2024-06-07 03:09:21 -04:00
wyj 16a504966c feat: complete done zsh install and swith to zinit 2024-06-07 01:04:42 -04:00
wyj a23f49bcaf Merge branch 'upstream-main' into zshfish 2024-06-05 05:51:09 -04:00
wyj d9bdf7e748 feat: add .zshrc 2024-05-20 23:01:49 -04:00
117 changed files with 2355 additions and 2725 deletions
+1 -1
View File
@@ -109,7 +109,7 @@ alias setkb='setxkbmap de;echo "Keyboard set back to de."'
alias res1='xrandr --output DisplayPort-0 --mode 2560x1440 --rate 120'
alias res2='xrandr --output DisplayPort-0 --mode 1920x1080 --rate 120'
export PATH="$HOME/.local/bin/:/usr/lib/ccache/bin/:$PATH"
export PATH="/usr/lib/ccache/bin/:$PATH"
# -----------------------------------------------------
# DEVELOPMENT
+18
View File
@@ -13,6 +13,24 @@ if [[ $(_isInstalledPacman "ttf-ms-fonts") == 0 ]]; then
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
rm -rf ~/dotfiles/hypr/settings
echo ":: ~/dotfiles/hypr/settings removed."
+6
View File
@@ -0,0 +1,6 @@
# ------------------------------------------------------
# install fish
# ------------------------------------------------------
packagesPacman=("fish");
packagesYay=();
source .install/install-packages.sh
-10
View File
@@ -5,9 +5,6 @@
if [ -d ~/dotfiles-versions/$version/alacritty ]; then
_installSymLink alacritty ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config
fi
if [ -d ~/dotfiles-versions/$version/kitty ]; then
_installSymLink kitty ~/.config/kitty ~/dotfiles/kitty/ ~/.config
fi
if [ -d ~/dotfiles-versions/$version/vim ]; then
_installSymLink vim ~/.config/vim ~/dotfiles/vim/ ~/.config
fi
@@ -46,12 +43,5 @@ fi
if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
_installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config
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
+18 -10
View File
@@ -1,57 +1,65 @@
packagesPacman=(
"pacman-contrib"
"vim"
"bat"
"fzf"
"zsh"
"fastfetch"
"ranger"
"btop"
"bluez"
"bluez-utils"
"neovim"
"wget"
"unzip"
"alacritty"
"chromium"
"dunst"
"starship"
"mpv"
"thunar"
"nautilus"
"mousepad"
"noto-fonts"
"otf-font-awesome"
"ttf-fira-sans"
"ttf-fira-code"
"ttf-firacode-nerd"
"ttf-firacode-nerd"
"figlet"
"vlc"
"eza"
"python-pip"
"python-psutil"
"python-rich"
"python-click"
"python-pywal"
"python-gobject"
"pavucontrol"
"tumbler"
"papirus-icon-theme"
"breeze-icons"
"polkit-gnome"
"brightnessctl"
"gum"
"man-pages"
"nm-connection-editor"
"gvfs"
"xdg-user-dirs"
"xdg-desktop-portal-gtk"
"networkmanager"
"network-manager-applet"
"xarchiver"
"thunar-archive-plugin"
"zip"
"fuse2"
"gtk4"
"libadwaita"
"xdg-desktop-portal"
"qalculate-gtk"
"imagemagick"
"guvcview"
"jq"
"rofi-wayland"
"fastfetch"
"blueman"
);
packagesYay=(
"vimix-cursors"
"orchis-theme"
"bibata-cursor-theme"
"trizen"
"google-chrome"
"pacseek"
);
-2
View File
@@ -9,11 +9,9 @@ packagesPacman=(
"slurp"
"swappy"
"cliphist"
"kitty"
);
packagesYay=(
"pyprland"
"wlogout"
"nwg-look"
"eww"
-3
View File
@@ -35,7 +35,4 @@ fi
if [ -d ~/dotfiles-versions/$version/swappy ]; then
_installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config
fi
if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
_installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config
fi
echo ":: Symbolic links created."
+8
View File
@@ -14,6 +14,14 @@ _showRestoreOptions() {
restorelist+="~/dotfiles/.bashrc "
selectedlist+="~/dotfiles/.bashrc,"
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
restorelist+="~/dotfiles/.settings "
selectedlist+="~/dotfiles/.settings,"
+7 -8
View File
@@ -5,17 +5,16 @@ echo -e "${GREEN}"
figlet "Wallpapers"
echo -e "${NONE}"
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 gum confirm "Do you want to download the repository?" ;then
# wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip
# unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
# if [ ! -d ~/wallpaper/ ]; then
# mkdir ~/wallpaper
# fi
# cp ~/Downloads/wallpaper-main/* ~/wallpaper/
git clone https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ~/wallpaper
wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip
unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
if [ ! -d ~/wallpaper/ ]; then
mkdir ~/wallpaper
fi
cp ~/Downloads/wallpaper-main/* ~/wallpaper/
echo "Wallpapers from the repository installed successfully."
elif [ $? -eq 130 ]; then
exit 130
+22
View File
@@ -0,0 +1,22 @@
# ------------------------------------------------------
# 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
if [ ! -d ~/.oh-my-zsh ]; then
RUNZSH=no CHSH=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
fi
git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k
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
@@ -0,0 +1,25 @@
# ------------------------------------------------------
# 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 -3
View File
@@ -1,3 +1 @@
* {
border-width: 2px;
}
* { border-width: 3px; }
+1
View File
@@ -0,0 +1 @@
alacritty -e pacseek
+88
View File
@@ -0,0 +1,88 @@
# 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='nvim'
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"
alias code="code --ozone-platform=wayland --enable-wayland-ime"
# fix ssh if in kitty
if [[ "$TERM" == "xterm-kitty" && -z "$SSH_CONNECTION" ]]; then
alias ssh="kitty +kitten ssh"
fi
# -----------------------------------------------------
# Completion
# -----------------------------------------------------
[[ -f /home/wyj/.dart-cli-completion/zsh-config.zsh ]] && . /home/wyj/.dart-cli-completion/zsh-config.zsh || true
# -----------------------------------------------------
# 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
+64
View File
@@ -0,0 +1,64 @@
# ---------------------------------------------------
# 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
if [[ "$TERM" == "xterm-kitty" && -z "$SSH_CONNECTION" ]]; then
alias ssh="kitty +kitten ssh"
fi
# 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
-3
View File
@@ -11,6 +11,3 @@ opacity = 0.7
[window.padding]
x = 15
y = 15
[selection]
save_to_clipboard = true
-1
View File
@@ -1 +0,0 @@
--ozone-platform=wayland --enable-wayland-ime
+88 -143
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",
// "logo": {
// "type": "iterm",
// "source": "/Users/carter/Desktop/apple1.png",
// "width": 28,
// "height": 12
// },
"logo": {
"padding": {
"top": 2
}
},
"display": {
// "separator": "  "
"separator": " "
"separator": " ➜ "
},
"modules": [
{
"type": "host",
"key": "╭─󰌢",
"keyColor": "green"
},
{
"type": "cpu",
"key": "├─󰻠",
"keyColor": "green"
},
{
"type": "gpu",
"key": "├─󰍛",
"keyColor": "green"
},
{
"type": "disk",
"key": "├─",
"keyColor": "green"
},
{
"type": "memory",
"key": "├─󰑭",
"keyColor": "green"
},
{
"type": "swap",
"key": "├─󰓡",
"keyColor": "green"
},
{
"type": "display",
"key": "├─󰍹",
"keyColor": "green"
},
{
"type": "battery",
"key": "├─",
"keyColor": "green"
},
{
"type": "poweradapter",
"key": "├─",
"keyColor": "green"
},
{
"type": "gamepad",
"key": "├─",
"keyColor": "green"
},
{
"type": "bluetooth",
"key": "├─",
"keyColor": "green"
},
{
"type": "sound",
"key": "╰─",
"keyColor": "green"
},
"break",
{
"type": "shell",
"key": "╭─",
"keyColor": "yellow"
},
{
"type": "terminal",
"key": "├─",
"keyColor": "yellow"
},
{
"type": "terminalfont",
"key": "├─",
"keyColor": "yellow"
},
{
"type": "lm",
"key": "├─󰧨",
"keyColor": "yellow"
},
{
"type": "de",
"key": "├─",
"keyColor": "yellow"
},
{
"type": "wm",
"key": "├─",
"keyColor": "yellow"
},
{
"type": "theme",
"key": "├─󰉼",
"keyColor": "yellow"
},
{
"type": "icons",
"key": "╰─󰀻",
"keyColor": "yellow"
},
"break",
{
"type": "title",
"key": "╭─",
"format": "{1}@{2}",
"keyColor": "blue"
},
"break",
{
"type": "os",
"key": "├─󰣇", // Just get your distro's logo off nerdfonts.com
"keyColor": "blue"
"key": "OS ",
"keyColor": "31", // = color1
},
{
"type": "kernel",
"key": "├─",
"format": "{1} {2}",
"keyColor": "blue"
"key": " ├  ",
"keyColor": "31",
},
{
"type": "packages",
"key": "├─󰏖",
"keyColor": "blue"
"format": "{} (pacman)",
"key": " ├ 󰏖 ",
"keyColor": "31",
},
{
"type": "uptime",
"key": "├─󰅐",
"keyColor": "blue"
},
{
"type": "media",
"key": "├─󰝚",
"keyColor": "blue"
},
{
"type": "localip",
"key": "╰─󰩟",
"compact": true,
"keyColor": "blue"
"type": "shell",
"key": " └  ",
"keyColor": "31",
},
"break",
{
"type": "custom",
"format": " \u001b[90m󱓻 \u001b[31m󱓻 \u001b[32m󱓻 \u001b[33m󱓻 \u001b[34m󱓻 \u001b[35m󱓻 \u001b[36m󱓻 \u001b[37m󱓻 \u001b[38m󱓻 \u001b[39m󱓻"
}
"type": "wm",
"key": "WM ",
"keyColor": "32",
},
{
"type": "wmtheme",
"key": " ├ 󰉼 ",
"keyColor": "32",
},
{
"type": "icons",
"key": " ├ 󰀻 ",
"keyColor": "32",
},
{
"type": "cursor",
"key": " ├  ",
"keyColor": "32",
},
{
"type": "terminal",
"key": " ├  ",
"keyColor": "32",
},
{
"type": "terminalfont",
"key": " └  ",
"keyColor": "32",
},
"break",
{
"type": "host",
"format": "{5} {1} Type {2}",
"key": "PC ",
"keyColor": "33",
},
{
"type": "cpu",
"format": "{1} ({3}) @ {7} GHz",
"key": " ├  ",
"keyColor": "33",
},
{
"type": "gpu",
"format": "{1} {2} @ {12} GHz",
"key": " ├ 󰢮 ",
"keyColor": "33",
},
{
"type": "memory",
"key": " ├  ",
"keyColor": "33",
},
{
"type": "swap",
"key": " ├ 󰓡 ",
"keyColor": "33",
},
{
"type": "disk",
"key": " ├ 󰋊 ",
"keyColor": "33",
},
{
"type": "monitor",
"key": " └  ",
"keyColor": "33",
},
"break",
"break",
]
}
+1 -1
View File
@@ -1 +1 @@
source = ~/dotfiles/hypr/conf/animations/animations-high.conf
source = ~/dotfiles/hypr/conf/animations/default.conf
+3 -3
View File
@@ -29,8 +29,8 @@ exec-once = ~/dotfiles/hypr/scripts/ml4w-welcome-autostart.sh
# Start ewww daemon
exec-once = ~/dotfiles/hypr/scripts/eww.sh
exec-once = pypr
# Start autostart cleanup
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
env = HYPRCURSOR_THEME,Vimix-hyprcursors
exec-once = hyprctl setcursor Bibata-Modern-Ice 24
+1 -1
View File
@@ -1 +1 @@
source = ~/dotfiles/hypr/conf/decorations/custom.conf
source = ~/dotfiles/hypr/conf/decorations/default.conf
-25
View File
@@ -1,25 +0,0 @@
# -----------------------------------------------------
# General window decoration
# name: "Default"
# -----------------------------------------------------
decoration {
rounding = 10
blur {
enabled = true
size = 10
passes = 3
new_optimizations = on
ignore_opacity = true
xray = false
blurls = waybar
}
active_opacity = 1.0
inactive_opacity = 0.8
fullscreen_opacity = 1.0
drop_shadow = true
shadow_range = 30
shadow_render_power = 3
col.shadow = 0x66000000
}
-1
View File
@@ -6,7 +6,6 @@
env = XDG_SESSION_TYPE,wayland
env = XDG_SESSION_DESKTOP,Hyprland
env = QT_QPA_PLATFORM,wayland
env = QT_QPA_PLATFORMTHEME,qt6ct
env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
env = QT_AUTO_SCREEN_SCALE_FACTOR,1
env = MOZ_ENABLE_WAYLAND,1
+1 -1
View File
@@ -1 +1 @@
source = ~/dotfiles/hypr/conf/keybindings/custom.conf
source = ~/dotfiles/hypr/conf/keybindings/default.conf
-100
View File
@@ -1,100 +0,0 @@
# -----------------------------------------------------
# Key bindings
# name: "Default"
# -----------------------------------------------------
# SUPER KEY
$mainMod = SUPER
# Applications
bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh
bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh
bind = $mainMod SHIFT, E, exec, emote
# Windows
bind = $mainMod, Q, killactive
bind = $mainMod, F, fullscreen
bind = $mainMod, E, exec, ~/dotfiles/.settings/filemanager.sh
bind = $mainMod, T, togglefloating
bind = $mainMod SHIFT, T, exec, ~/dotfiles/hypr/scripts/toggleallfloat.sh
bind = $mainMod, J, togglesplit
bind = $mainMod, left, movefocus, l
bind = $mainMod, right, movefocus, r
bind = $mainMod, up, movefocus, u
bind = $mainMod, down, movefocus, d
bindm = $mainMod, mouse:272, movewindow
bindm = $mainMod, mouse:273, resizewindow
bind = $mainMod SHIFT, right, resizeactive, 100 0
bind = $mainMod SHIFT, left, resizeactive, -100 0
bind = $mainMod SHIFT, up, resizeactive, 0 -100
bind = $mainMod SHIFT, down, resizeactive, 0 100
bind = $mainMod, G, togglegroup
# Actions
bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh
bind = $mainMod CTRL, Q, exec, wlogout
bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh
bind = $mainMod CTRL, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh select
bind = $mainMod, SPACE, exec, rofi -show drun -replace -i
bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.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 CTRL, C, 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, 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
bind = $mainMod, 1, workspace, 1
bind = $mainMod, 2, workspace, 2
bind = $mainMod, 3, workspace, 3
bind = $mainMod, 4, workspace, 4
bind = $mainMod, 5, workspace, 5
bind = $mainMod, 6, workspace, 6
bind = $mainMod, 7, workspace, 7
bind = $mainMod, 8, workspace, 8
bind = $mainMod, 9, workspace, 9
bind = $mainMod, 0, workspace, 10
bind = $mainMod SHIFT, 1, movetoworkspace, 1
bind = $mainMod SHIFT, 2, movetoworkspace, 2
bind = $mainMod SHIFT, 3, movetoworkspace, 3
bind = $mainMod SHIFT, 4, movetoworkspace, 4
bind = $mainMod SHIFT, 5, movetoworkspace, 5
bind = $mainMod SHIFT, 6, movetoworkspace, 6
bind = $mainMod SHIFT, 7, movetoworkspace, 7
bind = $mainMod SHIFT, 8, movetoworkspace, 8
bind = $mainMod SHIFT, 9, movetoworkspace, 9
bind = $mainMod SHIFT, 0, movetoworkspace, 10
bind = $mainMod, mouse_down, workspace, e+1
bind = $mainMod, mouse_up, workspace, e-1
bind = $mainMod CTRL, down, workspace, empty
bind = $mainMod CTRL, left, workspace, e-1
bind = $mainMod CTRL, right, workspace, e+1
# Fn keys
bind = , XF86MonBrightnessUp, exec, brightnessctl -q s +10%
bind = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%-
bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% && notify-send -t 400 "Volume: $(pactl get-sink-volume @DEFAULT_SINK@ | awk '/front-left/ {print $5}')"
bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% && notify-send -t 400 "Volume: $(pactl get-sink-volume @DEFAULT_SINK@ | awk '/front-left/ {print $5}')"
bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
bind = , XF86AudioPlay, exec, playerctl play-pause
bind = , XF86AudioPause, exec, playerctl pause
bind = , XF86AudioNext, exec, playerctl next
bind = , XF86AudioPrev, exec, playerctl previous
bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
bind = , XF86Calculator, exec, qalculate-gtk
bind = , XF86Lock, exec, hyprlock
bind = , XF86Tools, exec, alacritty --class dotfiles-floating -e ~/dotfiles/hypr/settings/settings.sh
# Passthrough SUPER KEY to Virtual Machine
bind = $mainMod, P, submap, passthru
submap = passthru
bind = SUPER, Escape, submap, reset
submap = reset
# Pyprland
bind = $mainMod SHIFT, RETURN, exec, pypr toggle term
+2 -4
View File
@@ -3,7 +3,7 @@
# https://wiki.hyprland.org/Configuring/Variables/#input
# -----------------------------------------------------
input {
kb_layout = us
kb_layout = de
kb_variant =
kb_model =
kb_options =
@@ -11,9 +11,7 @@ input {
follow_mouse = 1
mouse_refocus=false
touchpad {
natural_scroll = true
disable_while_typing=true
tap-to-click=true
natural_scroll = false
}
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
}
+1 -8
View File
@@ -12,12 +12,5 @@ master {
}
gestures {
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
workspace_swipe = true
}
-2
View File
@@ -5,6 +5,4 @@
misc {
disable_hyprland_logo = true
disable_splash_rendering = true
enable_swallow = true
swallow_regex = ^(Alacritty|kitty|thunar)$
}
-10
View File
@@ -1,10 +0,0 @@
# -----------------------------------------------------
# Monitor Setup
# name: "Default"
# -----------------------------------------------------
monitor=DP-1,preferred,0x0,2
monitor=HDMI-A-1,3840x2160,1920x-275,2,transform,1
workspace=1,monitor:DP-1
exec-once=hyprctl dispatch workspace 1
+1 -1
View File
@@ -1 +1 @@
source = ~/dotfiles/hypr/conf/windowrules/custom.conf
source = ~/dotfiles/hypr/conf/windowrules/default.conf
-22
View File
@@ -1,22 +0,0 @@
# -----------------------------------------------------
# Window rules
# -----------------------------------------------------
windowrule = tile,^(Microsoft-edge)$
windowrule = tile,^(Brave-browser)$
windowrule = tile,^(Chromium)$
windowrule = float,^(pavucontrol)$
windowrule = float,^(blueman-manager)$
windowrule = float,^(nm-connection-editor)$
windowrule = float,^(qalculate-gtk)$
windowrule = float,^(showmethekey-gtk)$
windowrule = pin,^(showmethekey-gtk)$
layerrule = blur, gtk-layer-shell
layerrule = blur, logout_dialog
windowrule = float,title=^(Mathematica)$
windowrule = opacity 0.75, ^(Code)$
windowrule = opacity 0.75, ^(code-url-handler)$
windowrule = float,^(QQ)$
windowrule = float,^(fdm)$
windowrule = float,^(xdg-desktop-portal-gtk)$
+1 -1
View File
@@ -6,7 +6,7 @@
general {
gaps_in = 10
gaps_out = 14
border_size = 2
border_size = 3
col.active_border = $color11
col.inactive_border = rgba(ffffffff)
layout = dwindle
-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" color-scheme "prefer-dark"
# if [ -f ~/dotfiles/hypr/conf/cursor.conf ] ;then
# echo "exec-once = hyprctl setcursor $cursor_theme $cursor_size" > ~/dotfiles/hypr/conf/cursor.conf
# hyprctl setcursor $cursor_theme $cursor_size
# fi
if [ -f ~/dotfiles/hypr/conf/cursor.conf ] ;then
echo "exec-once = hyprctl setcursor $cursor_theme $cursor_size" > ~/dotfiles/hypr/conf/cursor.conf
hyprctl setcursor $cursor_theme $cursor_size
fi
+1
View File
@@ -76,6 +76,7 @@ fi
if [[ $profile == *"Qtile"* ]]; then
source .install/qtile-dotfiles.sh
fi
source .install/zshfish.sh
source .install/settings.sh
source .install/apps.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
+5 -8
View File
@@ -38,13 +38,12 @@ configuration {
/* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
@import "~/dotfiles/.settings/rofi-border-radius.rasi"
/* ---- Window ---- */
window {
width: 400px;
x-offset: -14px;
y-offset: 14px;
y-offset: 65px;
spacing: 0px;
padding: 0px;
margin: 0px;
@@ -57,7 +56,7 @@ window {
anchor: northeast;
fullscreen: false;
enabled: true;
border-radius: @border-radius;
border-radius: 10px;
background-color: transparent;
}
@@ -121,7 +120,6 @@ entry {
cursor: text;
placeholder: "Search";
placeholder-color: inherit;
border-radius: 0px;
}
/* ---- Mode Switcher ---- */
@@ -134,7 +132,7 @@ mode-switcher{
button {
padding: 10px;
border-radius: @border-radius;
border-radius: 10px;
background-color: @background;
text-color: inherit;
cursor: pointer;
@@ -162,8 +160,7 @@ listview {
padding: 10px;
margin: 0px;
background-color: @background;
border: 0px;
border-radius: 0px;
border:0px;
}
/* ---- Element ---- */
@@ -173,7 +170,7 @@ element {
margin: 5px;
cursor: pointer;
background-color: @background;
border-radius: @border-radius;
border-radius: 10px;
border: @border-width;
}
+4 -7
View File
@@ -39,7 +39,6 @@ configuration {
/* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
@import "~/dotfiles/.settings/rofi-border-radius.rasi"
/* ---- Window ---- */
window {
@@ -58,7 +57,7 @@ window {
anchor: north;
fullscreen: false;
enabled: true;
border-radius: @border-radius;
border-radius: 10px;
background-color: transparent;
}
@@ -122,7 +121,6 @@ entry {
cursor: text;
placeholder: "Search";
placeholder-color: inherit;
border-radius: 0px;
}
/* ---- Mode Switcher ---- */
@@ -135,7 +133,7 @@ mode-switcher{
button {
padding: 10px;
border-radius: @border-radius;
border-radius: 10px;
background-color: @background;
text-color: inherit;
cursor: pointer;
@@ -163,8 +161,7 @@ listview {
padding: 10px;
margin: 0px;
background-color: @background;
border: 0px;
border-radius: 0px;
border:0px;
}
/* ---- Element ---- */
@@ -174,7 +171,7 @@ element {
margin: 5px;
cursor: pointer;
background-color: @background;
border-radius: @border-radius;
border-radius: 10px;
border: @border-width;
}
+3 -4
View File
@@ -38,7 +38,6 @@ configuration {
/* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
@import "~/dotfiles/.settings/rofi-border-radius.rasi"
/* ---- Window ---- */
window {
@@ -57,7 +56,7 @@ window {
anchor: center;
fullscreen: false;
enabled: true;
border-radius: @border-radius;
border-radius: 10px;
background-color: transparent;
}
@@ -133,7 +132,7 @@ mode-switcher{
button {
padding: 10px;
border-radius: @border-radius;
border-radius: 10px;
background-color: @background;
text-color: inherit;
cursor: pointer;
@@ -171,7 +170,7 @@ element {
margin: 5px;
cursor: pointer;
background-color: @background;
border-radius: @border-radius;
border-radius: 10px;
border: @border-width;
}
+3 -4
View File
@@ -38,7 +38,6 @@ configuration {
/* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
@import "~/dotfiles/.settings/rofi-border-radius.rasi"
/* ---- Window ---- */
window {
@@ -57,7 +56,7 @@ window {
anchor: center;
fullscreen: false;
enabled: true;
border-radius: @border-radius;
border-radius: 10px;
background-color: transparent;
}
@@ -133,7 +132,7 @@ mode-switcher{
button {
padding: 10px;
border-radius: @border-radius;
border-radius: 10px;
background-color: @background;
text-color: inherit;
cursor: pointer;
@@ -171,7 +170,7 @@ element {
margin: 5px;
cursor: pointer;
background-color: @background;
border-radius: @border-radius;
border-radius: 10px;
border: @border-width;
}
+3 -4
View File
@@ -38,7 +38,6 @@ configuration {
/* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
@import "~/dotfiles/.settings/rofi-border-radius.rasi"
/* ---- Window ---- */
window {
@@ -58,7 +57,7 @@ window {
anchor: northeast;
fullscreen: false;
enabled: true;
border-radius: @border-radius;
border-radius: 10px;
background-color: transparent;
}
@@ -134,7 +133,7 @@ mode-switcher{
button {
padding: 10px;
border-radius: @border-radius;
border-radius: 10px;
background-color: @background;
text-color: inherit;
cursor: pointer;
@@ -172,7 +171,7 @@ element {
margin: 5px;
cursor: pointer;
background-color: @background;
border-radius: @border-radius;
border-radius: 10px;
border: @border-width;
}
+5 -8
View File
@@ -38,13 +38,12 @@ configuration {
/* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
@import "~/dotfiles/.settings/rofi-border-radius.rasi"
/* ---- Window ---- */
window {
width: 400px;
x-offset: 0px;
y-offset: 14px;
y-offset: 65px;
spacing: 0px;
padding: 0px;
margin: 0px;
@@ -57,7 +56,7 @@ window {
anchor: north;
fullscreen: false;
enabled: true;
border-radius: @border-radius;
border-radius: 10px;
background-color: transparent;
}
@@ -121,7 +120,6 @@ entry {
cursor: text;
placeholder: "Search";
placeholder-color: inherit;
border-radius: 0px;
}
/* ---- Mode Switcher ---- */
@@ -134,7 +132,7 @@ mode-switcher{
button {
padding: 10px;
border-radius: @border-radius;
border-radius: 10px;
background-color: @background;
text-color: inherit;
cursor: pointer;
@@ -162,8 +160,7 @@ listview {
padding: 10px;
margin: 0px;
background-color: @background;
border: 0px;
border-radius: 0px;
border:0px;
}
/* ---- Element ---- */
@@ -173,7 +170,7 @@ element {
margin: 5px;
cursor: pointer;
background-color: @background;
border-radius: @border-radius;
border-radius: 10px;
border: @border-width;
}
+4 -7
View File
@@ -33,13 +33,12 @@ configuration {
/* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
@import "~/dotfiles/.settings/rofi-border-radius.rasi"
/* ---- Window ---- */
window {
width: 761px;
x-offset: 0px;
y-offset: 14px;
y-offset: 65px;
spacing: 0px;
padding: 0px;
margin: 0px;
@@ -52,7 +51,7 @@ window {
anchor: north;
fullscreen: false;
enabled: true;
border-radius: @border-radius;
border-radius: 10px;
background-color: transparent;
}
@@ -115,7 +114,6 @@ entry {
cursor: text;
placeholder: "Search";
placeholder-color: inherit;
border-radius: 0px;
}
/* ---- Mode Switcher ---- */
@@ -128,7 +126,7 @@ mode-switcher{
button {
padding: 10px;
border-radius: @border-radius;
border-radius: 10px;
background-color: @background;
text-color: inherit;
cursor: pointer;
@@ -157,7 +155,6 @@ listview {
fixed-columns: true;
background-color: @background;
border: 0px;
border-radius: 0px;
flow: horizontal;
}
@@ -168,7 +165,7 @@ element {
margin: 5px;
cursor: pointer;
background-color: @background;
border-radius: @border-radius;
border-radius: 10px;
border: @border-width;
orientation: vertical;
}
+5 -7
View File
@@ -39,7 +39,6 @@ configuration {
/* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
@import "~/dotfiles/.settings/rofi-border-radius.rasi"
/* ---- Window ---- */
window {
@@ -51,14 +50,14 @@ window {
margin: 0px;
color: #FFFFFF;
border: @border-width;
border-color: @foreground;
border-color: #FFFFFF;
cursor: "default";
transparency: "real";
location: center;
anchor: center;
fullscreen: false;
enabled: true;
border-radius: @border-radius;
border-radius: 10px;
background-color: transparent;
}
@@ -100,7 +99,7 @@ inputbar {
text-color: @foreground;
spacing: 10px;
padding: 15px;
border-radius: @border-radius;
border-radius: 10px;
border-color: @foreground;
background-color: @background;
children: [ "textbox-prompt-colon", "entry" ];
@@ -122,7 +121,6 @@ entry {
cursor: text;
placeholder: "Search";
placeholder-color: inherit;
border-radius: 0px;
}
/* ---- Mode Switcher ---- */
@@ -135,7 +133,7 @@ mode-switcher{
button {
padding: 10px;
border-radius: @border-radius;
border-radius: 10px;
background-color: @background;
text-color: inherit;
cursor: pointer;
@@ -173,7 +171,7 @@ element {
margin: 5px;
cursor: pointer;
background-color: @background;
border-radius: @border-radius;
border-radius: 10px;
border: @border-width;
}
+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

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