From 42fafa468d570b90516479c0ae590a61e324cae3 Mon Sep 17 00:00:00 2001 From: liv Date: Wed, 6 Nov 2024 14:28:33 +0100 Subject: [PATCH] new STUFF --- dot_config/alacritty/alacritty.toml | 10 + dot_config/doom/config.el | 74 ++++++ dot_config/doom/init.el | 194 ++++++++++++++ dot_config/doom/packages.el | 59 +++++ dot_config/nvim/README.md | 4 - dot_config/nvim/dot_neoconf.json | 15 -- dot_config/nvim/init.lua | 2 - dot_config/nvim/lua/config/autocmds.lua | 3 - dot_config/nvim/lua/config/keymaps.lua | 3 - dot_config/nvim/lua/config/lazy.lua | 46 ---- dot_config/nvim/lua/config/options.lua | 22 -- dot_config/nvim/lua/plugins/cmp.lua | 9 - dot_config/nvim/lua/plugins/colorscheme.lua | 9 - dot_config/nvim/lua/plugins/elixir.lua | 17 -- dot_config/nvim/lua/plugins/example.lua | 265 -------------------- dot_config/nvim/lua/plugins/keymaps.lua | 9 - dot_config/nvim/lua/plugins/nushell.lua | 30 --- dot_config/nvim/lua/plugins/projects.lua | 42 ---- dot_config/nvim/lua/plugins/tmux.lua | 32 --- dot_config/nvim/stylua.toml | 3 - 20 files changed, 337 insertions(+), 511 deletions(-) create mode 100644 dot_config/alacritty/alacritty.toml create mode 100644 dot_config/doom/config.el create mode 100644 dot_config/doom/init.el create mode 100644 dot_config/doom/packages.el delete mode 100644 dot_config/nvim/README.md delete mode 100644 dot_config/nvim/dot_neoconf.json delete mode 100644 dot_config/nvim/init.lua delete mode 100644 dot_config/nvim/lua/config/autocmds.lua delete mode 100644 dot_config/nvim/lua/config/keymaps.lua delete mode 100644 dot_config/nvim/lua/config/lazy.lua delete mode 100644 dot_config/nvim/lua/config/options.lua delete mode 100644 dot_config/nvim/lua/plugins/cmp.lua delete mode 100644 dot_config/nvim/lua/plugins/colorscheme.lua delete mode 100644 dot_config/nvim/lua/plugins/elixir.lua delete mode 100644 dot_config/nvim/lua/plugins/example.lua delete mode 100644 dot_config/nvim/lua/plugins/keymaps.lua delete mode 100644 dot_config/nvim/lua/plugins/nushell.lua delete mode 100644 dot_config/nvim/lua/plugins/projects.lua delete mode 100644 dot_config/nvim/lua/plugins/tmux.lua delete mode 100644 dot_config/nvim/stylua.toml diff --git a/dot_config/alacritty/alacritty.toml b/dot_config/alacritty/alacritty.toml new file mode 100644 index 0000000..08d221b --- /dev/null +++ b/dot_config/alacritty/alacritty.toml @@ -0,0 +1,10 @@ +[window] +padding = { x = 10, y = 10 } +dimensions = { columns = 140, lines = 40 } + +[terminal] +shell = "/usr/bin/nu" + +[font] +normal = { family = "RecMonoCasual Nerd Font" } +size = 11 diff --git a/dot_config/doom/config.el b/dot_config/doom/config.el new file mode 100644 index 0000000..19b4cd9 --- /dev/null +++ b/dot_config/doom/config.el @@ -0,0 +1,74 @@ +;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- + +(setq user-full-name "liv" + user-mail-address "shadows@with.al") + +;; Set fonts and window sizes +(add-to-list 'default-frame-alist '(fullscreen . maximized)) + +(if (string= (system-name) "enoko") + (setq doom-font (font-spec :family "RecMonoCasual Nerd Font" :size 25 :weight 'semi-light)) + (setq doom-font (font-spec :family "RecMonoCasual Nerd Font" :size 17 :weight 'semi-light))) + + + + +;; Load our cute color scheme +(setq catppuccin-flavor 'mocha) +(setq doom-theme 'catppuccin) + +;; 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 t) + +;; 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 "~/Documents/org/") + +;; Set our tab-width +(setq-default tab-width 2) + +;; Configure exercism +(use-package! exercism + :config + (map! :map global-map :nv "SPC o e" #'exercism)) + +;; Increase Nix LSP memory limit +(after! lsp-mode + (setq lsp-nix-nil-max-mem 15000)) + +(map! :leader :desc "Find in Chezmoi dotfiles" :n "f ." #'chezmoi-find) +(map! :leader :desc "Save a Chezmoi dotfile" :n "f ," #'chezmoi-write) + +;; 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. + diff --git a/dot_config/doom/init.el b/dot_config/doom/init.el new file mode 100644 index 0000000..f9ece12 --- /dev/null +++ b/dot_config/doom/init.el @@ -0,0 +1,194 @@ +;;; 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 +icons +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 +light) ; 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 +dirvish) ; making dired pretty [functional] + electric ; smarter, keyword-based electric-indent + eww ; the internet is gross + ibuffer ; interactive buffer management + (undo +tree) ; 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 +peek) ; 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 +tree-sitter +lsp) ; 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 +lsp +tree-sitter) ; 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 +tree-sitter) ; the poster child for carpal tunnel syndrome + (javascript +lsp +tree-sitter) ; 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 +lsp +tree-sitter) ; I hereby declare "nix geht mehr!" + ;;ocaml ; an objective camel + org ; organize your plain life in plain text + ;; (php +lsp +tree-sitter) ; perl's insecure younger brother + ;;plantuml ; diagrams for confusing people more + ;;graphviz ; diagrams for confusing yourself even more + ;;purescript ; javascript, but functional + ;; (python +lsp +pyright +tree-sitter) ; 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 +tree-sitter +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + ;;scala ; java, but good + ;;(scheme +guile) ; a fully conniving family of lisps + (sh +fish) ; 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 +tree-sitter +lsp) ; 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/dot_config/doom/packages.el b/dot_config/doom/packages.el new file mode 100644 index 0000000..32d12e1 --- /dev/null +++ b/dot_config/doom/packages.el @@ -0,0 +1,59 @@ +;; -*- 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 +;; use 'M-x doom/reload'. + +;; Catppucin! +(package! catppuccin-theme) + +;; Exercism integration, very useful +(package! exercism) + +;; Chezmoi integration +(package! chezmoi) + +;; 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/dot_config/nvim/README.md b/dot_config/nvim/README.md deleted file mode 100644 index 185280b..0000000 --- a/dot_config/nvim/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# 💤 LazyVim - -A starter template for [LazyVim](https://github.com/LazyVim/LazyVim). -Refer to the [documentation](https://lazyvim.github.io/installation) to get started. diff --git a/dot_config/nvim/dot_neoconf.json b/dot_config/nvim/dot_neoconf.json deleted file mode 100644 index 7c48087..0000000 --- a/dot_config/nvim/dot_neoconf.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "neodev": { - "library": { - "enabled": true, - "plugins": true - } - }, - "neoconf": { - "plugins": { - "lua_ls": { - "enabled": true - } - } - } -} diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua deleted file mode 100644 index 2514f9e..0000000 --- a/dot_config/nvim/init.lua +++ /dev/null @@ -1,2 +0,0 @@ --- bootstrap lazy.nvim, LazyVim and your plugins -require("config.lazy") diff --git a/dot_config/nvim/lua/config/autocmds.lua b/dot_config/nvim/lua/config/autocmds.lua deleted file mode 100644 index 27e9e06..0000000 --- a/dot_config/nvim/lua/config/autocmds.lua +++ /dev/null @@ -1,3 +0,0 @@ --- Autocmds are automatically loaded on the VeryLazy event --- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua --- Add any additional autocmds here diff --git a/dot_config/nvim/lua/config/keymaps.lua b/dot_config/nvim/lua/config/keymaps.lua deleted file mode 100644 index 2c134f7..0000000 --- a/dot_config/nvim/lua/config/keymaps.lua +++ /dev/null @@ -1,3 +0,0 @@ --- Keymaps are automatically loaded on the VeryLazy event --- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua --- Add any additional keymaps here diff --git a/dot_config/nvim/lua/config/lazy.lua b/dot_config/nvim/lua/config/lazy.lua deleted file mode 100644 index 93e1f7f..0000000 --- a/dot_config/nvim/lua/config/lazy.lua +++ /dev/null @@ -1,46 +0,0 @@ -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - -- bootstrap lazy.nvim - -- stylua: ignore - vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath }) -end -vim.opt.rtp:prepend(vim.env.LAZY or lazypath) - -require("lazy").setup({ - spec = { - -- add LazyVim and import its plugins - { "LazyVim/LazyVim", import = "lazyvim.plugins" }, - -- import any extras modules here - { import = "lazyvim.plugins.extras.editor.aerial" }, - { import = "lazyvim.plugins.extras.editor.leap" }, - { import = "lazyvim.plugins.extras.lang.typescript" }, - { import = "lazyvim.plugins.extras.lang.svelte" }, - { import = "lazyvim.plugins.extras.lang.rust" }, - { import = "lazyvim.plugins.extras.lang.haskell" }, - { import = "lazyvim.plugins.extras.formatting.prettier" }, - { import = "lazyvim.plugins.extras.util.chezmoi" }, - -- import/override with your plugins - { import = "plugins" }, - }, - defaults = { - lazy = false, - version = false, -- always use the latest git commit - }, - install = { colorscheme = { "tokyonight", "habamax" } }, - checker = { enabled = true }, -- automatically check for plugin updates - performance = { - rtp = { - -- disable some rtp plugins - disabled_plugins = { - "gzip", - -- "matchit", - -- "matchparen", - -- "netrwPlugin", - "tarPlugin", - "tohtml", - "tutor", - "zipPlugin", - }, - }, - }, -}) diff --git a/dot_config/nvim/lua/config/options.lua b/dot_config/nvim/lua/config/options.lua deleted file mode 100644 index f416859..0000000 --- a/dot_config/nvim/lua/config/options.lua +++ /dev/null @@ -1,22 +0,0 @@ --- Options are automatically loaded before lazy.nvim startup --- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua --- Add any additional options here - --- Disable relative line numbers -vim.o.relativenumber = false - --- Change the default font --- Some of my machines have HDR displayed, meaning they need a smaller font size -if vim.fn.hostname() == "enoko" then - vim.o.guifont = "JetBrainsMono NF:h12" -else - vim.o.guifont = "JetBrainsMono NF:h14" -end - -if vim.g.neovide then - -- Reduce neovide scroll animation length - vim.g.neovide_scroll_animation_length = 0.1 -end - --- Prepend mise shims to path -vim.env.PATH = vim.env.HOME .. ".local/share/mise/shims:" .. vim.env.PATH diff --git a/dot_config/nvim/lua/plugins/cmp.lua b/dot_config/nvim/lua/plugins/cmp.lua deleted file mode 100644 index 63a63f8..0000000 --- a/dot_config/nvim/lua/plugins/cmp.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "hrsh7th/nvim-cmp", - opts = function(_, opts) - opts.experimental = { - -- Disable ghost text because it pisses me off. - ghost_text = false, - } - end, -} diff --git a/dot_config/nvim/lua/plugins/colorscheme.lua b/dot_config/nvim/lua/plugins/colorscheme.lua deleted file mode 100644 index 94ea587..0000000 --- a/dot_config/nvim/lua/plugins/colorscheme.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - { "navarasu/onedark.nvim" }, - { - "LazyVim/LazyVim", - opts = { - colorscheme = "onedark", - }, - }, -} diff --git a/dot_config/nvim/lua/plugins/elixir.lua b/dot_config/nvim/lua/plugins/elixir.lua deleted file mode 100644 index f9de1ec..0000000 --- a/dot_config/nvim/lua/plugins/elixir.lua +++ /dev/null @@ -1,17 +0,0 @@ --- Set up elixir-tools.nvim for better Elixir support - -return { - { - "elixir-tools/elixir-tools.nvim", - event = { "BufReadPre", "BufNewFile" }, - config = function() - local elixir = require("elixir") - - elixir.setup({ - elixirls = { - enable = false, -- handle elixirls through mason - }, - }) - end, - }, -} diff --git a/dot_config/nvim/lua/plugins/example.lua b/dot_config/nvim/lua/plugins/example.lua deleted file mode 100644 index 6859c0e..0000000 --- a/dot_config/nvim/lua/plugins/example.lua +++ /dev/null @@ -1,265 +0,0 @@ --- since this is just an example spec, don't actually load anything here and return an empty spec --- stylua: ignore -if true then return {} end - --- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim --- --- In your plugin files, you can: --- * add extra plugins --- * disable/enabled LazyVim plugins --- * override the configuration of LazyVim plugins -return { - -- add gruvbox - { "ellisonleao/gruvbox.nvim" }, - - -- Configure LazyVim to load gruvbox - { - "LazyVim/LazyVim", - opts = { - colorscheme = "gruvbox", - }, - }, - - -- change trouble config - { - "folke/trouble.nvim", - -- opts will be merged with the parent spec - opts = { use_diagnostic_signs = true }, - }, - - -- disable trouble - { "folke/trouble.nvim", enabled = false }, - - -- add symbols-outline - { - "simrat39/symbols-outline.nvim", - cmd = "SymbolsOutline", - keys = { { "cs", "SymbolsOutline", desc = "Symbols Outline" } }, - config = true, - }, - - -- override nvim-cmp and add cmp-emoji - { - "hrsh7th/nvim-cmp", - dependencies = { "hrsh7th/cmp-emoji" }, - ---@param opts cmp.ConfigSchema - opts = function(_, opts) - table.insert(opts.sources, { name = "emoji" }) - end, - }, - - -- change some telescope options and a keymap to browse plugin files - { - "nvim-telescope/telescope.nvim", - keys = { - -- add a keymap to browse plugin files - -- stylua: ignore - { - "fp", - function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end, - desc = "Find Plugin File", - }, - }, - -- change some options - opts = { - defaults = { - layout_strategy = "horizontal", - layout_config = { prompt_position = "top" }, - sorting_strategy = "ascending", - winblend = 0, - }, - }, - }, - - -- add telescope-fzf-native - { - "telescope.nvim", - dependencies = { - "nvim-telescope/telescope-fzf-native.nvim", - build = "make", - config = function() - require("telescope").load_extension("fzf") - end, - }, - }, - - -- add pyright to lspconfig - { - "neovim/nvim-lspconfig", - ---@class PluginLspOpts - opts = { - ---@type lspconfig.options - servers = { - -- pyright will be automatically installed with mason and loaded with lspconfig - pyright = {}, - }, - }, - }, - - -- add tsserver and setup with typescript.nvim instead of lspconfig - { - "neovim/nvim-lspconfig", - dependencies = { - "jose-elias-alvarez/typescript.nvim", - init = function() - require("lazyvim.util").lsp.on_attach(function(_, buffer) - -- stylua: ignore - vim.keymap.set( "n", "co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" }) - vim.keymap.set("n", "cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer }) - end) - end, - }, - ---@class PluginLspOpts - opts = { - ---@type lspconfig.options - servers = { - -- tsserver will be automatically installed with mason and loaded with lspconfig - tsserver = {}, - }, - -- you can do any additional lsp server setup here - -- return true if you don't want this server to be setup with lspconfig - ---@type table - setup = { - -- example to setup with typescript.nvim - tsserver = function(_, opts) - require("typescript").setup({ server = opts }) - return true - end, - -- Specify * to use this function as a fallback for any server - -- ["*"] = function(server, opts) end, - }, - }, - }, - - -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, - -- treesitter, mason and typescript.nvim. So instead of the above, you can use: - { import = "lazyvim.plugins.extras.lang.typescript" }, - - -- add more treesitter parsers - { - "nvim-treesitter/nvim-treesitter", - opts = { - ensure_installed = { - "bash", - "html", - "javascript", - "json", - "lua", - "markdown", - "markdown_inline", - "python", - "query", - "regex", - "tsx", - "typescript", - "vim", - "yaml", - }, - }, - }, - - -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above - -- would overwrite `ensure_installed` with the new value. - -- If you'd rather extend the default config, use the code below instead: - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - -- add tsx and treesitter - vim.list_extend(opts.ensure_installed, { - "tsx", - "typescript", - }) - end, - }, - - -- the opts function can also be used to change the default opts: - { - "nvim-lualine/lualine.nvim", - event = "VeryLazy", - opts = function(_, opts) - table.insert(opts.sections.lualine_x, "😄") - end, - }, - - -- or you can return new options to override all the defaults - { - "nvim-lualine/lualine.nvim", - event = "VeryLazy", - opts = function() - return { - --[[add your custom lualine config here]] - } - end, - }, - - -- use mini.starter instead of alpha - { import = "lazyvim.plugins.extras.ui.mini-starter" }, - - -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc - { import = "lazyvim.plugins.extras.lang.json" }, - - -- add any tools you want to have installed below - { - "williamboman/mason.nvim", - opts = { - ensure_installed = { - "stylua", - "shellcheck", - "shfmt", - "flake8", - }, - }, - }, - - -- Use for completion and snippets (supertab) - -- first: disable default and behavior in LuaSnip - { - "L3MON4D3/LuaSnip", - keys = function() - return {} - end, - }, - -- then: setup supertab in cmp - { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-emoji", - }, - ---@param opts cmp.ConfigSchema - opts = function(_, opts) - local has_words_before = function() - unpack = unpack or table.unpack - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil - end - - local luasnip = require("luasnip") - local cmp = require("cmp") - - opts.mapping = vim.tbl_extend("force", opts.mapping, { - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable() - -- this way you will only jump inside the snippet region - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - }) - end, - }, -} diff --git a/dot_config/nvim/lua/plugins/keymaps.lua b/dot_config/nvim/lua/plugins/keymaps.lua deleted file mode 100644 index 14eb4f1..0000000 --- a/dot_config/nvim/lua/plugins/keymaps.lua +++ /dev/null @@ -1,9 +0,0 @@ --- Override plugin keymaps - -return { - "nvim-telescope/telescope.nvim", - keys = { - { "", "Telescope find_files", desc = "Find files" }, - { "qc", "Telescope chezmoi", desc = "Find in dotfiles" }, - }, -} diff --git a/dot_config/nvim/lua/plugins/nushell.lua b/dot_config/nvim/lua/plugins/nushell.lua deleted file mode 100644 index c46345f..0000000 --- a/dot_config/nvim/lua/plugins/nushell.lua +++ /dev/null @@ -1,30 +0,0 @@ -return { - { - "neovim/nvim-lspconfig", - opts = { - servers = { - nushell = {}, - }, - }, - }, - { - "nvim-treesitter/nvim-treesitter", - dependencies = { - { "nushell/tree-sitter-nu" }, - }, - opts = function(_, opts) - require("nvim-treesitter.parsers").get_parser_configs().nu = { - install_info = { - url = "https://github.com/nushell/tree-sitter-nu", - files = { "src/parser.c" }, - branch = "main", - }, - filetype = "nu", - } - - if type(opts.ensure_installed) == "table" then - vim.list_extend(opts.ensure_installed, { "nu" }) - end - end, - }, -} diff --git a/dot_config/nvim/lua/plugins/projects.lua b/dot_config/nvim/lua/plugins/projects.lua deleted file mode 100644 index 990e8f5..0000000 --- a/dot_config/nvim/lua/plugins/projects.lua +++ /dev/null @@ -1,42 +0,0 @@ --- Better project/cd support - -return { - { - "gnikdroy/projections.nvim", - config = function() - require("projections").setup({ - workspaces = { - "~/Projects/Personal", - }, - }) - require("telescope").load_extension("projections") - - -- Load project if started in a project directory - local switcher = require("projections.switcher") - vim.api.nvim_create_autocmd({ "VimEnter" }, { - callback = function() - if vim.fn.argc() == 0 then - switcher.switch(vim.loop.cwd()) - end - end, - }) - end, - keys = { - { "fp", "Telescope projections", desc = "Search projects" }, - }, - }, - { - "nvimdev/dashboard-nvim", - opts = function(_, opts) - local button = { - action = "Telescope projections", - desc = "Projects", - icon = "🕮 ", - key = "p", - } - - button.key_format = " %s" - table.insert(opts.config.center, 6, button) - end, - }, -} diff --git a/dot_config/nvim/lua/plugins/tmux.lua b/dot_config/nvim/lua/plugins/tmux.lua deleted file mode 100644 index c83e7aa..0000000 --- a/dot_config/nvim/lua/plugins/tmux.lua +++ /dev/null @@ -1,32 +0,0 @@ -return { - { - "aserowy/tmux.nvim", - event = "VeryLazy", - config = function() - local tmux = require("tmux") - tmux.setup({ - copy_sync = { - enable = false, - }, - navigation = { - cycle_navigation = false, - enable_default_keybindings = false, - persist_zoom = true, - }, - resize = { - enable_default_keybindings = false, - }, - }) - end, - keys = { - { "", mode = { "n", "t", "i" }, 'lua require("tmux").move_left()' }, - { "", mode = { "n", "t", "i" }, 'lua require("tmux").move_right()' }, - { "", mode = { "n", "t", "i" }, 'lua require("tmux").move_bottom()' }, - { "", mode = { "n", "t", "i" }, 'lua require("tmux").move_top()' }, - { "", mode = { "n", "t", "i" }, 'lua require("tmux").resize_left()' }, - { "", mode = { "n", "t", "i" }, 'lua require("tmux").resize_bottom()' }, - { "", mode = { "n", "t", "i" }, 'lua require("tmux").resize_top()' }, - { "", mode = { "n", "t", "i" }, 'lua require("tmux").resize_right()' }, - }, - }, -} diff --git a/dot_config/nvim/stylua.toml b/dot_config/nvim/stylua.toml deleted file mode 100644 index 5d6c50d..0000000 --- a/dot_config/nvim/stylua.toml +++ /dev/null @@ -1,3 +0,0 @@ -indent_type = "Spaces" -indent_width = 2 -column_width = 120 \ No newline at end of file