Made some small changes

This commit is contained in:
2025-01-05 11:52:31 +01:00
parent ba64b6c31e
commit 8b31f5f547
11 changed files with 91 additions and 68 deletions

View File

@@ -25,6 +25,9 @@ vim.keymap.set("t", "<Esc><Esc>", "<C-\\><C-n>", { desc = "Exit terminal mode" }
-- vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
-- vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
vim.keymap.set("n", "<C-m>", ":m .+1<CR>==", { desc = "Move line up" }) -- move line up(n)
vim.keymap.set("n", "<C-n>", ":m .-2<CR>==", { desc = "Move line down" }) -- move line down(n)
vim.keymap.set("n", "<C-t><C-n>", "<cmd>:FloatermNew<CR>", { desc = "New terminal" })
vim.keymap.set("n", "<C-t><C-t>", "<cmd>:FloatermToggle<CR>", { desc = "Toggle terminal" })
vim.keymap.set("n", "gr", "")

View File

@@ -1,39 +1,39 @@
return {
{ -- Autoformat
'stevearc/conform.nvim',
lazy = false,
keys = {
{
'<leader>f',
function()
require('conform').format { async = true, lsp_fallback = true }
end,
mode = '',
desc = '[F]ormat buffer',
},
},
opts = {
notify_on_error = false,
format_on_save = function(bufnr)
-- Disable "format_on_save lsp_fallback" for languages that don't
-- have a well standardized coding style. You can add additional
-- languages here or re-enable it for the disabled ones.
local disable_filetypes = { c = true, cpp = true }
return {
timeout_ms = 500,
lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype],
}
end,
formatters_by_ft = {
lua = { 'stylua' },
-- Conform can also run multiple formatters sequentially
-- python = { "isort", "black" },
--
-- You can use a sub-list to tell conform to run *until* a formatter
-- is found.
-- javascript = { { "prettierd", "prettier" } },
},
},
},
{ -- Autoformat
"stevearc/conform.nvim",
lazy = false,
keys = {
{
"<leader>f",
function()
require("conform").format({ async = true, lsp_fallback = true })
end,
mode = "",
desc = "[F]ormat buffer",
},
},
opts = {
notify_on_error = false,
format_on_save = function(bufnr)
-- Disable "format_on_save lsp_fallback" for languages that don't
-- have a well standardized coding style. You can add additional
-- languages here or re-enable it for the disabled ones.
local disable_filetypes = { c = true, cpp = true, go = true }
return {
timeout_ms = 500,
lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype],
}
end,
formatters_by_ft = {
lua = { "stylua" },
-- Conform can also run multiple formatters sequentially
-- python = { "isort", "black" },
--
-- You can use a sub-list to tell conform to run *until* a formatter
-- is found.
-- javascript = { { "prettierd", "prettier" } },
},
},
},
}
-- vim: ts=2 sts=2 sw=2 et

View File

@@ -1,20 +1,22 @@
return {
{ -- You can easily change to a different colorscheme.
-- Change the name of the colorscheme plugin below, and then
-- change the command in the config to whatever the name of that colorscheme is.
--
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
'folke/tokyonight.nvim',
priority = 1000, -- Make sure to load this before all the other start plugins.
init = function()
-- Load the colorscheme here.
-- Like many other themes, this one has different styles, and you could load
-- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
vim.cmd.colorscheme 'tokyonight-night'
{ -- You can easily change to a different colorscheme.
-- Change the name of the colorscheme plugin below, and then
-- change the command in the config to whatever the name of that colorscheme is.
--
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
"catppuccin/nvim",
name = "catppuccin",
priority = 1000, -- Make sure to load this before all the other start plugins.
init = function()
-- Load the colorscheme here.
-- Like many other themes, this one has different styles, and you could load
-- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
vim.o.termguicolors = true
vim.cmd.colorscheme("catppuccin-mocha")
-- You can configure highlights by doing something like:
vim.cmd.hi 'Comment gui=none'
end,
},
-- You can configure highlights by doing something like:
-- vim.cmd.hi 'Comment gui=none'
end,
},
}
-- vim: ts=2 sts=2 sw=2 et

View File

@@ -10,10 +10,10 @@ if not vim.loop.fs_stat(lazypath) then
end ---@diagnostic disable-next-line: undefined-field
vim.opt.rtp:prepend(lazypath)
local gdproject = io.open(vim.fn.getcwd() .. "/project.godot", "r")
if gdproject then
io.close(gdproject)
vim.fn.serverstart("./godothost")
end
--local gdproject = io.open(vim.fn.getcwd() .. "/project.godot", "r")
--if gdproject then
-- io.close(gdproject)
-- vim.fn.serverstart("./godothost")
--end
-- vim: ts=2 sts=2 sw=2 et