Add in new conf

playbooks/apt.yaml

@@ -22,6 +22,7 @@
           - foot
           - git
           - grimshot
+          - hiera-eyaml
           - inkscape
           - isort
           - libreoffice

templates/config.lua.j2

@@ -15,9 +15,9 @@ vim.opt.relativenumber = true
 -- general
 lvim.log.level = "info"
 lvim.format_on_save = {
-  enabled = true,
+	enabled = true,
-  pattern = "*.lua",
+	pattern = "*.lua",
-  timeout = 1000,
+	timeout = 1000,
 }
 -- to disable icons and use a minimalist setup, uncomment the following
 -- lvim.use_icons = false
@@ -59,55 +59,56 @@ lvim.builtin.treesitter.ensure_installed = { "comment", "markdown_inline", "rege
 -- ---configure a server manually. IMPORTANT: Requires `:LvimCacheReset` to take effect
 -- ---see the full default list `:lua =lvim.lsp.automatic_configuration.skipped_servers`
 -- add `pylyzer` to `skipped_servers` list
+require("mason").setup()
+require("mason-lspconfig").setup()
 vim.list_extend(lvim.lsp.automatic_configuration.skipped_servers, { "pylyzer" })
 -- remove `pyright` from `skipped_servers` list
 lvim.lsp.automatic_configuration.skipped_servers = vim.tbl_filter(function(server)
-  return server ~= "pyright"
+	return server ~= "pyright"
 end, lvim.lsp.automatic_configuration.skipped_servers)
-require("mason-lspconfig").setup {
+require("mason-lspconfig").setup({
-  automatic_installation = { exclude = { "puppet", "pylyzer" } }
+	automatic_installation = { exclude = { "puppet", "pylyzer" } },
-}
+})
 -- local opts = {} -- check the lspconfig documentation for a list of all possible options
 -- require("lvim.lsp.manager").setup("pyright", opts)
 --require 'lspconfig'.puppet.setup {}
 local null_ls = require("null-ls")
 
 null_ls.setup({
-  sources = {
+	sources = {
-    null_ls.builtins.diagnostics.puppet_lint,
+		null_ls.builtins.diagnostics.puppet_lint,
-    null_ls.builtins.formatting.puppet_lint,
+		null_ls.builtins.formatting.puppet_lint,
-  },
+	},
 })
 
-
 -- -- linters, formatters and code actions <https://www.lunarvim.org/docs/languages#lintingformatting>
-local formatters = require "lvim.lsp.null-ls.formatters"
+local formatters = require("lvim.lsp.null-ls.formatters")
-formatters.setup {
+formatters.setup({
-  { command = "stylua" },
+	{ command = "stylua" },
-  {
+	{
-    command = "prettier",
+		command = "prettier",
-    extra_args = { "--print-width", "100" },
+		extra_args = { "--print-width", "100" },
-    filetypes = { "typescript", "typescriptreact" },
+		filetypes = { "typescript", "typescriptreact" },
-  },
+	},
-  {
+	{
-    command = "yapf",
+		command = "yapf",
-    --   extra_args = { "-i" },
+		--   extra_args = { "-i" },
-    filetypes = { "python" },
+		filetypes = { "python" },
-  },
+	},
-  {
+	{
-    command = "isort",
+		command = "isort",
-    filetypes = { "python" },
+		filetypes = { "python" },
-  },
+	},
-  {
+	{
-    command = "yamlfix",
+		command = "yamlfix",
-    filetypes = { "yaml" },
+		filetypes = { "yaml" },
-  },
+	},
-  {
+	{
-    command = "shfmt",
+		command = "shfmt",
-    extra_args = { "-w" },
+		extra_args = { "-w" },
-    filetypes = { "sh" },
+		filetypes = { "sh" },
-  },
+	},
-}
+})
 -- local linters = require "lvim.lsp.null-ls.linters"
 -- linters.setup {
 --   { command = "flake8", filetypes = { "python" } },
@@ -126,21 +127,21 @@ formatters.setup {
 
 -- -- Additional Plugins <https://www.lunarvim.org/docs/plugins#user-plugins>
 lvim.plugins = {
-  {
+	{
-    "rodjek/vim-puppet",
+		"rodjek/vim-puppet",
-    "tpope/vim-surround",
+		"tpope/vim-surround",
-    "TabbyML/vim-tabby",
+		"TabbyML/vim-tabby",
-  },
+	},
 }
 
 -- -- Autocommands (`:help autocmd`) <https://neovim.io/doc/user/autocmd.html>
 vim.api.nvim_create_autocmd("BufReadPost", {
-  pattern = { "*" },
+	pattern = { "*" },
-  callback = function()
+	callback = function()
-    if vim.fn.line("'\"") > 1 and vim.fn.line("'\"") <= vim.fn.line("$") then
+		if vim.fn.line("'\"") > 1 and vim.fn.line("'\"") <= vim.fn.line("$") then
-      vim.api.nvim_exec("normal! g'\"", false)
+			vim.api.nvim_exec("normal! g'\"", false)
-    end
+		end
-  end
+	end,
 })
 -- vim.api.nvim_create_autocmd("FileType", {
 --   pattern = "zsh",
@@ -150,13 +151,44 @@ vim.api.nvim_create_autocmd("BufReadPost", {
 --   end,
 -- })
 
-
+vim.g.tabby_keybinding_accept = "<C-Right>"
-vim.g.tabby_keybinding_accept = '<C-Right>'
+vim.g.tabby_keybinding_trigger_or_dismiss = "<C-Left>"
-vim.g.tabby_keybinding_trigger_or_dismiss = '<C-Left>'
 vim.g.tabby_suggestion_delay = 100
 lvim.builtin.which_key.mappings["lh"] = {
-  "<cmd>lua vim.lsp.buf.hover()<CR>", "Show documentation"
+	"<cmd>lua vim.lsp.buf.hover()<CR>",
+	"Show documentation",
 }
 lvim.builtin.which_key.mappings["lu"] = {
-  "<cmd>lua require('telescope.builtin').lsp_references()<CR>", "Show usage"
+	"<cmd>lua require('telescope.builtin').lsp_references()<CR>",
+	"Show usage",
 }
+local lspconfig = require("lspconfig")
+local configs = require("lspconfig.configs")
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities.textDocument.completion.completionItem.snippetSupport = true
+
+if not configs.intelephense then
+	configs.intelephense = {
+		default_config = {
+			cmd = { "intelephense", "--stdio" },
+			filetypes = { "php" },
+			root_dir = function(fname)
+				return vim.loop.cwd()
+			end,
+			settings = {
+				intelephense = {
+					files = {
+						maxSize = 1000000,
+					},
+					environment = {
+						includePaths = {
+							"/home/micke/sources/nextcloud/server",
+						},
+					},
+				},
+			},
+		},
+	}
+end
+
+lspconfig.intelephense.setup({ capabilities = capabilities })

templates/sway_config.j2

@@ -8,7 +8,7 @@ set $down j
 set $up k
 set $right l
 # Your preferred terminal emulator
-set $term foot
+set $term foot-client
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
 # on the original workspace that the command was run on.
@@ -20,6 +20,7 @@ exec --no-startup-id autotiling
 exec --no-startup-id lxpolkit
 exec --no-startup-id nextcloud
 exec --no-startup-id fcitx5
+exec --no-startup-id foot --server
 
 include /etc/sway/config-vars.d/*