Compare commits

...

5 Commits

11 changed files with 124 additions and 11 deletions

1
.gitignore vendored
View File

@ -27,6 +27,7 @@ zsh/*
tmux/* tmux/*
!tmux/tmux.conf !tmux/tmux.conf
!tmux/tmux-sessionizer !tmux/tmux-sessionizer
!tmux/tmux-ggclone
# git # git
!git !git

View File

@ -1,5 +1,5 @@
# Neovim should be able to run anywhere # Neovim should be able to run anywhere
neovim pynvim
# Upgrade pip while we're at it. # Upgrade pip while we're at it.
pip pip

81
alacritty/alacritty.toml Normal file
View File

@ -0,0 +1,81 @@
[colors]
draw_bold_text_with_bright_colors = true
[colors.bright]
black = "0x45403d"
blue = "0x7daea3"
cyan = "0x89b482"
green = "0xa9b665"
magenta = "0xd3869b"
red = "0xea6962"
white = "0xd4be98"
yellow = "0xd8a657"
[colors.normal]
black = "0x45403d"
blue = "0x7daea3"
cyan = "0x89b482"
green = "0xa9b665"
magenta = "0xd3869b"
red = "0xea6962"
white = "0xd4be98"
yellow = "0xd8a657"
[colors.primary]
background = "0x32302f"
foreground = "0xd4be98"
[cursor]
unfocused_hollow = true
[cursor.style]
blinking = "On"
shape = "Block"
[env]
TERM = "xterm-256color"
[font]
size = 13
[font.bold]
family = "JetBrainsMono Nerd Font"
style = "Bold"
[font.bold_italic]
family = "JetBrainsMono Nerd Font"
style = "Bold Italic"
[font.italic]
family = "JetBrainsMono Nerd Font"
style = "Italic"
[font.normal]
family = "JetBrainsMono Nerd Font"
style = "Regular"
[[keyboard.bindings]]
chars = "\f"
key = "R"
mode = "~Vi|~Search"
mods = "Command"
[[keyboard.bindings]]
action = "ScrollPageUp"
key = "PageUp"
mode = "~Alt"
[[keyboard.bindings]]
action = "ScrollPageDown"
key = "PageDown"
mode = "~Alt"
[scrolling]
history = 10000
[window]
dynamic_title = true
[window.dimensions]
columns = 150
lines = 36

2
nvim

@ -1 +1 @@
Subproject commit 2b7b3c86626250fd349b21f93a68d1345ce7aab1 Subproject commit d6ce80e6a2c8faaa7b7f36b18a97a2c1cf203657

15
tmux/tmux-ggclone Executable file
View File

@ -0,0 +1,15 @@
#!/usr/bin/env bash
if [[ $# -eq 1 ]]; then
selected=$1
else
read -p "ssh url: " selected
fi
if [[ -z $selected ]]; then
exit 0
fi
ggman clone "$selected"
find -L $GGROOT -mindepth 1 -maxdepth 5 -type d -name .git -prune | xargs -n 1 dirname > "$GGROOT/compiled"

View File

@ -15,7 +15,15 @@ set -g status-left-length 30
set-window-option -g mode-keys vi set-window-option -g mode-keys vi
bind -T copy-mode-vi v send-keys -X begin-selection bind -T copy-mode-vi v send-keys -X begin-selection
bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'pbcopy'
# differentiate copy on linux and max
if-shell -b '[ "$(uname -s)" = "Linux" ]' {
bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
}
if-shell -b '[ "$(uname -s)" = "Darwin" ]' {
bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'pbcopy'
}
# vim-like pane switching # vim-like pane switching
bind -r ^ last-window bind -r ^ last-window
@ -29,6 +37,7 @@ bind -r t neww -c "~" "nvim ~/.TODO.md"
bind-key -r f run-shell "tmux neww ~/.config/tmux/tmux-sessionizer" bind-key -r f run-shell "tmux neww ~/.config/tmux/tmux-sessionizer"
bind-key -r g run-shell "tmux neww ~/.config/tmux/tmux-sessionizer $XDG_CONFIG_HOME" bind-key -r g run-shell "tmux neww ~/.config/tmux/tmux-sessionizer $XDG_CONFIG_HOME"
bind-key -r T run-shell "tmux neww ~/.config/tmux/tmux-sessionizer ~/Desktop/temp" bind-key -r T run-shell "tmux neww ~/.config/tmux/tmux-sessionizer ~/temp"
bind-key -r R run-shell "tmux neww ~/.config/tmux/tmux-sessionizer ~" bind-key -r R run-shell "tmux neww ~/.config/tmux/tmux-sessionizer ~"
bind-key -r G run-shell "tmux neww ~/.config/tmux/tmux-ggclone"

View File

@ -1 +1,2 @@
export PATH="/usr/local/bin:/opt/homebrew/bin:$Home/neovim/bin:${PATH}" export PATH="/usr/local/bin:/opt/homebrew/bin:$HOME/neovim/bin:$HOME/bin:${PATH}"

View File

@ -37,3 +37,11 @@ command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
# poetry # poetry
export POETRY_HOME="$XDG_DATA_HOME/poetry" export POETRY_HOME="$XDG_DATA_HOME/poetry"
command -v poetry >/dev/null || export PATH="$POETRY_HOME/bin:$PATH" command -v poetry >/dev/null || export PATH="$POETRY_HOME/bin:$PATH"
# gnupg
export GPG_TTY=$TTY
# aflabs
export USER_UID=$(id -u)
export USER_GID=$(id -g)

View File

@ -39,9 +39,6 @@ eval "$(pyenv virtualenv-init -)"
# ggman # ggman
eval "$(ggman shellrc)" eval "$(ggman shellrc)"
# gpg
export GPG_TTY=$(tty)
# custom functions and aliases # custom functions and aliases
source "$ZDOTDIR/aliases.zsh" source "$ZDOTDIR/aliases.zsh"
source "$ZDOTDIR/scripts.zsh" source "$ZDOTDIR/scripts.zsh"

View File

@ -1,8 +1,9 @@
alias s="ssh" alias s="ssh"
alias z="exec zsh" alias z="exec zsh"
alias t="tmux a || tmux new-session -s janezicmatej -c ~" alias t="tmux a || tmux new-session -s $(whoami) -c ~"
alias n=nvim_ve alias n=nvim_ve
# alias vim=nvim_ve # alias vim=nvim_ve
alias ssh-hosts="grep -P \"^Host ([^*]+)$\" $HOME/.ssh/config | sed 's/Host //'"
# navigation # navigation
alias cdgit="cd $GGROOT" alias cdgit="cd $GGROOT"

View File

@ -53,7 +53,7 @@ function pyinit {
DIRNAME=$(basename "$PWD") DIRNAME=$(basename "$PWD")
if [[ $(pyenv versions | grep "$DIRNAME") ]]; then if [[ $(pyenv versions | grep -E "/${DIRNAME}$") ]]; then
echo "found existing version with this name, setting..." echo "found existing version with this name, setting..."
pyenv local "$DIRNAME" pyenv local "$DIRNAME"
return return
@ -101,7 +101,7 @@ function get_dump {
return return
fi fi
selected=$(ssh "$1" docker ps --filter image=postgres:* --format "{{.Names}}" | fzf) selected=$(ssh "$1" docker ps --format "{{.Names}}" | fzf)
if [[ -z $selected ]]; then if [[ -z $selected ]]; then
return return