diff --git a/pkgs/nvchad/nvim/lua/chadrc.lua b/pkgs/nvchad/nvim/lua/chadrc.lua index c6cd178..8350352 100644 --- a/pkgs/nvchad/nvim/lua/chadrc.lua +++ b/pkgs/nvchad/nvim/lua/chadrc.lua @@ -1,22 +1,22 @@ local M = {} M.ui = { - lsp = { - signature = false, - }, - theme = "poimandres", - transparency = true, - nvdash = { - load_on_startup = true, + lsp = { + signature = false, + }, + theme = "poimandres", + transparency = true, + nvdash = { + load_on_startup = true, - header = { - "|------------------------|", - "| NOBODY FUX WITH TUX |", - "|------------------------|", - " \\ (•◡•) / ", - " \\ / ", - }, - }, + header = { + "|------------------------|", + "| NOBODY FUX WITH TUX |", + "|------------------------|", + " \\ (•◡•) / ", + " \\ / ", + }, + }, } return M diff --git a/pkgs/nvchad/nvim/lua/configs/dap.lua b/pkgs/nvchad/nvim/lua/configs/dap.lua index c97071f..c2f3ff1 100644 --- a/pkgs/nvchad/nvim/lua/configs/dap.lua +++ b/pkgs/nvchad/nvim/lua/configs/dap.lua @@ -4,14 +4,14 @@ require("nvim-dap-virtual-text").setup() local dap, dapui = require("dap"), require("dapui") dap.listeners.before.attach.dapui_config = function() - dapui.open() + dapui.open() end dap.listeners.before.launch.dapui_config = function() - dapui.open() + dapui.open() end dap.listeners.before.event_terminated.dapui_config = function() - dapui.close() + dapui.close() end dap.listeners.before.event_exited.dapui_config = function() - dapui.close() + dapui.close() end diff --git a/pkgs/nvchad/nvim/lua/configs/lspconfig.lua b/pkgs/nvchad/nvim/lua/configs/lspconfig.lua index 3bf4899..62cb11e 100644 --- a/pkgs/nvchad/nvim/lua/configs/lspconfig.lua +++ b/pkgs/nvchad/nvim/lua/configs/lspconfig.lua @@ -7,21 +7,21 @@ local lspconfig = require("lspconfig") local servers = { "tailwindcss", "eslint", "gopls" } for _, lsp in ipairs(servers) do - lspconfig[lsp].setup({ - on_attach = on_attach, - capabilities = capabilities, - }) + lspconfig[lsp].setup({ + on_attach = on_attach, + capabilities = capabilities, + }) end lspconfig.nil_ls.setup({ - on_attach = on_attach, - capabilities = capabilities, - cmd = { "nil" }, - settings = { - ["nil"] = { - flake = { - autoArchive = true, - }, - }, - }, + on_attach = on_attach, + capabilities = capabilities, + cmd = { "nil" }, + settings = { + ["nil"] = { + flake = { + autoArchive = true, + }, + }, + }, }) diff --git a/pkgs/nvchad/nvim/lua/configs/noice.lua b/pkgs/nvchad/nvim/lua/configs/noice.lua index abc5b13..4f4af30 100644 --- a/pkgs/nvchad/nvim/lua/configs/noice.lua +++ b/pkgs/nvchad/nvim/lua/configs/noice.lua @@ -8,8 +8,8 @@ local opts = { }, presets = { long_message_to_split = true, -- long messages will be sent to a split - inc_rename = false, -- enables an input dialog for inc-rename.nvim - lsp_doc_border = false, -- add a border to hover docs and signature help + inc_rename = false, -- enables an input dialog for inc-rename.nvim + lsp_doc_border = false, -- add a border to hover docs and signature help }, } diff --git a/pkgs/nvchad/nvim/lua/mappings.lua b/pkgs/nvchad/nvim/lua/mappings.lua index 0868241..c64fbf1 100644 --- a/pkgs/nvchad/nvim/lua/mappings.lua +++ b/pkgs/nvchad/nvim/lua/mappings.lua @@ -4,24 +4,24 @@ local map = vim.keymap.set local g = vim.g local float_opts = { - relative = "editor", - row = 0.13, - col = 0.14, - width = 0.7, - height = 0.7, - border = "single", + relative = "editor", + row = 0.13, + col = 0.14, + width = 0.7, + height = 0.7, + border = "single", } local toggleTerm = function() - require("nvchad.term").toggle({ pos = "float", id = "float", float_opts = float_opts }) + require("nvchad.term").toggle({ pos = "float", id = "float", float_opts = float_opts }) end local toggleLazygit = function() - require("nvchad.term").toggle({ pos = "float", id = "lazygit", float_opts = float_opts, cmd = "lazygit" }) + require("nvchad.term").toggle({ pos = "float", id = "lazygit", float_opts = float_opts, cmd = "lazygit" }) end local toggleTreesj = function() - require("treesj").toggle() + require("treesj").toggle() end map({ "n", "t" }, "", toggleTerm, { desc = "Toggle Floating Terminal" }) @@ -45,14 +45,14 @@ map("n", "", "DapTerminate", { desc = "Terminate" }) map("n", "", "DapStepOver", { desc = "Step over" }) if g.neovide then - local zoomInNeovide = function() - g.neovide_scale_factor = g.neovide_scale_factor + 0.1 - end + local zoomInNeovide = function() + g.neovide_scale_factor = g.neovide_scale_factor + 0.1 + end - local zoomOutNeovide = function() - g.neovide_scale_factor = g.neovide_scale_factor - 0.1 - end + local zoomOutNeovide = function() + g.neovide_scale_factor = g.neovide_scale_factor - 0.1 + end - map("n", "", zoomInNeovide, { desc = "Zoom In (Neovide)" }) - map("n", "", zoomOutNeovide, { desc = "Zoom Out (Neovide)" }) + map("n", "", zoomInNeovide, { desc = "Zoom In (Neovide)" }) + map("n", "", zoomOutNeovide, { desc = "Zoom Out (Neovide)" }) end diff --git a/pkgs/nvchad/nvim/lua/options.lua b/pkgs/nvchad/nvim/lua/options.lua index 9a62a66..7768f49 100644 --- a/pkgs/nvchad/nvim/lua/options.lua +++ b/pkgs/nvchad/nvim/lua/options.lua @@ -1,4 +1,4 @@ -require "nvchad.options" +require("nvchad.options") local opt = vim.opt local g = vim.g @@ -10,4 +10,3 @@ opt.guifont = "FiraCode Nerd Font:h12" -- neovide stuff g.neovide_scale_factor = 0.7 -- g.neovide_transparency = 0.8 - diff --git a/pkgs/nvchad/nvim/lua/plugins/init.lua b/pkgs/nvchad/nvim/lua/plugins/init.lua index 52a5b0a..0ffbc36 100644 --- a/pkgs/nvchad/nvim/lua/plugins/init.lua +++ b/pkgs/nvchad/nvim/lua/plugins/init.lua @@ -1,176 +1,176 @@ local overrides = require("configs.overrides") local plugins = { - { - "stevearc/conform.nvim", - event = { "BufWritePre" }, - cmd = { "ConformInfo" }, - config = function() - require("configs.conform") - end, - }, - { - "nvim-treesitter/nvim-treesitter", - opts = overrides.treesitter, - }, - { - "williamboman/mason.nvim", - opts = overrides.mason, - }, - { - "David-Kunz/gen.nvim", - lazy = false, - opts = function() - return require("configs.gen") - end, - }, - { - "Shatur/neovim-session-manager", - dependencies = { - "nvim-lua/plenary.nvim", - "stevearc/dressing.nvim", - }, - event = "BufWritePost", - cmd = "SessionManager", - }, - { - "folke/noice.nvim", - event = "VeryLazy", - dependencies = { - "MunifTanjim/nui.nvim", - "rcarriga/nvim-notify", - }, - opts = function() - return require("configs.noice") - end, - }, - { - "neovim/nvim-lspconfig", - config = function() - require("nvchad.configs.lspconfig").defaults() - require("configs.lspconfig") - end, - }, - { - "nvimtools/none-ls.nvim", - event = "VeryLazy", - opts = function() - return require("configs.null-ls") - end, - }, - { - "windwp/nvim-ts-autotag", - ft = { "javascript", "javascriptreact", "typescript", "typescriptreact" }, - config = function() - require("nvim-ts-autotag").setup() - end, - }, - { - "wakatime/vim-wakatime", - lazy = false, - }, - { - "nvim-treesitter/nvim-treesitter-context", - event = "BufReadPost", - }, - { - "Wansmer/treesj", - cmd = { "TSJToggle" }, - }, - { - "hedyhli/outline.nvim", - lazy = true, - cmd = { "Outline", "OutlineOpen" }, - opts = {}, - }, - { - "folke/trouble.nvim", - cmd = { "Trouble", "TroubleToggle" }, - }, - { - "folke/todo-comments.nvim", - cmd = { "TodoTrouble", "TodoTelescope" }, - config = true, - }, - { - "folke/neodev.nvim", - event = "VeryLazy", - config = function() - require("neodev").setup({ - library = { - plugins = { "nvim-dap-ui" }, - types = true, - }, - }) - end, - }, - { - "mfussenegger/nvim-dap", - config = function() - require("configs.dap") - end, - dependencies = { - "rcarriga/nvim-dap-ui", - "nvim-neotest/nvim-nio", - "theHamsta/nvim-dap-virtual-text", - }, - }, - { - "nat-418/boole.nvim", - event = "VeryLazy", - config = function() - require("boole").setup() - end, - }, - -- Language specific plugins - { - "pmizio/typescript-tools.nvim", - dependencies = { - "nvim-lua/plenary.nvim", - "neovim/nvim-lspconfig", - }, - config = function() - require("configs.ts") - end, - ft = { - "javascript", - "typescript", - "javascriptreact", - "typescriptreact", - }, - }, - { - "ray-x/go.nvim", - dependencies = { - "neovim/nvim-lspconfig", - "nvim-treesitter/nvim-treesitter", - "mfussenegger/nvim-dap", - "rcarriga/nvim-dap-ui", - }, - event = { "CmdlineEnter" }, - config = function() - require("configs.go") - end, - ft = { - "go", - "gomod", - "gosum", - "gowork", - "gotmpl", - }, - build = ':lua require("go.install").update_all_sync()', - }, - { - "mrcjkb/rustaceanvim", - config = function() - require("configs.rust") - end, - version = "^4", - dependencies = { - "mfussenegger/nvim-dap", - "rcarriga/nvim-dap-ui", - }, - ft = { "rust" }, - }, + { + "stevearc/conform.nvim", + event = { "BufWritePre" }, + cmd = { "ConformInfo" }, + config = function() + require("configs.conform") + end, + }, + { + "nvim-treesitter/nvim-treesitter", + opts = overrides.treesitter, + }, + { + "williamboman/mason.nvim", + opts = overrides.mason, + }, + { + "David-Kunz/gen.nvim", + lazy = false, + opts = function() + return require("configs.gen") + end, + }, + { + "Shatur/neovim-session-manager", + dependencies = { + "nvim-lua/plenary.nvim", + "stevearc/dressing.nvim", + }, + event = "BufWritePost", + cmd = "SessionManager", + }, + { + "folke/noice.nvim", + event = "VeryLazy", + dependencies = { + "MunifTanjim/nui.nvim", + "rcarriga/nvim-notify", + }, + opts = function() + return require("configs.noice") + end, + }, + { + "neovim/nvim-lspconfig", + config = function() + require("nvchad.configs.lspconfig").defaults() + require("configs.lspconfig") + end, + }, + { + "nvimtools/none-ls.nvim", + event = "VeryLazy", + opts = function() + return require("configs.null-ls") + end, + }, + { + "windwp/nvim-ts-autotag", + ft = { "javascript", "javascriptreact", "typescript", "typescriptreact" }, + config = function() + require("nvim-ts-autotag").setup() + end, + }, + { + "wakatime/vim-wakatime", + lazy = false, + }, + { + "nvim-treesitter/nvim-treesitter-context", + event = "BufReadPost", + }, + { + "Wansmer/treesj", + cmd = { "TSJToggle" }, + }, + { + "hedyhli/outline.nvim", + lazy = true, + cmd = { "Outline", "OutlineOpen" }, + opts = {}, + }, + { + "folke/trouble.nvim", + cmd = { "Trouble", "TroubleToggle" }, + }, + { + "folke/todo-comments.nvim", + cmd = { "TodoTrouble", "TodoTelescope" }, + config = true, + }, + { + "folke/neodev.nvim", + event = "VeryLazy", + config = function() + require("neodev").setup({ + library = { + plugins = { "nvim-dap-ui" }, + types = true, + }, + }) + end, + }, + { + "mfussenegger/nvim-dap", + config = function() + require("configs.dap") + end, + dependencies = { + "rcarriga/nvim-dap-ui", + "nvim-neotest/nvim-nio", + "theHamsta/nvim-dap-virtual-text", + }, + }, + { + "nat-418/boole.nvim", + event = "VeryLazy", + config = function() + require("boole").setup() + end, + }, + -- Language specific plugins + { + "pmizio/typescript-tools.nvim", + dependencies = { + "nvim-lua/plenary.nvim", + "neovim/nvim-lspconfig", + }, + config = function() + require("configs.ts") + end, + ft = { + "javascript", + "typescript", + "javascriptreact", + "typescriptreact", + }, + }, + { + "ray-x/go.nvim", + dependencies = { + "neovim/nvim-lspconfig", + "nvim-treesitter/nvim-treesitter", + "mfussenegger/nvim-dap", + "rcarriga/nvim-dap-ui", + }, + event = { "CmdlineEnter" }, + config = function() + require("configs.go") + end, + ft = { + "go", + "gomod", + "gosum", + "gowork", + "gotmpl", + }, + build = ':lua require("go.install").update_all_sync()', + }, + { + "mrcjkb/rustaceanvim", + config = function() + require("configs.rust") + end, + version = "^4", + dependencies = { + "mfussenegger/nvim-dap", + "rcarriga/nvim-dap-ui", + }, + ft = { "rust" }, + }, } return plugins diff --git a/stylua.toml b/stylua.toml new file mode 100644 index 0000000..2b4ca7d --- /dev/null +++ b/stylua.toml @@ -0,0 +1,3 @@ +line_endings = "Unix" +indent_type = "Spaces" +indent_width = 2