Font consistency

6 files changed, 473 insertions, 236 deletions

diff --git a/doom/config.el b/doom/config.el
new file mode 100644
index 0000000..1413521
--- /dev/null
+++ b/doom/config.el
@@ -0,0 +1,228 @@
+;;; $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/")
+
+;; Keep terminal and editor typography aligned and ensure Nerd Font glyphs render.
+(setq doom-font (font-spec :family "JetBrainsMono Nerd Font Mono" :size 15)
+      doom-variable-pitch-font (font-spec :family "JetBrainsMono Nerd Font" :size 15)
+      doom-symbol-font (font-spec :family "JetBrainsMono Nerd Font Mono" :size 15))
+
+(defun my/setup-icon-font-fallback (&optional frame)
+  "Ensure Nerd Font glyphs are available in FRAME."
+  (with-selected-frame (or frame (selected-frame))
+    (when (display-graphic-p)
+      (set-fontset-font t 'unicode "JetBrainsMono Nerd Font Mono" nil 'append))))
+
+(add-hook 'after-make-frame-functions #'my/setup-icon-font-fallback)
+(my/setup-icon-font-fallback)
+
+
+;; 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))
+
+(defvar my/gui-transparency 85
+  "Alpha background value for GUI frames (0-100).")
+
+(defun my/make-all-faces-transparent (&optional frame)
+  "Make face backgrounds transparent in both terminal and GUI Emacs."
+  (or frame (setq frame (selected-frame)))
+  (if (display-graphic-p frame)
+      ;; GUI: prefer alpha-background; keep alpha as macOS-compatible fallback.
+      (progn
+        (set-frame-parameter frame 'alpha-background my/gui-transparency)
+        (set-frame-parameter frame 'alpha
+                             (cons my/gui-transparency my/gui-transparency)))
+    ;; TTY: use terminal background (lets terminal emulator transparency show through).
+    (progn
+      (set-face-background 'default "unspecified-bg" frame)
+      (mapc (lambda (face)
+              (when (facep face)
+                (let ((bg (face-background face nil nil)))
+                  (when (and bg (not (equal 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)
+
+(add-to-list 'default-frame-alist `(alpha-background . ,my/gui-transparency))
+(add-to-list 'default-frame-alist `(alpha . (,my/gui-transparency . ,my/gui-transparency)))
+
+(my/make-all-faces-transparent)
+
+(after! diff-hl
+  (defun my/setup-diff-hl-faces ()
+    (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))
+  (my/setup-diff-hl-faces)
+  (add-hook 'doom-load-theme-hook #'my/setup-diff-hl-faces 20)
+
+  (defun my/diff-hl-hunk-text (ov)
+    "Return the diff hunk text for overlay OV."
+    (save-excursion
+      (goto-char (overlay-start ov))
+      (let* ((line (line-number-at-pos))
+             (file (buffer-file-name))
+             (diff (when file
+                     (shell-command-to-string
+                      (format "git diff -U0 -- %s" (shell-quote-argument file))))))
+        (when (and diff (string-match
+                         (format "@@ [^ ]+ \\+\\([0-9]+\\)[, ].*@@\\([^@]*\\)" )
+                         diff))
+          (let ((result nil))
+            (with-temp-buffer
+              (insert diff)
+              (goto-char (point-min))
+              (while (re-search-forward "^@@ -\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)? \\+\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)? @@.*$" nil t)
+                (let* ((new-start (string-to-number (match-string 3)))
+                       (new-count (if (match-string 4) (string-to-number (match-string 4)) 1))
+                       (hunk-start (match-beginning 0))
+                       (hunk-end (or (save-excursion
+                                       (when (re-search-forward "^@@ " nil t)
+                                         (match-beginning 0)))
+                                     (point-max))))
+                  (when (and (>= line new-start)
+                             (< line (+ new-start (max new-count 1))))
+                    (setq result (buffer-substring-no-properties hunk-start hunk-end))))))
+            result)))))
+
+  (defun my/diff-hl-add-tooltips (&rest _)
+    "Add help-echo tooltips to diff-hl overlays."
+    (dolist (ov (overlays-in (point-min) (point-max)))
+      (when (overlay-get ov 'diff-hl)
+        (overlay-put ov 'help-echo
+                     (lambda (_win ov _pos)
+                       (my/diff-hl-hunk-text ov))))))
+
+  (advice-add 'diff-hl-update :after #'my/diff-hl-add-tooltips))
+
+(after! (diff-hl magit)
+  (add-hook 'magit-pre-refresh-hook  #'diff-hl-magit-pre-refresh)
+  (add-hook 'magit-post-refresh-hook #'diff-hl-magit-post-refresh))
+
+(defun my/diff-hl-margin-setup (frame)
+  (with-selected-frame frame
+    (if (display-graphic-p)
+        (diff-hl-margin-mode -1)
+      (diff-hl-margin-mode +1))))
+(add-hook 'after-make-frame-functions #'my/diff-hl-margin-setup)
+(when (daemonp)
+  (add-hook 'server-after-make-frame-hook
+            (lambda () (my/diff-hl-margin-setup (selected-frame)))))
+
+(defun my/yank-to-clipboard ()
+  "Yank to system clipboard via Evil's + register."
+  (interactive)
+  (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/init.el b/doom/init.el
new file mode 100644
index 0000000..4465f3d
--- /dev/null
+++ b/doom/init.el
@@ -0,0 +1,193 @@
+;;; 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
new file mode 100644
index 0000000..b3322c7
--- /dev/null
+++ b/doom/packages.el
@@ -0,0 +1,49 @@
+;; -*- 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/ghostty/config b/ghostty/config
index efeeb09..e85c1ec 100644
--- a/ghostty/config
+++ b/ghostty/config
@@ -1,4 +1,5 @@
 background=#131313
+font-family = JetBrainsMono Nerd Font Mono
 font-size = 15
 background-blur-radius = 20
 mouse-hide-while-typing = true
@@ -22,3 +23,5 @@ keybind = ctrl+shift+j=goto_split:down
 window-padding-balance = true
 split-divider-color = #444444
 
+image-storage-limit = 320000000
+
diff --git a/nvim/init.lua b/nvim/init.lua
deleted file mode 100644
index 24e5b27..0000000
--- a/nvim/init.lua
+++ /dev/null
@@ -1,223 +0,0 @@
--- disable netrw before plugins load
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
-
--- 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>' },
-    },
-  },
-  {
-    "rcarriga/nvim-dap-ui",
-    dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" },
-  },
-  {
-    'lewis6991/gitsigns.nvim',
-    event = { 'BufReadPre', 'BufNewFile' },
-    opts = {
-      signs = {
-        add          = { text = '+' },
-        change       = { text = '~' },
-        delete       = { text = '_' },
-        topdelete    = { text = '-' },
-        changedelete = { text = '~' },
-      },
-    },
-  },
-  {
-    'stevearc/oil.nvim',
-    dependencies = { 'nvim-tree/nvim-web-devicons' },
-    opts = {
-      default_file_explorer = true,
-      view_options = { show_hidden = true },
-      keymaps = {
-        ['l'] = { 'actions.select', opts = {}, desc = 'Open file or directory' },
-        ['h'] = { 'actions.parent', desc = 'Go to parent directory' },
-      },
-    },
-    keys = {
-      { '-', '<cmd>Oil<cr>', desc = 'Open parent directory' },
-      { '<leader>e', '<cmd>Oil<cr>', desc = 'Open file explorer' },
-    },
-  },
-  {
-    "nvim-neorg/neorg",
-    lazy = false,
-    version = "*",
-    dependencies = {
-      "nvim-lua/plenary.nvim",
-      {
-        "nvim-treesitter/nvim-treesitter",
-        build = ":TSUpdate",
-        opts = {},
-      },
-    },
-    config = function()
-      require("neorg").setup({
-        load = {
-          ["core.defaults"] = {},
-          ["core.concealer"] = {},
-          ["core.dirman"] = {
-            config = {
-              workspaces = {
-                notes = "~/notes",
-              },
-              default_workspace = "notes",
-            },
-          },
-        },
-      })
-    end,
-  },
-  {
-    "iamcco/markdown-preview.nvim",
-    cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
-    build = "cd app && npm install",
-    init = function()
-      vim.g.mkdp_filetypes = { "markdown" }
-    end,
-    ft = { "markdown" },
-  },
-})
-
--- theme
-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
-vim.opt.relativenumber = true
-vim.opt.cursorline = true
-vim.opt.wrap = false
-vim.opt.scrolloff = 10
-vim.opt.list = true
-vim.opt.listchars = { extends = '…', precedes = '…', tab = '  ' }
-vim.opt.sidescrolloff = 1
-
-vim.opt.tabstop = 2
-vim.opt.shiftwidth = 2
-vim.opt.softtabstop = 2
-vim.opt.expandtab = true
-vim.opt.smartindent = true
-
--- search
-vim.opt.ignorecase = true
-vim.opt.smartcase = true
-vim.opt.hlsearch = true
-vim.opt.incsearch = true
-
--- visuals
-vim.opt.termguicolors = true
-vim.opt.signcolumn = "yes"
-vim.opt.colorcolumn = "100"
-vim.opt.showmatch = true
-vim.opt.matchtime = 2
-vim.opt.cmdheight = 1
-vim.opt.completeopt = "menuone,noinsert,noselect"
-vim.opt.showmode = false
-vim.opt.pumheight = 10
-vim.opt.pumblend = 10
-vim.opt.winblend = 0
-vim.opt.conceallevel = 0
-vim.opt.lazyredraw = true
-
--- files
-vim.opt.swapfile = false
-vim.opt.undofile = true
-vim.opt.undodir = vim.fn.expand("~/.vim/undodir")
-vim.opt.updatetime = 300
-vim.opt.timeoutlen = 500
-vim.opt.autoread = true
-
--- behavior
-vim.opt.hidden = true
-vim.opt.backspace = "indent,eol,start"
-vim.opt.iskeyword:append("-")
-vim.opt.path:append("**")
-vim.opt.clipboard:append("unnamedplus")
-vim.opt.encoding = "UTF-8"
-
--- keymaps
-vim.keymap.set({ "n", "v" }, "<leader>d", '"_d', { desc = "Delete without yanking" })
-vim.keymap.set("n", "<leader>w", ":w<CR>", { desc = "Save file" })
-vim.keymap.set("n", "<leader>h", ":nohlsearch<CR>", { desc = "Clear search highlight" })
-
-vim.keymap.set("n", "J", "mzJ`z")
-
--- move lines (visual only)
-vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
-vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
-
--- indent keep selection
-vim.keymap.set("v", "<", "<gv")
-vim.keymap.set("v", ">", ">gv")
-
--- copy full path
-vim.keymap.set("n", "<leader>pp", function()
-  local path = vim.fn.expand("%:p")
-  vim.fn.setreg("+", path)
-  print("file:", path)
-end)
-
--- autocommands
-local augroup = vim.api.nvim_create_augroup("UserConfig", {})
-
-vim.api.nvim_create_autocmd("TextYankPost", {
-  group = augroup,
-  callback = function()
-    vim.highlight.on_yank()
-  end,
-})
-
--- LSP
-vim.api.nvim_create_autocmd('LspAttach', {
-  callback = function(event)
-    local opts = { buffer = event.buf }
-
-    -- navigation (fixed)
-    vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
-    vim.keymap.set('n', 'gD', 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)
-
-    -- info
-    vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
-    vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
-
-    -- 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>q', vim.diagnostic.setloclist, opts)
-  end,
-})
-
-vim.diagnostic.config({
-  virtual_text = { prefix = '●' },
-  signs = true,
-  underline = true,
-})
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
deleted file mode 100644
index 03666f4..0000000
--- a/nvim/lazy-lock.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "gitsigns.nvim": { "branch": "main", "commit": "0a80125bace82d82847d40bc2c38a22d62c6dc2d" },
-  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
-  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "nvim-dap": { "branch": "master", "commit": "a9d8cb68ee7184111dc66156c4a2ebabfbe01bc5" },
-  "nvim-dap-ui": { "branch": "master", "commit": "f5b6673f374626515401c5bc51b005f784a4f252" },
-  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" },
-  "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" },
-  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
-  "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" }
-}