Merge branch 'master' of gitjoe.xyz:dotfiles-bsd

4 files changed, 11 insertions, 10 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index f0425b7..38af20b 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -10,8 +10,6 @@
  ;; If there is more than one, they won't work right.
  '(ansi-color-faces-vector
    [default default default italic underline success warning error])
- '(ansi-color-names-vector
-   ["#292D3E" "#ff5370" "#c3e88d" "#ffcb6b" "#82aaff" "#c792ea" "#89DDFF" "#EEFFFF"])
  '(auth-source-save-behavior nil)
  '(ccls-sem-function-colors '("#e5b124"))
  '(ccls-sem-parameter-faces
@@ -41,8 +39,7 @@
  '(jdee-db-spec-breakpoint-face-colors (cons "#1c1f2b" "#676E95"))
  '(objed-cursor-color "#ff5370")
  '(package-selected-packages
-   '(neotree color-theme doom-modeline-now-playing treemacs-icons-dired edit-indirect yaml-mode lua-mode company-nginx company-fuzzy company-go company-shell helm-ag rainbow-identifiers nginx-mode evil-quickscope vc-fossil crontab-mode go-mode mutt-mode pacmacs gemini-mode org-evil glsl-mode vimrc-mode windresize evil evil-collection evil-leader evil-search-highlight-persist evil-mc evil-surround evil-ediff evil-visual-mark-mode evil-nerd-commenter evil-vimish-fold evil-numbers yasnippet yasnippet-classic-snippets yasnippet-snippets auto-yasnippet el-autoyas helm helm-xref helm-etags-plus helm-fuzzy helm-themes helm-make helm-projectile projectile company company-box which-key magit undo-tree shell-pop autopair paredit rainbow-delimiters color-identifiers-mode ibuffer-vc ibuffer-projectile eyebrowse diff-hl fzf font-utils restart-emacs string-utils dired-icon kaolin-themes doom-themes spacemacs-theme dashboard org-superstar toc-org pdf-tools dockerfile-mode web-mode ssh sudo-ext vimish-fold bind-key all-the-icons all-the-icons-dired all-the-icons-ibuffer))
- '(pdf-view-midnight-colors (cons "#EEFFFF" "#292D3E"))
+   '(helm-fuzzy-find helm-fuzzier fuzzy fuzzy-finder neotree color-theme doom-modeline-now-playing treemacs-icons-dired edit-indirect yaml-mode lua-mode company-nginx company-fuzzy company-go company-shell helm-ag rainbow-identifiers nginx-mode evil-quickscope vc-fossil crontab-mode go-mode mutt-mode pacmacs gemini-mode org-evil glsl-mode vimrc-mode windresize evil evil-collection evil-leader evil-search-highlight-persist evil-mc evil-surround evil-ediff evil-visual-mark-mode evil-nerd-commenter evil-vimish-fold evil-numbers yasnippet yasnippet-classic-snippets yasnippet-snippets auto-yasnippet el-autoyas helm helm-xref helm-etags-plus helm-fuzzy helm-themes helm-make helm-projectile projectile company company-box which-key magit undo-tree shell-pop autopair paredit rainbow-delimiters color-identifiers-mode ibuffer-vc ibuffer-projectile eyebrowse diff-hl fzf font-utils restart-emacs string-utils dired-icon kaolin-themes doom-themes spacemacs-theme dashboard org-superstar toc-org pdf-tools dockerfile-mode web-mode ssh sudo-ext vimish-fold bind-key all-the-icons all-the-icons-dired all-the-icons-ibuffer))
  '(pos-tip-background-color "#2E2A29")
  '(pos-tip-foreground-color "#d4d4d6")
  '(rustic-ansi-faces
diff --git a/.config/env b/.config/env
index 2ad51f7..c89c760 100644
--- a/.config/env
+++ b/.config/env
@@ -22,6 +22,7 @@ export XDG_DOWNLOAD_DIR="$HOME"/dl
 export XDG_MUSIC_DIR="$HOME"/mu
 export XDG_PICTURES_DIR="$HOME"/pics
 export XDG_VIDEOS_DIR="$HOME"/vids
+export XDG_RUNTIME_DIR=/tmp/xdg_runtime
 
 # Apps
 export EDITOR="editorcmd"
@@ -34,8 +35,8 @@ export FILE='lf'
 
 # UTF-8
 export CHARSET='UTF-8'
-export LANG='en_US.UTF-8'
-# export LANG='C'
+# export LANG='en_US.UTF-8'
+export LANG='C'
 export LC_COLLATE='C'
 export LC_ALL=''
 
@@ -49,12 +50,13 @@ export CCACHE_CONFIGPATH="$XDG_CONFIG_HOME"/ccache.conf
 export CCACHE_DIR="$XDG_CACHE_HOME"/ccache
 export DOCKER_CONFIG="$XDG_CONFIG_HOME"/docker
 export DVDCSS_CACHE="$XDG_DATA_HOME"/dvdcss
+export FOSSGIT="$XDG_DATA_HOME"/fossil/git_exports
+export FOSSIL="$XDG_DATA_HOME"/fossil/repos
 export GNUPGHOME="$XDG_DATA_HOME"/gnupg
 export GPG_TUI_CONFIG="$XDG_CONFIG_HOME"/gpg-tui/gpg-tui.toml
 export GOPATH="$XDG_DATA_HOME"/go
 export GOBIN="$GOPATH"/bin
-export FOSSGIT="$XDG_DATA_HOME"/fossil/git_exports
-export FOSSIL="$XDG_DATA_HOME"/fossil/repos
+export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_DATA_HOME"/java
 export MACHINE_STORAGE_PATH="$XDG_DATA_HOME"/docker-machine
 export NODE_REPL_HISTORY="$XDG_DATA_HOME"/node_repl_history
 export NOTMUCH_CONFIG="$XDG_CONFIG_HOME"/notmuch/notmuchrc
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 6af7f1d..b26ff59 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -102,5 +102,7 @@ bindkey -v "^ " globalias
 bindkey -v " " magic-space
 bindkey -M isearch " " magic-space
 
+export LANG='en_US.UTF-8'
+
 PROMPT="%B%{$fg[red]%}%M %{$fg[blue]%}%c%{$fg[red]%}%#%{$reset_color%} "
 RPROMPT="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}"
diff --git a/.config/zsh/alias.zsh b/.config/zsh/alias.zsh
index 65b3c3d..edea077 100644
--- a/.config/zsh/alias.zsh
+++ b/.config/zsh/alias.zsh
@@ -24,9 +24,9 @@ alias \
 	bc='bc -l' \
 	mkf='gmake fclean' \
 	mkc='gmake clean' \
-	mk='gmake -j9' \
+	mk='gmake -j5' \
 	bmkc='make clean' \
-	bmk='make -j9' \
+	bmk='make -j5' \
 	web='w3m https://duckduckgo.com/' \
 	mpv='mpv --audio-channels=stereo' \
 	bat='bat --style=plain --tabs 4 --paging=always -f' \