init.lua @ 58ab6f486d4c78d86af7ebb0d8f0bc6dd0d1c140

M init.lua

@@ -1,9 +1,9 @@
 require "impatient"
-require "options"
-require "plugin"
-require "keymapings"
-require "disabled"
-require "globals"
-require "autocmd"
+require "fk.options"
+require "fk.plugin"
+require "fk.keymapings"
+require "fk.disabled"
+require "fk.globals"
+require "fk.autocmd"
 
 vim.cmd [[colo onenord]]

M lua/fk/autocmd.lua →lua/fk/autocmd.lua

M lua/fk/disabled.lua →lua/fk/disabled.lua

M lua/fk/globals.lua →lua/fk/globals.lua

M lua/fk/keymapings.lua →lua/fk/keymapings.lua

M lua/fk/lsp/attach.lua →lua/fk/lsp/attach.lua

M lua/fk/lsp/diagnostic.lua →lua/fk/lsp/diagnostic.lua

M lua/fk/lsp/init.lua →lua/fk/lsp/init.lua

@@ -1,12 +1,12 @@
-local on_attach = require "lsp.attach"
-local diagnostic = require "lsp.diagnostic"
+local on_attach = require "fk.lsp.attach"
+local diagnostic = require "fk.lsp.diagnostic"
 local M = {}
 
 function M.setup()
   vim.diagnostic.config(diagnostic)
 
   require("nvim-lsp-installer").on_server_ready(function(server)
-    require "lsp.null" -- null-ls setup
+    require "fk.lsp.null" -- null-ls setup
     local opts = {
       on_attach = on_attach,
       capabilities = require("cmp_nvim_lsp").update_capabilities(vim.lsp.protocol.make_client_capabilities()),
@@ -18,7 +18,7 @@ vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = "" })
     end
 
     -- set server config him exists
-    local ok, server_opts = pcall(require, "lsp.providers." .. server.name)
+    local ok, server_opts = pcall(require, "fk.lsp.providers." .. server.name)
     if ok then
       opts = vim.tbl_deep_extend("force", opts, server_opts or {})
     end

M lua/fk/lsp/null.lua →lua/fk/lsp/null.lua

M lua/fk/lsp/providers/gopls.lua →lua/fk/lsp/providers/gopls.lua

M lua/fk/lsp/providers/pyright.lua →lua/fk/lsp/providers/pyright.lua

M lua/fk/lsp/providers/rust_analyzer.lua →lua/fk/lsp/providers/rust_analyzer.lua

M lua/fk/lsp/providers/sumneko_lua.lua →lua/fk/lsp/providers/sumneko_lua.lua

M lua/fk/lsp/providers/yamlls.lua →lua/fk/lsp/providers/yamlls.lua

M lua/fk/options.lua →lua/fk/options.lua

M lua/fk/plugin.lua →lua/fk/plugin.lua

@@ -1,4 +1,4 @@
-local utils = require "utils"
+local utils = require "fk.utils"
 local get_config = utils.get_config
 local get_setup = utils.get_setup
 
@@ -12,29 +12,29 @@ use "lewis6991/impatient.nvim"
 
   use { "tpope/vim-surround", keys = { "c", "d", "y" } }
   use { "numToStr/Comment.nvim", keys = { "gc" }, config = get_setup "Comment" }
-  use { "windwp/nvim-autopairs", config = get_config "plugin.autopairs" }
-  use { "ahmedkhalf/project.nvim", config = get_config "plugin.project" }
+  use { "windwp/nvim-autopairs", config = get_config "fk.plugin.autopairs" }
+  use { "ahmedkhalf/project.nvim", config = get_config "fk.plugin.project" }
 
   -- languages
   use { "~/code/gopher.nvim", ft = "go" }
-  use { "folke/lua-dev.nvim", ft = "lua", config = get_config "plugin.lua-dev" }
+  use { "folke/lua-dev.nvim", ft = "lua", config = get_config "fk.plugin.lua-dev" }
   use { "zah/nim.vim", ft = "nim" }
 
   -- git
   use { "TimUntersberger/neogit", cmd = "Neogit", config = get_setup "neogit" }
-  use { "lewis6991/gitsigns.nvim", config = get_config "plugin.gitsigns" }
+  use { "lewis6991/gitsigns.nvim", config = get_config "fk.plugin.gitsigns" }
 
   -- appearance
-  use { "folke/which-key.nvim", config = get_config "plugin.whichkey" }
-  use { "nvim-lualine/lualine.nvim", config = get_config "plugin.statusline" }
+  use { "folke/which-key.nvim", config = get_config "fk.plugin.whichkey" }
+  use { "nvim-lualine/lualine.nvim", config = get_config "fk.plugin.statusline" }
   use { "folke/todo-comments.nvim", config = get_setup "todo-comments" }
-  use { "goolord/alpha-nvim", config = get_config "plugin.alpha" }
+  use { "goolord/alpha-nvim", config = get_config "fk.plugin.alpha" }
 
   -- another menus :D
   use {
     "kyazdani42/nvim-tree.lua",
     cmd = "NvimTreeToggle",
-    config = get_config "plugin.nvimtree",
+    config = get_config "fk.plugin.nvimtree",
   }
 
   use {
@@ -45,7 +45,7 @@ }
 
   use {
     "akinsho/toggleterm.nvim",
-    config = get_config "plugin.terminal",
+    config = get_config "fk.plugin.terminal",
     module = "toggleterm",
     keys = "<C-t>",
   }
@@ -54,13 +54,13 @@ use {
     "nvim-telescope/telescope.nvim",
     cmd = "Telescope",
     module = "telescope",
-    config = get_config "plugin.telescope",
+    config = get_config "fk.plugin.telescope",
   }
 
   -- Lsp
   use {
     "neovim/nvim-lspconfig",
-    config = get_setup "lsp",
+    config = get_setup "fk.lsp",
     requires = {
       "williamboman/nvim-lsp-installer",
       "jose-elias-alvarez/null-ls.nvim",
@@ -70,7 +70,7 @@
   -- Completion
   use {
     "hrsh7th/nvim-cmp",
-    config = get_config "plugin.cmp",
+    config = get_config "fk.plugin.cmp",
     event = "InsertEnter",
     module = "cmp",
     requires = {
@@ -89,6 +89,6 @@ -- Syntax
   use {
     "nvim-treesitter/nvim-treesitter",
     branch = "0.5-compat",
-    config = get_config "plugin.treesitter",
+    config = get_config "fk.plugin.treesitter",
   }
 end)

M lua/fk/plugin/alpha.lua →lua/fk/plugin/alpha.lua

M lua/fk/plugin/autopairs.lua →lua/fk/plugin/autopairs.lua

M lua/fk/plugin/cmp.lua →lua/fk/plugin/cmp.lua

M lua/fk/plugin/gitsigns.lua →lua/fk/plugin/gitsigns.lua

M lua/fk/plugin/lua-dev.lua →lua/fk/plugin/lua-dev.lua

M lua/fk/plugin/nvimtree.lua →lua/fk/plugin/nvimtree.lua

M lua/fk/plugin/project.lua →lua/fk/plugin/project.lua

M lua/fk/plugin/statusline.lua →lua/fk/plugin/statusline.lua

M lua/fk/plugin/telescope.lua →lua/fk/plugin/telescope.lua

M lua/fk/plugin/terminal.lua →lua/fk/plugin/terminal.lua

M lua/fk/plugin/treesitter.lua →lua/fk/plugin/treesitter.lua

M lua/fk/plugin/whichkey.lua →lua/fk/plugin/whichkey.lua

M lua/fk/utils.lua →lua/fk/utils.lua