mirror of
https://github.com/ivuorinen/dotfiles.git
synced 2026-02-01 21:47:45 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 261ff41e28 | |||
| 36ad2a2ad9 |
14
base/zshrc
14
base/zshrc
@@ -61,17 +61,11 @@ antigen bundle jreese/zsh-titles
|
|||||||
antigen bundle zsh-users/zsh-completions
|
antigen bundle zsh-users/zsh-completions
|
||||||
|
|
||||||
# these should be available if there's need
|
# these should be available if there's need
|
||||||
# x-have brew && antigen bundle brew
|
|
||||||
# x-have php && antigen bundle php
|
|
||||||
x-have python && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
|
x-have python && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
|
||||||
|
|
||||||
# nvm is a strange beast
|
# nvm is a strange beast
|
||||||
zstyle ':omz:plugins:nvm' autoload yes
|
zstyle ':omz:plugins:nvm' autoload yes
|
||||||
antigen bundle nvm
|
antigen bundle nvm
|
||||||
# antigen bundle "$DOTFILES/config/zsh/plugins/nvm-auto-use"
|
|
||||||
|
|
||||||
# nice to have stuff
|
|
||||||
# antigen bundle gcloud
|
|
||||||
|
|
||||||
# this needs to be the last item
|
# this needs to be the last item
|
||||||
antigen bundle zsh-users/zsh-syntax-highlighting
|
antigen bundle zsh-users/zsh-syntax-highlighting
|
||||||
@@ -110,3 +104,11 @@ x-have oh-my-posh && {
|
|||||||
eval "$(oh-my-posh init zsh --config $XDG_CONFIG_HOME/oh-my-posh.omp.json)"
|
eval "$(oh-my-posh init zsh --config $XDG_CONFIG_HOME/oh-my-posh.omp.json)"
|
||||||
}
|
}
|
||||||
source "$DOTFILES/config/alias"
|
source "$DOTFILES/config/alias"
|
||||||
|
|
||||||
|
# Herd checks for a few environment variables to inject PHP binaries and configurations.
|
||||||
|
# Herd injected PHP binary.
|
||||||
|
# export PATH="/Users/ivuorinen/Library/Application Support/Herd/bin/":$PATH
|
||||||
|
# Herd injected PHP 8.3 configuration.
|
||||||
|
# export HERD_PHP_83_INI_SCAN_DIR="/Users/ivuorinen/Library/Application Support/Herd/config/php/83/"
|
||||||
|
# Herd injected PHP 7.4 configuration.
|
||||||
|
# export HERD_PHP_74_INI_SCAN_DIR="/Users/ivuorinen/Library/Application Support/Herd/config/php/74/"
|
||||||
|
|||||||
@@ -99,7 +99,8 @@ if [[ $(uname) == 'Darwin' ]]; then
|
|||||||
# Also, clear Apple's System Logs to improve shell startup speed
|
# Also, clear Apple's System Logs to improve shell startup speed
|
||||||
alias emptytrash="sudo rm -rfv /Volumes/*/.Trashes; sudo rm -rfv ~/.Trash; sudo rm -rfv /private/var/log/asl/*.asl"
|
alias emptytrash="sudo rm -rfv /Volumes/*/.Trashes; sudo rm -rfv ~/.Trash; sudo rm -rfv /private/var/log/asl/*.asl"
|
||||||
|
|
||||||
x-set-php-aliases
|
# Using herd for php now, so this is not needed anymore
|
||||||
|
# x-set-php-aliases
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Alacritty preexec hook to update dynamic title
|
# Alacritty preexec hook to update dynamic title
|
||||||
|
|||||||
@@ -52,6 +52,17 @@ export GNUPGHOME="$XDG_DATA_HOME/gnupg"
|
|||||||
export GOPATH="$XDG_DATA_HOME/go"
|
export GOPATH="$XDG_DATA_HOME/go"
|
||||||
export GOBIN="$XDG_BIN_HOME"
|
export GOBIN="$XDG_BIN_HOME"
|
||||||
|
|
||||||
|
# Herd, herd.laravel.com
|
||||||
|
# Herd injected PHP binary.
|
||||||
|
export PATH="$HOME/Library/Application Support/Herd/bin/":$PATH
|
||||||
|
|
||||||
|
x-have herd && {
|
||||||
|
# Herd injected PHP 8.3 configuration.
|
||||||
|
export HERD_PHP_83_INI_SCAN_DIR="$HOME/Library/Application Support/Herd/config/php/83/"
|
||||||
|
# Herd injected PHP 7.4 configuration.
|
||||||
|
export HERD_PHP_74_INI_SCAN_DIR="$HOME/Library/Application Support/Herd/config/php/74/"
|
||||||
|
}
|
||||||
|
|
||||||
# nb, https://xwmx.github.io/nb/
|
# nb, https://xwmx.github.io/nb/
|
||||||
export NBRC_PATH="$XDG_CONFIG_HOME/nbrc"
|
export NBRC_PATH="$XDG_CONFIG_HOME/nbrc"
|
||||||
export NB_DIR="$XDG_STATE_HOME/nb"
|
export NB_DIR="$XDG_STATE_HOME/nb"
|
||||||
|
|||||||
@@ -1,5 +1,24 @@
|
|||||||
-- luacheck: globals vim
|
-- luacheck: globals vim
|
||||||
return {
|
return {
|
||||||
|
-- Neotree configuration
|
||||||
|
{
|
||||||
|
"nvim-neo-tree/neo-tree.nvim",
|
||||||
|
opts = {
|
||||||
|
filesystem = {
|
||||||
|
filtered_items = {
|
||||||
|
always_show = {
|
||||||
|
".github",
|
||||||
|
".gitignore",
|
||||||
|
".editorconfig",
|
||||||
|
".python-version",
|
||||||
|
".nvmrc",
|
||||||
|
".env",
|
||||||
|
".env.example",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
-- Cloak allows you to overlay *'s over defined patterns in defined files.
|
-- Cloak allows you to overlay *'s over defined patterns in defined files.
|
||||||
-- https://github.com/laytan/cloak.nvim
|
-- https://github.com/laytan/cloak.nvim
|
||||||
{ "laytan/cloak.nvim" },
|
{ "laytan/cloak.nvim" },
|
||||||
|
|||||||
@@ -130,21 +130,5 @@
|
|||||||
"foreground_templates": ["{{ if gt .Code 0 }}red{{ end }}"],
|
"foreground_templates": ["{{ if gt .Code 0 }}red{{ end }}"],
|
||||||
"template": "\u279c "
|
"template": "\u279c "
|
||||||
},
|
},
|
||||||
"tooltips": [
|
|
||||||
{
|
|
||||||
"type": "git",
|
|
||||||
"tips": ["git", "g"],
|
|
||||||
"style": "diamond",
|
|
||||||
"foreground": "#193549",
|
|
||||||
"background": "#fffb38",
|
|
||||||
"leading_diamond": "",
|
|
||||||
"trailing_diamond": "",
|
|
||||||
"template": "{{ .HEAD }}{{ if .Staging.Changed }} {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}",
|
|
||||||
"properties": {
|
|
||||||
"fetch_status": true,
|
|
||||||
"fetch_upstream_icon": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"version": 2
|
"version": 2
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user