diff --git a/bin/.local/bin/lash b/bin/.local/bin/lash new file mode 100755 index 0000000..666fef1 Binary files /dev/null and b/bin/.local/bin/lash differ diff --git a/nvim/.config/nvim/ftplugin/c.lua b/nvim/.config/nvim/ftplugin/c.lua index d77f9eb..75e9fbd 100644 --- a/nvim/.config/nvim/ftplugin/c.lua +++ b/nvim/.config/nvim/ftplugin/c.lua @@ -1,3 +1,5 @@ vim.opt_local.shiftwidth = 8 vim.opt_local.expandtab = false vim.opt_local.formatoptions:remove "o" + +vim.diagnostic.config { virtual_text = false, underline = false, signs = false } diff --git a/nvim/.config/nvim/lsp/bashls.lua b/nvim/.config/nvim/lsp/bashls.lua deleted file mode 100644 index 72f608e..0000000 --- a/nvim/.config/nvim/lsp/bashls.lua +++ /dev/null @@ -1,11 +0,0 @@ ----@type vim.lsp.Config -return { - cmd = { 'bash-language-server', 'start' }, - settings = { - bashIde = { - globPattern = vim.env.GLOB_PATTERN or '*@(.sh|.inc|.bash|.command)', - }, - }, - filetypes = { 'bash', 'sh', 'zsh' }, - root_markers = { '.git' }, -} diff --git a/nvim/.config/nvim/lsp/pyright.lua b/nvim/.config/nvim/lsp/pyright.lua deleted file mode 100644 index 4e9c888..0000000 --- a/nvim/.config/nvim/lsp/pyright.lua +++ /dev/null @@ -1,15 +0,0 @@ ----@type vim.lsp.Config -return { - cmd = { 'pyright-langserver', '--stdio' }, - settings = { - python = { - analysis = { - typeCheckingMode = 'basic', - autoSearchPaths = true, - useLibraryCodeForTypes = true, - }, - }, - }, - filetypes = { 'python' }, - root_markers = { 'pyproject.toml', 'setup.py', 'requirements.txt', '.git' }, -} diff --git a/nvim/.config/nvim/lsp/rust-analyzer.lua b/nvim/.config/nvim/lsp/rust-analyzer.lua deleted file mode 100644 index d414d65..0000000 --- a/nvim/.config/nvim/lsp/rust-analyzer.lua +++ /dev/null @@ -1,6 +0,0 @@ ----@type vim.lsp.Config -return { - cmd = { 'rust-analyzer' }, - filetypes = { 'rs' }, - root_markers = { 'Cargo.toml' }, -} diff --git a/nvim/.config/nvim/lsp/tinymist.lua b/nvim/.config/nvim/lsp/tinymist.lua deleted file mode 100644 index faf1a52..0000000 --- a/nvim/.config/nvim/lsp/tinymist.lua +++ /dev/null @@ -1,6 +0,0 @@ ----@type vim.lsp.Config -return { - cmd = { 'tinymist' }, - filetypes = { 'typ' }, - root_markers = { 'main.typ', 'typst.toml' }, -} diff --git a/nvim/.config/nvim/lsp/zls.lua b/nvim/.config/nvim/lsp/zls.lua deleted file mode 100644 index 436c5ec..0000000 --- a/nvim/.config/nvim/lsp/zls.lua +++ /dev/null @@ -1,6 +0,0 @@ ----@type vim.lsp.Config -return { - cmd = { 'zls' }, - filetypes = { 'zig' }, - root_markers = { '.git', 'build.zig' }, -} diff --git a/nvim/.config/nvim/lua/configs.lua b/nvim/.config/nvim/lua/configs.lua index accd564..d903acb 100644 --- a/nvim/.config/nvim/lua/configs.lua +++ b/nvim/.config/nvim/lua/configs.lua @@ -8,13 +8,3 @@ opt.splitright = true opt.splitbelow = true vim.cmd.colorscheme("gruber-darker") - -if vim.g.neovide then - vim.o.guifont = "ComicShannsMono Nerd Font" - - local function copy() vim.cmd([[normal! "+y]]) end - local function paste() vim.api.nvim_paste(vim.fn.getreg("+"), true, -1) end - - vim.keymap.set("v", "", copy, { silent = true }) - vim.keymap.set({ "n", "i", "v", "c", "t" }, "", paste) -end diff --git a/nvim/.config/nvim/lua/keymaps.lua b/nvim/.config/nvim/lua/keymaps.lua index 9d737e4..544cc71 100644 --- a/nvim/.config/nvim/lua/keymaps.lua +++ b/nvim/.config/nvim/lua/keymaps.lua @@ -8,13 +8,13 @@ keymap("v", "K", ":m '<-2gv=gv") keymap("c", "", "") keymap("c", "", "") -keymap("n", "-", ":Dired") +keymap("n", "-", ":Ex") for _, k in ipairs({ "h", "j", "k", "l" }) do keymap({ "n", "i", "v" }, "", "") end -keymap({ "n", "t" }, "", function() +keymap({ "n", "t" }, "", function() require("snacks").terminal() end) @@ -26,29 +26,6 @@ keymap("n", "eo", ":edit ~/dotfiles/oxwm/.config/oxwm/config.lua") keymap("n", "", ":Pick files") keymap("n", "f", ":Pick grep_live") --- Project -keymap("n", "p", function() - local root = vim.fn.expand("~/programming") - local items = vim.fn.globpath(root, "*", false, true) - local dirs = {} - for _, p in ipairs(items) do - if vim.fn.isdirectory(p) == 1 then table.insert(dirs, p) end - end - if #dirs == 0 then - vim.notify("No directories in " .. root, vim.log.levels.INFO) - return - end - vim.ui.select(dirs, { prompt = "Pick dir:" }, function(choice) - if not choice then return end - local escapedChoice = vim.fn.fnameescape(choice) - vim.cmd("cd " .. escapedChoice) - vim.cmd("Explore " .. escapedChoice) - vim.notify("cd -> " .. choice, vim.log.levels.INFO) - end) -end) - -keymap("n", "g", ":Neogit") - -- Language keymap("n", "lf", vim.lsp.buf.format) keymap("n", "la", vim.lsp.buf.code_action) diff --git a/nvim/.config/nvim/lua/lsp.lua b/nvim/.config/nvim/lua/lsp.lua index e2ef7c8..33c1f8c 100644 --- a/nvim/.config/nvim/lua/lsp.lua +++ b/nvim/.config/nvim/lua/lsp.lua @@ -3,8 +3,6 @@ vim.lsp.enable { "lua_ls", "clangd", "jdtls", - "bashls", - "zls", } vim.diagnostic.config { virtual_text = true, underline = true, signs = false } diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index 6be4178..f21cd17 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -5,43 +5,13 @@ vim.pack.add { { src = "https://github.com/rafamadriz/friendly-snippets" }, { src = "https://github.com/saghen/blink.cmp" }, { src = "https://github.com/nvim-lualine/lualine.nvim" }, - { src = "https://github.com/sphamba/smear-cursor.nvim" }, - { src = "https://github.com/m00qek/baleia.nvim" }, - { src = "https://github.com/esmuellert/codediff.nvim" }, - { src = "https://github.com/NeogitOrg/neogit" }, { src = "https://github.com/folke/snacks.nvim" }, { src = "https://github.com/saghen/blink.lib" }, { src = "https://github.com/blazkowolf/gruber-darker.nvim" }, - { src = "https://github.com/MeanderingProgrammer/render-markdown.nvim" }, - - { src = "https://github.com/MunifTanjim/nui.nvim" }, - { src = "https://github.com/X3eRo0/dired.nvim" } } require("mini.pick").setup {} require("lualine").setup {} -require("neogit").setup {} -require("render-markdown").setup { - completions = { lsp = { enabled = true } } -} -require("render-markdown").enable() - -require("dired").setup { - show_hidden = false, - show_icons = true, - - keybinds = { - dired_mark = "" - }, - - colors = { - DiredMarkedFile = { link = {}, bg = "aa0000", fg = "NONE", gui = "bold" } - } -} - -if not vim.g.neovide then - require("smear_cursor").setup {} -end require("snacks").setup { notifier = { enabled = true }, diff --git a/oxwm/.config/oxwm/config.lua b/oxwm/.config/oxwm/config.lua index 85354e2..3e9f471 100644 --- a/oxwm/.config/oxwm/config.lua +++ b/oxwm/.config/oxwm/config.lua @@ -112,7 +112,6 @@ oxwm.key.bind({ modkey }, "D", oxwm.spawn({ "vesktop-bin" })) oxwm.key.bind({ modkey }, "G", oxwm.spawn({ "steam" })) oxwm.key.bind({ modkey }, "M", oxwm.spawn({ "ATLauncher" })) oxwm.key.bind({ modkey }, "S", oxwm.spawn({ "flatpak run org.vinegarhq.Sober" })) -oxwm.key.bind({ modkey }, "N", oxwm.spawn({ "neovide" })) oxwm.key.bind({ modkey, "Shift" }, "F", oxwm.spawn({ "thunar" })) oxwm.key.bind({ modkey }, "Return", oxwm.spawn_terminal())