Merge branch 'flow'

.config/nvim/init.lua

@@ -15,54 +15,11 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 
-vim.g.mapleader= " "
+local opts = {
-vim.o.termguicolors = true
-vim.o.number = true
-vim.o.relativenumber = true
-vim.o.signcolumn = "yes"
-vim.o.expandtab = true
-vim.o.tabstop = 2
-vim.o.softtabstop = 2
-vim.o.shiftwidth = 2
-vim.o.termguicolors = true
-
--- Setup lazy.nvim
-require("lazy").setup({
-  spec = {
-    { "catppuccin/nvim", name = "catppuccin", priority = 1000 },
-    { "nvim-telescope/telescope.nvim", tag = "0.1.8", dependencies = { "nvim-lua/plenary.nvim" } },
-    { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
-    { "neovim/nvim-lspconfig" },
-    { "sindrets/diffview.nvim" },
-  },
-  -- Configure any other settings here. See the documentation for more details.
-  -- colorscheme that will be used when installing plugins.
   install = { colorscheme = { "catppuccin" } },
   -- automatically check for plugin updates
   checker = { enabled = true },
-})
+}
 
-require("catppuccin").setup({
+-- Setup lazy.nvim
-  auto_integrations = true,
+require("lazy").setup("plugins", opts)
-  flavour = "mocha",
-  background = {
-    light = "mocha",
-    dark = "mocha",
-  },
-})
-
-vim.cmd("colorscheme catppuccin-mocha")
-
-local builtin = require("telescope.builtin")
-vim.keymap.set("n", "<C-t>", builtin.find_files, {})
-vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
-
-local config = require("nvim-treesitter.configs")
-config.setup({
-  ensure_installed = {"lua", "javascript", "c", "zig", "vim", "rasi", "cpp", "markdown", "markdown_inline"},
-  highlight = { enable = true },
-  indent = { enable = true },
-})
-
-vim.lsp.enable("zls")
-vim.lsp.enable("clangd")

.config/nvim/lua/plugins.lua

@@ -0,0 +1,2 @@
+return {
+}

.config/nvim/lua/plugins/catppuccin.lua

@@ -0,0 +1,17 @@
+return {
+  "catppuccin/nvim",
+  name = "catppuccin",
+  priority = 1000,
+  config = function()
+    local config = require("catppuccin")
+    config.setup({
+      auto_integrations = true,
+      flavour = "mocha",
+      background = {
+        light = "mocha",
+        dark = "mocha",
+      },
+    })
+    vim.cmd.colorscheme "catppuccin-mocha"    
+  end
+}

.config/nvim/lua/plugins/diffview.lua

@@ -0,0 +1,3 @@
+return {
+  "sindrets/diffview.nvim"
+}

.config/nvim/lua/plugins/lspconfig.lua

@@ -0,0 +1,7 @@
+return {
+  "neovim/nvim-lspconfig",
+  config = function()
+    vim.lsp.enable("zls")
+    vim.lsp.enable("clangd")
+  end
+}

.config/nvim/lua/plugins/neo-tree.lua

@@ -0,0 +1,12 @@
+return {
+  "nvim-neo-tree/neo-tree.nvim",
+  branch = "v3.x",
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    "nvim-tree/nvim-web-devicons",
+    "MunifTanjim/nui.nvim",
+  },
+  config = function()
+    vim.keymap.set('n', '<C-n>', ':Neotree filesystem reveal float<CR>')
+  end
+}

.config/nvim/lua/plugins/telescope.lua

@@ -0,0 +1,10 @@
+return {
+  "nvim-telescope/telescope.nvim", 
+  tag = "0.1.8", 
+  dependencies = { "nvim-lua/plenary.nvim" }, 
+  config = function()
+    local builtin = require("telescope.builtin")
+    vim.keymap.set("n", "<C-p>", builtin.find_files, {})
+    vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
+  end
+}

.config/nvim/lua/plugins/treesitter.lua

@@ -0,0 +1,12 @@
+return {
+  "nvim-treesitter/nvim-treesitter",
+  build = ":TSUpdate",
+  config = function()
+    local config = require("nvim-treesitter.configs")
+    config.setup({
+      ensure_installed = {"lua", "javascript", "c", "zig", "vim", "rasi", "cpp", "markdown", "markdown_inline"},
+      highlight = { enable = true },
+      indent = { enable = true },
+    })
+  end
+}

.config/nvim/lua/vim-options.lua

@@ -0,0 +1,10 @@
+vim.g.mapleader= " "
+vim.o.termguicolors = true
+vim.o.number = true
+vim.o.relativenumber = true
+vim.o.signcolumn = "yes"
+vim.o.expandtab = true
+vim.o.tabstop = 2
+vim.o.softtabstop = 2
+vim.o.shiftwidth = 2
+vim.o.termguicolors = true