M3

.gitignore

@@ -18,6 +18,7 @@
 # term
 iterm2/AppSupport
 !alacritty
+!ghostty
 
 # nvim config
 !nvim

README.md

@@ -5,7 +5,7 @@ Here you'll find what I use on a daily basis, located in my `~/.config` folder
 - [nvim](https://github.com/shortcuts/dotfiles/tree/main/nvim)
 - [fish](https://github.com/shortcuts/dotfiles/tree/main/fish)
 - [tmux](https://github.com/shortcuts/dotfiles/tree/main/tmux)
-- [alacritty](https://github.com/shortcuts/dotfiles/tree/main/alacritty)
+- [ghostty](https://github.com/shortcuts/dotfiles/tree/main/ghostty)
 - [starship](https://github.com/shortcuts/dotfiles/blob/main/starship.toml)
 - [rectangle](https://github.com/shortcuts/dotfiles/blob/main/RectangleConfig.json)
 

alacritty/alacritty.toml

@@ -104,7 +104,7 @@ hide_when_typing = true
 
 [terminal.shell]
 args = ["--login", "--init-command", "~/.config/scripts/tmux-sessionizer"]
-program = "/usr/local/bin/fish"
+program = "/opt/homebrew/bin/fish"
 
 [window]
 decorations = "none"

fish/conf.d/rustup.fish

@@ -1 +1 @@
-source "$HOME/.cargo/env.fish"
+# source "$HOME/.cargo/env.fish"

fish/config.fish

@@ -47,9 +47,15 @@ set -U fish_user_paths $HOME/.local/share/bob/nvim-bin $fish_user_paths
 set -U fish_user_paths $HOME/Documents/no-neck-pain.nvim/.ci/lua-ls $fish_user_paths
 set -U fish_user_paths /Library/Frameworks/Python.framework/Versions/3.11/bin $fish_user_paths
 
+# pyenv
+set -Ux PYENV_ROOT $HOME/.pyenv
+set -U fish_user_paths $PYENV_ROOT/bin $fish_user_paths
+
+pyenv init - | source
+
 set -x KO_DOCKER_REPO ko.local
 
-eval "$(/usr/local/Homebrew/bin/brew shellenv)"
+eval "$(/opt/homebrew/bin/brew shellenv)"
 
 fzf --fish | source
 

fish/fish_variables

@@ -2,6 +2,7 @@
 # VERSION: 3.0
 SETUVAR GOROOT:\x24HOME/\x2egobrew/current/go
 SETUVAR NVM_DIR:/usr/local/opt/nvm
+SETUVAR --export PYENV_ROOT:/Users/clement\x2evannicatte/\x2epyenv
 SETUVAR --export VAULT_ADDR:https\x3a//vault\x2ealgolia\x2enet
 SETUVAR __fish_initialized:3400
 SETUVAR _fisher_edc_2F_bass_files:\x7e/\x2econfig/fish/functions/__bass\x2epy\x1e\x7e/\x2econfig/fish/functions/bass\x2efish
@@ -38,5 +39,5 @@ SETUVAR fish_pager_color_description:B3A06D\x1eyellow\x1e\x2di
 SETUVAR fish_pager_color_prefix:cyan\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
 SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
 SETUVAR fish_pager_color_selected_background:\x2dr
-SETUVAR fish_user_paths:/Library/Frameworks/Python\x2eframework/Versions/3\x2e11/bin\x1e/Users/k/Documents/no\x2dneck\x2dpain\x2envim/\x2eci/lua\x2dls\x1e/Users/k/\x2elocal/share/bob/nvim\x2dbin\x1e/Users/k/go/bin\x1e/Users/k/\x2ecargo/bin\x1e/Users/k/\x2elocal/bin\x1e/usr/local/bin\x1e/usr/local/Homebrew/bin\x1e/Users/clement\x2evannicatte/Documents/no\x2dneck\x2dpain\x2envim/\x2eci/lua\x2dls\x1e/Users/clement\x2evannicatte/\x2elocal/share/bob/nvim\x2dbin\x1e/Users/clement\x2evannicatte/go/bin\x1e/Users/clement\x2evannicatte/\x2ecargo/bin\x1e/Users/clement\x2evannicatte/\x2elocal/bin\x1e/Users/clement\x2evannicatte/Documents/no\x2dneck\x2dpain\x2envim/deps/lua\x2dls\x1e/Users/clement\x2evannicatte/Documents/no\x2dneck\x2dpain\x2envim/deps/lua\x2dls/bin\x1e/Users/clement\x2evannicatte/Documents/no\x2dneck\x2dpain\x2envim/\x2eci/lua\x2dls/bin\x1e/Users/clement\x2evannicate/\x2egobrew/current/bin\x1e/Users/clement\x2evannicate/\x2egobrew/bin\x1e/Users/klm/\x2ecargo/bin\x1e/usr/local/opt/fzf/bin\x1e/usr/bin\x1e/bin\x1e/usr/sbin\x1e/sbin\x1e/Library/Apple/usr/bin\x1e/Users/clement\x2evannicate/Downloads/google\x2dcloud\x2dsdk/bin\x1e/opt/homebrew/opt/fzf/bin
+SETUVAR fish_user_paths:/Users/clement\x2evannicatte/\x2epyenv/bin\x1e/Library/Frameworks/Python\x2eframework/Versions/3\x2e11/bin\x1e/Users/clement\x2evannicatte/Documents/no\x2dneck\x2dpain\x2envim/\x2eci/lua\x2dls\x1e/Users/clement\x2evannicatte/\x2elocal/share/bob/nvim\x2dbin\x1e/Users/clement\x2evannicatte/go/bin\x1e/Users/clement\x2evannicatte/\x2ecargo/bin\x1e/Users/clement\x2evannicatte/\x2elocal/bin\x1e/usr/local/bin\x1e/opt/homebrew/bin\x1e/Users/k/Documents/no\x2dneck\x2dpain\x2envim/\x2eci/lua\x2dls\x1e/Users/k/\x2elocal/share/bob/nvim\x2dbin\x1e/Users/k/go/bin\x1e/Users/k/\x2ecargo/bin\x1e/Users/k/\x2elocal/bin\x1e/usr/local/Homebrew/bin\x1e/Users/clement\x2evannicatte/Documents/no\x2dneck\x2dpain\x2envim/deps/lua\x2dls\x1e/Users/clement\x2evannicatte/Documents/no\x2dneck\x2dpain\x2envim/deps/lua\x2dls/bin\x1e/Users/clement\x2evannicatte/Documents/no\x2dneck\x2dpain\x2envim/\x2eci/lua\x2dls/bin\x1e/Users/clement\x2evannicate/\x2egobrew/current/bin\x1e/Users/clement\x2evannicate/\x2egobrew/bin\x1e/Users/klm/\x2ecargo/bin\x1e/usr/local/opt/fzf/bin\x1e/usr/bin\x1e/bin\x1e/usr/sbin\x1e/sbin\x1e/Library/Apple/usr/bin\x1e/Users/clement\x2evannicate/Downloads/google\x2dcloud\x2dsdk/bin\x1e/opt/homebrew/opt/fzf/bin
 SETUVAR nvm_default_version:v21\x2e2\x2e0

ghostty/config

@@ -0,0 +1,51 @@
+# font
+
+font-family = FiraMono Nerd Font
+font-size = 18
+
+# opts
+
+mouse-hide-while-typing = true
+
+window-save-state = always
+window-padding-x = 0
+window-padding-y = 0
+window-padding-color = background
+
+macos-titlebar-style = hidden
+macos-window-shadow = false
+
+# theme
+## name: duskfox
+## upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/duskfox/duskfox.ghostty
+
+background = #080402
+background-opacity = 0.8
+
+foreground = #e0def4
+selection-background = #433c59
+selection-foreground = #e0def4
+cursor-color = #e0def4
+
+# normal
+palette = 0=#393552
+palette = 1=#eb6f92
+palette = 2=#a3be8c
+palette = 3=#f6c177
+palette = 4=#569fba
+palette = 5=#c4a7e7
+palette = 6=#9ccfd8
+palette = 7=#e0def4
+
+# bright
+palette = 8=#47407d
+palette = 9=#f083a2
+palette = 10=#b1d196
+palette = 11=#f9cb8c
+palette = 12=#65b1cd
+palette = 13=#ccb1ed
+palette = 14=#a6dae3
+palette = 15=#e2e0f7
+
+# extended colors
+palette = 16=#ea9a97

install.sh

@@ -7,9 +7,9 @@ brew install fish
 cp ~/.config/.gitconfig ~/.gitconfig
 
 # setup fish as default shell
-fish_add_path /usr/local/Homebrew/bin
-echo /usr/local/Homebrew/bin | sudo tee -a /etc/shells
-chsh -s /usr/local/Homebrew/bin || true
+fish_add_path /opt/homebrew/bin
+echo /opt/homebrew/bin/fish | sudo tee -a /etc/shells
+chsh -s /opt/homebrew/bin/fish || true
 fish || true
 
 # fish plugin manager
@@ -25,10 +25,9 @@ brew install \
     jq yq fish neovim tmux rectangle starship kind \
     gh wget kubectl openvpn-connect fswatch luarocks \
     lazydocker coreutils ko bat ripgrep fd git-delta \
-    brew-cask-completion stats
+    brew-cask-completion stats zig ghostty
 brew tap hashicorp/tap
 brew install hashicorp/tap/terraform hashicorp/tap/vault
-brew install --cask alacritty --no-quarantine
 brew install --cask font-fira-mono-nerd-font
 brew install fzf && fzf --fish | source
 

nvim/lazy-lock.json

@@ -1,34 +1,34 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "0f7bbce41ea152a94d12aea286f2ce98e63c0f58" },
-  "barbar.nvim": { "branch": "master", "commit": "508864eb63178187faa06c59b283fd0a266d2844" },
+  "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" },
+  "barbar.nvim": { "branch": "master", "commit": "a26bae6c51899db530de19ce3c2f4307e37a869e" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" },
-  "gitsigns.nvim": { "branch": "main", "commit": "ac5aba6dce8c06ea22bea2c9016f51a2dbf90dc7" },
+  "fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" },
+  "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
   "harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" },
-  "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" },
+  "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
   "lsp_signature.nvim": { "branch": "master", "commit": "fc38521ea4d9ec8dbd4c2819ba8126cea743943b" },
   "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "43894adcf10bb1190c2184bd7c1750e8ea2b3dce" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.icons": { "branch": "main", "commit": "54686be7d58807906cb2c8c2216e0bf9c044f19a" },
+  "mini.icons": { "branch": "main", "commit": "44c0160526f7ae17ca8e8eab9ab235d047fcf7a6" },
   "nightfox.nvim": { "branch": "main", "commit": "7557f26defd093c4e9bc17f28b08403f706f5a44" },
   "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
-  "nvim-cmp": { "branch": "main", "commit": "be7bd4c5f860c79da97af3a26d489af50babfd4b" },
-  "nvim-lspconfig": { "branch": "master", "commit": "c646154d6e4db9b2979eeb517d0b817ad00c9c47" },
-  "nvim-treesitter": { "branch": "master", "commit": "731fbe9ac3c05c8c29598f98c76fc057fdd54c47" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "8e412ebe97d84504b68a071ecf9bb68413b13632" },
-  "nvim-web-devicons": { "branch": "master", "commit": "f09be61d05bebcba85bb47be1931322d51b95644" },
-  "oil.nvim": { "branch": "master", "commit": "99ce32f4a2ecf76263b72fcc31efb163faa1a941" },
+  "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" },
+  "nvim-lspconfig": { "branch": "master", "commit": "ff2b85abaa810f6611233dbe6d31c07510ebf43d" },
+  "nvim-treesitter": { "branch": "master", "commit": "17678b00fa5c2712890a0ec2e269d0a4de1207df" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "2bcf700b59bc92850ca83a1c02e86ba832e0fae0" },
+  "nvim-web-devicons": { "branch": "master", "commit": "63f552a7f59badc6e6b6d22e603150f0d5abebb7" },
+  "oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
-  "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
-  "vim-fugitive": { "branch": "master", "commit": "320b18fba2a4f2fe3c8225c778c687e0d2620384" },
-  "vim-go": { "branch": "master", "commit": "ec7a59ef10d417c0cc1cd571a165c7c9dec30d27" }
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
+  "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
+  "vim-fugitive": { "branch": "master", "commit": "fcb4db52e7f65b95705aa58f0f2df1312c1f2df2" },
+  "vim-go": { "branch": "master", "commit": "2072091419591862ded53c3d377acaedb3b5f494" }
 }

nvim/lua/plugins/no-neck-pain.lua

@@ -4,7 +4,7 @@ return {
         lazy = false,
         dev = true,
         opts = {
-            debug = true,
+            -- debug = true,
             width = 90,
             minSideBufferWidth = 0,
             autocmds = {

nvim/lua/plugins/theme.lua

@@ -10,7 +10,7 @@ return {
                 palettes = {
                     duskfox = {
                         bg0 = carbonfox.palette.bg0,
-                        bg1 = "#080402",
+                        bg1 = carbonfox.palette.bg0,
                         bg2 = carbonfox.palette.bg2,
                         bg3 = carbonfox.palette.bg3,
                         bg4 = carbonfox.palette.bg4,
@@ -76,12 +76,12 @@ return {
                 },
             },
             sections = {
-                lualine_a = { "branch" },
-                lualine_b = { { "filename", path = 1 }, "diff" },
-                lualine_c = { "diagnostics" },
-                lualine_x = {},
-                lualine_y = {},
-                lualine_z = { { "datetime", style = "%d/%m/%y %H:%M" } },
+                lualine_a = {},
+                lualine_b = {},
+                lualine_c = {},
+                lualine_x = {"branch"},
+                lualine_y = { { "filename", path = 1 }, "diff" },
+                lualine_z = { "diagnostics" },
             },
             inactive_sections = {},
         },

tmux/tmux.conf

@@ -2,8 +2,8 @@
 set-option -g focus-events on
 set-option -sa terminal-overrides ',screen-256color:RGB'
 set-option -g default-terminal "screen-256color"
-set -g default-command /usr/local/bin/fish
-set -g default-shell /usr/local/bin/fish
+set -g default-command /opt/homebrew/bin/fish
+set -g default-shell /opt/homebrew/bin/fish
 set -s escape-time 0
 set -g base-index 1
 set-option -g status-interval 5
@@ -45,26 +45,25 @@ bind-key C-c run-shell "~/.config/scripts/tmux-sessionizer ~/.config"
 bind-key C-n run-shell "~/.config/scripts/tmux-sessionizer ~/Documents/no-neck-pain.nvim"
 
 ############ THEME
+# Style: duskfox
+# Upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/duskfox/duskfox.tmux
+set -g message-command-style "fg=#080402,bg=#cdcbe0"
+set -g message-style "fg=#080402,bg=#cdcbe0"
+set -g mode-style "fg=#080402,bg=#cdcbe0"
+set -g pane-active-border-style "fg=#569fba"
+set -g pane-border-style "fg=#cdcbe0"
 set -g status "on"
-set -g status-position top
 set -g status-justify "centre"
+set -g status-left ""
 set -g status-left-length "100"
-set -g status-right-length "100"
 set -g status-left-style NONE
-set -g status-right-style NONE
-set -g status-left ""
+set -g status-position "top"
 set -g status-right ""
-setw -g window-status-separator " "
-setw -g window-status-activity-style "underscore,fg=#7b7c7e,bg=#161616"
-setw -g window-status-style "NONE,fg=#7b7c7e,bg=#161616"
-setw -g window-status-current-format "#[fg=blue]•"
-setw -g window-status-format "#[fg=white]•"
-
-# Style: duskfox
-# Upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/duskfox/duskfox.tmux
-set -g mode-style "fg=#161616,bg=#b6b8bb"
-set -g message-style "fg=#191726,bg=#cdcbe0"
-set -g message-command-style "fg=#191726,bg=#cdcbe0"
-set -g pane-border-style "fg=#cdcbe0"
-set -g pane-active-border-style "fg=#569fba"
-set -g status-style "fg=#cdcbe0,bg=#191726"
+set -g status-right-length "100"
+set -g status-right-style NONE
+set -g status-style "fg=#cdcbe0,bg=#080402"
+setw -g window-status-activity-style "underscore,fg=#6e6a86,bg=#080402"
+setw -g window-status-current-format "#[fg=#f4a261,bold] #W"
+setw -g window-status-format "#[default] #W"
+setw -g window-status-separator ""
+setw -g window-status-style "NONE,fg=#6e6a86,bg=#080402"