cleaned up $HOME some more

emacs/.config/emacs/Emacs.org

@@ -1,6 +1,6 @@
 #+title: My Emacs Config
 #+author: William Ball
-#+email: williampi103@gmail.com
+#+email: wball@ballcloud.cc
 #+property: header-args:emacs-lisp :tangle ./init.el :mkdirp
 
 * Basic Settings
@@ -148,24 +148,26 @@ Enable =use-package= integration
 ** Theme
 *** Modus Themes
 #+begin_src emacs-lisp
-  (use-package emacs
-    :ensure nil
-    :config
-    (require-theme 'modus-themes)
-    (setq modus-themes-italic-constructs t
-          modus-themes-bold-constructs t
-  	modus-themes-links '(no-underline background faint)
-          modus-themes-prompts '(bold intense)
-          modus-themes-mode-line '(borderless accented moody)
-          modus-themes-org-blocks 'gray-background
-          modus-themes-region '(bg-only no-extend))
-    (load-theme 'modus-operandi :no-confirm))
+  ;; (use-package emacs
+  ;;   :ensure nil
+  ;;   :config
+  ;;   (require-theme 'modus-themes)
+  ;;   (setq modus-themes-italic-constructs t
+  ;;         modus-themes-bold-constructs t
+  ;; 	modus-themes-links '(no-underline background faint)
+  ;;         modus-themes-prompts '(bold intense)
+  ;;         modus-themes-mode-line '(borderless accented moody)
+  ;;         modus-themes-org-blocks 'gray-background
+  ;;         modus-themes-region '(bg-only no-extend))
+  ;;   (load-theme 'modus-operandi :no-confirm))
 #+end_src
 *** Catpuccin
 #+begin_src emacs-lisp
   (use-package catppuccin-theme
     :init (setq catppuccin-flavor 'mocha)
-    :hook (after-init . (lambda () (load-theme 'catppuccin :no-confirm))))
+    :config
+    (load-theme 'catpuccin :no-confirm))
+#+end_src
 
 *** Italic Comments
 #+begin_src emacs-lisp

fish/.config/fish/config.fish

@@ -52,6 +52,7 @@ set -x GDK_BACKEND wayland
 set -x BEMENU_OPTS '--ignorecase --fb "#1e1e2e" --ff "#cdd6f4" --nb "#1e1e2e" --nf "#cdd6f4" --tb "#1e1e2e" --hb "#1e1e2e" --tf "#f5c2e7" --hf "#f9e2af" --af "#cdd6f4" --ab "#1e1e2e" --fn "Iosevka Nerd Font 16" --no-overlap --wrap'
 
 set -x LESSHISTFILE -
+set -x ASPELL_CONF "per-conf $XDG_CONFIG_HOME/aspell/aspell.conf; personal $XDG_DATA_HOME/aspell/en.pws; repl $XDG_DATA_HOME/aspell/en.prepl"
 set -x INPUTRC $HOME/.config/readline/inputrc
 set -x HISTFILE $XDG_CACHE_HOME/bash/history
 set -x XDG_DATA_HOME $HOME/.local/share
@@ -69,3 +70,4 @@ set -x AGDA_DIR $HOME/.config/agda
 set -x PACK_DIR $HOME/.local/share/pack
 set -x MIZFILES $HOME/.local/share/mizar
 set -x RLWRAP_HOME $XDG_DATA_HOME/rlwrap
+set -x WOLFRAM_USERBASE $XDG_CONFIG_HOME/Wolfram

fish/.config/fish/fish_variables

@@ -1,7 +1,7 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
 SETUVAR --export FZF_DEFAULT_OPTS:\x2d\x2dcolor\x3dbg\x2b\x3a\x23313244\x2cbg\x3a\x231e1e2e\x2cspinner\x3a\x23f5e0dc\x2chl\x3a\x23f38ba8\x20\x2d\x2dcolor\x3dfg\x3a\x23cdd6f4\x2cheader\x3a\x23f38ba8\x2cinfo\x3a\x23cba6f7\x2cpointer\x3a\x23f5e0dc\x20\x2d\x2dcolor\x3dmarker\x3a\x23f5e0dc\x2cfg\x2b\x3a\x23cdd6f4\x2cprompt\x3a\x23cba6f7\x2chl\x2b\x3a\x23f38ba8
-SETUVAR --export GPG_TTY:/dev/pts/0
+SETUVAR --export GPG_TTY:not\x20a\x20tty
 SETUVAR --export SSH_AGENT_PID:786479
 SETUVAR --export SSH_AUTH_SOCK:/tmp/ssh\x2dXXXXXXkRTHwG/agent\x2e786475
 SETUVAR ZO_CMD:zo

git/.config/git/config

@@ -15,8 +15,8 @@
 [gpg]
     format = ssh
 
-# [gpg "ssh"]
-#     program = "/opt/1Password/op-ssh-sign"
+[gpg "ssh"]
+    program = "/opt/1Password/op-ssh-sign"
 
 [commit]
 	gpgSign = true

nvim/.config/nvim/lua/plugins/languages/coq.lua

@@ -1,25 +0,0 @@
-return {
-    {
-        'whonore/Coqtail',
-        event = { 'BufReadPre *.v', 'BufNewFile *.v' },
-        init = function()
-            vim.g.loaded_coqtail = 1
-            vim.g['coqtail#supported'] = 0
-        end
-    },
-    {
-        'tomtomjhj/vscoq.nvim',
-        event = { 'BufReadPre *.v', 'BufNewFile *.v'},
-        filetypes = 'coq',
-        opts = true,
-        dependencies = { 'whonore/Coqtail', 'neovim/nvim-lspconfig' },
-    }
-    -- {
-    --     'tomtomjhj/coq-lsp.nvim',
-    --     event = { 'BufReadPre *.v', 'BufNewFile *.v' },
-    --     opts = {
-    --         autostart = true,
-    --     },
-    --     dependencies = { 'whonore/Coqtail' }
-    -- }
-}

nvim/.config/nvim/lua/plugins/languages/mizar.lua

@@ -1,5 +0,0 @@
-return {
-    {
-        'andy-morris/mizar.vim',
-    }
-}

nvim/.config/nvim/lua/plugins/languages/typst.lua

@@ -1,8 +0,0 @@
-return {
-    {
-        'chomosuke/typst-preview.nvim',
-        ft = typst,
-        version = '1.*',
-        opts = {},
-    },
-}

nvim/.config/nvim/lua/plugins/languages/zig.lua

@@ -1,27 +1,28 @@
-return {
-    {
-        "jinzhongjia/zig-lamp",
-        event = "VeryLazy",
-        build = ":ZigLamp build sync",
-        dependencies = {
-            "neovim/nvim-lspconfig",
-            "nvim-lua/plenary.nvim",
-        },
-        init = function()
-            -- Timeout in milliseconds for automatic ZLS installation
-            -- Set to nil to disable auto-install
-            vim.g.zig_lamp_zls_auto_install = nil
-
-            -- Fallback to system ZLS if local version not found
-            -- Set to any non-negative value to enable
-            vim.g.zig_lamp_fall_back_sys_zls = nil
-
-            -- LSP configuration options passed to lspconfig
-            vim.g.zig_lamp_zls_lsp_opt = {}
-
-            -- UI customization
-            vim.g.zig_lamp_pkg_help_fg = "#CF5C00"
-            vim.g.zig_lamp_zig_fetch_timeout = 5000
-        end,
-    }
-}
+return {}
+-- return {
+--     {
+--         "jinzhongjia/zig-lamp",
+--         event = "VeryLazy",
+--         build = ":ZigLamp build sync",
+--         dependencies = {
+--             "neovim/nvim-lspconfig",
+--             "nvim-lua/plenary.nvim",
+--         },
+--         init = function()
+--             -- Timeout in milliseconds for automatic ZLS installation
+--             -- Set to nil to disable auto-install
+--             vim.g.zig_lamp_zls_auto_install = nil
+--
+--             -- Fallback to system ZLS if local version not found
+--             -- Set to any non-negative value to enable
+--             vim.g.zig_lamp_fall_back_sys_zls = nil
+--
+--             -- LSP configuration options passed to lspconfig
+--             vim.g.zig_lamp_zls_lsp_opt = {}
+--
+--             -- UI customization
+--             vim.g.zig_lamp_pkg_help_fg = "#CF5C00"
+--             vim.g.zig_lamp_zig_fetch_timeout = 5000
+--         end,
+--     }
+-- }

nvim/.config/nvim/lua/plugins/lsp.lua

@@ -3,14 +3,15 @@ return {
         'neovim/nvim-lspconfig',
         config = function()
             local capabilities = require('cmp_nvim_lsp').default_capabilities()
-            local lspconfig = require('lspconfig')
             local wk = require('which-key')
 
-            lspconfig.ocamllsp.setup({
+            vim.lsp.enable('ocamllsp')
+            vim.lsp.config('ocamllsp', {
                 capabilities = capabilities
             })
 
-            lspconfig.tinymist.setup({
+            vim.lsp.enable('tinymist')
+            vim.lsp.config('tinymist', {
                 settings = {
                     formatterMode = "typstyle",
                     exportPdf = "onType",
@@ -18,15 +19,17 @@ return {
                 }
             })
 
-            lspconfig.millet.setup({
+            vim.lsp.enable('millet')
+            vim.lsp.config('millet', {
                 root_dir = function(fname)
-                    local util = require("lspconfig.util")
+                    local util = vim.lsp.config.util
                     return util.root_pattern(".cm", ".mlb")(fname)
                         or util.path.dirname(fname)
                 end
             })
 
-            lspconfig.clangd.setup({
+            vim.lsp.enable('clangd')
+            vim.lsp.config('clangd', {
                 capabilities = capabilities
             })
 

ssh/.ssh/config

@@ -1,18 +1,13 @@
-Host gh
-    User git
-    Hostname github.com
-    IdentityFile ~/.ssh/id_rsa-github
-
 Host fg
     User git
     Hostname forgejo.ballcloud.cc
-    IdentityFile ~/.ssh/id_ed25519
+    IdentityFile ~/.ssh/perga
     Port 222
 
 Host server
     User wball
     Hostname ballcloud.cc
-    IdentityFile ~/.ssh/id_ed25519
+    IdentityFile ~/.ssh/perga
 
 Host *
   IdentityAgent ~/.1password/agent.sock