rework everything
This commit is contained in:
-118
@@ -1,118 +0,0 @@
|
||||
# ~/.bashrc: executed by bash(1) for non-login shells.
|
||||
# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
|
||||
# for examples
|
||||
|
||||
# If not running interactively, don't do anything
|
||||
case $- in
|
||||
*i*) ;;
|
||||
*) return;;
|
||||
esac
|
||||
|
||||
# don't put duplicate lines or lines starting with space in the history.
|
||||
# See bash(1) for more options
|
||||
HISTCONTROL=ignoreboth
|
||||
|
||||
# append to the history file, don't overwrite it
|
||||
shopt -s histappend
|
||||
|
||||
# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
|
||||
HISTSIZE=1000
|
||||
HISTFILESIZE=2000
|
||||
|
||||
# check the window size after each command and, if necessary,
|
||||
# update the values of LINES and COLUMNS.
|
||||
shopt -s checkwinsize
|
||||
|
||||
# If set, the pattern "**" used in a pathname expansion context will
|
||||
# match all files and zero or more directories and subdirectories.
|
||||
#shopt -s globstar
|
||||
|
||||
# make less more friendly for non-text input files, see lesspipe(1)
|
||||
[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
|
||||
|
||||
# set variable identifying the chroot you work in (used in the prompt below)
|
||||
if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
|
||||
debian_chroot=$(cat /etc/debian_chroot)
|
||||
fi
|
||||
|
||||
# set a fancy prompt (non-color, unless we know we "want" color)
|
||||
case "$TERM" in
|
||||
xterm-color|*-256color) color_prompt=yes;;
|
||||
esac
|
||||
|
||||
# uncomment for a colored prompt, if the terminal has the capability; turned
|
||||
# off by default to not distract the user: the focus in a terminal window
|
||||
# should be on the output of commands, not on the prompt
|
||||
#force_color_prompt=yes
|
||||
|
||||
if [ -n "$force_color_prompt" ]; then
|
||||
if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
|
||||
# We have color support; assume it's compliant with Ecma-48
|
||||
# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
|
||||
# a case would tend to support setf rather than setaf.)
|
||||
color_prompt=yes
|
||||
else
|
||||
color_prompt=
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$color_prompt" = yes ]; then
|
||||
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
|
||||
else
|
||||
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
|
||||
fi
|
||||
unset color_prompt force_color_prompt
|
||||
|
||||
# If this is an xterm set the title to user@host:dir
|
||||
case "$TERM" in
|
||||
xterm*|rxvt*)
|
||||
PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
|
||||
# enable color support of ls and also add handy aliases
|
||||
if [ -x /usr/bin/dircolors ]; then
|
||||
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
|
||||
alias ls='ls --color=auto'
|
||||
#alias dir='dir --color=auto'
|
||||
#alias vdir='vdir --color=auto'
|
||||
|
||||
alias grep='grep --color=auto'
|
||||
alias fgrep='fgrep --color=auto'
|
||||
alias egrep='egrep --color=auto'
|
||||
fi
|
||||
|
||||
# colored GCC warnings and errors
|
||||
#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
|
||||
|
||||
# some more ls aliases
|
||||
alias ll='ls -alF'
|
||||
alias la='ls -A'
|
||||
alias l='ls -CF'
|
||||
|
||||
# Add an "alert" alias for long running commands. Use like so:
|
||||
# sleep 10; alert
|
||||
alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
|
||||
|
||||
# Alias definitions.
|
||||
# You may want to put all your additions into a separate file like
|
||||
# ~/.bash_aliases, instead of adding them here directly.
|
||||
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
|
||||
|
||||
if [ -f ~/.bash_aliases ]; then
|
||||
. ~/.bash_aliases
|
||||
fi
|
||||
|
||||
# enable programmable completion features (you don't need to enable
|
||||
# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
|
||||
# sources /etc/bash.bashrc).
|
||||
if ! shopt -oq posix; then
|
||||
if [ -f /usr/share/bash-completion/bash_completion ]; then
|
||||
. /usr/share/bash-completion/bash_completion
|
||||
elif [ -f /etc/bash_completion ]; then
|
||||
. /etc/bash_completion
|
||||
fi
|
||||
fi
|
||||
eval "$(starship init bash)"
|
||||
Submodule dot-oh-my-zsh deleted from 9e23925b85
-1720
File diff suppressed because it is too large
Load Diff
-147
@@ -1,147 +0,0 @@
|
||||
# ################################################################ #
|
||||
# THE FOLLOWING IS AN EXPLANATION OF THE GRAMMAR THAT SKHD PARSES. #
|
||||
# FOR SIMPLE EXAMPLE MAPPINGS LOOK FURTHER DOWN THIS FILE.. #
|
||||
# ################################################################ #
|
||||
|
||||
# A list of all built-in modifier and literal keywords can
|
||||
# be found at https://github.com/koekeishiya/skhd/issues/1
|
||||
#
|
||||
# A hotkey is written according to the following rules:
|
||||
#
|
||||
# hotkey = <mode> '<' <action> | <action>
|
||||
#
|
||||
# mode = 'name of mode' | <mode> ',' <mode>
|
||||
#
|
||||
# action = <keysym> '[' <proc_map_lst> ']' | <keysym> '->' '[' <proc_map_lst> ']'
|
||||
# <keysym> ':' <command> | <keysym> '->' ':' <command>
|
||||
# <keysym> ';' <mode> | <keysym> '->' ';' <mode>
|
||||
#
|
||||
# keysym = <mod> '-' <key> | <key>
|
||||
#
|
||||
# mod = 'modifier keyword' | <mod> '+' <mod>
|
||||
#
|
||||
# key = <literal> | <keycode>
|
||||
#
|
||||
# literal = 'single letter or built-in keyword'
|
||||
#
|
||||
# keycode = 'apple keyboard kVK_<Key> values (0x3C)'
|
||||
#
|
||||
# proc_map_lst = * <proc_map>
|
||||
#
|
||||
# proc_map = <string> ':' <command> | <string> '~' |
|
||||
# '*' ':' <command> | '*' '~'
|
||||
#
|
||||
# string = '"' 'sequence of characters' '"'
|
||||
#
|
||||
# command = command is executed through '$SHELL -c' and
|
||||
# follows valid shell syntax. if the $SHELL environment
|
||||
# variable is not set, it will default to '/bin/bash'.
|
||||
# when bash is used, the ';' delimeter can be specified
|
||||
# to chain commands.
|
||||
#
|
||||
# to allow a command to extend into multiple lines,
|
||||
# prepend '\' at the end of the previous line.
|
||||
#
|
||||
# an EOL character signifies the end of the bind.
|
||||
#
|
||||
# -> = keypress is not consumed by skhd
|
||||
#
|
||||
# * = matches every application not specified in <proc_map_lst>
|
||||
#
|
||||
# ~ = application is unbound and keypress is forwarded per usual, when specified in a <proc_map>
|
||||
#
|
||||
# A mode is declared according to the following rules:
|
||||
#
|
||||
# mode_decl = '::' <name> '@' ':' <command> | '::' <name> ':' <command> |
|
||||
# '::' <name> '@' | '::' <name>
|
||||
#
|
||||
# name = desired name for this mode,
|
||||
#
|
||||
# @ = capture keypresses regardless of being bound to an action
|
||||
#
|
||||
# command = command is executed through '$SHELL -c' and
|
||||
# follows valid shell syntax. if the $SHELL environment
|
||||
# variable is not set, it will default to '/bin/bash'.
|
||||
# when bash is used, the ';' delimeter can be specified
|
||||
# to chain commands.
|
||||
#
|
||||
# to allow a command to extend into multiple lines,
|
||||
# prepend '\' at the end of the previous line.
|
||||
#
|
||||
# an EOL character signifies the end of the bind.
|
||||
|
||||
ctrl + 1 : yabai -m space --focus 1
|
||||
|
||||
# ############################################################### #
|
||||
# THE FOLLOWING SECTION CONTAIN SIMPLE MAPPINGS DEMONSTRATING HOW #
|
||||
# TO INTERACT WITH THE YABAI WM. THESE ARE SUPPOSED TO BE USED AS #
|
||||
# A REFERENCE ONLY, WHEN MAKING YOUR OWN CONFIGURATION.. #
|
||||
# ############################################################### #
|
||||
|
||||
# focus window
|
||||
# alt - h : yabai -m window --focus west
|
||||
|
||||
# swap managed window
|
||||
# shift + alt - h : yabai -m window --swap north
|
||||
|
||||
# move managed window
|
||||
# shift + cmd - h : yabai -m window --warp east
|
||||
|
||||
# balance size of windows
|
||||
# shift + alt - 0 : yabai -m space --balance
|
||||
|
||||
# make floating window fill screen
|
||||
# shift + alt - up : yabai -m window --grid 1:1:0:0:1:1
|
||||
|
||||
# make floating window fill left-half of screen
|
||||
# shift + alt - left : yabai -m window --grid 1:2:0:0:1:1
|
||||
|
||||
# create desktop, move window and follow focus - uses jq for parsing json (brew install jq)
|
||||
# shift + cmd - n : yabai -m space --create && \
|
||||
# index="$(yabai -m query --spaces --display | jq 'map(select(."is-native-fullscreen" == false))[-1].index')" && \
|
||||
# yabai -m window --space "${index}" && \
|
||||
# yabai -m space --focus "${index}"
|
||||
|
||||
# fast focus desktop
|
||||
# cmd + alt - x : yabai -m space --focus recent
|
||||
# cmd + alt - 1 : yabai -m space --focus 1
|
||||
|
||||
# send window to desktop and follow focus
|
||||
# shift + cmd - z : yabai -m window --space next; yabai -m space --focus next
|
||||
# shift + cmd - 2 : yabai -m window --space 2; yabai -m space --focus 2
|
||||
|
||||
# focus monitor
|
||||
# ctrl + alt - z : yabai -m display --focus prev
|
||||
# ctrl + alt - 3 : yabai -m display --focus 3
|
||||
|
||||
# send window to monitor and follow focus
|
||||
# ctrl + cmd - c : yabai -m window --display next; yabai -m display --focus next
|
||||
# ctrl + cmd - 1 : yabai -m window --display 1; yabai -m display --focus 1
|
||||
|
||||
# move floating window
|
||||
# shift + ctrl - a : yabai -m window --move rel:-20:0
|
||||
# shift + ctrl - s : yabai -m window --move rel:0:20
|
||||
|
||||
# increase window size
|
||||
# shift + alt - a : yabai -m window --resize left:-20:0
|
||||
# shift + alt - w : yabai -m window --resize top:0:-20
|
||||
|
||||
# decrease window size
|
||||
# shift + cmd - s : yabai -m window --resize bottom:0:-20
|
||||
# shift + cmd - w : yabai -m window --resize top:0:20
|
||||
|
||||
# set insertion point in focused container
|
||||
# ctrl + alt - h : yabai -m window --insert west
|
||||
|
||||
# toggle window zoom
|
||||
# alt - d : yabai -m window --toggle zoom-parent
|
||||
# alt - f : yabai -m window --toggle zoom-fullscreen
|
||||
|
||||
# toggle window split type
|
||||
# alt - e : yabai -m window --toggle split
|
||||
|
||||
# float / unfloat window and center on screen
|
||||
# alt - t : yabai -m window --toggle float --grid 4:4:1:1:2:2
|
||||
|
||||
# toggle sticky(+float), picture-in-picture
|
||||
# alt - p : yabai -m window --toggle sticky --toggle pip
|
||||
@@ -1,6 +0,0 @@
|
||||
set -g mouse on
|
||||
set -g default-terminal "xterm"
|
||||
set-option -g default-command fish
|
||||
bind-key -n Home send Escape "OH"
|
||||
bind-key -n End send Escape "OF"
|
||||
|
||||
-49
@@ -1,49 +0,0 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
#
|
||||
# for this to work you must configure sudo such that
|
||||
# it will be able to run the command without password
|
||||
#
|
||||
# see this wiki page for information:
|
||||
# - https://github.com/koekeishiya/yabai/wiki/Installing-yabai-(latest-release)#configure-scripting-addition
|
||||
#
|
||||
# yabai -m signal --add event=dock_did_restart action="sudo yabai --load-sa"
|
||||
# sudo yabai --load-sa
|
||||
#
|
||||
|
||||
# global settings
|
||||
yabai -m config \
|
||||
external_bar off:40:0 \
|
||||
menubar_opacity 1.0 \
|
||||
mouse_follows_focus on \
|
||||
focus_follows_mouse autofocus \
|
||||
display_arrangement_order default \
|
||||
window_origin_display default \
|
||||
window_placement second_child \
|
||||
window_insertion_point focused \
|
||||
window_zoom_persist on \
|
||||
window_shadow on \
|
||||
window_animation_duration 0.0 \
|
||||
window_animation_easing ease_out_circ \
|
||||
window_opacity_duration 0.0 \
|
||||
active_window_opacity 1.0 \
|
||||
normal_window_opacity 0.50 \
|
||||
window_opacity on \
|
||||
insert_feedback_color 0xffd75f5f \
|
||||
split_ratio 0.50 \
|
||||
split_type auto \
|
||||
auto_balance on \
|
||||
top_padding 6 \
|
||||
bottom_padding 6 \
|
||||
left_padding 6 \
|
||||
right_padding 6 \
|
||||
window_gap 6 \
|
||||
layout bsp \
|
||||
mouse_modifier fn \
|
||||
mouse_action1 move \
|
||||
mouse_action2 resize \
|
||||
mouse_drop_action swap
|
||||
|
||||
echo "yabai configuration loaded.."
|
||||
|
||||
|
||||
@@ -1,133 +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
|
||||
|
||||
# If you come from bash you might have to change your $PATH.
|
||||
# export PATH=$HOME/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
|
||||
zsh-autosuggestions
|
||||
zsh-syntax-highlighting
|
||||
zsh-autocomplete
|
||||
)
|
||||
|
||||
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='nvim'
|
||||
# fi
|
||||
|
||||
# Compilation flags
|
||||
# export ARCHFLAGS="-arch $(uname -m)"
|
||||
|
||||
# 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 a top-level file in
|
||||
# the $ZSH_CUSTOM folder, with .zsh extension. Examples:
|
||||
# - $ZSH_CUSTOM/aliases.zsh
|
||||
# - $ZSH_CUSTOM/macos.zsh
|
||||
# For a full list of active aliases, run `alias`.
|
||||
#
|
||||
# Example aliases
|
||||
# alias zshconfig="mate ~/.zshrc"
|
||||
# alias ohmyzsh="mate ~/.oh-my-zsh"
|
||||
|
||||
alias ls="eza --icons"
|
||||
alias tree="eza --tree"
|
||||
alias c="clear"
|
||||
|
||||
bindkey '^I' menu-complete
|
||||
bindkey "$terminfo[kcbt]" reverse-menu-complete
|
||||
bindkey -M menuselect '^[[D' .backward-char '^[OD' .backward-char
|
||||
bindkey -M menuselect '^[[C' .forward-char '^[OC' .forward-char
|
||||
|
||||
|
||||
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||
|
||||
eval "$(zoxide init zsh --cmd cd)"
|
||||
|
||||
Reference in New Issue
Block a user