Merge branches 'upstream-custom' and 'zshfish' into dev

This commit is contained in:
Yingjie Wang 2024-05-22 00:13:06 -04:00
commit 9f9ea20ee3
5 changed files with 1198 additions and 780 deletions

128
.zshrc Normal file
View File

@ -0,0 +1,128 @@
# 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
# If you come from bash you might have to change your $PATH.
export PATH=$HOME/bin:$HOME/.cargo/bin:$HOME/.local/bin:/usr/local/bin:$PATH
# Path to your oh-my-zsh installation.
export ZSH="$HOME/.oh-my-zsh"
# Set name of the theme to load --- if set to "random", it will
# load a random theme each time oh-my-zsh is loaded, in which case,
# to know which specific one was loaded, run: echo $RANDOM_THEME
# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
# ZSH_THEME="robbyrussell"
ZSH_THEME="powerlevel10k/powerlevel10k"
# Set list of themes to pick from when loading at random
# Setting this variable when ZSH_THEME=random will cause zsh to load
# a theme from this variable instead of looking in $ZSH/themes/
# If set to an empty array, this variable will have no effect.
# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
# Uncomment the following line to use case-sensitive completion.
# CASE_SENSITIVE="true"
# Uncomment the following line to use hyphen-insensitive completion.
# Case-sensitive completion must be off. _ and - will be interchangeable.
# HYPHEN_INSENSITIVE="true"
# Uncomment one of the following lines to change the auto-update behavior
# zstyle ':omz:update' mode disabled # disable automatic updates
# zstyle ':omz:update' mode auto # update automatically without asking
# zstyle ':omz:update' mode reminder # just remind me to update when it's time
# Uncomment the following line to change how often to auto-update (in days).
# zstyle ':omz:update' frequency 13
# Uncomment the following line if pasting URLs and other text is messed up.
# DISABLE_MAGIC_FUNCTIONS="true"
# Uncomment the following line to disable colors in ls.
# DISABLE_LS_COLORS="true"
# Uncomment the following line to disable auto-setting terminal title.
# DISABLE_AUTO_TITLE="true"
# Uncomment the following line to enable command auto-correction.
# ENABLE_CORRECTION="true"
# 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"
# Uncomment the following line if you want to disable marking untracked files
# under VCS as dirty. This makes repository status check for large repositories
# much, much faster.
# DISABLE_UNTRACKED_FILES_DIRTY="true"
# Uncomment the following line if you want to change the command execution time
# stamp shown in the history command output.
# You can set one of the optional three formats:
# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
# or set a custom format using the strftime function format specifications,
# see 'man strftime' for details.
# HIST_STAMPS="mm/dd/yyyy"
# Would you like to use another custom folder than $ZSH/custom?
# ZSH_CUSTOM=/path/to/new-custom-folder
# Which plugins would you like to load?
# Standard plugins can be found in $ZSH/plugins/
# Custom plugins may be added to $ZSH_CUSTOM/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup.
plugins=(git colored-man-pages eza z sudo zsh-autosuggestions fast-syntax-highlighting)
source $ZSH/oh-my-zsh.sh
# User configuration
# export MANPATH="/usr/local/man:$MANPATH"
# You may need to manually set your language environment
# export LANG=en_US.UTF-8
# Preferred editor for local and remote sessions
# if [[ -n $SSH_CONNECTION ]]; then
# export EDITOR='vim'
# else
# export EDITOR='mvim'
# fi
# Compilation flags
# export ARCHFLAGS="-arch x86_64"
# Set personal aliases, overriding those provided by oh-my-zsh libs,
# plugins, and themes. Aliases can be placed here, though oh-my-zsh
# users are encouraged to define aliases within the ZSH_CUSTOM folder.
# For a full list of active aliases, run `alias`.
#
# Example aliases
# alias zshconfig="mate ~/.zshrc"
# alias ohmyzsh="mate ~/.oh-my-zsh"
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"
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
eval $(thefuck --alias)
eval "$(fzf --zsh)"
# -----------------------------------------------------
# PYWAL
# -----------------------------------------------------
cat ~/.cache/wal/sequences
export EDITOR=nvim

View File

@ -13,4 +13,35 @@
@define-color textcolor3 #FFFFFF;
@define-color iconcolor #FFFFFF;
@define-color base #1e1e2e;
@define-color mantle #181825;
@define-color crust #11111b;
@define-color text #cdd6f4;
@define-color subtext0 #a6adc8;
@define-color subtext1 #bac2de;
@define-color surface0 #313244;
@define-color surface1 #45475a;
@define-color surface2 #585b70;
@define-color overlay0 #6c7086;
@define-color overlay1 #7f849c;
@define-color overlay2 #9399b2;
@define-color blue #89b4fa;
@define-color lavender #b4befe;
@define-color sapphire #74c7ec;
@define-color sky #89dceb;
@define-color teal #94e2d5;
@define-color green #a6e3a1;
@define-color yellow #f9e2af;
@define-color peach #fab387;
@define-color maroon #eba0ac;
@define-color red #f38ba8;
@define-color mauve #cba6f7;
@define-color pink #f5c2e7;
@define-color flamingo #f2cdcd;
@define-color rosewater #f5e0dc;
@import '../style.css';

View File

@ -1,73 +1,70 @@
// __ __ _
// \ \ / /_ _ _ _| |__ __ _ _ __
// \ \ /\ / / _` | | | | '_ \ / _` | '__|
// \ V V / (_| | |_| | |_) | (_| | |
// \_/\_/ \__,_|\__, |_.__/ \__,_|_|
// |___/
//
// by Stephan Raabe (2023)
// -----------------------------------------------------
//
/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
// ### DEFAULT Top -Laptop ### //
{
// General Settings
// Position TOP
"include": "~/dotfiles/waybar/themes/custom/modules.json",
"layer": "top",
"margin-bottom": 0,
//"mode": "dock",
"exclusive": true,
"passthrough": false,
"position": "top",
"spacing": 3,
"fixed-center": true,
"ipc": true,
"margin-top": 3,
"margin-left": 8,
"margin-right": 8,
// Position BOTTOM
// "position": "bottom",
// "margin-top": 0,
// "margin-bottom": 14,
"layer": "top",
"margin-left": 0,
"margin-right": 0,
"spacing": 0,
// Load Modules
"include": ["~/dotfiles/waybar/themes/custom/modules.json"],
// Modules Left
"modules-left": [
"custom/appmenu",
"custom/settings",
"custom/waybarthemes",
"custom/wallpaper",
// START TASK TOOGLE
// "wlr/taskbar",
// END TASK TOOGLE
"group/quicklinks",
"hyprland/window",
"custom/starter"
"hyprland/workspaces#pacman",
"custom/separator#dot-line",
"cpu",
"custom/separator#dot-line",
"temperature",
"custom/separator#dot-line",
"memory",
"custom/separator#dot-line",
"custom/weather",
"custom/separator#blank_3",
"custom/cava_mviz",
],
// Modules Center
"modules-center": [
"hyprland/workspaces"
"custom/menu",
"custom/separator#dot-line",
"idle_inhibitor",
"custom/separator#dot-line",
"clock",
"custom/separator#dot-line",
"custom/light_dark",
"custom/separator#dot-line",
"custom/lock",
//],
"custom/separator#dot-line",
"custom/hint",
],
// Modules Right
"modules-right": [
"custom/updates",
"pulseaudio",
// START BT TOOGLE
"bluetooth",
// END BT TOOGLE
"battery",
// START NETWORK TOOGLE
"network",
// END NETWORK TOOGLE
"group/hardware",
"custom/cliphist",
// START IDLE TOOGLE
"idle_inhibitor",
// END IDLE TOOGLE
// START TRAY TOOGLE
"network#speed",
"custom/separator#dot-line",
"custom/swaync",
"tray",
// END TRAY TOOGLE
"custom/exit",
"custom/ml4w-welcome",
"clock"
]
}
"mpris",
"custom/separator#dot-line",
"bluetooth",
"custom/separator#dot-line",
"battery",
"custom/separator#dot-line",
"backlight",
"custom/separator#dot-line",
"pulseaudio",
"custom/separator#dot-line",
"pulseaudio#microphone",
"custom/separator#dot-line",
"keyboard-state",
"custom/separator#dot-line",
"custom/keyboard",
"custom/separator#dot-line",
"custom/power",
],
}

File diff suppressed because it is too large Load Diff

View File

@ -1,430 +1,314 @@
/*
* __ __ _ ____ _ _
* \ \ / /_ _ _ _| |__ __ _ _ __ / ___|| |_ _ _| | ___
* \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \
* \ V V / (_| | |_| | |_) | (_| | | ___) | |_| |_| | | __/
* \_/\_/ \__,_|\__, |_.__/ \__,_|_| |____/ \__|\__, |_|\___|
* |___/ |___/
*
* by Stephan Raabe (2023)
* -----------------------------------------------------
*/
/* -----------------------------------------------------
* Import Pywal colors
* ----------------------------------------------------- */
/* @import 'style-light.css'; */
/* @define-color backgroundlight #FFFFFF;
@define-color backgrounddark #FFFFFF;
@define-color workspacesbackground1 #FFFFFF;
@define-color workspacesbackground2 #CCCCCC;
@define-color bordercolor #FFFFFF;
@define-color textcolor1 #000000;
@define-color textcolor2 #000000;
@define-color textcolor3 #FFFFFF;
@define-color iconcolor #FFFFFF; */
/* -----------------------------------------------------
* General
* ----------------------------------------------------- */
/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
/* Catppuccin Mocha */
* {
font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
border: none;
border-radius: 0px;
}
window#waybar {
background-color: rgba(0,0,0,0.2);
border-bottom: 0px solid #ffffff;
/* color: #FFFFFF; */
transition-property: background-color;
transition-duration: .5s;
}
/* -----------------------------------------------------
* Workspaces
* ----------------------------------------------------- */
#workspaces {
margin: 5px 1px 6px 1px;
padding: 0px 1px;
border-radius: 15px;
border: 0px;
font-family: "JetBrainsMono Nerd Font";
font-weight: bold;
font-style: normal;
font-size: 16px;
color: @textcolor1;
}
#workspaces button {
padding: 0px 5px;
margin: 4px 3px;
border-radius: 15px;
border: 0px;
color: @textcolor3;
transition: all 0.3s ease-in-out;
}
#workspaces button.active {
color: @textcolor1;
background: @workspacesbackground2;
border-radius: 15px;
min-width: 40px;
transition: all 0.3s ease-in-out;
}
#workspaces button:hover {
color: @textcolor1;
background: @workspacesbackground2;
border-radius: 15px;
}
/* -----------------------------------------------------
* Tooltips
* ----------------------------------------------------- */
tooltip {
border-radius: 10px;
background-color: @backgroundlight;
opacity:0.8;
padding:20px;
margin:0px;
}
tooltip label {
color: @textcolor2;
}
/* -----------------------------------------------------
* Window
* ----------------------------------------------------- */
#window {
background: @backgroundlight;
margin: 10px 15px 10px 0px;
padding: 2px 10px 0px 10px;
border-radius: 12px;
color:@textcolor2;
font-size:16px;
font-weight:normal;
}
window#waybar.empty #window {
background-color:transparent;
}
/* -----------------------------------------------------
* Taskbar
* ----------------------------------------------------- */
#taskbar {
background: @backgroundlight;
margin: 6px 15px 6px 0px;
padding:0px;
border-radius: 15px;
font-weight: normal;
font-style: normal;
border: 3px solid @backgroundlight;
}
#taskbar button {
margin:0;
border-radius: 15px;
padding: 0px 5px 0px 5px;
}
/* -----------------------------------------------------
* Modules
* ----------------------------------------------------- */
.modules-left > widget:first-child > #workspaces {
margin-left: 0;
}
.modules-right > widget:last-child > #workspaces {
margin-right: 0;
}
/* -----------------------------------------------------
* Custom Quicklinks
* ----------------------------------------------------- */
#custom-brave,
#custom-browser,
#custom-keybindings,
#custom-outlook,
#custom-filemanager,
#custom-teams,
#custom-chatgpt,
#custom-calculator,
#custom-windowsvm,
#custom-cliphist,
#custom-wallpaper,
#custom-settings,
#custom-wallpaper,
#custom-system,
#custom-waybarthemes {
margin-right: 23px;
font-size: 20px;
font-weight: bold;
color: @iconcolor;
}
#custom-waybarthemes,#custom-system {
margin-right:15px;
min-height: 0;
/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
font-size: 97%;
font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
padding: 1px;
}
window#waybar {
transition-property: background-color;
transition-duration: 0.5s;
background: transparent;
/*border: 2px solid @overlay0;*/
/*background: @theme_base_color;*/
border-radius: 10px;
}
#custom-ml4w-welcome {
margin-right: 15px;
background-image: url("../assets/ml4w-icon.png");
background-repeat: no-repeat;
background-position: center;
padding-right: 24px;
}
window#waybar.hidden {
opacity: 0.2;
}
/* -----------------------------------------------------
* Idle Inhibator
* ----------------------------------------------------- */
#waybar.empty #window {
background: none;
}
/* This section can be use if you want to separate waybar modules */
.modules-left, .modules-center, .modules-right {
background: @theme_base_color;
border: 0.5px solid @overlay0;
padding-top: 2px;
padding-bottom: 2px;
padding-right: 4px;
padding-left: 4px;
border-radius: 10px;
}
.modules-left, .modules-right {
border: 1px solid @blue;
padding-top: 2px;
padding-bottom: 2px;
padding-right: 4px;
padding-left: 4px;
}
#backlight,
#backlight-slider,
#battery,
#bluetooth,
#clock,
#cpu,
#disk,
#idle_inhibitor,
#keyboard-state,
#memory,
#mode,
#mpris,
#network,
#pulseaudio,
#pulseaudio-slider,
#taskbar button,
#taskbar,
#temperature,
#tray,
#window,
#wireplumber,
#workspaces,
#custom-backlight,
#custom-cycle_wall,
#custom-hint,
#custom-keyboard,
#custom-light_dark,
#custom-lock,
#custom-menu,
#custom-power_vertical,
#custom-power,
#custom-swaync,
#custom-updater,
#custom-weather,
#custom-weather.clearNight,
#custom-weather.cloudyFoggyDay,
#custom-weather.cloudyFoggyNight,
#custom-weather.default,
#custom-weather.rainyDay,
#custom-weather.rainyNight,
#custom-weather.severe,
#custom-weather.showyIcyDay,
#custom-weather.snowyIcyNight,
#custom-weather.sunnyDay {
padding-top: 3px;
padding-bottom: 3px;
padding-right: 6px;
padding-left: 6px;
}
#idle_inhibitor {
margin-right: 15px;
font-size: 22px;
font-weight: bold;
opacity: 0.8;
color: @iconcolor;
}
#idle_inhibitor.activated {
margin-right: 15px;
font-size: 20px;
font-weight: bold;
opacity: 0.8;
color: #dc2f2f;
}
/* -----------------------------------------------------
* Custom Modules
* ----------------------------------------------------- */
#custom-appmenu {
background-color: @backgrounddark;
font-size: 16px;
color: @textcolor1;
border-radius: 15px;
padding: 2px 10px 0px 10px;
margin: 10px 15px 10px 10px;
}
/* -----------------------------------------------------
* Custom Exit
* ----------------------------------------------------- */
#custom-exit {
margin: 0px 20px 0px 0px;
padding:0px;
font-size:20px;
color: @iconcolor;
}
/* -----------------------------------------------------
* Custom Updates
* ----------------------------------------------------- */
#custom-updates {
background-color: @backgroundlight;
font-size: 16px;
color: @textcolor2;
border-radius: 15px;
padding: 2px 10px 0px 10px;
margin: 10px 15px 10px 0px;
}
#custom-updates.green {
background-color: @backgroundlight;
}
#custom-updates.yellow {
background-color: #ff9a3c;
color: #FFFFFF;
}
#custom-updates.red {
background-color: #dc2f2f;
color: #FFFFFF;
}
/* -----------------------------------------------------
* Custom Youtube
* ----------------------------------------------------- */
#custom-youtube {
background-color: @backgroundlight;
font-size: 16px;
color: @textcolor2;
border-radius: 15px;
padding: 2px 10px 0px 10px;
margin: 10px 15px 10px 0px;
}
/* -----------------------------------------------------
* Hardware Group
* ----------------------------------------------------- */
#disk,#memory,#cpu,#language {
margin:0px;
padding:0px;
font-size:16px;
color:@iconcolor;
}
#language {
margin-right:10px;
}
/* -----------------------------------------------------
* Clock
* ----------------------------------------------------- */
#clock {
background-color: @backgrounddark;
font-size: 16px;
color: @textcolor1;
border-radius: 15px;
padding: 2px 10px 0px 10px;
margin: 10px 15px 10px 0px;
}
/* -----------------------------------------------------
* Pulseaudio
* ----------------------------------------------------- */
#pulseaudio {
background-color: @backgroundlight;
font-size: 16px;
color: @textcolor2;
border-radius: 15px;
padding: 2px 10px 0px 10px;
margin: 10px 15px 10px 0px;
}
#pulseaudio.muted {
background-color: @backgrounddark;
color: @textcolor1;
}
/* -----------------------------------------------------
* Network
* ----------------------------------------------------- */
#network {
background-color: @backgroundlight;
font-size: 16px;
color: @textcolor2;
border-radius: 15px;
padding: 2px 10px 0px 10px;
margin: 10px 15px 10px 0px;
}
#network.ethernet {
background-color: @backgroundlight;
color: @textcolor2;
}
#network.wifi {
background-color: @backgroundlight;
color: @textcolor2;
}
/* -----------------------------------------------------
* Bluetooth
* ----------------------------------------------------- */
#bluetooth, #bluetooth.on, #bluetooth.connected {
background-color: @backgroundlight;
font-size: 16px;
color: @textcolor2;
border-radius: 15px;
padding: 2px 10px 0px 10px;
margin: 10px 15px 10px 0px;
}
#bluetooth.off {
background-color: transparent;
padding: 0px;
margin: 0px;
}
/* -----------------------------------------------------
* Battery
* ----------------------------------------------------- */
#battery {
background-color: @backgroundlight;
font-size: 16px;
color: @textcolor2;
border-radius: 15px;
padding: 2px 15px 0px 10px;
margin: 10px 15px 10px 0px;
}
#battery.charging, #battery.plugged {
color: @textcolor2;
background-color: @backgroundlight;
}
@keyframes blink {
to {
background-color: @backgroundlight;
color: @textcolor2;
color: @blue;
}
}
#battery.critical:not(.charging) {
background-color: #f53c3c;
color: @textcolor3;
#bluetooth,
#backlight {
color: @blue;
}
#battery {
color: @green;
}
@keyframes blink {
to {
color: @surface0;
}
}
#battery.critical:not(.charging) {
background-color: @red;
color: @theme_text_color;
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
}
box-shadow: inset 0 -3px transparent;
}
/* -----------------------------------------------------
* Tray
* ----------------------------------------------------- */
#clock {
color: @yellow;
}
#tray {
background-color: #2980b9;
}
#cpu {
color: @green;
}
#tray > .passive {
#custom-keyboard,
#memory {
color: @sky;
}
#disk {
color: @sapphire;
}
#temperature {
color: @teal;
}
#temperature.critical {
background-color: @red;
}
#tray > .passive {
-gtk-icon-effect: dim;
}
#tray > .needs-attention {
}
#tray > .needs-attention {
-gtk-icon-effect: highlight;
background-color: #eb4d4b;
}
}
/* -----------------------------------------------------
* Other
* ----------------------------------------------------- */
#keyboard-state {
color: @flamingo;
}
label:focus {
background-color: #000000;
}
#workspaces button {
box-shadow: none;
text-shadow: none;
padding: 0px;
border-radius: 9px;
padding-left: 4px;
padding-right: 4px;
animation: gradient_f 20s ease-in infinite;
transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
}
#backlight {
background-color: #90b1b1;
}
#workspaces button:hover {
border-radius: 10px;
color: @overlay0;
background-color: @surface0;
padding-left: 2px;
padding-right: 2px;
animation: gradient_f 20s ease-in infinite;
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
}
#network {
background-color: #2980b9;
}
#workspaces button.persistent {
color: @surface1;
border-radius: 10px;
}
#network.disconnected {
background-color: #f53c3c;
}
#workspaces button.active {
color: @peach;
border-radius: 10px;
padding-left: 8px;
padding-right: 8px;
animation: gradient_f 20s ease-in infinite;
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
}
#workspaces button.urgent {
color: @red;
border-radius: 0px;
}
#taskbar button.active {
padding-left: 8px;
padding-right: 8px;
animation: gradient_f 20s ease-in infinite;
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
}
#taskbar button:hover {
padding-left: 2px;
padding-right: 2px;
animation: gradient_f 20s ease-in infinite;
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
}
#custom-cava_mviz {
color: @pink;
}
#custom-menu {
color: @rosewater;
}
#custom-power {
color: @red;
}
#custom-updater {
color: @red;
}
#custom-light_dark {
color: @blue;
}
#custom-weather {
color: @lavender;
}
#custom-lock {
color: @maroon;
}
#pulseaudio {
color: @sapphire;
}
#pulseaudio.bluetooth {
color: @pink;
}
#pulseaudio.muted {
color: @red;
}
#window {
color: @mauve;
}
#custom-waybar-mpris {
color:@lavender;
}
#network {
color: @teal;
}
#network.disconnected,
#network.disabled {
background-color: @surface0;
color: @text;
}
#pulseaudio-slider slider {
min-width: 0px;
min-height: 0px;
opacity: 0;
background-image: none;
border: none;
box-shadow: none;
}
#pulseaudio-slider trough {
min-width: 80px;
min-height: 5px;
border-radius: 5px;
}
#pulseaudio-slider highlight {
min-height: 10px;
border-radius: 5px;
}
#backlight-slider slider {
min-width: 0px;
min-height: 0px;
opacity: 0;
background-image: none;
border: none;
box-shadow: none;
}
#backlight-slider trough {
min-width: 80px;
min-height: 10px;
border-radius: 5px;
}
#backlight-slider highlight {
min-width: 10px;
border-radius: 5px;
}