From f721b557b835d8cf3377d33a96b3a9cbd6de7c4c Mon Sep 17 00:00:00 2001 From: afonso Date: Sun, 26 May 2024 16:12:58 +0100 Subject: [PATCH] Fix macos only paths --- .config/alacritty/alacritty.toml | 2 +- .config/nvim/lazy-lock.json | 2 +- .config/tmux/tmux_plugins.conf | 4 ++-- .config/zsh/main.zsh | 4 +++- .config/zsh/replacements.zsh | 16 ++-------------- .zshrc | 2 +- 6 files changed, 10 insertions(+), 20 deletions(-) diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 059800a..ffa1e86 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -4,7 +4,7 @@ import = ["~/.config/alacritty/themes/gruvbox_dark.toml"] TERM = "xterm-256color" [font] -size = 16.0 +size = 14.0 [font.normal] family = "JetBrainsMono Nerd Font Mono" diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 3439b16..1dfdc86 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -21,7 +21,7 @@ "instant.nvim": { "branch": "master", "commit": "294b6d08143b3db8f9db7f606829270149e1a786" }, "jq.nvim": { "branch": "master", "commit": "b9879798f25a9318894456dc7464af0904c08958" }, "keylab.nvim": { "branch": "main", "commit": "9686b09253b5dde40e18554d189deb1b0c47f437" }, - "lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" }, + "lazy.nvim": { "branch": "main", "commit": "8f19915175395680808de529e4220da8dafc0759" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "ltex-extra.nvim": { "branch": "master", "commit": "4296c2c7aefbca721d02a011366a1de30598046c" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, diff --git a/.config/tmux/tmux_plugins.conf b/.config/tmux/tmux_plugins.conf index fff680a..7da6c6c 100644 --- a/.config/tmux/tmux_plugins.conf +++ b/.config/tmux/tmux_plugins.conf @@ -16,6 +16,6 @@ set -g @resurrect-strategy-nvim 'session' set -g @resurrect-capture-pane-contents 'on' set -g @continuum-restore 'on' set -g @continuum-save-interval '5' -set -g @continuum-boot 'on' -set -g @continuum-boot-options 'alacritty' +#set -g @continuum-boot 'on' +#set -g @continuum-boot-options 'alacritty' diff --git a/.config/zsh/main.zsh b/.config/zsh/main.zsh index 561d50b..dbbaa5e 100644 --- a/.config/zsh/main.zsh +++ b/.config/zsh/main.zsh @@ -21,4 +21,6 @@ enable-fzf-tab source $HOME/.opam/opam-init/init.zsh > /dev/null 2>&1 || true eval "$(direnv hook zsh)" -eval "$(/opt/homebrew/bin/brew shellenv)" +if [[ $(uname) == "Darwin" ]]; then + eval "$(/opt/homebrew/bin/brew shellenv)" +fi diff --git a/.config/zsh/replacements.zsh b/.config/zsh/replacements.zsh index 51a1633..b85d648 100644 --- a/.config/zsh/replacements.zsh +++ b/.config/zsh/replacements.zsh @@ -1,20 +1,8 @@ # ~/.config/zsh/replacements.zsh -ls() { - eza --icons -l --sort type "$@" -} +alias ls="eza --icons -l --sort type" -nvim() { - /opt/homebrew/bin/nvim --listen /tmp/nvim.pipe "$@" -} - -vim() { - /opt/homebrew/bin/nvim --listen /tmp/nvim.pipe "$@" -} - -v() { - /opt/homebrew/bin/nvim --listen /tmp/nvim.pipe "$@" -} +alias vim="nvim --listen /tmp/nvim.pipe" alias lg="lazygit" alias calcurse-caldav='CALCURSE_CALDAV_PASSWORD=$(keyring get caldav afonso) calcurse-caldav' diff --git a/.zshrc b/.zshrc index bc6466b..c4e7923 100644 --- a/.zshrc +++ b/.zshrc @@ -75,7 +75,7 @@ ZSH_THEME="" # HIST_STAMPS="mm/dd/yyyy" # Would you like to use another custom folder than $ZSH/custom? -ZSH_CUSTOM=/Users/afonso/.config/zsh +ZSH_CUSTOM=$HOME/.config/zsh # Which plugins would you like to load? # Standard plugins can be found in $ZSH/plugins/