From 68bb53435dff61103dde04e5bd9cb71c92aba6ea Mon Sep 17 00:00:00 2001
From: Ismo Vuorinen <ismo@ivuorinen.net>
Date: Sun, 13 Aug 2023 17:21:53 +0300
Subject: [PATCH] chore(config): cleanup configs, fixes

---
 base/huskyrc                | 2 --
 base/zshrc                  | 4 +++-
 config/exports-apps         | 1 +
 config/exports-shell        | 1 +
 config/functions            | 1 +
 config/nvm/default-packages | 1 -
 config/tmux/tmux.conf       | 2 +-
 install.conf.yaml           | 1 -
 8 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/base/huskyrc b/base/huskyrc
index 7d30591..411b8d0 100644
--- a/base/huskyrc
+++ b/base/huskyrc
@@ -4,5 +4,3 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"                   # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
 
-alias php="php -d error_reporting=22527"
-
diff --git a/base/zshrc b/base/zshrc
index 3d87f47..a0067cf 100644
--- a/base/zshrc
+++ b/base/zshrc
@@ -17,6 +17,8 @@ export DOTFILES="$HOME/.dotfiles"
 # shellcheck source=shared.sh
 source "$DOTFILES/scripts/shared.sh"
 
+export HISTFILE="$XDG_STATE_HOME"/zsh/history
+
 autoload -U colors zsh/terminfo
 colors
 setopt correct
@@ -32,7 +34,7 @@ compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
 if type brew &>/dev/null
 then
   FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}"
-  compinit
+  compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
 fi
 
 # Run x-load-configs in your terminal to reload the files.
diff --git a/config/exports-apps b/config/exports-apps
index feaa8de..392cf8c 100755
--- a/config/exports-apps
+++ b/config/exports-apps
@@ -3,6 +3,7 @@
 # shellcheck enable=external-sources
 # shellcheck disable=1091,2139
 # vim: filetype=zsh
+export DOTFILES="$HOME/.dotfiles"
 source "$DOTFILES/scripts/shared.sh"
 
 # Antigen configuration
diff --git a/config/exports-shell b/config/exports-shell
index 91849fb..383b9b9 100755
--- a/config/exports-shell
+++ b/config/exports-shell
@@ -2,6 +2,7 @@
 # shellcheck shell=bash
 # shellcheck disable=1091,2046
 # vim: filetype=zsh
+export DOTFILES="$HOME/.dotfiles"
 source "$DOTFILES/scripts/shared.sh"
 
 export LC_ALL=fi_FI.UTF-8
diff --git a/config/functions b/config/functions
index 23d4664..e879388 100755
--- a/config/functions
+++ b/config/functions
@@ -3,6 +3,7 @@
 # shell functions
 #
 # shellcheck source="../scripts/shared.sh"
+export DOTFILES="$HOME/.dotfiles"
 source "$DOTFILES/scripts/shared.sh"
 
 # Weather in Tampere, or other city
diff --git a/config/nvm/default-packages b/config/nvm/default-packages
index af49374..c55318b 100644
--- a/config/nvm/default-packages
+++ b/config/nvm/default-packages
@@ -4,5 +4,4 @@ editorconfig-checker
 github-release-notes
 neovim
 stylelint-lsp
-tldr
 
diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index 6e838dc..2e4c83f 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -23,7 +23,7 @@ set -g @tpm_plugins '           \
 '
 
 # Set plugins install dir
-set-environment -g TMUX_PLUGIN_MANAGER_PATH '~/.dotfiles/config/tmux/plugins/'
+set-environment -g TMUX_PLUGIN_MANAGER_PATH '~/.dotfiles/config/tmux/plugins'
 
 set-option -sa terminal-overrides ",xterm*:Tc"
 
diff --git a/install.conf.yaml b/install.conf.yaml
index f42ca88..228a5e6 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -32,7 +32,6 @@
       glob: true
       path: local/bin/**
     ~/.ssh/:
-      force: true
       glob: true
       mode: 0600
       path: ssh/**