From 6cba1e35d510af6e2feddb604750c6ba34b9ca26 Mon Sep 17 00:00:00 2001 From: arc Date: Fri, 24 Jan 2025 15:01:04 -0700 Subject: [PATCH] help --- fish/fish/conf.d/fnm.fish | 2 ++ fish/fish/conf.d/rustup.fish | 1 + fish/fish/config.fish | 4 +++ fish/fish/fish_variables | 2 +- fish/fish/functions/!!.fish | 4 +++ neovim/nvim/init.lua | 48 ++++++++++++++++++------------------ neovim/nvim/lazy-lock.json | 28 ++++++++++----------- 7 files changed, 50 insertions(+), 39 deletions(-) create mode 100644 fish/fish/conf.d/fnm.fish create mode 100644 fish/fish/conf.d/rustup.fish create mode 100644 fish/fish/functions/!!.fish diff --git a/fish/fish/conf.d/fnm.fish b/fish/fish/conf.d/fnm.fish new file mode 100644 index 0000000..b07f532 --- /dev/null +++ b/fish/fish/conf.d/fnm.fish @@ -0,0 +1,2 @@ +# https://github.com/Schniz/fnm?tab=readme-ov-file#shell-setup +fnm env --use-on-cd --shell fish | source diff --git a/fish/fish/conf.d/rustup.fish b/fish/fish/conf.d/rustup.fish new file mode 100644 index 0000000..e4cb363 --- /dev/null +++ b/fish/fish/conf.d/rustup.fish @@ -0,0 +1 @@ +source "$HOME/.cargo/env.fish" diff --git a/fish/fish/config.fish b/fish/fish/config.fish index fa701c8..88a2add 100644 --- a/fish/fish/config.fish +++ b/fish/fish/config.fish @@ -1,6 +1,10 @@ if status is-interactive # Commands to run in interactive sessions can go here + alias --save !! $(history -1) end +# Set the default editor to be nvim +setenv EDITOR nvim +setenv BEESHOME /.beeshome/ setenv FZF_DEFAULT_COMMAND 'fd --type file --follow' setenv FZF_CTRL_T_COMMAND 'fd --type file --follow' diff --git a/fish/fish/fish_variables b/fish/fish/fish_variables index 9c38a68..ceca42a 100644 --- a/fish/fish/fish_variables +++ b/fish/fish/fish_variables @@ -29,4 +29,4 @@ SETUVAR fish_pager_color_description:yellow\x1e\x2di SETUVAR fish_pager_color_prefix:normal\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:/opt/homebrew/opt/php\x408\x2e1/bin\x1e/Users/arc/\x2ecargo/bin\x1e/opt/homebrew/bin +SETUVAR fish_user_paths:/opt/homebrew/opt/php\x408\x2e1/bin\x1e/Users/arc/\x2ecargo/bin\x1e/opt/homebrew/bin\x1e/usr/local/libexec\x1e/home/arc/\x2elocal/share/fnm diff --git a/fish/fish/functions/!!.fish b/fish/fish/functions/!!.fish new file mode 100644 index 0000000..35d2592 --- /dev/null +++ b/fish/fish/functions/!!.fish @@ -0,0 +1,4 @@ +function !! --wraps='sudo pacman -Syu' --description 'alias !! sudo pacman -Syu' + sudo pacman -Syu $argv + +end diff --git a/neovim/nvim/init.lua b/neovim/nvim/init.lua index 769d73a..8229619 100644 --- a/neovim/nvim/init.lua +++ b/neovim/nvim/init.lua @@ -249,34 +249,12 @@ require("lazy").setup({ -- main color scheme -- Switched to https://github.com/projekt0n/github-nvim-theme -- - { - "projekt0n/github-nvim-theme", - lazy = false, -- load at start - priority = 1000, -- load first - config = function() - vim.cmd([[colorscheme github_dark]]) - vim.o.background = 'dark' - -- XXX: hi Normal ctermbg=NONE - -- Make comments more prominent -- they are important. - local bools = vim.api.nvim_get_hl(0, { name = 'Boolean' }) - vim.api.nvim_set_hl(0, 'Comment', bools) - -- Make it clearly visible which argument we're at. - local marked = vim.api.nvim_get_hl(0, { name = 'PMenu' }) - vim.api.nvim_set_hl(0, 'LspSignatureActiveParameter', { fg = marked.fg, bg = marked.bg, ctermfg = marked.ctermfg, ctermbg = marked.ctermbg, bold = true }) - -- XXX - -- Would be nice to customize the highlighting of warnings and the like to make - -- them less glaring. But alas - -- https://github.com/nvim-lua/lsp_extensions.nvim/issues/21 - -- call Base16hi("CocHintSign", g:base16_gui03, "", g:base16_cterm03, "", "", "") - end - }, - -- nice bar at the bottom -- { - -- "wincent/base16-nvim", + -- "projekt0n/github-nvim-theme", -- lazy = false, -- load at start -- priority = 1000, -- load first -- config = function() - -- vim.cmd([[colorscheme base16-gruvbox-dark-hard]]) + -- vim.cmd([[colorscheme github_dark]]) -- vim.o.background = 'dark' -- -- XXX: hi Normal ctermbg=NONE -- -- Make comments more prominent -- they are important. @@ -293,6 +271,28 @@ require("lazy").setup({ -- end -- }, -- nice bar at the bottom + { + "wincent/base16-nvim", + lazy = false, -- load at start + priority = 1000, -- load first + config = function() + vim.cmd([[colorscheme gruvbox-dark-medium]]) + vim.o.background = 'dark' + -- XXX: hi Normal ctermbg=NONE + -- Make comments more prominent -- they are important. + local bools = vim.api.nvim_get_hl(0, { name = 'Boolean' }) + vim.api.nvim_set_hl(0, 'Comment', bools) + -- Make it clearly visible which argument we're at. + local marked = vim.api.nvim_get_hl(0, { name = 'PMenu' }) + vim.api.nvim_set_hl(0, 'LspSignatureActiveParameter', { fg = marked.fg, bg = marked.bg, ctermfg = marked.ctermfg, ctermbg = marked.ctermbg, bold = true }) + -- XXX + -- Would be nice to customize the highlighting of warnings and the like to make + -- them less glaring. But alas + -- https://github.com/nvim-lua/lsp_extensions.nvim/issues/21 + -- call Base16hi("CocHintSign", g:base16_gui03, "", g:base16_cterm03, "", "", "") + end + }, + -- nice bar at the bottom { 'itchyny/lightline.vim', lazy = false, -- also load at start since it's UI diff --git a/neovim/nvim/lazy-lock.json b/neovim/nvim/lazy-lock.json index af05cce..0ed75b3 100644 --- a/neovim/nvim/lazy-lock.json +++ b/neovim/nvim/lazy-lock.json @@ -1,24 +1,24 @@ { + "base16-nvim": { "branch": "main", "commit": "178bebdd6342c59151f6cfa2553d8e0f3f8b6a69" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "fzf": { "branch": "master", "commit": "ff1687744db737c935db0f8e4d29373db9f84d8c" }, - "fzf.vim": { "branch": "master", "commit": "ec75ffbfd50630bf2b8d444d89487e149bacf7f3" }, - "github-nvim-theme": { "branch": "main", "commit": "0e4636f556880d13c00d8a8f686fae8df7c9845f" }, - "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" }, - "leap.nvim": { "branch": "main", "commit": "c6bfb191f1161fbabace1f36f578a20ac6c7642c" }, - "lightline.vim": { "branch": "master", "commit": "d6a07ea376a4b7372aa59e7ea6a051c9470bb4d0" }, - "lsp_signature.nvim": { "branch": "master", "commit": "fc38521ea4d9ec8dbd4c2819ba8126cea743943b" }, - "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, - "nvim-lspconfig": { "branch": "master", "commit": "28b205ebe73a18f401e040585106f9bafd8ff21f" }, - "nvim-treesitter": { "branch": "master", "commit": "00d219068385a4aa80859d4606ad6e03af6faa83" }, + "fzf": { "branch": "master", "commit": "243a76002c93b474cf8401b37670a43803a0a2d2" }, + "fzf.vim": { "branch": "master", "commit": "556f45e79ae5e3970054fee4c4373472604a1b4e" }, + "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, + "leap.nvim": { "branch": "main", "commit": "67d26a13cfbf558450955ee9c76e78e03d13ee9e" }, + "lightline.vim": { "branch": "master", "commit": "e358557e1a9f9fc860416c8eb2e34c0404078155" }, + "lsp_signature.nvim": { "branch": "master", "commit": "5b64964ed02098c85613ee3d20f96bed1dfb64cc" }, + "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, + "nvim-lspconfig": { "branch": "master", "commit": "b4d65bce97795438ab6e1974b3672c17a4865e3c" }, + "nvim-treesitter": { "branch": "master", "commit": "6587a5886873cce8698a47477224c30578b33a24" }, "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" }, "vim-fish-syntax": { "branch": "master", "commit": "e229becbf4bbee21cc78cd2cf24f57112e33c02a" }, "vim-markdown": { "branch": "master", "commit": "8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51" }, - "vim-matchup": { "branch": "master", "commit": "2328f4a3082093fe61f6d8004572f905cc1b58f4" }, + "vim-matchup": { "branch": "master", "commit": "aca23ce53ebfe34e02c4fe07e29e9133a2026481" }, "vim-svelte": { "branch": "main", "commit": "0e93ec53c3667753237282926fec626785622c1c" }, - "vim-terraform": { "branch": "master", "commit": "24de93afb05078bac6a2e966402cc1f672277708" }, + "vim-terraform": { "branch": "master", "commit": "8912ca1be3025a1c9fab193618f3b99517e01973" }, "vim-toml": { "branch": "main", "commit": "d36caa6b1cf508a4df1c691f915572fc02143258" }, - "yaml.nvim": { "branch": "main", "commit": "1c1096a0b4b2cc31ca7cf430570911faaeca02c2" } + "yaml.nvim": { "branch": "main", "commit": "7f1e6a368bc366d510eece0247440db7ed3a4552" } }