Compare commits

...

10 commits

Author SHA1 Message Date
Gabriel Augendre 256c856778 cleanup brew-related config 2024-02-19 23:43:26 +01:00
Gabriel Augendre be629e6c58 nvim: highlight cursor line 2024-02-19 23:13:05 +01:00
Gabriel Augendre d2dc83f0a8 cleanup duplicates between bash profile files 2024-02-19 20:00:28 +00:00
Gabriel Augendre 9b57ffd20b cleanup rvm 2024-02-19 19:54:59 +00:00
Gabriel Augendre 2e35096963 cleanup rvm 2024-02-19 19:53:12 +00:00
Gabriel Augendre 32d88634ee linux: fix linuxbrew setup 2024-02-19 19:52:56 +00:00
Gabriel Augendre 07abd061fe bash profile: make a template for linux diff 2024-02-19 19:51:45 +00:00
Gabriel Augendre 36d8ad6e5d neovim: update config to ensure tools are installed 2024-02-19 20:40:45 +01:00
Gabriel Augendre ab9f724c28 neovim: update on-save triggers for go 2024-02-19 20:40:28 +01:00
Gabriel Augendre e2e612fc9c use terminal colors in tmux 2024-02-19 19:22:44 +01:00
9 changed files with 60 additions and 42 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,5 +0,0 @@
[[ -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"

View file

@ -0,0 +1,8 @@
[[ -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 }}

View file

@ -1,13 +1,8 @@
export PATH=$PATH:~/bin export EDITOR=nvim
export LC_ALL=fr_FR.UTF-8 export LC_ALL=fr_FR.UTF-8
[ command -v mise &> /dev/null ] && eval "$(mise activate bash)" [ 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 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
[[ -s "$HOME/.cargo/env" ]] && . "$HOME/.cargo/env"
[ -f ~/.work.bash ] && source ~/.work.bash [ -f ~/.work.bash ] && source ~/.work.bash

View file

@ -1,12 +1,7 @@
# 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" [[ -s "$HOME/.cargo/env" ]] && . "$HOME/.cargo/env"
{{- if eq .chezmoi.os "linux" }} {{- if and (eq .chezmoi.os "linux") (get . "brew") }}
# Set PATH, MANPATH, etc., for Homebrew. # Set PATH, MANPATH, etc., for Homebrew.
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" [[ -s "/home/linuxbrew/.linuxbrew/bin/brew" ]] && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
{{- end }} {{- end }}