mirror of
https://github.com/ivuorinen/dotfiles.git
synced 2026-02-02 08:48:02 +00:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 03a1b5fb85 | |||
| 7b83f6e943 | |||
| 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"
|
||||||
|
|||||||
@@ -6,9 +6,7 @@ tap "gesquive/tap"
|
|||||||
tap "github/gh"
|
tap "github/gh"
|
||||||
tap "homebrew/autoupdate"
|
tap "homebrew/autoupdate"
|
||||||
tap "homebrew/bundle"
|
tap "homebrew/bundle"
|
||||||
tap "homebrew/cask"
|
|
||||||
tap "homebrew/cask-fonts"
|
tap "homebrew/cask-fonts"
|
||||||
tap "homebrew/core"
|
|
||||||
tap "homebrew/services"
|
tap "homebrew/services"
|
||||||
tap "jesseduffield/lazygit"
|
tap "jesseduffield/lazygit"
|
||||||
tap "keith/formulae"
|
tap "keith/formulae"
|
||||||
@@ -41,10 +39,6 @@ brew "ca-certificates"
|
|||||||
brew "openssl@3"
|
brew "openssl@3"
|
||||||
# Companion library to apr, the Apache Portable Runtime library
|
# Companion library to apr, the Apache Portable Runtime library
|
||||||
brew "apr-util"
|
brew "apr-util"
|
||||||
# Password hashing library and CLI utility
|
|
||||||
brew "argon2"
|
|
||||||
# Open Source Kubernetes Marketplace
|
|
||||||
brew "arkade"
|
|
||||||
# Spell checker with better logic than ispell
|
# Spell checker with better logic than ispell
|
||||||
brew "aspell"
|
brew "aspell"
|
||||||
# Automatic configure script builder
|
# Automatic configure script builder
|
||||||
@@ -73,8 +67,6 @@ brew "cmake"
|
|||||||
brew "gmp"
|
brew "gmp"
|
||||||
# GNU File, Shell, and Text utilities
|
# GNU File, Shell, and Text utilities
|
||||||
brew "coreutils"
|
brew "coreutils"
|
||||||
# Get, unpack, build, and install modules from CPAN
|
|
||||||
brew "cpanminus"
|
|
||||||
# Open source suite of directory software
|
# Open source suite of directory software
|
||||||
brew "openldap"
|
brew "openldap"
|
||||||
# Get a file from an HTTP, HTTPS or FTP server
|
# Get a file from an HTTP, HTTPS or FTP server
|
||||||
@@ -175,22 +167,10 @@ brew "m-cli"
|
|||||||
brew "mutt"
|
brew "mutt"
|
||||||
# NCurses Disk Usage
|
# NCurses Disk Usage
|
||||||
brew "ncdu"
|
brew "ncdu"
|
||||||
# Ambitious Vim-fork focused on extensibility and agility
|
|
||||||
brew "neovim"
|
|
||||||
# HTTP(S) server and reverse proxy, and IMAP/POP3 proxy server
|
# HTTP(S) server and reverse proxy, and IMAP/POP3 proxy server
|
||||||
brew "nginx"
|
brew "nginx"
|
||||||
# Port scanning utility for large networks
|
# Port scanning utility for large networks
|
||||||
brew "nmap"
|
brew "nmap"
|
||||||
# Manage multiple Node.js versions
|
|
||||||
brew "nvm"
|
|
||||||
# Development kit for the Java programming language
|
|
||||||
brew "openjdk@11"
|
|
||||||
# Generate clients, server & docs from an OpenAPI spec (v2, v3)
|
|
||||||
brew "openapi-generator"
|
|
||||||
# Development kit for the Java programming language
|
|
||||||
brew "openjdk"
|
|
||||||
# Highly capable, feature-rich programming language
|
|
||||||
brew "perl"
|
|
||||||
# Coreutils progress viewer
|
# Coreutils progress viewer
|
||||||
brew "progress"
|
brew "progress"
|
||||||
# Python version management
|
# Python version management
|
||||||
@@ -201,8 +181,6 @@ brew "pyenv-pip-migrate"
|
|||||||
brew "pyenv-virtualenv"
|
brew "pyenv-virtualenv"
|
||||||
# Ruby version manager
|
# Ruby version manager
|
||||||
brew "rbenv"
|
brew "rbenv"
|
||||||
# RC file (dotfile) management
|
|
||||||
brew "rcm"
|
|
||||||
# Search tool like grep and The Silver Searcher
|
# Search tool like grep and The Silver Searcher
|
||||||
brew "ripgrep"
|
brew "ripgrep"
|
||||||
# Safe, concurrent, practical language
|
# Safe, concurrent, practical language
|
||||||
@@ -215,8 +193,6 @@ brew "shfmt"
|
|||||||
brew "task"
|
brew "task"
|
||||||
# Terminal user interface for taskwarrior
|
# Terminal user interface for taskwarrior
|
||||||
brew "taskwarrior-tui"
|
brew "taskwarrior-tui"
|
||||||
# Very fast implementation of tldr in Rust
|
|
||||||
brew "tealdeer"
|
|
||||||
# Send macOS User Notifications from the command-line
|
# Send macOS User Notifications from the command-line
|
||||||
brew "terminal-notifier"
|
brew "terminal-notifier"
|
||||||
# Thin wrapper for Terraform e.g. for locking state
|
# Thin wrapper for Terraform e.g. for locking state
|
||||||
@@ -243,45 +219,15 @@ brew "watch"
|
|||||||
brew "wget"
|
brew "wget"
|
||||||
# Check your $HOME for unwanted files and directories
|
# Check your $HOME for unwanted files and directories
|
||||||
brew "xdg-ninja", args: ["HEAD"]
|
brew "xdg-ninja", args: ["HEAD"]
|
||||||
# Hackable, minimal, fast TUI file explorer
|
|
||||||
brew "xplr"
|
|
||||||
# JavaScript package manager
|
# JavaScript package manager
|
||||||
brew "yarn"
|
brew "yarn"
|
||||||
# High-performance load testing tool, written in Golang.
|
|
||||||
brew "ddosify/tap/ddosify"
|
|
||||||
# lets you quickly switch between multiple git user profiles
|
# lets you quickly switch between multiple git user profiles
|
||||||
brew "gesquive/tap/git-user"
|
brew "gesquive/tap/git-user"
|
||||||
brew "keith/formulae/reminders-cli"
|
brew "keith/formulae/reminders-cli"
|
||||||
# Imagick PHP extension
|
|
||||||
brew "shivammathur/extensions/imagick@8.2"
|
|
||||||
# Imagick PHP extension
|
|
||||||
brew "shivammathur/extensions/imagick@8.3"
|
|
||||||
# Mcrypt PHP extension
|
|
||||||
brew "shivammathur/extensions/mcrypt@8.3"
|
|
||||||
# PCOV PHP extension
|
|
||||||
brew "shivammathur/extensions/pcov@8.3"
|
|
||||||
# Redis PHP extension
|
|
||||||
brew "shivammathur/extensions/redis@8.3"
|
|
||||||
# Uuid PHP extension
|
|
||||||
brew "shivammathur/extensions/uuid@8.3"
|
|
||||||
# Xdebug PHP extension
|
|
||||||
brew "shivammathur/extensions/xdebug@7.4"
|
|
||||||
# Xdebug PHP extension
|
|
||||||
brew "shivammathur/extensions/xdebug@8.0"
|
|
||||||
# Xdebug PHP extension
|
|
||||||
brew "shivammathur/extensions/xdebug@8.1"
|
|
||||||
# Yaml PHP extension
|
|
||||||
brew "shivammathur/extensions/yaml@8.3"
|
|
||||||
# General-purpose scripting language
|
|
||||||
brew "shivammathur/php/php"
|
|
||||||
# Command-line interface for 1Password
|
# Command-line interface for 1Password
|
||||||
cask "1password-cli"
|
cask "1password-cli"
|
||||||
# GPU-accelerated terminal emulator
|
# GPU-accelerated terminal emulator
|
||||||
cask "alacritty"
|
cask "alacritty"
|
||||||
# Automatic tiling window manager similar to xmonad
|
|
||||||
cask "amethyst"
|
|
||||||
# Turn audio CDs and files into audiobooks
|
|
||||||
cask "audiobook-builder"
|
|
||||||
# Text editor
|
# Text editor
|
||||||
cask "coda"
|
cask "coda"
|
||||||
# Universal database tool and SQL client
|
# Universal database tool and SQL client
|
||||||
@@ -290,8 +236,6 @@ cask "dbeaver-community"
|
|||||||
cask "dbngin"
|
cask "dbngin"
|
||||||
# App to build and share containerised applications and microservices
|
# App to build and share containerised applications and microservices
|
||||||
cask "docker"
|
cask "docker"
|
||||||
# UI toolkit for building applications for mobile, web and desktop
|
|
||||||
cask "flutter"
|
|
||||||
# Unofficial overcast.fm podcast app
|
# Unofficial overcast.fm podcast app
|
||||||
cask "fog"
|
cask "fog"
|
||||||
# Typeface made for developers
|
# Typeface made for developers
|
||||||
@@ -344,12 +288,6 @@ cask "quicklookase"
|
|||||||
cask "quitter"
|
cask "quitter"
|
||||||
# Control your tools with a few keystrokes
|
# Control your tools with a few keystrokes
|
||||||
cask "raycast"
|
cask "raycast"
|
||||||
# Move and resize windows using keyboard shortcuts or snap areas
|
|
||||||
cask "rectangle"
|
|
||||||
# GUI for rsync
|
|
||||||
cask "rsyncosx"
|
|
||||||
# GUI for rsync
|
|
||||||
cask "rsyncui"
|
|
||||||
# MySQL/MariaDB database management
|
# MySQL/MariaDB database management
|
||||||
cask "sequel-ace"
|
cask "sequel-ace"
|
||||||
# Plugin for AWS CLI to start and end sessions that connect to managed instances
|
# Plugin for AWS CLI to start and end sessions that connect to managed instances
|
||||||
@@ -370,7 +308,5 @@ cask "visual-studio-code"
|
|||||||
cask "vlc"
|
cask "vlc"
|
||||||
# Spell-checking service for Finnish
|
# Spell-checking service for Finnish
|
||||||
cask "voikkospellservice"
|
cask "voikkospellservice"
|
||||||
# Rust-based terminal
|
|
||||||
cask "warp"
|
|
||||||
# Application for generating TOTP and HOTP codes
|
# Application for generating TOTP and HOTP codes
|
||||||
cask "yubico-authenticator"
|
cask "yubico-authenticator"
|
||||||
|
|||||||
@@ -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