Merge pull request #7 from kbarioi/main

arst

Author: kbario

after/plugin/colors.lua

@@ -1,2 +1,2 @@
-vim.g.tokyonight_style = "night"
-vim.cmd("colorscheme tokyonight")
+-- vim.g.tokyonight_style = "night"
+vim.cmd("colorscheme catppuccin")

after/plugin/mason.lua

@@ -1,10 +1,9 @@
 local clients = require('kbario.clients')
 local clients_to_install = {}
 for client, config in pairs(clients) do
-  if config then 
+  if config and client ~= "rust_analyzer" then
     table.insert(clients_to_install, client)
   end
-  
 end
 
 require("mason").setup()
@@ -13,10 +12,9 @@ require("mason-lspconfig").setup({
 })
 
 require("mason-null-ls").setup({
-    automatic_setup = true,
-    ensure_installed = {
-      "sqlfluff", "sql_formatter", "stylua", "codespell", "prettier", "prettierd", "eslint_d"
-    }
+  automatic_setup = true,
+  ensure_installed = {
+    "sqlfluff", "sql_formatter", "stylua", "codespell", "prettier", "prettierd", "eslint_d"
+  }
 })
 require("null-ls").setup()
-require 'mason-null-ls'.setup_handlers()

after/plugin/remaps/angular.lua

@@ -4,26 +4,53 @@ local Remap = require("kbario.keymap")
 local nnoremap = Remap.nnoremap
 
 nnoremap(vim.g.mapleader .. hr.l4t .. hr.l4t, function()
+  -- get current file name which should be the module you wish to add the comp to
   local module = vim.api.nvim_buf_get_name(0)
-  -- local module_name = vim.fn.fnamemodify(module, ':p:.:t')
+  -- -- is standalone?
+  -- local isStandaloneInput = vim.fn.input("standalone component? y/n > ")
+  -- local isStandalone
+  -- if isStandaloneInput == "y" then
+  --   isStandalone = true
+  -- else
+  --   isStandalone = false
+  -- end
+  -- -- is in current module or top level?
+  -- local isInCurrentModuleInput = vim.fn.input("put in current module? (else app module) y/n > ")
+  -- local isInCurrentModule
+  -- if isInCurrentModuleInput == "y" then
+  --   isInCurrentModule = true
+  -- else
+  --   isInCurrentModule = false
+  -- end
+  -- get the path of the module without the module in it
   local module_path = vim.fn.fnamemodify(module, ':p:.:h'):gsub('src/app/', ''):gsub('src\\app\\', '')
+  -- get the module file name
   module = vim.fn.fnamemodify(module, ':p:.'):gsub('src/app/', ''):gsub('src\\app\\', '')
-
+  -- create a table with possible options for new components
+  local comp_tbl = {
+    ['p'] = "pipes",
+    ['s'] = "services",
+    ['c'] = "components",
+  }
+  -- get the type of component you want - either component, service or pipe
+  local type = vim.fn.input("file type (c, s, p) > ")
+  -- get the name of the file
   local name = vim.fn.input("file name > ")
-
-  local path = vim.fn.input("file path from " .. module_path .. "/ not including name > ")
-  path = pth:new(string.format('%s/%s/%s', module_path, path, name)).filename
-  print(':!ng g c ' .. path .. ' -m ' .. module)
-  vim.cmd(':!ng g c ' .. path .. ' -m ' .. module)
-
-  -- local cdub = vim.loop.cwd()
-  -- local jsbeautifyrc = pth:new(string.format("%s/.jsbeautifyrc.json", cdub))
-  --
-  -- local file = pth:new(vim.api.nvim_buf_get_name(0)):make_relative(cdub)
-  -- local filetype = vim.fn.fnamemodify(file, ":e")
-  --
-  -- if jsbeautifyrc:exists() and filetype == "html" then
-  --   vim.cmd(string.format(":!js-beautify --config %s --replace %s", jsbeautifyrc.filename, file))
-  --   print("beautified")
-  -- end
+  -- check if you want it put in the logical folder based on the component type
+  local path
+  local auto_sort = vim.fn.input("automatically file component in logical folder? (else custom) y/n > ")
+  if auto_sort ~= 'y' and auto_sort ~= 'n' then return print('incorrect input') end
+  -- if yes then assign path, else ask for the custom path
+  if auto_sort == 'y' then
+    path = comp_tbl[type]
+  else
+    path = vim.fn.input("file path from " .. module_path .. "/ not including name > ")
+  end
+  -- create the path for the new component to go to
+  local new_comp_path = pth:new(string.format('%s/%s/%s/%s', module_path, path, name, name)).filename
+  -- print the command
+  print(string.format(':!ng g %s %s -m %s', type, new_comp_path, module))
+  -- run the command
+  -- vim.cmd(string.format(':!ng g %s %s -m %s', type, new_comp_path, module))
 end, { desc = "jsbeautifyrc formatting" })
+

after/plugin/remaps/telescope.lua

@@ -31,5 +31,25 @@ nnoremap("<leader>" .. hr.l1 .. hr.R3, function()
 end, { desc = "telescope: live grep" })
 
 nnoremap("<leader>" .. hr.l1 .. hr.r4, function()
+  require("telescope.builtin").git_status()
+end, { desc = "telescope: keymaps" })
+
+nnoremap("<leader>" .. hr.l1 .. hr.r4b, function()
   require("telescope.builtin").keymaps()
 end, { desc = "telescope: keymaps" })
+
+-- vstask maps
+
+nnoremap("<leader>" .. hr.l0b .. hr.r1, function()
+  require("telescope").extensions.vstask.tasks()
+end, { desc = "vstask: tasks" })
+nnoremap("<leader>" .. hr.l0b .. hr.r2, function()
+  require("telescope").extensions.vstask.inputs()
+end, { desc = "vstask: inputs" })
+nnoremap("<leader>" .. hr.l0b .. hr.r3, function()
+  require("telescope").extensions.vstask.history()
+end, { desc = "vstask: history" })
+nnoremap("<leader>" .. hr.l0b .. hr.r4, function()
+  require("telescope").extensions.vstask.launch()
+end, { desc = "vstask: launch" })
+

after/plugin/remaps/terminal.lua

@@ -1,2 +1,5 @@
 local tnoremap = require("kbario.keymap").tnoremap
+local nnoremap = require("kbario.keymap").nnoremap
+local hr = require('homerows.homerows')
 tnoremap('<Esc>', '<C-\\><C-n>')
+nnoremap('<leader><leader>'..hr.l1, function() vim.cmd(":vsplit term://powershell") end)

lua/kbario/clients.lua

@@ -25,6 +25,7 @@ M = {
   jsonls = {},
   marksman = false,
   omnisharp = {},
+  powershell_es = {},
   prismals = false,
   r_language_server = false,
   remark_ls = {},

lua/kbario/packer.lua

@@ -21,6 +21,13 @@ return require('packer').startup(function(use)
   -- colours
   use 'folke/tokyonight.nvim'
   use 'joshdick/onedark.vim'
+  use { "catppuccin/nvim", as = "catppuccin",
+    config = function()
+      require("catppuccin").setup {
+        flavour = 'macchiato'
+      }
+    end
+  }
 
   -- telescope
   use {
@@ -191,6 +198,19 @@ return require('packer').startup(function(use)
     end
   }
 
+  -- vscode port
+  use {
+    'EthanJWright/vs-tasks.nvim',
+    requires = {
+      'nvim-lua/popup.nvim',
+      'nvim-lua/plenary.nvim',
+      'nvim-telescope/telescope.nvim'
+    },
+    config = function()
+      require("vstask").setup()
+    end
+  }
+
   -- kbario plugins
   use {
     "kbario/spear.nvim",