Compare commits

..

No commits in common. "5f6957f1375ec2e570617c0be1620dac8c8b8c68" and "203d2f524379c1dba168e56e699e99d957f66efc" have entirely different histories.

8 changed files with 51 additions and 56 deletions

1
.gitignore vendored
View File

@ -1,4 +1,3 @@
lazy-lock.json lazy-lock.json
.DS_Store .DS_Store
**/packer_compiled.lua **/packer_compiled.lua
parsers.lua

View File

@ -1,4 +0,0 @@
-- bootstrap lazy.nvim, LazyVim and your plugins
require("config.lazy")
local ok, mymod = pcall(require, "parsers")

1
init.lua Symbolic link
View File

@ -0,0 +1 @@
/nix/store/hqcbiwnv1298ak69qhdq58ppy47vja9c-home-manager-files/.config/nvim/init.lua

View File

@ -3,7 +3,6 @@
"lazyvim.plugins.extras.coding.mini-surround", "lazyvim.plugins.extras.coding.mini-surround",
"lazyvim.plugins.extras.dap.core", "lazyvim.plugins.extras.dap.core",
"lazyvim.plugins.extras.editor.aerial", "lazyvim.plugins.extras.editor.aerial",
"lazyvim.plugins.extras.editor.aerial",
"lazyvim.plugins.extras.editor.harpoon2", "lazyvim.plugins.extras.editor.harpoon2",
"lazyvim.plugins.extras.editor.navic", "lazyvim.plugins.extras.editor.navic",
"lazyvim.plugins.extras.formatting.prettier", "lazyvim.plugins.extras.formatting.prettier",
@ -11,14 +10,15 @@
"lazyvim.plugins.extras.lang.elixir", "lazyvim.plugins.extras.lang.elixir",
"lazyvim.plugins.extras.lang.go", "lazyvim.plugins.extras.lang.go",
"lazyvim.plugins.extras.lang.java", "lazyvim.plugins.extras.lang.java",
"lazyvim.plugins.extras.lang.nix",
"lazyvim.plugins.extras.lang.omnisharp", "lazyvim.plugins.extras.lang.omnisharp",
"lazyvim.plugins.extras.lang.rust", "lazyvim.plugins.extras.lang.rust",
"lazyvim.plugins.extras.lang.tailwind", "lazyvim.plugins.extras.lang.tailwind",
"lazyvim.plugins.extras.lang.typescript" "lazyvim.plugins.extras.lang.typescript",
"lazyvim.plugins.extras.editor.aerial"
], ],
"news": { "news": {
"NEWS.md": "6077" "NEWS.md": "6077"
}, },
"version": 6 "version": 6
} }

View File

@ -16,20 +16,16 @@ local function map(mode, lhs, rhs, opts)
end end
end end
vim.keymap.set("n", "<C-d>", "<C-d>zz", { desc = "Center cursor after moving down half-page" }) map(
vim.keymap.set("n", "<C-u>", "<C-u>zz", { desc = "Center cursor after moving up half-page" }) "n",
"<C-u>",
-- map( "<Cmd>lua vim.cmd('normal! <C-u>'); MiniAnimate.execute_after('scroll', 'normal! zz')<CR>",
-- "n", { desc = "Centered Half Page Up", remap = true }
-- "<C-u>", )
-- "<Cmd>lua vim.cmd('normal! <C-u>'); MiniAnimate.execute_after('scroll', 'normal! zz')<CR>", map(
-- { desc = "Centered Half Page Up", remap = true } "n",
-- ) "<C-d>",
-- map( "<Cmd>lua vim.cmd('normal! <C-d>'); MiniAnimate.execute_after('scroll', 'normal! zz')<CR>",
-- "n", { desc = "Centered Half Page Down", remap = true }
-- "<C-d>", )
-- "<Cmd>lua vim.cmd('normal! <C-d>'); MiniAnimate.execute_after('scroll', 'normal! zz')<CR>",
-- { desc = "Centered Half Page Down", remap = true }
-- )
map("n", "<leader>u<Tab>", ":set list!<CR>", { desc = "Toggle list (Whitespace display)", remap = true }) map("n", "<leader>u<Tab>", ":set list!<CR>", { desc = "Toggle list (Whitespace display)", remap = true })

View File

@ -4,14 +4,16 @@
vim.o.conceallevel = 2 vim.o.conceallevel = 2
if vim.loader then
vim.loader.enable()
end
vim.filetype.add({ vim.filetype.add({
extension = { extension = {
mdx = "markdown", mdx = "markdown",
}, },
}) })
vim.g.editorconfig = true
vim.cmd([[ vim.cmd([[
filetype plugin on filetype plugin on
filetype indent off filetype indent off

View File

@ -15,6 +15,7 @@ return {
}, },
{ {
"nyoom-engineering/oxocarbon.nvim", "nyoom-engineering/oxocarbon.nvim",
event = "VeryLazy",
}, },
-- Configure LazyVim to load rose-pine -- Configure LazyVim to load rose-pine

View File

@ -3,7 +3,6 @@ return {
opts = { opts = {
formatters_by_ft = { formatters_by_ft = {
sql = { "sql_formatter" }, sql = { "sql_formatter" },
-- nix = { "nixpgs_fmt" },
}, },
}, },
} }

View File

@ -6,6 +6,7 @@ return {
opts = { opts = {
-- -@type lspconfig.options -- -@type lspconfig.options
servers = { servers = {
-- pyright will be automatically installed with mason and loaded with lspconfig
nil_ls = { nil_ls = {
mason = false, mason = false,
settings = { settings = {
@ -19,34 +20,34 @@ return {
lua_ls = { lua_ls = {
mason = false, mason = false,
}, },
-- rust_analyzer = { rust_analyzer = {
-- mason = false, mason = false,
-- settings = { -- settings = {
-- ["rust-analyzer"] = { -- ["rust-analyzer"] = {
-- -- rustfmt = { -- -- rustfmt = {
-- -- overrideCommand = { "leptosfmt", "--stdin", "--rustfmt" }, -- -- overrideCommand = { "leptosfmt", "--stdin", "--rustfmt" },
-- -- }, -- -- },
-- imports = { -- imports = {
-- granularity = { -- granularity = {
-- group = "module", -- group = "module",
-- }, -- },
-- }, -- },
-- cargo = { -- cargo = {
-- buildScripts = { -- buildScripts = {
-- enable = false, -- enable = false,
-- }, -- },
-- }, -- },
-- files = { -- files = {
-- excludeDirs = { -- excludeDirs = {
-- "pe-template", -- "pe-template",
-- }, -- },
-- }, -- },
-- procMacro = { -- procMacro = {
-- enable = true, -- enable = true,
-- }, -- },
-- }, -- },
-- }, -- },
-- }, },
tailwindcss = { tailwindcss = {
init_options = { init_options = {
userLanguages = { userLanguages = {