aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2022-09-28 18:20:54 +0200
committerCharles Cabergs <me@cacharle.xyz>2022-09-28 18:20:54 +0200
commitece8fc96ab578c6a183ba9302523ca34e0ae05f4 (patch)
tree2e36cd594f74bc0a31488d328a98c7370f72556a
parent879cfe5375ec79ca4021398af868f9fe2f7262fb (diff)
parent6e72a59d840da5bde8c8e283b3fde7e849296f01 (diff)
downloaddotfiles-ece8fc96ab578c6a183ba9302523ca34e0ae05f4.tar.gz
dotfiles-ece8fc96ab578c6a183ba9302523ca34e0ae05f4.tar.bz2
dotfiles-ece8fc96ab578c6a183ba9302523ca34e0ae05f4.zip
Merge branch 'master' of cacharle.xyz:/srv/git/dotfiles
-rw-r--r--config/alacritty/alacritty.darwin.yml6
-rw-r--r--config/tmux/tmux.conf1
-rw-r--r--config/zsh/.zshenv2
-rwxr-xr-xinstall4
4 files changed, 11 insertions, 2 deletions
diff --git a/config/alacritty/alacritty.darwin.yml b/config/alacritty/alacritty.darwin.yml
index 417c54a..b8794ae 100644
--- a/config/alacritty/alacritty.darwin.yml
+++ b/config/alacritty/alacritty.darwin.yml
@@ -34,6 +34,12 @@ key_bindings:
- { key: Return, mods: Command, action: ToggleSimpleFullScreen }
- { key: Q, mods: Command, chars: "" }
+scrolling:
+ history: 10000
+ multiplier: 3
+ faux_multiplier: 3
+ auto_scroll: false
+
# Colors (Nord)
# colors:
# primary:
diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index eb20984..328a92f 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -14,6 +14,7 @@ set -s history-file '~/.local/share/tmux/history'
set -g mouse on
setw -g mode-keys vi
+set -ga terminal-overrides ',screen-256color:smcup@:rmcup@'
set -sg escape-time 0 # otherwise <ESC> in vim has a small delay
set -sg bell-action none
diff --git a/config/zsh/.zshenv b/config/zsh/.zshenv
index 273827a..94910be 100644
--- a/config/zsh/.zshenv
+++ b/config/zsh/.zshenv
@@ -79,3 +79,5 @@ export MINIKUBE_IN_STYLE=false # disable cringe minikube emojies
export CLOUT_SYNC_DIR="clout-sync/"
export CLOUT_SYNC_PATH="${XDG_DATA_HOME:-$HOME/.sync}/$CLOUT_SYNC_DIR"
+export HOMEBREW_NO_AUTO_UPDATE=1 # disable brew updating stuff when I install
+
diff --git a/install b/install
index 87c447a..397a974 100755
--- a/install
+++ b/install
@@ -2,7 +2,7 @@
# zprofile isn't installed yet on new machine
# shellcheck source=/dev/null
-. config/zsh/zprofile
+. config/zsh/.zshenv
if [ "$USER" = 'root' ]
then
@@ -73,7 +73,7 @@ echo '---------------------------- INSTALL NVIM PACKER -------------------------
PACKERDIR="$XDG_DATA_HOME/nvim/site/pack/packer/start/packer.nvim"
PACKERURL='https://github.com/wbthomason/packer.nvim'
[ ! -d "$PACKERDIR" ] && git clone --depth 1 "$PACKERURL" "$PACKERDIR"
-nvim -c 'PackerInstall' -c 'PackerUpdate' -c "qa"
+nvim -c 'PackerInstall' -c 'PackerSync' -c "qa"
###############################################################################
# zsh pluggins