diff --git a/fish/fish/fish_variables b/fish/fish/fish_variables index ceca42a..9c2de99 100644 --- a/fish/fish/fish_variables +++ b/fish/fish/fish_variables @@ -1,6 +1,6 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 -SETUVAR __fish_initialized:3400 +SETUVAR __fish_initialized:3800 SETUVAR fish_color_autosuggestion:brblack SETUVAR fish_color_cancel:\x2dr SETUVAR fish_color_command:blue @@ -18,7 +18,7 @@ SETUVAR fish_color_operator:brcyan SETUVAR fish_color_param:cyan SETUVAR fish_color_quote:yellow 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_status:red SETUVAR fish_color_user:brgreen diff --git a/fish/fish/functions/!!.fish b/fish/fish/functions/!!.fish index 35d2592..bf1636e 100644 --- a/fish/fish/functions/!!.fish +++ b/fish/fish/functions/!!.fish @@ -1,4 +1,4 @@ -function !! --wraps='sudo pacman -Syu' --description 'alias !! sudo pacman -Syu' - sudo pacman -Syu $argv +function !! --wraps='nvim ./Lab3/FullAdder.srcs/sources_1/new' --description 'alias !! nvim ./Lab3/FullAdder.srcs/sources_1/new' + nvim ./Lab3/FullAdder.srcs/sources_1/new $argv end diff --git a/neovim/nvim/init.lua b/neovim/nvim/init.lua index 8229619..f0e6bf5 100644 --- a/neovim/nvim/init.lua +++ b/neovim/nvim/init.lua @@ -19,7 +19,8 @@ vim.opt.foldlevelstart = 99 -- vim.opt.completeopt = 'menuone,noinsert,noselect' -- not setting updatedtime because I use K to manually trigger hover effects -- 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" -- http://stackoverflow.com/questions/2158516/delay-before-o-opens-a-new-line -- vim.opt.timeoutlen = 300 @@ -74,6 +75,15 @@ vim.api.nvim_create_autocmd('Filetype', { pattern = 'rust', command = 'set color -- also, show tabs nicer 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 @@ -396,27 +406,29 @@ require("lazy").setup({ local lspconfig = require('lspconfig') -- Rust - lspconfig.rust_analyzer.setup { - -- Server-specific settings. See `:help lspconfig-setup` - settings = { - ["rust-analyzer"] = { - cargo = { - allFeatures = true, - }, - imports = { - group = { - enable = false, - }, - }, - completion = { - postfix = { - -- Commened out to see if I like it more (arc) - 2024-10-03 - -- enable = false, - }, - }, - }, - }, - } + -- Commented out to see if we could stop rust-analyzer from crashing (arc) - 2025-02-26 + lspconfig.rust_analyzer.setup {} + -- lspconfig.rust_analyzer.setup { + -- -- Server-specific settings. See `:help lspconfig-setup` + -- settings = { + -- ["rust-analyzer"] = { + -- cargo = { + -- allFeatures = true, + -- }, + -- imports = { + -- group = { + -- enable = false, + -- }, + -- }, + -- completion = { + -- postfix = { + -- -- Commened out to see if I like it more (arc) - 2024-10-03 + -- -- enable = false, + -- }, + -- }, + -- }, + -- }, + -- } -- C lspconfig.clangd.setup {} diff --git a/neovim/nvim/lazy-lock.json b/neovim/nvim/lazy-lock.json index 0ed75b3..c30cab6 100644 --- a/neovim/nvim/lazy-lock.json +++ b/neovim/nvim/lazy-lock.json @@ -3,15 +3,15 @@ "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "fzf": { "branch": "master", "commit": "243a76002c93b474cf8401b37670a43803a0a2d2" }, - "fzf.vim": { "branch": "master", "commit": "556f45e79ae5e3970054fee4c4373472604a1b4e" }, - "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, - "leap.nvim": { "branch": "main", "commit": "67d26a13cfbf558450955ee9c76e78e03d13ee9e" }, + "fzf": { "branch": "master", "commit": "77568e114ff531f4fe14cfaeab6febd53a99b1bc" }, + "fzf.vim": { "branch": "master", "commit": "6cda389bdea953c9c66a3cfe57e40463ffd61ae9" }, + "lazy.nvim": { "branch": "main", "commit": "e5e9bf48211a13d9ee6c1077c88327c49c1ab4a0" }, + "leap.nvim": { "branch": "main", "commit": "8b826a9fc766bffd14288aee01847cb0d6c6c383" }, "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" }, + "nvim-lspconfig": { "branch": "master", "commit": "7c8cb61b21727a473663054edec4b83633d9e442" }, + "nvim-treesitter": { "branch": "master", "commit": "4cf2da5c3a2dfd22e72713c66203d21883b149fd" }, "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" }, "vim-fish-syntax": { "branch": "master", "commit": "e229becbf4bbee21cc78cd2cf24f57112e33c02a" }, @@ -20,5 +20,5 @@ "vim-svelte": { "branch": "main", "commit": "0e93ec53c3667753237282926fec626785622c1c" }, "vim-terraform": { "branch": "master", "commit": "8912ca1be3025a1c9fab193618f3b99517e01973" }, "vim-toml": { "branch": "main", "commit": "d36caa6b1cf508a4df1c691f915572fc02143258" }, - "yaml.nvim": { "branch": "main", "commit": "7f1e6a368bc366d510eece0247440db7ed3a4552" } + "yaml.nvim": { "branch": "main", "commit": "a7fc7a07076689a7b5f0f6d06347c1e221f0d1b0" } }