diff --git a/.config/fish/conf.d/my_variables.fish b/.config/fish/conf.d/my_variables.fish index 3ac354c..b0eeb1d 100644 --- a/.config/fish/conf.d/my_variables.fish +++ b/.config/fish/conf.d/my_variables.fish @@ -1,4 +1,3 @@ #!/usr/bin/env fish -set -Ux EDITOR nvim - +set -gx EDITOR nvim diff --git a/.config/fish/config.fish b/.config/fish/config.fish index d9acffb..2c03af8 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,4 +1,6 @@ if status is-interactive + set -Ux PYENV_ROOT $HOME/.pyenv + fish_add_path -p $PYENV_ROOT/shims switch (whoami) # Corporate machine case Ivan_Golikov @@ -11,6 +13,7 @@ if status is-interactive fish_add_path -a /usr/local/opt/node@18/bin end + pyenv init - fish | source fzf --fish | source # keeping this in the end zoxide init fish | source diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 0fda20c..be72a50 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,3 +1,7 @@ +vim.opt.exrc = true + +vim.opt.relativenumber = true + vim.g.base46_cache = vim.fn.stdpath "data" .. "/base46/" vim.g.mapleader = " " diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index aa6397e..84caa7c 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -7,7 +7,7 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "conform.nvim": { "branch": "master", "commit": "62055b40c4d0b001c87559c7adf96a4a464bcdd5" }, + "conform.nvim": { "branch": "master", "commit": "9180320205d250429f0f80e073326c674e2a7149" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, @@ -17,14 +17,14 @@ "minty": { "branch": "main", "commit": "6dce9f097667862537823d515a0250ce58faab05" }, "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, - "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" }, - "nvim-tree.lua": { "branch": "master", "commit": "f7b76cd1a75615c8d6254fc58bedd2a7304eb7d8" }, - "nvim-treesitter": { "branch": "master", "commit": "2a75d8065cff33216e106b651eb0f58b90375717" }, - "nvim-web-devicons": { "branch": "master", "commit": "0eb18da56e2ba6ba24de7130a12bcc4e31ad11cb" }, + "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" }, + "nvim-tree.lua": { "branch": "master", "commit": "68fc4c20f5803444277022c681785c5edd11916d" }, + "nvim-treesitter": { "branch": "master", "commit": "a295ba13d27684e8904e8e51876b84ee85135cf1" }, + "nvim-web-devicons": { "branch": "master", "commit": "63f552a7f59badc6e6b6d22e603150f0d5abebb7" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "rainbow_csv.nvim": { "branch": "main", "commit": "7f3fddfe813641035fac2cdf94c2ff69bb0bf0b9" }, "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" }, - "ui": { "branch": "v3.0", "commit": "a22e2dd50d0558e14d56ce1e2fa932267e646597" }, - "volt": { "branch": "main", "commit": "0cdfa1dfbbfc8fda340054915991fda188db8d8e" }, + "ui": { "branch": "v3.0", "commit": "912f4064e4fab183f860204e385a21c022f1c886" }, + "volt": { "branch": "main", "commit": "3f9abc92d7eda77c16ef540a86764d8a499137eb" }, "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" } } diff --git a/.local/share/dotfiles/install_dev_tools.yml b/.local/share/dotfiles/install_dev_tools.yml index cae4e9b..906cf1f 100644 --- a/.local/share/dotfiles/install_dev_tools.yml +++ b/.local/share/dotfiles/install_dev_tools.yml @@ -12,6 +12,7 @@ - git - difftastic - tldr + - pyenv brew_packages: - pipx @@ -22,6 +23,7 @@ pipx_packages: - poetry - basedpyright + - pre-commit macos_fish_path: /usr/local/bin/fish arch_fish_path: /usr/bin/fish