Skip to content

fix: clean up issues across config files #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
larsx2 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: clean up issues across config files #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .config/zsh/docker-aliases.zsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ alias dversion="docker compose version"
alias dreload="docker compose restart"
alias dkill="docker compose kill"
alias dstart="docker compose start"
alias dstop="docker compose stop"

dnuke() {
if [[ -z $(docker ps -aq) ]]; then
Expand Down
2 changes: 1 addition & 1 deletion .config/zsh/git-aliases.zsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ alias gdfp="git diff --cached --name-only \
| xargs -r -o nvim"

# git unstaged file pick with preview
alias gdcap="git status --porcelain | egrep '^ [^ ]|^\?\?' | cut -c4- \
alias gdcap="git status --porcelain | grep -E '^ [^ ]|^\?\?' | cut -c4- \
| fzf -m --preview 'git diff --color=always -- {}' \
| xargs -r nvim"

Expand Down
2 changes: 1 addition & 1 deletion tmux.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ unbind [
unbind ]
bind [ previous-window
bind ] next-window
bind \ copy-mode
bind \\ copy-mode

# set vim mode by default
set -g mode-keys vi
Expand Down
21 changes: 3 additions & 18 deletions zshrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,24 +96,9 @@ source $ZSH/oh-my-zsh.sh
# users are encouraged to define aliases within the ZSH_CUSTOM folder.
# For a full list of active aliases, run `alias`.
#
# Example aliases
alias zshrc="nvim ~/.zshrc"
alias nvim-init="nvim ~/.config/nvim/lua/plugins/init.lua"
alias nvim-mappings="nvim ~/.config/nvim/lua/mappings.lua"
alias view="nvim -R"
alias z="zellij"
alias zdf="z d -f"
alias zl="z ls"
alias zls="z ls"
alias za="z a"
alias zn="z -n default -s"
alias zpwd="z -n default -s $(basename `pwd`)"
alias znuke="z delete-all-sessions"

# https://github.com/zellij-org/zellij/issues/1933#issuecomment-2274464004
autoload -U +X compinit && compinit
. <( zellij setup --generate-completion zsh | sed -Ee 's/^(_(zellij) ).*/compdef \1\2/' )
# alias ohmyzsh="mate ~/.oh-my-zsh"

if [ "$(uname -m)" = "arm64" ]; then
export DOCKER_DEFAULT_PLATFORM=linux/arm64
Expand All @@ -139,17 +124,17 @@ alias nvim-init="nvim ~/.config/nvim/lua/plugins/init.lua"
alias nvim-config="cd ~/.config/nvim && nvim init.lua"
alias nvim-mappings="nvim ~/.config/nvim/lua/mappings.lua"
alias view="nvim -R"
alias zstart="zellij setup --generate-auto-start zsh"
alias zstart="zellij setup --generate-auto-start zsh"
alias z="zellij"
alias zdf="z d -f"
alias zl="z ls"
alias zls="z ls"
alias za="z a"
alias zn="z -n default -s"
alias zpwd="z -n default -s $(basename `pwd`)"
alias zpwd="z -n default -s $(basename $(pwd))"
alias znuke="z delete-all-sessions"
alias zs="z -s"

function zlz() {
local sessions
sessions=$(zellij list-sessions 2>/dev/null)
Expand Down