From 0ae98568e89c7792b0433e5bb450c6706562eb71 Mon Sep 17 00:00:00 2001 From: foswret Date: Wed, 2 Jul 2025 11:16:43 -0500 Subject: first commit --- nvim/init.lua | 7 ++++ nvim/lazy-lock.json | 16 ++++++++ nvim/lua/config/lazy.lua | 34 ++++++++++++++++ nvim/lua/config/remaps.lua | 4 ++ nvim/lua/plugins/init.lua | 7 ++++ nvim/lua/plugins/lsp.lua | 91 +++++++++++++++++++++++++++++++++++++++++++ nvim/lua/plugins/obsidian.lua | 43 ++++++++++++++++++++ nvim/lua/plugins/theme.lua | 3 ++ nvim/lua/plugins/tmux.lua | 18 +++++++++ scripts/battery.sh | 22 +++++++++++ 10 files changed, 245 insertions(+) create mode 100644 nvim/init.lua create mode 100644 nvim/lazy-lock.json create mode 100644 nvim/lua/config/lazy.lua create mode 100644 nvim/lua/config/remaps.lua create mode 100644 nvim/lua/plugins/init.lua create mode 100644 nvim/lua/plugins/lsp.lua create mode 100644 nvim/lua/plugins/obsidian.lua create mode 100644 nvim/lua/plugins/theme.lua create mode 100644 nvim/lua/plugins/tmux.lua create mode 100755 scripts/battery.sh diff --git a/nvim/init.lua b/nvim/init.lua new file mode 100644 index 0000000..9bb2e0b --- /dev/null +++ b/nvim/init.lua @@ -0,0 +1,7 @@ +require("config.lazy") +require("config.remaps") +vim.cmd('set background=light') +vim.cmd('colorscheme flexoki-light') + +vim.cmd('set number! relativenumber!') +vim.opt.conceallevel = 1 diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json new file mode 100644 index 0000000..0d94812 --- /dev/null +++ b/nvim/lazy-lock.json @@ -0,0 +1,16 @@ +{ + "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "flexoki": { "branch": "main", "commit": "8899dab435d8c82329397ca224e63b129a21e1e6" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "be159e939543777bbfe9e1fe5389984c4570afce" }, + "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, + "neoconf.nvim": { "branch": "main", "commit": "7624a7af00082200c3c0c697fcb8fcfd239c1b14" }, + "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-lspconfig": { "branch": "master", "commit": "314b35335cc84bc2a085c84c69da955ba22da163" }, + "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" }, + "vim-tmux-navigator": { "branch": "master", "commit": "412c474e97468e7934b9c217064025ea7a69e05e" }, + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } +} diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua new file mode 100644 index 0000000..a65ee40 --- /dev/null +++ b/nvim/lua/config/lazy.lua @@ -0,0 +1,34 @@ +-- Bootstrap lazy.nvim +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +-- Make sure to setup `mapleader` and `maplocalleader` before +-- loading lazy.nvim so that mappings are correct. +-- This is also a good place to setup other settings (vim.opt) +vim.g.mapleader = " " +vim.g.maplocalleader = "\\" + +-- Setup lazy.nvim +require("lazy").setup({ + spec = { + { import = "plugins" }, + }, + -- Configure any other settings here. See the documentation for more details. + -- colorscheme that will be used when installing plugins. + install = { colorscheme = { "habamax" } }, + -- automatically check for plugin updates + checker = { enabled = true, notify = false}, +}) diff --git a/nvim/lua/config/remaps.lua b/nvim/lua/config/remaps.lua new file mode 100644 index 0000000..b49d648 --- /dev/null +++ b/nvim/lua/config/remaps.lua @@ -0,0 +1,4 @@ +vim.g.mapleader = " " +vim.keymap.set('n', '', vim.cmd.UndotreeToggle) +vim.keymap.set('n', 'pv', vim.cmd.Ex) +vim.keymap.set('n', 'r', vim.diagnostic.goto_next, opts) diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua new file mode 100644 index 0000000..71214e8 --- /dev/null +++ b/nvim/lua/plugins/init.lua @@ -0,0 +1,7 @@ +return { + "folke/neodev.nvim", + "folke/which-key.nvim", + { "folke/neoconf.nvim", cmd = "Neoconf" }, + "mbbill/undotree", +} + diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua new file mode 100644 index 0000000..40a205c --- /dev/null +++ b/nvim/lua/plugins/lsp.lua @@ -0,0 +1,91 @@ +return { + { + 'williamboman/mason.nvim', + lazy = false, + opts = {}, + }, + + -- Autocompletion + { + 'hrsh7th/nvim-cmp', + event = 'InsertEnter', + config = function() + local cmp = require('cmp') + + cmp.setup({ + sources = { + {name = 'nvim_lsp'}, + }, + mapping = cmp.mapping.preset.insert({ + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + }), + snippet = { + expand = function(args) + vim.snippet.expand(args.body) + end, + }, + }) + end + }, + + -- LSP + { + 'neovim/nvim-lspconfig', + cmd = {'LspInfo', 'LspInstall', 'LspStart'}, + event = {'BufReadPre', 'BufNewFile'}, + dependencies = { + {'hrsh7th/cmp-nvim-lsp'}, + {'williamboman/mason.nvim'}, + {'williamboman/mason-lspconfig.nvim'}, + }, + init = function() + -- Reserve a space in the gutter + -- This will avoid an annoying layout shift in the screen + vim.opt.signcolumn = 'yes' + end, + config = function() + local lsp_defaults = require('lspconfig').util.default_config + + -- Add cmp_nvim_lsp capabilities settings to lspconfig + -- This should be executed before you configure any language server + lsp_defaults.capabilities = vim.tbl_deep_extend( + 'force', + lsp_defaults.capabilities, + require('cmp_nvim_lsp').default_capabilities() + ) + + -- LspAttach is where you enable features that only work + -- if there is a language server active in the file + vim.api.nvim_create_autocmd('LspAttach', { + desc = 'LSP actions', + callback = function(event) + local opts = {buffer = event.buf} + + vim.keymap.set('n', 'K', 'lua vim.lsp.buf.hover()', opts) + vim.keymap.set('n', 'gd', 'lua vim.lsp.buf.definition()', opts) + vim.keymap.set('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) + vim.keymap.set('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) + vim.keymap.set('n', 'go', 'lua vim.lsp.buf.type_definition()', opts) + vim.keymap.set('n', 'gr', 'lua vim.lsp.buf.references()', opts) + vim.keymap.set('n', 'gs', 'lua vim.lsp.buf.signature_help()', opts) + vim.keymap.set('n', '', 'lua vim.lsp.buf.rename()', opts) + vim.keymap.set({'n', 'x'}, '', 'lua vim.lsp.buf.format({async = true})', opts) + vim.keymap.set('n', '', 'lua vim.lsp.buf.code_action()', opts) + end, + }) + + require('mason-lspconfig').setup({ + ensure_installed = {}, + handlers = { + -- this first function is the "default handler" + -- it applies to every language server without a "custom handler" + function(server_name) + require('lspconfig')[server_name].setup({}) + end, + } + }) + end + } +} diff --git a/nvim/lua/plugins/obsidian.lua b/nvim/lua/plugins/obsidian.lua new file mode 100644 index 0000000..7b95d1e --- /dev/null +++ b/nvim/lua/plugins/obsidian.lua @@ -0,0 +1,43 @@ +return { + "epwalsh/obsidian.nvim", + version = "*", -- recommended, use latest release instead of latest commit + lazy = true, + ft = "markdown", + -- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault: + -- event = { + -- -- If you want to use the home shortcut '~' here you need to call 'vim.fn.expand'. + -- -- E.g. "BufReadPre " .. vim.fn.expand "~" .. "/my-vault/*.md" + -- -- refer to `:h file-pattern` for more examples + -- "BufReadPre path/to/my-vault/*.md", + -- "BufNewFile path/to/my-vault/*.md", + -- }, + dependencies = { + -- Required. + "nvim-lua/plenary.nvim", + + -- see below for full list of optional dependencies 👇 + }, + opts = { + workspaces = { + { + name = "zettelkasten", + path = "~/zettelkasten", + }, + }, + + note_frontmatter_func = function(note) + + local out = { aliases = note.aliases, tags = note.tags } + + -- `note.metadata` contains any manually added fields in the frontmatter. + -- So here we just make sure those fields are kept in the frontmatter. + if note.metadata ~= nil and not vim.tbl_isempty(note.metadata) then + for k, v in pairs(note.metadata) do + out[k] = v + end + end + + return out + end, + }, +} diff --git a/nvim/lua/plugins/theme.lua b/nvim/lua/plugins/theme.lua new file mode 100644 index 0000000..0f491cb --- /dev/null +++ b/nvim/lua/plugins/theme.lua @@ -0,0 +1,3 @@ +return { + 'kepano/flexoki-neovim', name = 'flexoki' +} diff --git a/nvim/lua/plugins/tmux.lua b/nvim/lua/plugins/tmux.lua new file mode 100644 index 0000000..31321a6 --- /dev/null +++ b/nvim/lua/plugins/tmux.lua @@ -0,0 +1,18 @@ +return { + "christoomey/vim-tmux-navigator", + cmd = { + "TmuxNavigateLeft", + "TmuxNavigateDown", + "TmuxNavigateUp", + "TmuxNavigateRight", + "TmuxNavigatePrevious", + "TmuxNavigatorProcessList", + }, + keys = { + { "", "TmuxNavigateLeft" }, + { "", "TmuxNavigateDown" }, + { "", "TmuxNavigateUp" }, + { "", "TmuxNavigateRight" }, + { "", "TmuxNavigatePrevious" }, + }, +} diff --git a/scripts/battery.sh b/scripts/battery.sh new file mode 100755 index 0000000..3872f11 --- /dev/null +++ b/scripts/battery.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# Made for use in dwmblocks + +num_of_batteries=0 +sum_battery_totals=0 +icon_array=('󱃍' '󰁺' '󰁻' '󰁼' '󰁽' '󰁾' '󰁿' '󰂀' '󰂁' '󰂂' '󰁹') + +for BATT in /sys/class/power_supply/BAT*/capacity; do + sum_battery_totals=$((sum_battery_totals + $(cat $BATT))) + num_of_batteries=$((num_of_batteries + 1)) +done + +final_percentage=$((sum_battery_totals / num_of_batteries)) +ac_state=$(cat /sys/class/power_supply/AC/online) + +if [ $ac_state -eq 1 ] +then + echo -n " 󱐋 " +fi +echo -n "${icon_array[$((final_percentage / 10))]} " + +printf "%d%% \n" $final_percentage -- cgit v1.2.3