Moving in progress

4 files changed, 26 insertions, 15 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 57d5eac..49c9f30 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -36,7 +36,7 @@
  '(jdee-db-spec-breakpoint-face-colors (cons "#1c1f2b" "#676E95"))
  '(objed-cursor-color "#ff5370")
  '(package-selected-packages
-   '(cl-format company-irony neotree irony xr font-utils org-evil evil-vimish-fold crontab-mode vterm symon toc-org evil-org org-bullets yaml-mode twittering-mode helm-slime helm-w3m helm-mu htmlize babel org-pdftools shell-pop which-key golden-ratio dmenu mingus lua-mode dionysos helm-c-yasnippet helm-emms emms font-lock-cl restart-emacs w3m string-utils go-mode major-mode-icons dired-icon mode-icons evil-collection sed-mode zones kaolin-themes gruvbox-theme helm-themes yasnippet-classic-snippets yasnippet-snippets auto-yasnippet php-auto-yasnippets el-autoyas yasnippet cargo evil-ediff windresize helm-make spacemacs-theme centaur-tabs evil-mu4e evil-magit dashboard slime ssh sudo-ext dockerfile-mode docker frame-local ov dash-functional helm-addressbook org-mime flyspell-correct pdf-tools websocket request emojify-logos emojify oauth2 circe mu4e-alert web-mode doom-themes doom-modeline all-the-icons-dired all-the-icons-gnus all-the-icons html5-schema phps-mode org-babel-eval-in-repl rust-mode smart-mode-line-powerline-theme eshell-prompt-extras eshell-fixed-prompt pyenv-mode s realgud-lldb ranger ## color-theme-modern auto-complete-c-headers command-log-mode auto-complete magit smart-tabs-mode airline-themes paredit autopair tabbar-ruler tabbar use-package-el-get color-theme-approximate diminish rainbow-delimiters color-identifiers-mode use-package helm evil-visual-mark-mode))
+   '(cl-format company-irony neotree irony xr font-utils org-evil evil-vimish-fold crontab-mode vterm symon toc-org evil-org org-bullets yaml-mode twittering-mode helm-w3m helm-mu htmlize babel org-pdftools shell-pop which-key golden-ratio dmenu mingus lua-mode dionysos helm-c-yasnippet helm-emms emms font-lock-cl restart-emacs w3m string-utils go-mode major-mode-icons dired-icon mode-icons evil-collection sed-mode zones kaolin-themes gruvbox-theme helm-themes yasnippet-classic-snippets yasnippet-snippets auto-yasnippet php-auto-yasnippets el-autoyas yasnippet cargo evil-ediff windresize helm-make spacemacs-theme centaur-tabs evil-mu4e evil-magit dashboard ssh sudo-ext dockerfile-mode docker frame-local ov dash-functional helm-addressbook org-mime flyspell-correct pdf-tools websocket request emojify-logos emojify oauth2 circe mu4e-alert web-mode doom-themes doom-modeline all-the-icons-dired all-the-icons-gnus all-the-icons html5-schema phps-mode org-babel-eval-in-repl rust-mode smart-mode-line-powerline-theme eshell-prompt-extras eshell-fixed-prompt pyenv-mode s realgud-lldb ranger ## color-theme-modern auto-complete-c-headers command-log-mode auto-complete magit smart-tabs-mode airline-themes paredit autopair tabbar-ruler tabbar use-package-el-get color-theme-approximate diminish rainbow-delimiters color-identifiers-mode use-package helm evil-visual-mark-mode))
  '(pdf-view-midnight-colors (cons "#EEFFFF" "#292D3E"))
  '(pos-tip-background-color "#2E2A29")
  '(pos-tip-foreground-color "#d4d4d6")
diff --git a/.config/fish/alias.fish b/.config/fish/alias.fish
index 9aad5d9..9e09ee3 100644
--- a/.config/fish/alias.fish
+++ b/.config/fish/alias.fish
@@ -40,7 +40,7 @@ alias nb='newsboat'
 alias mutt='neomutt'
 alias nmt='neomutt'
 alias sxiv='sxiv -b'
-alias infox='pkg info -x'
+alias pinfo='pkg info -x'
 function search
 	make -C /usr/ports search name=$argv | grep 'Path:';
 end
@@ -51,3 +51,4 @@ alias rsox='sox -t oss default'
 alias calcurse="calcurse -C $XDG_CONFIG_HOME/calcurse -D $XDG_DATA_HOME/calcurse"
 alias abook="abook -C $XDG_CONFIG_HOME/abook/abookrc --datafile $XDG_DATA_HOME/abook/addressbook"
 alias dosbox="dosbox -conf $XDG_CONFIG_HOME/dosbox/dosbox.conf"
+alias svn="svn --config-dir "$XDG_CONFIG_HOME"/subversion"
diff --git a/.screenrc b/.config/screen/screenrc
index 5ab5917..5ab5917 100644
--- a/.screenrc
+++ b/.config/screen/screenrc
diff --git a/.profile b/.profile
index 03fd6f1..fa2d05b 100644
--- a/.profile
+++ b/.profile
@@ -23,21 +23,24 @@ ENV=$HOME/.shrc; export ENV
 export PATH="${HOME}/.local/bin:${PATH}"
 
 # Apps
-export EDITOR="nvim"
-export VISUAL="nvim"
-export PAGER="less"
-export TERMINAL="alacritty"
-export BROWSER="firefox"
-export READER="zathura"
-export FILE="vifm"
+export EDITOR='nvim'
+export VISUAL='nvim'
+export PAGER='less'
+export TERMINAL='alacritty'
+export BROWSER='firefox'
+export READER='zathura'
+export FILE='vifm'
 
 # UTF-8
-export LANG="en_US.UTF-8"
+export CHARSET='UTF-8'
+export LANG='en_US.UTF-8'
+export LC_COLLATE='C'
 
 # xdg
 export XDG_DATA_HOME="$HOME"/.local/share
 export XDG_CONFIG_HOME="$HOME"/.config
 export XDG_CACHE_HOME="$HOME"/.cache
+export XDG_RUNTIME_DIR=/tmp
 export XDG_MUSIC_DIR="$HOME"/mu
 
 # Cleanup
@@ -47,19 +50,26 @@ export ANDROID_EMULATOR_HOME="$XDG_DATA_HOME"/android/
 export ADB_VENDOR_KEY="$XDG_CONFIG_HOME"/android
 export CARGO_HOME="$XDG_DATA_HOME"/cargo
 export DOCKER_CONFIG="$XDG_CONFIG_HOME"/docker
-export MACHINE_STORAGE_PATH="$XDG_DATA_HOME"/docker-machine
 export GNUPGHOME="$XDG_DATA_HOME"/gnupg
-export LESSHISTFILE="-"
+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
+export NMBGIT="$XDG_DATA_HOME"/notmuch/nmbug
+export NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc
+export SCREENRC="$XDG_CONFIG_HOME"/screen/screenrc
+export STACK_ROOT="$XDG_DATA_HOME"/stack
+export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass
 
 # ccache
-export CCACHE_PATH="/usr/bin:/usr/local/bin:/usr/local/llvm11/bin"
-export CCACHE_DIR="/var/cache/ccache-jozan"
-export CCACHE_LOGFILE="/var/log/ccache.log"
+export CCACHE_PATH='/usr/bin:/usr/local/bin:/usr/local/llvm11/bin'
+export CCACHE_DIR='/var/cache/ccache-jozan'
+export CCACHE_LOGFILE='/var/log/ccache.log'
 
 # Apps config
 export FZF_DEFAULT_COMMAND='ag -g "" --ignore dotfiles-bsd'
 export FZF_DEFAULT_OPTS='--height 40% --layout=reverse --border'
 export LESS="-R"
+export LESSHISTFILE='-'
 export MANPAGER="less -R -M +Gg"
 export MPD_HOST="${HOME}/.config/mpd/socket"
 export RUSTFLAGS="-L /usr/local/lib"