some updates for new mail domain, editor changes, $PATH

5 files changed, 23 insertions, 19 deletions

diff --git a/.SpaceVim.d/init.toml b/.SpaceVim.d/init.toml
index fd09311..929e326 100644
--- a/.SpaceVim.d/init.toml
+++ b/.SpaceVim.d/init.toml
@@ -55,14 +55,10 @@
 [[layers]]
     name = 'gtags'
 [[layers]]
-    name = 'lang#c'
-[[layers]]
     name = 'lang#elixir'
 [[layers]]
     name = 'lang#extra'
 [[layers]]
-    name = 'lang#go'
-[[layers]]
     name = 'lang#html'
 [[layers]]
     name = 'lang#javascript'
@@ -76,14 +72,6 @@
 [[layers]]
     name = 'lang#perl'
 [[layers]]
-    name = 'lang#python'
-    python_file_head = [
-        '#!/usr/bin/env python3',
-        '# -*- coding: utf-8 -*-',
-        '',
-        ''
-    ]
-[[layers]]
     name = 'lang#scheme'
 [[layers]]
     name = 'lang#sh'
@@ -92,8 +80,15 @@
 [[layers]]
     name = 'lsp'
     filetypes = [
-        'python'
+        'c',
+        'cpp',
+        'python',
+        'go',
+        'rust',
+        'zig'
     ]
+    [layers.override_cmd]
+      zig = ["zls"]
 [[layers]]
     name = 'shell'
     default_position = 'top'
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 2f8c7ef..61ea087 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -105,11 +105,17 @@ set -x PATH $HOME/.ghcup/bin $PATH
 set -x PATH /snap/bin $PATH
 set -x PATH $HOME/.gem/ruby/2.7.0/bin $PATH
 set -x PATH $DENO_INSTALL/bin $PATH
+set -x PATH $HOME/.pyenv/bin $PATH
+set -x PATH $HOME/.poetry/bin $PATH
 
 # hub, the github cli tool
 set -x HUB_CONFIG $HOME/.config/hub
 set -x HUB_PROTOCOL ssh
 
+# pyenv
+status is-login; and pyenv init --path | source
+status is-interactive; and pyenv init - | source
+
 # rust env
 #set -x RUST_SRC_PATH ~/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library
 
diff --git a/.config/git/config b/.config/git/config
index 0f93408..712cd8e 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,12 +1,12 @@
 [sendemail]
     smtpEncryption = tls
     smtpServer = smtp.fastmail.com
-    smtpUser = ben@gbmor.dev
+    smtpUser = ben@gbmor.org
     smtpServerPort = 587
     annotate = yes
 [user]
     name = "Benjamin Morrison"
-    email = ben@gbmor.dev
+    email = ben@gbmor.org
     signingkey = EAB272409CD12FF0
 [init]
     templatedir = ~/.config/git/template.git
diff --git a/.config/i3/config b/.config/i3/config
index ed3c049..afe1046 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -11,7 +11,10 @@
 #################################
 # AUTOSTART SECTION
 # ###############################
+exec_always "sh $HOME/.fehbg"
 exec_always --no-startup-id $HOME/.config/polybar/launch.sh
+exec "xcompmgr &"
+exec "xscreensaver &"
 exec "pactl upload-sample /usr/share/sounds/freedesktop/stereo/bell.oga x11-bell"
 exec "pactl load-module module-x11-bell sample=x11-bell display=$DISPLAY"
 exec "xset b 100"
diff --git a/.neomuttrc b/.neomuttrc
index e7a33c3..62a4b2f 100644
--- a/.neomuttrc
+++ b/.neomuttrc
@@ -10,7 +10,7 @@ set crypt_verify_sig	= yes
 #set crypt_replysignencrypted=yes
 #set crypt_autoencrypt = yes
 
-set from	= "Benjamin Morrison <ben@gbmor.dev>"
+set from	= "Benjamin Morrison <ben@gbmor.org>"
 set editor	= nvim
 set timeout	= 30
 set mail_check	= 5
@@ -18,10 +18,10 @@ set signature	= "$HOME/.neomutt/sig"
 
 set smtp_authenticators       = "login"
 set ssl_force_tls             = yes
-set smtp_url                  = "smtp://ben@gbmor.dev@smtp.fastmail.com:587"
-set smtp_pass	= "`pass Email/fastmail-mutt`"
+set smtp_url                  = "smtp://ben@gbmor.org@smtp.fastmail.com:587"
+set smtp_pass	= "`pass Email/fastmail-mutt-org`"
 
-set imap_user	= "ben@gbmor.dev"
+set imap_user	= "ben@gbmor.org"
 set imap_pass = $smtp_pass
 set folder	= imaps://imap.fastmail.com:993/
 set spoolfile	= +INBOX