Compare commits

..

8 Commits

Author SHA1 Message Date
arc
61d14ba3b2 . 2025-06-26 08:39:09 -06:00
arc
2c8f3e5a04 . 2025-06-21 16:17:20 -06:00
arc
fd6618262c sync 2025-06-18 09:31:02 -06:00
arc
77bf610632 sync: 2025-03-20 12:22:40 -06:00
arc
6cba1e35d5 help 2025-01-24 15:01:04 -07:00
6543069666 use github colorscheme for nvim 2024-11-04 10:31:20 -07:00
2d51753876 sync again 2024-10-14 13:54:11 -06:00
dced909d5a sync 2024-10-14 13:53:18 -06:00
10 changed files with 107 additions and 59 deletions

View File

@ -0,0 +1,2 @@
# https://github.com/Schniz/fnm?tab=readme-ov-file#shell-setup
fnm env --use-on-cd --shell fish | source

View File

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

View File

@ -1,6 +1,10 @@
if status is-interactive if status is-interactive
# Commands to run in interactive sessions can go here # Commands to run in interactive sessions can go here
alias --save !! $(history -1)
end end
# Set the default editor to be nvim
setenv EDITOR nvim
setenv BEESHOME /.beeshome/
setenv FZF_DEFAULT_COMMAND 'fd --type file --follow' setenv FZF_DEFAULT_COMMAND 'fd --type file --follow'
setenv FZF_CTRL_T_COMMAND 'fd --type file --follow' setenv FZF_CTRL_T_COMMAND 'fd --type file --follow'

View File

@ -1,6 +1,6 @@
# This file contains fish universal variable definitions. # This file contains fish universal variable definitions.
# VERSION: 3.0 # VERSION: 3.0
SETUVAR __fish_initialized:3400 SETUVAR __fish_initialized:3800
SETUVAR fish_color_autosuggestion:brblack SETUVAR fish_color_autosuggestion:brblack
SETUVAR fish_color_cancel:\x2dr SETUVAR fish_color_cancel:\x2dr
SETUVAR fish_color_command:blue SETUVAR fish_color_command:blue
@ -18,7 +18,7 @@ SETUVAR fish_color_operator:brcyan
SETUVAR fish_color_param:cyan SETUVAR fish_color_param:cyan
SETUVAR fish_color_quote:yellow SETUVAR fish_color_quote:yellow
SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack
SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
SETUVAR fish_color_status:red SETUVAR fish_color_status:red
SETUVAR fish_color_user:brgreen SETUVAR fish_color_user:brgreen
@ -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_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
SETUVAR fish_pager_color_selected_background:\x2dr 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

View File

@ -0,0 +1,4 @@
function !! --wraps=nvim --description 'alias !! nvim'
nvim $argv
end

View File

@ -19,7 +19,8 @@ vim.opt.foldlevelstart = 99
-- vim.opt.completeopt = 'menuone,noinsert,noselect' -- vim.opt.completeopt = 'menuone,noinsert,noselect'
-- not setting updatedtime because I use K to manually trigger hover effects -- not setting updatedtime because I use K to manually trigger hover effects
-- and lowering it also changes how frequently files are written to swap. -- and lowering it also changes how frequently files are written to swap.
-- vim.opt.updatetime = 300 -- Uncommented to see if it'll make tooltips pop up automatically
vim.opt.updatetime = 300
-- if key combos seem to be "lagging" -- if key combos seem to be "lagging"
-- http://stackoverflow.com/questions/2158516/delay-before-o-opens-a-new-line -- http://stackoverflow.com/questions/2158516/delay-before-o-opens-a-new-line
-- vim.opt.timeoutlen = 300 -- vim.opt.timeoutlen = 300
@ -74,6 +75,15 @@ vim.api.nvim_create_autocmd('Filetype', { pattern = 'rust', command = 'set color
-- also, show tabs nicer -- also, show tabs nicer
vim.opt.listchars = 'tab:^ ,nbsp:¬,extends:»,precedes:«,trail:•' vim.opt.listchars = 'tab:^ ,nbsp:¬,extends:»,precedes:«,trail:•'
-- Arc, March 20, 2025
-- Setting the filetype for Verilog
vim.api.nvim_create_autocmd(
{"BufNewFile", "BufRead"}, {
pattern = {"*.v"},
command = "set filetype=verilog",
}
)
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
-- --
-- hotkeys -- hotkeys
@ -247,12 +257,36 @@ vim.opt.rtp:prepend(lazypath)
-- then, setup! -- then, setup!
require("lazy").setup({ require("lazy").setup({
-- main color scheme -- 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", "wincent/base16-nvim",
lazy = false, -- load at start lazy = false, -- load at start
priority = 1000, -- load first priority = 1000, -- load first
config = function() config = function()
vim.cmd([[colorscheme base16-gruvbox-dark-hard]]) vim.cmd([[colorscheme gruvbox-dark-hard]])
vim.o.background = 'dark' vim.o.background = 'dark'
-- XXX: hi Normal ctermbg=NONE -- XXX: hi Normal ctermbg=NONE
-- Make comments more prominent -- they are important. -- Make comments more prominent -- they are important.
@ -325,11 +359,16 @@ require("lazy").setup({
}, },
-- auto-cd to root of git project -- auto-cd to root of git project
-- 'airblade/vim-rooter' -- 'airblade/vim-rooter'
-- Commented out because I don't like it (arc) - 2024-10-03
-- {
-- 'notjedi/nvim-rooter.lua',
-- config = function()
-- require('nvim-rooter').setup()
-- end
-- },
-- hopefully fix random crashes?
{ {
'notjedi/nvim-rooter.lua', 'hrsh7th/vim-vsnip'
config = function()
require('nvim-rooter').setup()
end
}, },
-- fzf support for ^p -- fzf support for ^p
{ {
@ -370,13 +409,17 @@ require("lazy").setup({
-- Setup language servers. -- Setup language servers.
local lspconfig = require('lspconfig') local lspconfig = require('lspconfig')
-- Rust
lspconfig.rust_analyzer.setup {
-- Server-specific settings. See `:help lspconfig-setup` -- Server-specific settings. See `:help lspconfig-setup`
settings = { settings = {
["rust-analyzer"] = { ["rust-analyzer"] = {
cargo = { cargo = {
allFeatures = true, features = "all"
},
checkOnSave = {
enable = true,
},
check = {
command = "clippy"
}, },
imports = { imports = {
group = { group = {
@ -385,34 +428,23 @@ require("lazy").setup({
}, },
completion = { completion = {
postfix = { postfix = {
enable = false, -- Commened out to see if I like it more (arc) - 2024-10-03
-- enable = false,
}, },
}, },
}, },
}, },
} -- Rust
vim.lsp.enable('rust_analyzer')
-- C -- C/C++
lspconfig.clangd.setup {} if vim.fn.executable('clangd') == 1 then
vim.lsp.enable('clangd')
-- Bash LSP
local configs = require 'lspconfig.configs'
if not configs.bash_lsp and vim.fn.executable('bash-language-server') == 1 then
configs.bash_lsp = {
default_config = {
cmd = { 'bash-language-server', 'start' },
filetypes = { 'sh' },
root_dir = require('lspconfig').util.find_git_ancestor,
init_options = {
settings = {
args = {}
}
}
}
}
end end
if configs.bash_lsp then
lspconfig.bash_lsp.setup {} -- Javascript
if vim.fn.executable('biome') == 1 then
vim.lsp.enable('biome')
end end
-- Global mappings. -- Global mappings.
@ -534,7 +566,7 @@ require("lazy").setup({
-- terraform -- terraform
{ {
'hashivim/vim-terraform', 'hashivim/vim-terraform',
ft = { "terraform" }, ft = { "hcl" },
}, },
-- svelte -- svelte
{ {
@ -562,11 +594,6 @@ require("lazy").setup({
vim.g.rust_clip_command = 'wl-copy' vim.g.rust_clip_command = 'wl-copy'
end end
}, },
-- C
-- {
-- 'clangd.nvim',
-- ft = { "C" },
-- },
-- fish -- fish
'khaveesh/vim-fish-syntax', 'khaveesh/vim-fish-syntax',
-- markdown -- markdown
@ -588,6 +615,14 @@ require("lazy").setup({
vim.g.vim_markdown_auto_insert_bullets = 0 vim.g.vim_markdown_auto_insert_bullets = 0
end end
}, },
-- Typescript
{
'tree-sitter/tree-sitter-typescript',
ft = { "typescript", "javascript" },
dependencies = {
"nvim-treesitter/nvim-treesitter",
},
},
}) })
--[[ --[[

View File

@ -1,25 +1,26 @@
{ {
"base16-nvim": { "branch": "main", "commit": "7dcb960acba2f0a662e8d1026464c4959645caab" }, "base16-nvim": { "branch": "main", "commit": "e86be83754d6c64f9678f072b382354d0f829ede" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
"fzf": { "branch": "master", "commit": "e76aa37fd402f994ff194a02e47576fba928e8f4" }, "fzf": { "branch": "master", "commit": "0c00b203e61bffbadbc499cbf68af6f89a5a3e29" },
"fzf.vim": { "branch": "master", "commit": "ec75ffbfd50630bf2b8d444d89487e149bacf7f3" }, "fzf.vim": { "branch": "master", "commit": "98dcd77a189a8a87052c20d1be8082aea60101b7" },
"lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"leap.nvim": { "branch": "main", "commit": "c6bfb191f1161fbabace1f36f578a20ac6c7642c" }, "leap.nvim": { "branch": "main", "commit": "10c14af4ddfb34dbd7721f0bfb2b4d91f0558907" },
"lightline.vim": { "branch": "master", "commit": "d6a07ea376a4b7372aa59e7ea6a051c9470bb4d0" }, "lightline.vim": { "branch": "master", "commit": "e358557e1a9f9fc860416c8eb2e34c0404078155" },
"lsp_signature.nvim": { "branch": "master", "commit": "fc38521ea4d9ec8dbd4c2819ba8126cea743943b" }, "lsp_signature.nvim": { "branch": "master", "commit": "15bb33cdb47e85278e168cad11acb1b6fa9c6488" },
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
"nvim-lspconfig": { "branch": "master", "commit": "8868928d20b392e24dafaafff8c1d75167726fbe" }, "nvim-lspconfig": { "branch": "master", "commit": "9276b82935bf6b951d08c864eb5ac3f85d6b743b" },
"nvim-rooter.lua": { "branch": "main", "commit": "36c597962c5f136d6230f53837ff14fcaf81eff7" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
"nvim-treesitter": { "branch": "master", "commit": "98a33cc524c85a78a1ff5a707998629b24cbf8c2" },
"rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
"tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" }, "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" },
"tree-sitter-typescript": { "branch": "master", "commit": "75b3874edb2dc714fb1fd77a32013d0f8699989f" },
"vim-fish-syntax": { "branch": "master", "commit": "e229becbf4bbee21cc78cd2cf24f57112e33c02a" }, "vim-fish-syntax": { "branch": "master", "commit": "e229becbf4bbee21cc78cd2cf24f57112e33c02a" },
"vim-markdown": { "branch": "master", "commit": "8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51" }, "vim-markdown": { "branch": "master", "commit": "8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51" },
"vim-matchup": { "branch": "master", "commit": "1975afe63198ab6a0dff7200919828e5cd4330b9" }, "vim-matchup": { "branch": "master", "commit": "c478d4a72bbf397eff42743198f1939f6a264736" },
"vim-svelte": { "branch": "main", "commit": "0e93ec53c3667753237282926fec626785622c1c" }, "vim-svelte": { "branch": "main", "commit": "f6df955ad86583e9751487eb7550fae9e53d2d6b" },
"vim-terraform": { "branch": "master", "commit": "24de93afb05078bac6a2e966402cc1f672277708" }, "vim-terraform": { "branch": "master", "commit": "520498fab16a3a11f2ae1b8cb65e0a1684bc317a" },
"vim-toml": { "branch": "main", "commit": "d36caa6b1cf508a4df1c691f915572fc02143258" }, "vim-toml": { "branch": "main", "commit": "1b63257680eeb65677eb1ca5077809a982756d58" },
"yaml.nvim": { "branch": "main", "commit": "615985c1886644a4b2c0eebf985c1d1ae8257dd1" } "vim-vsnip": { "branch": "master", "commit": "0a4b8419e44f47c57eec4c90df17567ad4b1b36e" },
"yaml.nvim": { "branch": "main", "commit": "09bbf7d936606d97f2c1d2e51171a602bc76b65e" }
} }

1
zed/.gitignore vendored
View File

@ -1 +1,2 @@
zed/.tmp* zed/.tmp*
zed/embeddings

Binary file not shown.