more changes, all should work pretty nicely now

2025-05-21 15:45:30 +02:00
parent 0e34591f0a
commit ab93aae1b6
56 changed files with 6674 additions and 229 deletions
@@ -0,0 +1,4 @@
+require("liamm.set")
+require("liamm.remap")
+require("liamm.packer")
+
@@ -0,0 +1,20 @@
+local M = {}
+
+local function bind(op, outer_opts)
+    outer_opts = outer_opts or {noremap = true}
+    return function(lhs, rhs, opts)
+        opts = vim.tbl_extend("force",
+            outer_opts,
+            opts or {}
+        )
+        vim.keymap.set(op, lhs, rhs, opts)
+    end
+end
+
+M.nmap = bind("n", {noremap = false})
+M.nnoremap = bind("n")
+M.vnoremap = bind("v")
+M.xnoremap = bind("x")
+M.inoremap = bind("i")
+
+return M
@@ -0,0 +1,54 @@
+return require('packer').startup(function(use)
+  use 'wbthomason/packer.nvim'
+
+  use({ 'folke/tokyonight.nvim', as = 'tokyonight' })
+  use({ 'karoliskoncevicius/sacredforest-vim', as = 'sacredforest' })
+  use({ 'EdenEast/nightfox.nvim', as = 'nightfox' })
+  use({ 'rebelot/kanagawa.nvim', as = 'kanagawa'})
+  use({ 'sainnhe/sonokai', as = 'sonokai'})
+  use({ 'p00f/alabaster.nvim', as = 'alabaster'})
+
+  use 'nvim-telescope/telescope.nvim'
+  use('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'})
+  use 'nvim-treesitter/playground'
+  use 'nvim-treesitter/nvim-treesitter-context'
+  use 'nvim-lua/plenary.nvim'
+  use 'mbbill/undotree'
+  use 'theprimeagen/harpoon'
+  use 'nvim-lualine/lualine.nvim'
+  use {
+      'mfussenegger/nvim-dap', -- debugger integration
+      requires = {
+          'rcarriga/nvim-dap-ui',
+          'nvim-neotest/nvim-nio' -- dep of dap-ui
+      }
+  }
+  use 'mfussenegger/nvim-jdtls' -- Java LSP Support
+
+  use 'tpope/vim-fugitive' -- git integration
+  --LSP CONFIG
+  --
+  use {
+  'VonHeikemen/lsp-zero.nvim',
+  branch = 'v4.x',
+    requires = {
+      -- LSP Support
+      {'neovim/nvim-lspconfig'},             -- Required
+      {'williamboman/mason.nvim'},           -- Optional
+      {'williamboman/mason-lspconfig.nvim'}, -- Optional
+
+      -- Autocompletion
+      {'hrsh7th/nvim-cmp'},     -- Required
+      {'hrsh7th/cmp-buffer'},
+	  {'hrsh7th/cmp-path'},
+	  {'saadparwaiz1/cmp_luasnip'},
+      {'hrsh7th/cmp-nvim-lsp'}, -- Required
+      {'hrsh7th/cmp-nvim-lua'},
+
+      -- Snippets
+      {'L3MON4D3/LuaSnip'},     -- Required
+      {'rafamadriz/friendly-snippets'},
+    }
+  }
+
+end)
@@ -0,0 +1,123 @@
+local nnoremap = require("liamm.keymap").nnoremap
+
+nnoremap("<leader>pv", "<cmd>Ex<CR>")
+nnoremap("<leader>tv", "<cmd>ToggleTerm<CR>")
+nnoremap("<leader>tt", "<cmd>TSContextToggle<CR>")
+
+vim.keymap.set("v", "<leader>ss", ":CarbonNow<CR>", { silent = true })
+
+vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
+vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
+
+vim.keymap.set("n", "J", "mzJ`z")
+vim.keymap.set("n", "<C-d>", "<C-d>zz")
+vim.keymap.set("n", "<C-u>", "<C-u>zz")
+vim.keymap.set("n", "n", "nzzzv")
+vim.keymap.set("n", "N", "Nzzzv")
+
+vim.keymap.set("n", "<leader>y", "\"+y")
+vim.keymap.set("v", "<leader>y", "\"+y")
+vim.keymap.set("n", "<leader>Y", "\"+Y")
+
+vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", {silent = true})
+
+-- put to background 
+vim.keymap.set("n", "<leader>bg", "<C-z>")
+
+-- BUILD SCRIPT INVOKATIONS
+-- generic build function
+local function set(list)
+    local _set = {}
+    for _, l in ipairs(list) do
+        _set[l] = true
+    end
+    return _set
+end
+
+-- TODO: add support for passing flags
+function Build()
+    local out_buf = vim.api.nvim_create_buf(false, true)
+
+    local build_scripts = set(vim.fs.find({ "build.sh", "build.zig", "build.bat" }, { upward = true, type = "file", path = "." }))
+    local output = "[No Build Output]"
+
+    if build_scripts['build.zig'] then
+        vim.cmd('echo "Running build.zig"')
+        output = vim.fn.system({ 'zig', 'build' })
+    else
+        if jit.os == 'Windows' and build_scripts['build.bat'] then
+            output = vim.fn.system({ 'build', '' })
+        elseif build_scripts['build.sh'] then
+            output = vim.fn.system({ './build.sh', '' })
+        else
+        end
+    end
+    vim.api.nvim_buf_set_lines(out_buf, -1, -1, true, {"[ Build Output ]"})
+    vim.api.nvim_buf_set_lines(out_buf, -1, -1, true, vim.split(output, '\n'))
+
+    local window = vim.api.nvim_open_win(out_buf, false, {
+        split = 'right',
+        win   = 0,
+        width = math.floor(vim.o.columns * 0.35),
+        style = 'minimal',
+    })
+    vim.api.nvim_set_current_win(window)
+
+    -- Keybind to close the window on pressing Enter
+    vim.api.nvim_buf_set_keymap(out_buf, 'n', '<CR>', '', {
+        noremap = true,
+        silent = true,
+        callback = function()
+            vim.api.nvim_win_close(window, true)
+        end
+    })
+end
+
+-- TODO: add support for passing flags
+vim.keymap.set("n", "<leader>bs", ":lua Build()<CR>")
+
+-- specific build scipt options
+
+-- `build.sh` script binds
+-- non-interactive binds
+vim.keymap.set("n", "<leader>bb"  , ":!./build.sh <CR>")
+vim.keymap.set("n", "<leader>br"  , ":!./build.sh run <CR>")
+vim.keymap.set("n", "<leader>bRb" , ":!./build.sh release <CR>")
+vim.keymap.set("n", "<leader>bRr" , ":!./build.sh release run <CR>")
+vim.keymap.set("n", "<leader>bRr" , ":!./build.sh release run <CR>")
+
+-- interactive binds
+vim.keymap.set("n", "<leader>bo"  , ":!./build.sh ") -- allow for adding extra flags/options
+vim.keymap.set("n", "<leader>bor" , ":!./build.sh run") -- allow for adding extra flags/options
+vim.keymap.set("n", "<leader>bRo" , ":!./build.sh release ")
+vim.keymap.set("n", "<leader>bRor", ":!./build.sh release run ")
+
+-- `build.zig` script binds
+-- non-interactive binds
+vim.keymap.set("n", "<leader>zbb"  , ":!zig build <CR>")
+vim.keymap.set("n", "<leader>zbr"  , ":!zig build run <CR>")
+vim.keymap.set("n", "<leader>zbt"  , ":!zig build test <CR>")
+vim.keymap.set("n", "<leader>zbR"  , ":!zig build -Doptimize=ReleaseSafe <CR>")
+vim.keymap.set("n", "<leader>zbRs" , ":!zig build -Doptimize=ReleaseSmall <CR>")
+vim.keymap.set("n", "<leader>zbRf" , ":!zig build -Doptimize=ReleaseFast <CR>")
+vim.keymap.set("n", "<leader>zbRr" , ":!zig build run -Doptimize=ReleaseSafe <CR>")
+vim.keymap.set("n", "<leader>zbRsr", ":!zig build run -Doptimize=ReleaseSmall <CR>")
+vim.keymap.set("n", "<leader>zbRfr", ":!zig build run -Doptimize=ReleaseFast <CR>")
+
+-- interactive binds
+vim.keymap.set("n", "<leader>zbob"  , ":!zig build ")
+vim.keymap.set("n", "<leader>zbor"  , ":!zig build run ")
+vim.keymap.set("n", "<leader>zbot"  , ":!zig build test ")
+vim.keymap.set("n", "<leader>zboR"  , ":!zig build -Doptimize=ReleaseSafe ")
+vim.keymap.set("n", "<leader>zboRs" , ":!zig build -Doptimize=ReleaseSmall ")
+vim.keymap.set("n", "<leader>zboRf" , ":!zig build -Doptimize=ReleaseFast ")
+vim.keymap.set("n", "<leader>zboRr" , ":!zig build run -Doptimize=ReleaseSafe ")
+vim.keymap.set("n", "<leader>zboRsr", ":!zig build run -Doptimize=ReleaseSmall ")
+vim.keymap.set("n", "<leader>zboRfr", ":!zig build run -Doptimize=ReleaseFast ")
+
+-- emacs-inspired binds
+ -- all <C-w> can be done w spacebar-w
+vim.keymap.set("n", "<leader>w", "<C-w>")
+vim.keymap.set("n", "<leader>qq", ":x<CR>")
+nnoremap("<leader>.", ":find ~/")
+nnoremap("<leader>fc", ":find ~/personal/nixos/modules/old_configs/nvim/lua/liamm/remap.lua<CR>")
@@ -0,0 +1,32 @@
+vim.opt.guicursor = ""
+
+vim.opt.nu = true
+vim.opt.rnu = true
+vim.opt.tabstop = 2
+vim.opt.softtabstop = 2
+vim.opt.shiftwidth = 2
+vim.opt.expandtab = true
+vim.opt.hlsearch = false
+vim.opt.incsearch = true
+vim.opt.termguicolors = true
+vim.opt.splitright = true
+vim.opt.splitbelow = true
+
+vim.opt.updatetime = 40
+
+vim.opt.colorcolumn = ""
+
+vim.opt.smartindent = true
+
+vim.opt.wrap = true
+
+vim.opt.swapfile = false
+vim.opt.backup = false
+vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
+vim.opt.undofile = true
+
+vim.opt.scrolloff = 8
+vim.opt.updatetime = 50
+
+vim.g.netrw_keepdir = 0
+vim.g.mapleader = " "