diff options
| -rw-r--r-- | doom/config.el | 153 | ||||
| -rw-r--r-- | doom/custom.el | 12 | ||||
| -rw-r--r-- | doom/init.el | 193 | ||||
| -rw-r--r-- | doom/packages.el | 49 | ||||
| -rw-r--r-- | nvim/init.lua | 714 | ||||
| -rw-r--r-- | nvim/lazy-lock.json | 7 |
6 files changed, 721 insertions, 407 deletions
diff --git a/doom/config.el b/doom/config.el deleted file mode 100644 index 3be5137..0000000 --- a/doom/config.el +++ /dev/null @@ -1,153 +0,0 @@ -;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- - -;; Place your private configuration here! Remember, you do not need to run 'doom -;; sync' after modifying this file! - - -;; Some functionality uses this to identify you, e.g. GPG configuration, email -;; clients, file templates and snippets. It is optional. -;; (setq user-full-name "John Doe" -;; user-mail-address "john@doe.com") - -;; Doom exposes five (optional) variables for controlling fonts in Doom: -;; -;; - `doom-font' -- the primary font to use -;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable) -;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for -;; presentations or streaming. -;; - `doom-symbol-font' -- for symbols -;; - `doom-serif-font' -- for the `fixed-pitch-serif' face -;; -;; See 'C-h v doom-font' for documentation and more examples of what they -;; accept. For example: -;; -;;(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light) -;; doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13)) -;; -;; If you or Emacs can't find your font, use 'M-x describe-font' to look them -;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to -;; refresh your font settings. If Emacs still can't find your font, it likely -;; wasn't installed correctly. Font issues are rarely Doom issues! - -;; There are two ways to load a theme. Both assume the theme is installed and -;; available. You can either set `doom-theme' or manually load a theme with the -;; `load-theme' function. This is the default: -(setq doom-theme 'doom-one) - -;; This determines the style of line numbers in effect. If set to `nil', line -;; numbers are disabled. For relative line numbers, set this to `relative'. -(setq display-line-numbers-type 'relative) - -;; If you use `org' and don't want your org files in the default location below, -;; change `org-directory'. It must be set before org loads! -(setq org-directory "~/org/") - - -;; Whenever you reconfigure a package, make sure to wrap your config in an -;; `after!' block, otherwise Doom's defaults may override your settings. E.g. -;; -;; (after! PACKAGE -;; (setq x y)) -;; -;; The exceptions to this rule: -;; -;; - Setting file/directory variables (like `org-directory') -;; - Setting variables which explicitly tell you to set them before their -;; package is loaded (see 'C-h v VARIABLE' to look up their documentation). -;; - Setting doom variables (which start with 'doom-' or '+'). -;; -;; Here are some additional functions/macros that will help you configure Doom. -;; -;; - `load!' for loading external *.el files relative to this one -;; - `use-package!' for configuring packages -;; - `after!' for running code after a package has loaded -;; - `add-load-path!' for adding directories to the `load-path', relative to -;; this file. Emacs searches the `load-path' when you load packages with -;; `require' or `use-package'. -;; - `map!' for binding new keys -;; -;; To get information about any of these functions/macros, move the cursor over -;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k'). -;; This will open documentation for it, including demos of how they are used. -;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces, -;; etc). -;; -;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how -;; they are implemented. - -(after! evil - (require 'evil-collection)) - -(after! solaire-mode - (solaire-global-mode -1)) - -(defun my/make-all-faces-transparent (&optional frame) - "Remove background color from ALL faces in terminal Emacs." - (or frame (setq frame (selected-frame))) - (unless (display-graphic-p frame) - (set-face-background 'default "unspecified-bg" frame) - (mapc (lambda (face) - (when (facep face) - (let ((bg (face-background face nil nil))) - (when (and bg (not (string= bg "unspecified-bg"))) - (set-face-background face "unspecified-bg" frame))))) - (face-list)))) - -(add-hook 'doom-load-theme-hook #'my/make-all-faces-transparent) -(add-hook 'after-make-frame-functions #'my/make-all-faces-transparent) -(add-hook 'window-setup-hook #'my/make-all-faces-transparent) -(add-hook 'server-after-make-frame-hook #'my/make-all-faces-transparent) - -(my/make-all-faces-transparent) - -(after! diff-hl - (global-diff-hl-mode +1) - (diff-hl-flydiff-mode +1) - (unless (display-graphic-p) - (diff-hl-margin-mode +1)) - (set-face-attribute 'diff-hl-insert nil :foreground "green" :background 'unspecified) - (set-face-attribute 'diff-hl-delete nil :foreground "red" :background 'unspecified) - (set-face-attribute 'diff-hl-change nil :foreground "yellow" :background 'unspecified)) -(add-hook 'after-make-frame-functions - (lambda (frame) - (unless (display-graphic-p frame) - (diff-hl-margin-mode +1)))) - -(defun my/yank-to-clipboard () - "Yank to system clipboard via Evil's + register." - - (let ((evil-this-register ?+)) - (call-interactively #'evil-yank))) - -(defun my/yank-line-to-clipboard () - "Yank current line to system clipboard via Evil's + register." - (interactive) - (let ((evil-this-register ?+)) - (call-interactively #'evil-yank-line))) - -(map! :leader - :desc "Yank to system clipboard" "y" #'my/yank-to-clipboard - :desc "Yank line to system clipboard" "Y" #'my/yank-line-to-clipboard) - -(defun my/setup-selection-face () - (unless (display-graphic-p) - (set-face-attribute 'region nil - :background "brightblack" - :foreground "white" - :extend t))) -(add-hook 'doom-load-theme-hook #'my/setup-selection-face 10) - -(after! evil-goggles - (set-face-attribute 'evil-goggles-default-face nil - :background "brightblack" - :foreground "white")) - -(setq scroll-margin 8) - -(after! which-key - (setq which-key-idle-delay 0.5)) - -(add-function :after after-focus-change-function - (lambda () - (unless (frame-focus-state) - (save-some-buffers t)))) diff --git a/doom/custom.el b/doom/custom.el deleted file mode 100644 index 78ab594..0000000 --- a/doom/custom.el +++ /dev/null @@ -1,12 +0,0 @@ -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(org-agenda-files '("~/Documents/agenda.org"))) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) diff --git a/doom/init.el b/doom/init.el deleted file mode 100644 index 7201554..0000000 --- a/doom/init.el +++ /dev/null @@ -1,193 +0,0 @@ -;;; init.el -*- lexical-binding: t; -*- - -;; This file controls what Doom modules are enabled and what order they load -;; in. Remember to run 'doom sync' after modifying it! - -;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's -;; documentation. There you'll find a link to Doom's Module Index where all -;; of our modules are listed, including what flags they support. - -;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or -;; 'C-c c k' for non-vim users) to view its documentation. This works on -;; flags as well (those symbols that start with a plus). -;; -;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its -;; directory (for easy access to its source code). - -(doom! :input - ;;bidi ; (tfel ot) thgir etirw uoy gnipleh - ;;chinese - ;;japanese - ;;layout ; auie,ctsrnm is the superior home row - - :completion - ;;company ; the ultimate code completion backend - (corfu +orderless) ; complete with cap(f), cape and a flying feather! - ;;helm ; the *other* search engine for love and life - ;;ido ; the other *other* search engine... - ;;ivy ; a search engine for love and life - vertico ; the search engine of the future - - :ui - deft ; notational velocity for Emacs - doom ; what makes DOOM look the way it does - doom-dashboard ; a nifty splash screen for Emacs - ;;doom-quit ; DOOM quit-message prompts when you quit Emacs - ;;(emoji +unicode) ; 🙂 - hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW - ;;indent-guides ; highlighted indent columns - ;;ligatures ; ligatures and symbols to make your code pretty again - ;;minimap ; show a map of the code on the side - modeline ; snazzy, Atom-inspired modeline, plus API - ;;nav-flash ; blink cursor line after big motions - ;;neotree ; a project drawer, like NERDTree for vim - ophints ; highlight the region an operation acts on - (popup +defaults) ; tame sudden yet inevitable temporary windows - ;;tabs ; a tab bar for Emacs - ;;treemacs ; a project drawer, like neotree but cooler - ;;unicode ; extended unicode support for various languages - (vc-gutter +pretty) ; vcs diff in the fringe - vi-tilde-fringe ; fringe tildes to mark beyond EOB - ;;window-select ; visually switch windows - workspaces ; tab emulation, persistence & separate workspaces - ;;zen ; distraction-free coding or writing - - :editor - (evil +everywhere); come to the dark side, we have cookies - file-templates ; auto-snippets for empty files - fold ; (nigh) universal code folding - ;;(format +onsave) ; automated prettiness - ;;god ; run Emacs commands without modifier keys - ;;lispy ; vim for lisp, for people who don't like vim - multiple-cursors ; editing in many places at once - ;;objed ; text object editing for the innocent - ;;parinfer ; turn lisp into python, sort of - ;;rotate-text ; cycle region at point between text candidates - snippets ; my elves. They type so I don't have to - ;;word-wrap ; soft wrapping with language-aware indent - - :emacs - dired ; making dired pretty [functional] - electric ; smarter, keyword-based electric-indent - ;;eww ; the internet is gross - ;;ibuffer ; interactive buffer management - undo ; persistent, smarter undo for your inevitable mistakes - vc ; version-control and Emacs, sitting in a tree - - :term - ;;eshell ; the elisp shell that works everywhere - ;;shell ; simple shell REPL for Emacs - ;;term ; basic terminal emulator for Emacs - ;;vterm ; the best terminal emulation in Emacs - - :checkers - syntax ; tasing you for every semicolon you forget - ;;(spell +flyspell) ; tasing you for misspelling mispelling - ;;grammar ; tasing grammar mistake every you make - - :tools - ;;ansible - ;;biblio ; Writes a PhD for you (citation needed) - ;;collab ; buffers with friends - ;;debugger ; FIXME stepping through code, to help you add bugs - ;;direnv - ;;docker - ;;editorconfig ; let someone else argue about tabs vs spaces - ;;ein ; tame Jupyter notebooks with emacs - (eval +overlay) ; run code, run (also, repls) - lookup ; navigate your code and its documentation - ;;lsp ; M-x vscode - magit ; a git porcelain for Emacs - ;;make ; run make tasks from Emacs - ;;pass ; password manager for nerds - ;;pdf ; pdf enhancements - ;;prodigy ; FIXME managing external services & code builders - ;;terraform ; infrastructure as code - ;;tmux ; an API for interacting with tmux - ;;tree-sitter ; syntax and parsing, sitting in a tree... - ;;upload ; map local to remote projects via ssh/ftp - - :os - (:if (featurep :system 'macos) macos) ; improve compatibility with macOS - ;;tty ; improve the terminal Emacs experience - - :lang - ;;agda ; types of types of types of types... - ;;beancount ; mind the GAAP - (cc +lsp) ; C > C++ == 1 - ;;clojure ; java with a lisp - ;;common-lisp ; if you've seen one lisp, you've seen them all - ;;coq ; proofs-as-programs - ;;crystal ; ruby at the speed of c - csharp ; unity, .NET, and mono shenanigans - ;;data ; config/data formats - ;;(dart +flutter) ; paint ui and not much else - ;;dhall - ;;elixir ; erlang done right - ;;elm ; care for a cup of TEA? - emacs-lisp ; drown in parentheses - ;;erlang ; an elegant language for a more civilized age - ;;ess ; emacs speaks statistics - ;;factor - ;;faust ; dsp, but you get to keep your soul - ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) - ;;fsharp ; ML stands for Microsoft's Language - ;;fstar ; (dependent) types and (monadic) effects and Z3 - ;;gdscript ; the language you waited for - ;;(go +lsp) ; the hipster dialect - ;;(graphql +lsp) ; Give queries a REST - ;;(haskell +lsp) ; a language that's lazier than I am - ;;hy ; readability of scheme w/ speed of python - ;;idris ; a language you can depend on - ;;json ; At least it ain't XML - ;;(java +lsp) ; the poster child for carpal tunnel syndrome - javascript ; all(hope(abandon(ye(who(enter(here)))))) - julia ; a better, faster MATLAB - ;;kotlin ; a better, slicker Java(Script) - latex ; writing papers in Emacs has never been so fun - ;;lean ; for folks with too much to prove - ;;ledger ; be audit you can be - lua ; one-based indices? one-based indices - markdown ; writing docs for people to ignore - ;;nim ; python + lisp at the speed of c - ;;nix ; I hereby declare "nix geht mehr!" - ;;ocaml ; an objective camel - (org +roam) ; organize your plain life in plain text - ;;php ; perl's insecure younger brother - ;;plantuml ; diagrams for confusing people more - ;;graphviz ; diagrams for confusing yourself even more - ;;purescript ; javascript, but functional - python ; beautiful is better than ugly - qt ; the 'cutest' gui framework ever - ;;racket ; a DSL for DSLs - ;;raku ; the artist formerly known as perl6 - ;;rest ; Emacs as a REST client - ;;rst ; ReST in peace - ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - ;;(rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() - ;;scala ; java, but good - ;;(scheme +guile) ; a fully conniving family of lisps - sh ; she sells {ba,z,fi}sh shells on the C xor - ;;sml - ;;solidity ; do you need a blockchain? No. - ;;swift ; who asked for emoji variables? - ;;terra ; Earth and Moon in alignment for performance. - ;;web ; the tubes - ;;yaml ; JSON, but readable - ;;zig ; C, but simpler - - :email - ;;(mu4e +org +gmail) -;;notmuch - ;;(wanderlust +gmail) - - :app - calendar - ;;emms - ;;everywhere ; *leave* Emacs!? You must be joking - ;;irc ; how neckbeards socialize - ;;(rss +org) ; emacs as an RSS reader - - :config - literate - (default +bindings +smartparens)) diff --git a/doom/packages.el b/doom/packages.el deleted file mode 100644 index b3322c7..0000000 --- a/doom/packages.el +++ /dev/null @@ -1,49 +0,0 @@ -;; -*- no-byte-compile: t; -*- -;;; $DOOMDIR/packages.el - -;; To install a package with Doom you must declare them here and run 'doom sync' -;; on the command line, then restart Emacs for the changes to take effect -- or - - -;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: -;; (package! some-package) - -;; To install a package directly from a remote git repo, you must specify a -;; `:recipe'. You'll find documentation on what `:recipe' accepts here: -;; https://github.com/radian-software/straight.el#the-recipe-format -;; (package! another-package -;; :recipe (:host github :repo "username/repo")) - -;; If the package you are trying to install does not contain a PACKAGENAME.el -;; file, or is located in a subdirectory of the repo, you'll need to specify -;; `:files' in the `:recipe': -;; (package! this-package -;; :recipe (:host github :repo "username/repo" -;; :files ("some-file.el" "src/lisp/*.el"))) - -;; If you'd like to disable a package included with Doom, you can do so here -;; with the `:disable' property: -;; (package! builtin-package :disable t) - -;; You can override the recipe of a built in package without having to specify -;; all the properties for `:recipe'. These will inherit the rest of its recipe -;; from Doom or MELPA/ELPA/Emacsmirror: -;; (package! builtin-package :recipe (:nonrecursive t)) -;; (package! builtin-package-2 :recipe (:repo "myfork/package")) - -;; Specify a `:branch' to install a package from a particular branch or tag. -;; This is required for some packages whose default branch isn't 'master' (which -;; our package manager can't deal with; see radian-software/straight.el#279) -;; (package! builtin-package :recipe (:branch "develop")) - -;; Use `:pin' to specify a particular commit to install. -;; (package! builtin-package :pin "1a2b3c4d5e") - - -;; Doom's packages are pinned to a specific commit and updated from release to -;; release. The `unpin!' macro allows you to unpin single packages... -;; (unpin! pinned-package) -;; ...or multiple packages -;; (unpin! pinned-package another-pinned-package) -;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) -;; (unpin! t) diff --git a/nvim/init.lua b/nvim/init.lua new file mode 100644 index 0000000..9c60d58 --- /dev/null +++ b/nvim/init.lua @@ -0,0 +1,714 @@ +-- Plugins +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", "clone", "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + +require("lazy").setup({ + { + 'nvim-telescope/telescope.nvim', + dependencies = { + 'nvim-lua/plenary.nvim', + { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' }, + }, + keys = { + { '<leader>ff', '<cmd>Telescope find_files<cr>' }, + { '<leader>fg', '<cmd>Telescope live_grep<cr>' }, + { '<leader>fb', '<cmd>Telescope buffers<cr>' }, + }, + }, + { + 'lewis6991/gitsigns.nvim', + event = { 'BufReadPre', 'BufNewFile' }, + opts = { + signs = { + add = { text = '+' }, + change = { text = '~' }, + delete = { text = '_' }, + topdelete = { text = '-' }, + changedelete = { text = '~' }, + }, + }, + }, +}) + +-- theme & transparency +vim.cmd.colorscheme("unokai") +vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) +vim.api.nvim_set_hl(0, "NormalNC", { bg = "none" }) +vim.api.nvim_set_hl(0, "EndOfBuffer", { bg = "none" }) + +-- Basic settings +vim.opt.number = true -- Line numbers +vim.opt.relativenumber = true -- Relative line numbers +vim.opt.cursorline = true -- Highlight current line +vim.opt.wrap = false -- Don't wrap lines +vim.opt.scrolloff = 10 -- Keep 10 lines above/below cursor +vim.opt.list = true -- Enable list mode for overflow indicators +vim.opt.listchars = { extends = '…', precedes = '…', tab = ' ' } +vim.opt.sidescrolloff = 1 -- Keep 1 column for the overflow indicator + +-- Indentation +vim.opt.tabstop = 2 -- Tab width +vim.opt.shiftwidth = 2 -- Indent width +vim.opt.softtabstop = 2 -- Soft tab stop +vim.opt.expandtab = true -- Use spaces instead of tabs +vim.opt.smartindent = true -- Smart auto-indenting +vim.opt.autoindent = true -- Copy indent from current line + +-- Search settings +vim.opt.ignorecase = true -- Case insensitive search +vim.opt.smartcase = true -- Case sensitive if uppercase in search +vim.opt.hlsearch = true -- Highlight search results +vim.opt.incsearch = true -- Show matches as you type + +-- Visual settings +vim.opt.termguicolors = true -- Enable 24-bit colors +vim.opt.signcolumn = "yes" -- Always show sign column +vim.opt.colorcolumn = "100" -- Show column at 100 characters +vim.opt.showmatch = true -- Highlight matching brackets +vim.opt.matchtime = 2 -- How long to show matching bracket +vim.opt.cmdheight = 1 -- Command line height +vim.opt.completeopt = "menuone,noinsert,noselect" -- Completion options +vim.opt.showmode = false -- Don't show mode in command line +vim.opt.pumheight = 10 -- Popup menu height +vim.opt.pumblend = 10 -- Popup menu transparency +vim.opt.winblend = 0 -- Floating window transparency +vim.opt.conceallevel = 0 -- Don't hide markup +vim.opt.concealcursor = "" -- Don't hide cursor line markup +vim.opt.lazyredraw = true -- Don't redraw during macros +vim.opt.synmaxcol = 300 -- Syntax highlighting limit + +-- File handling +vim.opt.backup = false -- Don't create backup files +vim.opt.writebackup = false -- Don't create backup before writing +vim.opt.swapfile = false -- Don't create swap files +vim.opt.undofile = true -- Persistent undo +vim.opt.undodir = vim.fn.expand("~/.vim/undodir") -- Undo directory +vim.opt.updatetime = 300 -- Faster completion +vim.opt.timeoutlen = 500 -- Key timeout duration +vim.opt.ttimeoutlen = 0 -- Key code timeout +vim.opt.autoread = true -- Auto reload files changed outside vim +vim.opt.autowrite = false -- Don't auto save + +-- Behavior settings +vim.opt.hidden = true -- Allow hidden buffers +vim.opt.errorbells = false -- No error bells +vim.opt.backspace = "indent,eol,start" -- Better backspace behavior +vim.opt.autochdir = false -- Don't auto change directory +vim.opt.iskeyword:append("-") -- Treat dash as part of word +vim.opt.path:append("**") -- include subdirectories in search +vim.opt.selection = "exclusive" -- Selection behavior +vim.opt.mouse = "a" -- Enable mouse support +vim.opt.clipboard:append("unnamedplus") -- Use system clipboard +vim.opt.modifiable = true -- Allow buffer modifications +vim.opt.encoding = "UTF-8" -- Set encoding + +-- Cursor settings +vim.opt.guicursor = "n-v-c:block,i-ci-ve:block,r-cr:hor20,o:hor50,a:blinkwait700-blinkoff400-blinkon250-Cursor/lCursor,sm:block-blinkwait175-blinkoff150-blinkon175" + +-- Split behavior +vim.opt.splitbelow = true -- Horizontal splits go below +vim.opt.splitright = true -- Vertical splits go right + +-- Normal mode mappings +vim.keymap.set("n", "<leader>c", ":nohlsearch<CR>", { desc = "Clear search highlights" }) + +-- Center screen when jumping +vim.keymap.set("n", "n", "nzzzv", { desc = "Next search result (centered)" }) +vim.keymap.set("n", "N", "Nzzzv", { desc = "Previous search result (centered)" }) +vim.keymap.set("n", "<C-d>", "<C-d>zz", { desc = "Half page down (centered)" }) +vim.keymap.set("n", "<C-u>", "<C-u>zz", { desc = "Half page up (centered)" }) + +-- Delete without yanking +vim.keymap.set({ "n", "v" }, "<leader>d", '"_d', { desc = "Delete without yanking" }) + +-- Buffer navigation +vim.keymap.set("n", "<leader>bn", ":bnext<CR>", { desc = "Next buffer" }) +vim.keymap.set("n", "<leader>bp", ":bprevious<CR>", { desc = "Previous buffer" }) + +-- Better window navigation +vim.keymap.set("n", "<C-h>", "<C-w>h", { desc = "Move to left window" }) +vim.keymap.set("n", "<C-j>", "<C-w>j", { desc = "Move to bottom window" }) +vim.keymap.set("n", "<C-k>", "<C-w>k", { desc = "Move to top window" }) +vim.keymap.set("n", "<C-l>", "<C-w>l", { desc = "Move to right window" }) + +-- Splitting & Resizing +vim.keymap.set("n", "<leader>sv", ":vsplit<CR>", { desc = "Split window vertically" }) +vim.keymap.set("n", "<leader>sh", ":split<CR>", { desc = "Split window horizontally" }) +vim.keymap.set("n", "<C-Up>", ":resize +2<CR>", { desc = "Increase window height" }) +vim.keymap.set("n", "<C-Down>", ":resize -2<CR>", { desc = "Decrease window height" }) +vim.keymap.set("n", "<C-Left>", ":vertical resize -2<CR>", { desc = "Decrease window width" }) +vim.keymap.set("n", "<C-Right>", ":vertical resize +2<CR>", { desc = "Increase window width" }) + +-- Move lines up/down +vim.keymap.set("n", "<A-j>", ":m .+1<CR>==", { desc = "Move line down" }) +vim.keymap.set("n", "<A-k>", ":m .-2<CR>==", { desc = "Move line up" }) +vim.keymap.set("v", "<A-j>", ":m '>+1<CR>gv=gv", { desc = "Move selection down" }) +vim.keymap.set("v", "<A-k>", ":m '<-2<CR>gv=gv", { desc = "Move selection up" }) + +-- Better indenting in visual mode +vim.keymap.set("v", "<", "<gv", { desc = "Indent left and reselect" }) +vim.keymap.set("v", ">", ">gv", { desc = "Indent right and reselect" }) + +-- Quick file navigation +vim.keymap.set("n", "<leader>e", ":Explore<CR>", { desc = "Open file explorer" }) +vim.keymap.set("n", "<leader>ff", ":find ", { desc = "Find file" }) + +-- Better J behavior +vim.keymap.set("n", "J", "mzJ`z", { desc = "Join lines and keep cursor position" }) + +-- Quick config editing +vim.keymap.set("n", "<leader>rc", ":e ~/.config/nvim/init.lua<CR>", { desc = "Edit config" }) + +-- ============================================================================ +-- USEFUL FUNCTIONS +-- ============================================================================ + +-- Copy Full File-Path +vim.keymap.set("n", "<leader>pa", function() + local path = vim.fn.expand("%:p") + vim.fn.setreg("+", path) + print("file:", path) +end) + +-- Basic autocommands +local augroup = vim.api.nvim_create_augroup("UserConfig", {}) + +-- Highlight yanked text +vim.api.nvim_create_autocmd("TextYankPost", { + group = augroup, + callback = function() + vim.highlight.on_yank() + end, +}) + +-- Return to last edit position when opening files +vim.api.nvim_create_autocmd("BufReadPost", { + group = augroup, + callback = function() + local mark = vim.api.nvim_buf_get_mark(0, '"') + local lcount = vim.api.nvim_buf_line_count(0) + if mark[1] > 0 and mark[1] <= lcount then + pcall(vim.api.nvim_win_set_cursor, 0, mark) + end + end, +}) + +-- Set filetype-specific settings +vim.api.nvim_create_autocmd("FileType", { + group = augroup, + pattern = { "lua", "python" }, + callback = function() + vim.opt_local.tabstop = 4 + vim.opt_local.shiftwidth = 4 + end, +}) + +vim.api.nvim_create_autocmd("FileType", { + group = augroup, + pattern = { "javascript", "typescript", "json", "html", "css" }, + callback = function() + vim.opt_local.tabstop = 2 + vim.opt_local.shiftwidth = 2 + end, +}) + +-- Auto-close terminal when process exits +vim.api.nvim_create_autocmd("TermClose", { + group = augroup, + callback = function() + if vim.v.event.status == 0 then + vim.api.nvim_buf_delete(0, {}) + end + end, +}) + +-- Disable line numbers in terminal +vim.api.nvim_create_autocmd("TermOpen", { + group = augroup, + callback = function() + vim.opt_local.number = false + vim.opt_local.relativenumber = false + vim.opt_local.signcolumn = "no" + end, +}) + +-- Auto-resize splits when window is resized +vim.api.nvim_create_autocmd("VimResized", { + group = augroup, + callback = function() + vim.cmd("tabdo wincmd =") + end, +}) + +-- Create directories when saving files +vim.api.nvim_create_autocmd("BufWritePre", { + group = augroup, + callback = function() + local dir = vim.fn.expand('<afile>:p:h') + if vim.fn.isdirectory(dir) == 0 then + vim.fn.mkdir(dir, 'p') + end + end, +}) + +-- Command-line completion +vim.opt.wildmenu = true +vim.opt.wildmode = "longest:full,full" +vim.opt.wildignore:append({ "*.o", "*.obj", "*.pyc", "*.class", "*.jar" }) + +-- Better diff options +vim.opt.diffopt:append("linematch:60") + +-- Performance improvements +vim.opt.redrawtime = 10000 +vim.opt.maxmempattern = 20000 + +-- Create undo directory if it doesn't exist +local undodir = vim.fn.expand("~/.vim/undodir") +if vim.fn.isdirectory(undodir) == 0 then + vim.fn.mkdir(undodir, "p") +end + +-- ============================================================================ +-- FLOATING TERMINAL +-- ============================================================================ + +-- terminal +local terminal_state = { + buf = nil, + win = nil, + is_open = false +} + +local function FloatingTerminal() + -- If terminal is already open, close it (toggle behavior) + if terminal_state.is_open and vim.api.nvim_win_is_valid(terminal_state.win) then + vim.api.nvim_win_close(terminal_state.win, false) + terminal_state.is_open = false + return + end + + -- Create buffer if it doesn't exist or is invalid + if not terminal_state.buf or not vim.api.nvim_buf_is_valid(terminal_state.buf) then + terminal_state.buf = vim.api.nvim_create_buf(false, true) + -- Set buffer options for better terminal experience + vim.api.nvim_buf_set_option(terminal_state.buf, 'bufhidden', 'hide') + end + + -- Calculate window dimensions + local width = math.floor(vim.o.columns * 0.8) + local height = math.floor(vim.o.lines * 0.8) + local row = math.floor((vim.o.lines - height) / 2) + local col = math.floor((vim.o.columns - width) / 2) + + -- Create the floating window + terminal_state.win = vim.api.nvim_open_win(terminal_state.buf, true, { + relative = 'editor', + width = width, + height = height, + row = row, + col = col, + style = 'minimal', + border = 'rounded', + }) + + -- Set transparency for the floating window + vim.api.nvim_win_set_option(terminal_state.win, 'winblend', 0) + + -- Set transparent background for the window + vim.api.nvim_win_set_option(terminal_state.win, 'winhighlight', + 'Normal:FloatingTermNormal,FloatBorder:FloatingTermBorder') + + -- Define highlight groups for transparency + vim.api.nvim_set_hl(0, "FloatingTermNormal", { bg = "none" }) + vim.api.nvim_set_hl(0, "FloatingTermBorder", { bg = "none", }) + + -- Start terminal if not already running + local has_terminal = false + local lines = vim.api.nvim_buf_get_lines(terminal_state.buf, 0, -1, false) + for _, line in ipairs(lines) do + if line ~= "" then + has_terminal = true + break + end + end + + if not has_terminal then + vim.fn.termopen(os.getenv("SHELL")) + end + + terminal_state.is_open = true + vim.cmd("startinsert") + + -- Set up auto-close on buffer leave + vim.api.nvim_create_autocmd("BufLeave", { + buffer = terminal_state.buf, + callback = function() + if terminal_state.is_open and vim.api.nvim_win_is_valid(terminal_state.win) then + vim.api.nvim_win_close(terminal_state.win, false) + terminal_state.is_open = false + end + end, + once = true + }) +end + +-- Function to explicitly close the terminal +local function CloseFloatingTerminal() + if terminal_state.is_open and vim.api.nvim_win_is_valid(terminal_state.win) then + vim.api.nvim_win_close(terminal_state.win, false) + terminal_state.is_open = false + end +end + +-- Key mappings +vim.keymap.set("n", "<leader>t", FloatingTerminal, { noremap = true, silent = true, desc = "Toggle floating terminal" }) +vim.keymap.set("t", "<Esc>", function() + if terminal_state.is_open then + vim.api.nvim_win_close(terminal_state.win, false) + terminal_state.is_open = false + end +end, { noremap = true, silent = true, desc = "Close floating terminal from terminal mode" }) + + +-- ============================================================================ +-- TABS +-- ============================================================================ + +-- Tab display settings +vim.opt.showtabline = 1 -- Always show tabline (0=never, 1=when multiple tabs, 2=always) +vim.opt.tabline = '' -- Use default tabline (empty string uses built-in) + +-- Transparent tabline appearance +vim.cmd([[ + hi TabLineFill guibg=NONE ctermfg=242 ctermbg=NONE +]]) + +-- Alternative navigation (more intuitive) +vim.keymap.set('n', '<leader>tn', ':tabnew<CR>', { desc = 'New tab' }) +vim.keymap.set('n', '<leader>tx', ':tabclose<CR>', { desc = 'Close tab' }) + +-- Tab moving +vim.keymap.set('n', '<leader>tm', ':tabmove<CR>', { desc = 'Move tab' }) +vim.keymap.set('n', '<leader>t>', ':tabmove +1<CR>', { desc = 'Move tab right' }) +vim.keymap.set('n', '<leader>t<', ':tabmove -1<CR>', { desc = 'Move tab left' }) + +-- Function to open file in new tab +local function open_file_in_tab() + vim.ui.input({ prompt = 'File to open in new tab: ', completion = 'file' }, function(input) + if input and input ~= '' then + vim.cmd('tabnew ' .. input) + end + end) +end + +-- Function to duplicate current tab +local function duplicate_tab() + local current_file = vim.fn.expand('%:p') + if current_file ~= '' then + vim.cmd('tabnew ' .. current_file) + else + vim.cmd('tabnew') + end +end + +-- Function to close tabs to the right +local function close_tabs_right() + local current_tab = vim.fn.tabpagenr() + local last_tab = vim.fn.tabpagenr('$') + + for i = last_tab, current_tab + 1, -1 do + vim.cmd(i .. 'tabclose') + end +end + +-- Function to close tabs to the left +local function close_tabs_left() + local current_tab = vim.fn.tabpagenr() + + for i = current_tab - 1, 1, -1 do + vim.cmd('1tabclose') + end +end + +-- Enhanced keybindings +vim.keymap.set('n', '<leader>tO', open_file_in_tab, { desc = 'Open file in new tab' }) +vim.keymap.set('n', '<leader>td', duplicate_tab, { desc = 'Duplicate current tab' }) +vim.keymap.set('n', '<leader>tr', close_tabs_right, { desc = 'Close tabs to the right' }) +vim.keymap.set('n', '<leader>tL', close_tabs_left, { desc = 'Close tabs to the left' }) + +-- Function to close buffer but keep tab if it's the only buffer in tab +local function smart_close_buffer() + local buffers_in_tab = #vim.fn.tabpagebuflist() + if buffers_in_tab > 1 then + vim.cmd('bdelete') + else + -- If it's the only buffer in tab, close the tab + vim.cmd('tabclose') + end +end +vim.keymap.set('n', '<leader>bd', smart_close_buffer, { desc = 'Smart close buffer/tab' }) + +-- ============================================================================ +-- STATUSLINE +-- ============================================================================ + +local function statusline_mode() + local modes = { + n = "NORMAL", i = "INSERT", v = "VISUAL", V = "V-LINE", + ["\22"] = "V-BLOCK", c = "COMMAND", R = "REPLACE", t = "TERMINAL", + } + return modes[vim.fn.mode()] or vim.fn.mode():upper() +end + +local function statusline_branch() + local branch = vim.b.gitsigns_head + if branch and branch ~= "" then return " " .. branch end + return "" +end + +_G.statusline_mode = statusline_mode +_G.statusline_branch = statusline_branch + +vim.api.nvim_set_hl(0, "StatusLineBold", { bold = true }) + +vim.api.nvim_create_autocmd({"WinEnter", "BufEnter"}, { + callback = function() + vim.opt_local.statusline = + " %#StatusLineBold#%{v:lua.statusline_mode()}%#StatusLine#" .. + " %f%m%r%{v:lua.statusline_branch()}" .. + "%=" .. + "%y %l:%c %P " + end +}) + +vim.api.nvim_create_autocmd({"WinLeave", "BufLeave"}, { + callback = function() + vim.opt_local.statusline = " %f%m%r%= %l:%c %P " + end +}) + +-- ============================================================================ +-- LSP +-- ============================================================================ + +-- Function to find project root +local function find_root(patterns) + local path = vim.fn.expand('%:p:h') + local root = vim.fs.find(patterns, { path = path, upward = true })[1] + return root and vim.fn.fnamemodify(root, ':h') or path +end + +-- Shell LSP setup +local function setup_shell_lsp() + vim.lsp.start({ + name = 'bashls', + cmd = {'bash-language-server', 'start'}, + filetypes = {'sh', 'bash', 'zsh'}, + root_dir = find_root({'.git', 'Makefile'}), + settings = { + bashIde = { + globPattern = "*@(.sh|.inc|.bash|.command)" + } + } + }) +end + +-- Python LSP setup +local function setup_python_lsp() + vim.lsp.start({ + name = 'pylsp', + cmd = {'pylsp'}, + filetypes = {'python'}, + root_dir = find_root({'pyproject.toml', 'setup.py', 'setup.cfg', 'requirements.txt', '.git'}), + settings = { + pylsp = { + plugins = { + pycodestyle = { + enabled = false + }, + flake8 = { + enabled = true, + }, + black = { + enabled = true + } + } + } + } + }) +end + +-- C/C++ LSP setup (clangd) +local function setup_clangd() + vim.lsp.start({ + name = 'clangd', + cmd = {'clangd', '--background-index'}, + root_dir = find_root({'compile_commands.json', 'CMakeLists.txt', 'Makefile', '.git'}), + }) +end + +-- Rust LSP setup (rust-analyzer) +local function setup_rust_analyzer() + vim.lsp.start({ + name = 'rust-analyzer', + cmd = {'rust-analyzer'}, + root_dir = find_root({'Cargo.toml', '.git'}), + settings = { + ['rust-analyzer'] = { + check = { command = 'clippy' }, + } + } + }) +end + +-- Auto-start LSPs based on filetype +vim.api.nvim_create_autocmd('FileType', { + pattern = 'sh,bash,zsh', + callback = setup_shell_lsp, + desc = 'Start shell LSP' +}) + +vim.api.nvim_create_autocmd('FileType', { + pattern = 'python', + callback = setup_python_lsp, + desc = 'Start Python LSP' +}) + +vim.api.nvim_create_autocmd('FileType', { + pattern = 'c,cpp', + callback = setup_clangd, + desc = 'Start clangd LSP' +}) + +vim.api.nvim_create_autocmd('FileType', { + pattern = 'rust', + callback = setup_rust_analyzer, + desc = 'Start rust-analyzer LSP' +}) + +-- formatting +local function format_code() + local bufnr = vim.api.nvim_get_current_buf() + local filename = vim.api.nvim_buf_get_name(bufnr) + local filetype = vim.bo[bufnr].filetype + + -- Save cursor position + local cursor_pos = vim.api.nvim_win_get_cursor(0) + + if filetype == 'python' or filename:match('%.py$') then + if filename == '' then + print("Save the file first before formatting Python") + return + end + + local black_cmd = "black --quiet " .. vim.fn.shellescape(filename) + local black_result = vim.fn.system(black_cmd) + + if vim.v.shell_error == 0 then + vim.cmd('checktime') + vim.api.nvim_win_set_cursor(0, cursor_pos) + print("Formatted with black") + return + else + print("No Python formatter available (install black)") + return + end + end + + if filetype == 'sh' or filetype == 'bash' or filename:match('%.sh$') then + local lines = vim.api.nvim_buf_get_lines(bufnr, 0, -1, false) + local content = table.concat(lines, '\n') + + local cmd = {'shfmt', '-i', '2', '-ci', '-sr'} -- 2 spaces, case indent, space redirects + local result = vim.fn.system(cmd, content) + + if vim.v.shell_error == 0 then + local formatted_lines = vim.split(result, '\n') + if formatted_lines[#formatted_lines] == '' then + table.remove(formatted_lines) + end + vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, formatted_lines) + vim.api.nvim_win_set_cursor(0, cursor_pos) + print("Shell script formatted with shfmt") + return + else + print("shfmt error: " .. result) + return + end + end + + print("No formatter available for " .. filetype) +end + +vim.api.nvim_create_user_command("FormatCode", format_code, { + desc = "Format current file" +}) + +vim.keymap.set('n', '<leader>fm', format_code, { desc = 'Format file' }) + +-- LSP keymaps +vim.api.nvim_create_autocmd('LspAttach', { + callback = function(event) + local opts = {buffer = event.buf} + + -- Navigation + vim.keymap.set('n', 'gD', vim.lsp.buf.definition, opts) + vim.keymap.set('n', 'gs', vim.lsp.buf.declaration, opts) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts) + + -- Information + vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts) + vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts) + + -- Code actions + vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, opts) + vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts) + + -- Diagnostics + vim.keymap.set('n', '<leader>nd', vim.diagnostic.goto_next, opts) + vim.keymap.set('n', '<leader>pd', vim.diagnostic.goto_prev, opts) + vim.keymap.set('n', '<leader>d', vim.diagnostic.open_float, opts) + vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, opts) + end, +}) + +-- Better LSP UI +vim.diagnostic.config({ + virtual_text = { prefix = '●' }, + signs = true, + underline = true, + update_in_insert = false, + severity_sort = true, +}) + +vim.diagnostic.config({ + signs = { + text = { + [vim.diagnostic.severity.ERROR] = "✗", + [vim.diagnostic.severity.WARN] = "⚠", + [vim.diagnostic.severity.INFO] = "ℹ", + [vim.diagnostic.severity.HINT] = "💡", + } + } +}) + +vim.api.nvim_create_user_command('LspInfo', function() + local clients = vim.lsp.get_clients({ bufnr = 0 }) + if #clients == 0 then + print("No LSP clients attached to current buffer") + else + for _, client in ipairs(clients) do + print("LSP: " .. client.name .. " (ID: " .. client.id .. ")") + end + end +end, { desc = 'Show LSP client info' }) + diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json new file mode 100644 index 0000000..b3fa85b --- /dev/null +++ b/nvim/lazy-lock.json @@ -0,0 +1,7 @@ +{ + "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" }, + "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, + "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" } +} |