dot_config/fish/private_config.fish.tmpl

@@ -1,14 +1,12 @@
-{{- if (get . "brew") }}
+fish_add_path /opt/homebrew/opt/curl/bin /opt/homebrew/bin /opt/homebrew/sbin $HOME/.local/bin $HOME/.cargo/bin $HOME/go/bin
-{{- if eq .chezmoi.os "darwin" }}
+{{- if not (get . "sudo") }}
-{{- if (get . "sudo") }}
+fish_add_path $HOME/.local/homebrew/bin
-eval (/opt/homebrew/bin/brew shellenv)
+command -v brew > /dev/null; and eval "$(brew shellenv)"
-{{- else }}
-eval ($HOME/.local/homebrew/bin/brew shellenv)
 {{- end }}
+{{- if eq .chezmoi.os "linux" }}
+fish_add_path /home/linuxbrew/.linuxbrew/bin $HOME/.local/share/JetBrains/Toolbox/scripts
+eval "$(brew shellenv)"
 {{- end }}
-{{- end }}
-
-fish_add_path $HOME/.local/bin $HOME/.cargo/bin $HOME/go/bin
 
 set -gx RUSTC_WRAPPER sccache
 
@@ -47,7 +45,7 @@ test -e {$HOME}/.iterm2_shell_integration.fish ; and source {$HOME}/.iterm2_shel
 set -gx EDITOR nvim
 set -gx DJANGOPROJECT_DATA_DIR $HOME/.djangoproject
 
-type -q mise && mise activate fish | source
+mise activate fish | source
 test -e {$HOME}/.config/fish/work.fish; and source {$HOME}/.config/fish/work.fish
 test -e {$HOME}/.config/fish/secrets.fish; and source {$HOME}/.config/fish/secrets.fish
 

dot_config/nvim/lua/custom/chadrc.lua

@@ -14,11 +14,6 @@ M.ui = {
     lazyload = false,
     show_numbers = true,
   },
-  hl_override = {
-    CursorLine = {
-      bg = "one_bg",
-    },
-  },
 }
 
 return M

dot_config/nvim/lua/custom/configs/null-ls.lua

@@ -4,8 +4,8 @@ local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
 local opts = {
   sources = { -- run these on save
     null_ls.builtins.formatting.gofumpt,
-    null_ls.builtins.formatting.goimports,
+    null_ls.builtins.formatting.goimports_reviser,
-    null_ls.builtins.diagnostics.golangci_lint,
+    null_ls.builtins.formatting.golines,
   },
   on_attach = function (client, bufnr)
     if client.supports_method("textDocument/formatting") then
@@ -17,7 +17,7 @@ local opts = {
         group = augroup,
         buffer = bufnr,
         callback = function()
-          vim.lsp.buf.format({ async = false })
+          vim.lsp.buf.format({bufnr = bufnr})
         end,
       })
     end

dot_config/nvim/lua/custom/plugins.lua

@@ -1,24 +1,9 @@
 local plugins = {
-  {
-    "nvim-treesitter/nvim-treesitter", -- grammars
-    opts = {
-      ensure_installed = {
-        "go",
-        "lua",
-        "python",
-      },
-      auto_install = true,
-    },
-  },
   {
     "williamboman/mason.nvim", -- auto install tools
     opts = {
       ensure_installed = {
-        "lua-language-server",
         "gopls",
-        "gofumpt",
-        "golangci-lint",
-        "goimports",
       },
     },
   },
@@ -55,7 +40,7 @@ local plugins = {
     end,
   },
   {
-    "nvimtools/none-ls.nvim", -- custom format on save
+    "jose-elias-alvarez/null-ls.nvim", -- custom format on save
     ft = "go",
     opts = function()
       return require "custom.configs.null-ls"

dot_config/tmux/tmux.conf.tmpl

@@ -59,34 +59,31 @@ bind u capture-pane \;\
 # DESIGN
 
 # clock mode
-setw -g clock-mode-colour white
+setw -g clock-mode-colour colour0
 # copy mode
-setw -g mode-style 'fg=white bg=red bold'
+setw -g mode-style 'fg=colour0 bg=colour1 bold'
 
 # pane borders
-set -g pane-border-style 'fg=red'
+set -g pane-border-style 'fg=colour1'
-set -g pane-active-border-style 'fg=yellow'
+set -g pane-active-border-style 'fg=colour3'
 
 # statusbar
 set -g status-position bottom
 set -g status-justify left
-set -g status-style 'fg=blue'
+set -g status-style 'fg=#3670a5'
-set -g status-left ' '
+set -g status-left ''
-set -g status-left-style 'fg=blue dim'
+set -g status-right '%Y-%m-%d %H:%M '
-set -g status-right '%Y-%m-%d %H:%M'
 set -g status-right-length 50
 set -g status-left-length 10
 
-setw -g window-status-current-style 'fg=default bg=blue bold'
+setw -g window-status-current-style 'fg=#071421 bg=#3670a5 bold'
 setw -g window-status-current-format ' #I #W #F '
 
-setw -g window-status-style 'fg=blue dim'
+setw -g window-status-style 'fg=#3670a5 dim'
-setw -g window-status-format ' #I #W #F '
+setw -g window-status-format ' #I #[fg=colour7]#W #[fg=#3670a5]#F '
 
-setw -g window-status-bell-style 'fg=black bg=yellow bold'
+setw -g window-status-bell-style 'fg=colour2 bg=#ad6f1d bold'
 
 # messages
-set -g message-style 'fg=black bg=white bold'
+set -g message-style 'fg=colour2 bg=colour0 bold'
 
-set -g window-style 'dim'
-set -g window-active-style 'dim'

private_dot_bash_profile

@@ -0,0 +1,5 @@
+
+[[ -s "$HOME/.profile" ]] && source "$HOME/.profile" # Load the default .profile
+
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
+[[ -s "$HOME/.cargo/env" ]] && . "$HOME/.cargo/env"

private_dot_bash_profile.tmpl

@@ -1,8 +0,0 @@
-[[ -s "$HOME/.profile" ]] && source "$HOME/.profile" # Load the default .profile
-[[ -s "$HOME/.bashrc" ]] && source "$HOME/.bashrc" # Load the default .bashrc
-
-export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/.local/go/bin"
-{{- if eq .chezmoi.os "linux" }}
-export PATH="$PATH:$HOME/.local/share/nvim-linux64/bin"
-{{- end }}
-

private_dot_bashrc

@@ -1,8 +1,13 @@
-export EDITOR=nvim
+export PATH=$PATH:~/bin
 export LC_ALL=fr_FR.UTF-8
 
 [ command -v mise &> /dev/null ] && eval "$(mise activate bash)"
 
+# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
+export PATH="$PATH:$HOME/.rvm/bin:$HOME/Projects/golang/bin"
+
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
+[[ -s "$HOME/.cargo/env" ]] && . "$HOME/.cargo/env"
+
 [ -f ~/.work.bash ] && source ~/.work.bash
 

private_dot_profile.tmpl

@@ -1,7 +1,12 @@
+
+# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
+export PATH="$PATH:$HOME/.rvm/bin"
+
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
 [[ -s "$HOME/.cargo/env" ]] && . "$HOME/.cargo/env"
 
-{{- if and (eq .chezmoi.os "linux") (get . "brew") }}
+{{- if eq .chezmoi.os "linux" }}
 # Set PATH, MANPATH, etc., for Homebrew.
-[[ -s "/home/linuxbrew/.linuxbrew/bin/brew" ]] && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
 {{- end }}