diff --git a/README.md b/README.md index cc84144..a57a229 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,59 @@ -# Nix +# dotfiles + +Contains my configurations for the software I use. + +I'm looking to move forward to configuration with NixOS, but until I get +a bit more experiment on NixOS, I'll keep this repository as simple as possible. + +## Nix Monorepo that contains my commonly used personal environments. I hope to incorporate my configs at [gh:pegasust/dotfiles](https://github.com/pegasust/dotfiles) onto this repo for quick env setup (especially devel) on new machines. +## How do I apply these config + +- I will always first clone this repository, preferably from local source before +going from the github. `git clone https://github.com/pegasust/dotfiles` + +### neovim + +My main text editor. It's based on `vim`, but stays loyal to `lua` ecosystem + +- Config file: `./nvim/init.lua` +- Command: `ln [-s] $PWD/nvim/init.lua ~/.config/nvim` + +#### Notes + +- Ensure that neovim is installed and invocable by `nvim`. +- My config based on rather experimental version of`nvim` (>=0.7.2) +- For information on installing neovim, visit their [github page](https://github.com/neovim/neovim/wiki/Installing-Neovim) + +### tmux + +Terminal multiplexor. Allows creating persistent sessions and multiple terminal windows +from one terminal. + +- Config file: `./tmux/.tmux.conf` +- Command: `ln [-s] $PWD/tmux/.tmux.conf ~/.tmux.conf` + +#### Notes + +- Unsure if the minimum version of tmux. I have had an ancient HPC server +that does not respond well to one of the config lines. + +### zk + +Zettelkasten notebook. This is how I document my learning and reflect on myself +via writing and typing. + +I am in the process of moving away from Obsidian so that I can write ZK notes +text-editor agnostically. + +- Config file: `zk/config.toml` +- Command: `ln [-s] $PWD/zk/config.toml ~/.config/zk/config.toml` + +- Templates: `zk/templates/` +- Command: `ln -s $PWD/zk/templates ~/.config/zk/templates` + diff --git a/neovim/init.lua b/neovim/init.lua new file mode 100644 index 0000000..e6aa1b9 --- /dev/null +++ b/neovim/init.lua @@ -0,0 +1,856 @@ +-- What: Mono-file nvim configuration file +-- Why: Easy to see through everything without needing to navigate thru files +-- Features: +-- - LSP +-- - Auto-complete (in insert mode: ctrl-space, navigate w/ Tab+S-Tab, confirm: Enter) +-- - df to format document +-- - Harpoon marks: Navigate through main files within each project +-- +-- REQUIREMENTS: +-- - zk @ https://github.com/mickael-menu/zk +-- - prettierd @ npm install -g @fsouza/prettierd + +-- Basic settings of vim +vim.cmd([[ +set number relativenumber +set tabstop=4 softtabstop=4 +set expandtab +set shiftwidth=4 +set smartindent +set exrc +set incsearch +set scrolloff=15 +set signcolumn=yes +set colorcolumn=80 +set background=light +]]) +vim.opt.lazyredraw = true +vim.opt.termguicolors = true +vim.opt.cursorline = true +-- some plugins misbehave when we do swap files +vim.opt.swapfile = false +vim.opt.backup = false +vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir" +vim.opt.undofile = true +vim.opt.completeopt = 'menuone,noselect' +-- vim.opt.clipboard = "unnamedplus" + +vim.g.mapleader = ' ' +vim.g.maplocalleader = ',' + +-- basic keymaps +vim.keymap.set({ 'n', 'v' }, '', '', { silent = true }) -- since we're using space for leader +vim.keymap.set('t', '', ')') -- make :terminal escape out +vim.keymap.set({ 'n', 'i', 'v' }, '', ':mode') -- redraw on every mode + +-- diagnostics (errors/warnings to be shown) +vim.keymap.set('n', '[d', vim.diagnostic.goto_prev) +vim.keymap.set('n', ']d', vim.diagnostic.goto_next) +vim.keymap.set('n', 'e', vim.diagnostic.open_float) -- opens diag in box (floating) +-- vim.keymap.set('n', 'q', vim.diagnostic.setloclist) -- opens list of diags +-- vim.keymap.set('n', 'wq', vim.diagnostic.setqflist) -- workspace diags +vim.keymap.set('n', 'q', 'TroubleToggle loclist') +vim.keymap.set('n', 'wq', 'TroubleToggle workspace_diagnostics') + + +-- vim-plug +local data_dir = vim.fn.stdpath('data') +vim.cmd([[ +let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim' +if empty(glob(data_dir . '/autoload/plug.vim')) + silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' + autocmd VimEnter * PlugInstall --sync | source $MYVIMRC +endif +]]) + +local Plug = vim.fn['plug#'] +vim.call('plug#begin', '~/.config/nvim/plugged') + +-- libs and dependencies +Plug('nvim-lua/plenary.nvim') + +-- plugins +Plug('nvim-treesitter/nvim-treesitter') -- language parser engine for highlighting +Plug('nvim-treesitter/nvim-treesitter-textobjects') -- more text objects +Plug('nvim-telescope/telescope.nvim', { tag = '0.1.0' }) -- file browser +Plug('nvim-telescope/telescope-fzf-native.nvim', + { ['do'] = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=release && cmake --build build --config Release && cmake --install build --prefix build' }) +Plug('nvim-telescope/telescope-file-browser.nvim') + +-- cmp: auto-complete/suggestions +Plug('neovim/nvim-lspconfig') -- built-in LSP configurations +Plug('hrsh7th/cmp-nvim-lsp') +Plug('hrsh7th/cmp-buffer') +Plug('hrsh7th/nvim-cmp') +Plug('onsails/lspkind-nvim') +Plug('yioneko/nvim-yati') -- hopefully fixes Python indentation auto-correct from Tree-sitter +-- Plug('tzachar/cmp-tabnine', { ['do'] = './install.sh' }) + +-- DevExp +Plug('windwp/nvim-autopairs') -- matches pairs like [] (),... +Plug('windwp/nvim-ts-autotag') -- matches tags hello +Plug('NMAC427/guess-indent.nvim') -- guesses the indentation of an opened buffer +Plug('numToStr/Comment.nvim') -- "gc" to comment visual regions/lines +Plug('lewis6991/gitsigns.nvim') -- add git info to sign columns +Plug('tpope/vim-fugitive') -- git commands in nvim +Plug('williamboman/mason.nvim') -- LSP, debuggers,... package manager +Plug('williamboman/mason-lspconfig.nvim') -- lsp config for mason +Plug('ThePrimeagen/harpoon') -- 1-click through marked files per project +Plug('TimUntersberger/neogit') -- Easy-to-see git status +Plug('folke/trouble.nvim') -- File-grouped workspace diagnostics +Plug('tpope/vim-dispatch') -- Allows quick build/compile/test vim commands +Plug('clojure-vim/vim-jack-in') -- Clojure: ":Boot", ":Clj", ":Lein" +Plug('radenling/vim-dispatch-neovim') -- Add support for neovim's terminal emulator +Plug('Olical/conjure') -- REPL on the source for Clojure (and other LISPs) +Plug('gennaro-tedesco/nvim-jqx') -- JSON formatter (use :Jqx*) +Plug('kylechui/nvim-surround') -- surrounds with tags/parenthesis +Plug('simrat39/rust-tools.nvim') -- config rust-analyzer and nvim integration + +-- UI & colorscheme +Plug('gruvbox-community/gruvbox') -- theme provider +Plug('nvim-lualine/lualine.nvim') -- fancy status line +Plug('lukas-reineke/indent-blankline.nvim') -- identation lines on blank lines +Plug('sunjon/shade.nvim') -- make inactive panes have lower opacity +Plug('kyazdani42/nvim-web-devicons') -- icons for folder and filetypes +Plug('m-demare/hlargs.nvim') -- highlights arguments; great for func prog +Plug('folke/todo-comments.nvim') -- Highlights TODO + +-- other utilities +Plug('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) +Plug('saadparwaiz1/cmp_luasnip') -- snippet engine +Plug('L3MON4D3/LuaSnip') -- snippet engine +Plug('mickael-menu/zk-nvim') -- Zettelkasten + +--------- +vim.call('plug#end') + +-- color, highlighting, UI stuffs +vim.cmd([[ colorscheme gruvbox ]]) +require('hlargs').setup() +require('shade').setup { + overlay_opacity = 60, + opacity_step = 1, + keys = { + brightness_up = '', + brightness_down = '', + toggle = 's', -- s: sha + } +} +require('nvim-web-devicons').setup() +require('trouble').setup() +require('todo-comments').setup() + +-- plugin keymaps + +local function remap(mode, key_cmd, binded_fn, opts) + opts = opts or { remap = true } + return vim.keymap.set(mode, key_cmd, binded_fn, opts) +end + +-- Comment.nvim +require('Comment').setup() +-- lukas-reineke/indent-blankline.nvim +vim.opt.list = true +vim.opt.listchars:append "space:⋅" +vim.opt.listchars:append "eol:↴" + +require("indent_blankline").setup { + show_end_of_line = true, + space_char_blankline = " ", +} +-- User command that transform into 2-spaces by translating to tabstop +vim.api.nvim_create_user_command( + 'HalfSpaces', + function(opts) + vim.api.nvim_command("set ts=2 sts=2 noet") + vim.api.nvim_command("retab!") + vim.api.nvim_command("set ts=1 sts=1 et") + vim.api.nvim_command("retab") + vim.api.nvim_command("GuessIndent") + end, + { nargs = 0 } +) +vim.api.nvim_create_user_command( + 'DoubleSpaces', + function(opts) + vim.api.nvim_command("set ts=1 sts=1 noet") + vim.api.nvim_command("retab!") + vim.api.nvim_command("set ts=2 sts=2 et") + vim.api.nvim_command("retab") + vim.api.nvim_command("GuessIndent") + end, + { nargs = 0 } +) + +-- telescope +local fb_actions = require "telescope".extensions.file_browser.actions +require('telescope').setup { + defaults = { + mappings = { + i = { + [''] = false, + [''] = false, + }, + }, + }, + extensions = { + fzf = { + fuzzy = true, -- allow fuzzy matches + override_generic_sorter = true, + override_file_sorter = true, + case_mode = 'smart_case' + }, + file_browser = { + theme = "ivy", + hiject_netrw = true, -- disables netrw and use file-browser instead + mappings = { + ["i"] = {}, -- disable any shortcut in insert mode for now + ["n"] = { + ["c"] = fb_actions.create, + ["r"] = fb_actions.rename, + ["m"] = fb_actions.move, + ["y"] = fb_actions.copy, + ["d"] = fb_actions.remove, + ["o"] = fb_actions.open, + ["g"] = fb_actions.goto_parent_dir, + ["e"] = fb_actions.goto_home_dir, + ["w"] = fb_actions.goto_cwd, + ["t"] = fb_actions.change_cwd, + ["f"] = fb_actions.toggle_browser, + ["h"] = fb_actions.toggle_hidden, + ["s"] = fb_actions.toggle_all, + } + } + } + } +} + +-- Telescope key remap stuffs +pcall(require('telescope').load_extension, 'fzf') +pcall(require('telescope').load_extension, 'file_browser') +remap('n', '', 'Telescope', { desc = 'Open Telescope general search' }) + +remap('n', 'fm', function() + require("telescope").extensions.file_browser.file_browser() +end, { desc = '[F]ile [M]utation' }) + +remap('n', 'ff', function() + require('telescope.builtin').find_files({ + hidden = false, + no_ignore = false, + follow = false, + }) +end, { desc = '[F]ind [F]ile' }) + +remap('n', 'fa', function() + require('telescope.builtin').find_files({ + hidden = true, + no_ignore = true, + follow = true, + }) +end, { desc = '[F]ind [A]ll files' }) + +remap('n', 'fg', function() + require('telescope.builtin').live_grep() +end, { desc = '[F]ind by [G]rep' }) + +remap('n', 'fb', function() + require('telescope.builtin').buffers() +end, { desc = '[F]ind existing [B]uffers' }) + +remap('n', 'fh', function() + require('telescope.builtin').help_tags() +end, { desc = '[F]ind [H]elp' }) + +remap('n', 'fd', function() + require('telescope.builtin').diagnostics() +end, { desc = '[F]ind [D]iagnostics' }) + +-- ZK remap stuffs +remap('n', 'zf', function() + vim.cmd([[:ZkNotes]]) +end, { desc = '[Z]ettelkasten [F]iles' }) + +remap('n', 'zg', function() + vim.cmd([[:ZkGrep]]) +end, { desc = '[Z]ettelkasten [G]rep' }) + +-- treesitter +require('nvim-treesitter.configs').setup { + yati = { enable = true }, + ensure_installed = { + 'tsx', 'toml', 'lua', 'typescript', 'rust', 'go', 'yaml', 'json', 'php', 'css', + 'python', 'prisma', 'html', "dockerfile", "c", "cpp", "hcl", "svelte", "astro", + "clojure", "fennel", "bash" + }, + sync_install = false, + highlight = { enable = true }, + indent = { enable = true, disabled = { "python" } }, + incremental_selection = { + enable = true, + keymaps = { + init_selection = '', + node_incremental = '', + node_decremental = '', + scope_incremental = '' + } + }, + textobjects = { + select = { + enable = true, + lookahead = true, + keymaps = { + ['af'] = '@function.outer', + ['if'] = '@function.inner', + ['ac'] = '@class.outer', + ['ic'] = '@class.inner', + }, + }, + }, + -- automatically close and modify HTML and TSX tags + autotag = { + enable = true, + }, +} + +require('nvim-autopairs').setup { + check_ts = true, + +} + +local parser_config = require('nvim-treesitter.parsers').get_parser_configs() +parser_config.tsx.filetype_to_parsername = { "javascript", "typescript.tsx" } +parser_config.astro.filetype_to_parsername = { "javascript", "typescript.tsx", "astro" } + + +require('guess-indent').setup { + auto_cmd = true, -- Set to false to disable automatic execution + filetype_exclude = { -- A list of filetypes for which the auto command gets disabled + "netrw", + "tutor", + }, + buftype_exclude = { -- A list of buffer types for which the auto command gets disabled + "help", + "nofile", + "terminal", + -- "prompt", + }, +} + +-- harpoon: mark significant files & switch between them +remap('n', 'm', function() require('harpoon.mark').add_file() end) +local function harpoon_nav(key, nav_file_index, lead_keybind) + lead_keybind = lead_keybind or 'h' + assert(type(key) == "string", "expect key to be string(keybind)") + assert(type(nav_file_index) == "number" and nav_file_index >= 1, "expect 1-indexed number for file index") + return remap('n', lead_keybind .. key, function() require('harpoon.ui').nav_file(nav_file_index) end) +end + +-- remap letters to index. Inspired by alternating number of Dvorak programmer +-- best practices: try to keep marked files to be around 4 +harpoon_nav('f', 1) +harpoon_nav('j', 2) +harpoon_nav('d', 3) +harpoon_nav('k', 4) +remap('n', 'hh', function() require('harpoon.ui').toggle_quick_menu() end) +-- harpoon: navigate by numbers +harpoon_nav('1', 1) +harpoon_nav('2', 2) +harpoon_nav('3', 3) +harpoon_nav('4', 4) +harpoon_nav('5', 5) +harpoon_nav('6', 6) +harpoon_nav('7', 7) +harpoon_nav('8', 8) +harpoon_nav('9', 9) +harpoon_nav('0', 10) + +-- neogit: easy-to-see git status +require('neogit').setup {} +remap('n', 'gs', function() require('neogit').open({}) end); + +-- LSP settings +-- This function gets run when an LSP connects to a particular buffer. +local on_attach = function(_client, bufnr) + -- NOTE: Remember that lua is a real programming language, and as such it is possible + -- to define small helper and utility functions so you don't have to repeat yourself + -- many times. + -- + -- In this case, we create a function that lets us more easily define mappings specific + -- for LSP related items. It sets the mode, buffer and description for us each time. + local nmap = function(keys, func, desc) + if desc then + desc = 'LSP: ' .. desc + end + + vim.keymap.set('n', keys, func, { noremap = true, buffer = bufnr, desc = desc }) + end + + nmap('rn', vim.lsp.buf.rename, '[R]e[n]ame') + nmap('ca', vim.lsp.buf.code_action, '[C]ode [A]ction') + vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + nmap('df', function() vim.lsp.buf.format({ async = true }) end, '[D]ocument [F]ormat') + + -- symbols and gotos + nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition') + nmap('gi', vim.lsp.buf.implementation, '[G]oto [I]mplementation') + nmap('gr', require('telescope.builtin').lsp_references) + nmap('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') + nmap('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') + + -- documentations. See `:help K` for why this keymap + nmap('K', vim.lsp.buf.hover, 'Hover Documentation') + nmap('', vim.lsp.buf.signature_help, 'Signature Documentation') + + -- Lesser used LSP functionality + nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') + nmap('gtd', vim.lsp.buf.type_definition, '[G]oto [T]ype [D]efinition') + nmap('D', vim.lsp.buf.type_definition, 'Type [D]efinition') + nmap('wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder') + nmap('wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder') + nmap('wl', function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, '[W]orkspace [L]ist Folders') + +end +-- nvim-cmp supports additional completion capabilities +local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities()) +-- local tabnine = require('cmp_tabnine.config') +-- tabnine.setup({ +-- max_lines = 1000, +-- max_num_results = 20, +-- sort = true, +-- run_on_every_keystroke = true, +-- snippet_placeholder = '..', +-- ignored_file_types = {}, +-- show_prediction_strength = true, +-- }) +-- default language servers +local servers = { 'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'sumneko_lua', 'cmake', 'tailwindcss', 'prismals', + 'rnix', 'eslint', 'terraformls', 'tflint', 'svelte', 'astro', 'clojure_lsp', "bashls", 'yamlls', "pylsp" } +require("mason").setup({ + ui = { + icons = { + package_installed = "✓", + package_pending = "➜", + package_uninstalled = "✗" + }, + check_outdated_packages_on_open = true, + } +}) +require('mason-lspconfig').setup({ + ensure_installed = servers, + automatic_installation = true +}) +require('mason-lspconfig').setup_handlers({ + -- default handler + function(server_name) + require('lspconfig')[server_name].setup { + on_attach = on_attach, + capabilities = capabilities, + } + end, + ["sumneko_lua"] = function() + require('lspconfig').sumneko_lua.setup { + on_attach = on_attach, + capabilities = capabilities, + settings = { + Lua = { + runtime = { + version = "LuaJIT", + path = vim.split(package.path, ";"), + }, + diagnostics = { + globals = { "vim" } + }, + workspace = { + library = vim.api.nvim_get_runtime_file('', true) + }, + telemetry = { enable = false }, + format = { + enable = true, + defaultConfig = { + indent_style = "space", + indent_size = 2, + } + } + } + } + } + end, + -- ["rust_analyzer"] = function() + -- require('lspconfig').rust_analyzer.setup { + -- on_attach = on_attach, + -- capabilities = capabilities, + -- settings = { + -- checkOnSave = { + -- command = "clippy", + -- } + -- } + -- } + -- end, + -- ["astro"] = function() + -- print('configuring astro') + -- require('lspconfig').astro.setup { + -- on_attach = on_attach, + -- capabilities = capabilities, + -- init_options = { + -- configuration = {}, + -- typescript = { + -- serverPath = data_dir + -- } + -- } + -- } + -- end +}) +require("rust-tools").setup { + tools = { -- rust-tools options + + -- how to execute terminal commands + -- options right now: termopen / quickfix + executor = require("rust-tools/executors").termopen, + + -- callback to execute once rust-analyzer is done initializing the workspace + -- The callback receives one parameter indicating the `health` of the server: "ok" | "warning" | "error" + on_initialized = nil, + + -- automatically call RustReloadWorkspace when writing to a Cargo.toml file. + reload_workspace_from_cargo_toml = true, + + -- These apply to the default RustSetInlayHints command + inlay_hints = { + -- automatically set inlay hints (type hints) + -- default: true + auto = true, + + -- Only show inlay hints for the current line + only_current_line = false, + + -- whether to show parameter hints with the inlay hints or not + -- default: true + show_parameter_hints = true, + + -- prefix for parameter hints + -- default: "<-" + parameter_hints_prefix = "<- ", + + -- prefix for all the other hints (type, chaining) + -- default: "=>" + other_hints_prefix = "=> ", + + -- whether to align to the length of the longest line in the file + max_len_align = false, + + -- padding from the left if max_len_align is true + max_len_align_padding = 1, + + -- whether to align to the extreme right or not + right_align = false, + + -- padding from the right if right_align is true + right_align_padding = 7, + + -- The color of the hints + highlight = "Comment", + }, + + -- options same as lsp hover / vim.lsp.util.open_floating_preview() + hover_actions = { + + -- the border that is used for the hover window + -- see vim.api.nvim_open_win() + border = { + { "╭", "FloatBorder" }, + { "─", "FloatBorder" }, + { "╮", "FloatBorder" }, + { "│", "FloatBorder" }, + { "╯", "FloatBorder" }, + { "─", "FloatBorder" }, + { "╰", "FloatBorder" }, + { "│", "FloatBorder" }, + }, + + -- whether the hover action window gets automatically focused + -- default: false + auto_focus = false, + }, + + -- settings for showing the crate graph based on graphviz and the dot + -- command + crate_graph = { + -- Backend used for displaying the graph + -- see: https://graphviz.org/docs/outputs/ + -- default: x11 + backend = "x11", + -- where to store the output, nil for no output stored (relative + -- path from pwd) + -- default: nil + output = nil, + -- true for all crates.io and external crates, false only the local + -- crates + -- default: true + full = true, + + -- List of backends found on: https://graphviz.org/docs/outputs/ + -- Is used for input validation and autocompletion + -- Last updated: 2021-08-26 + enabled_graphviz_backends = { + "bmp", + "cgimage", + "canon", + "dot", + "gv", + "xdot", + "xdot1.2", + "xdot1.4", + "eps", + "exr", + "fig", + "gd", + "gd2", + "gif", + "gtk", + "ico", + "cmap", + "ismap", + "imap", + "cmapx", + "imap_np", + "cmapx_np", + "jpg", + "jpeg", + "jpe", + "jp2", + "json", + "json0", + "dot_json", + "xdot_json", + "pdf", + "pic", + "pct", + "pict", + "plain", + "plain-ext", + "png", + "pov", + "ps", + "ps2", + "psd", + "sgi", + "svg", + "svgz", + "tga", + "tiff", + "tif", + "tk", + "vml", + "vmlz", + "wbmp", + "webp", + "xlib", + "x11", + }, + }, + }, + + -- all the opts to send to nvim-lspconfig + -- these override the defaults set by rust-tools.nvim + -- see https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#rust_analyzer + server = { + -- standalone file support + -- setting it to false may improve startup time + standalone = true, + on_attach = function(client, bufnr) + local nmap = function(keys, func, desc) + if desc then + desc = 'LSP: ' .. desc + end + + vim.keymap.set('n', keys, func, { noremap = true, buffer = bufnr, desc = desc }) + end + on_attach(client, bufnr); + nmap('K', require 'rust-tools'.hover_actions.hover_actions, 'Hover Documentation') + + end, + capabilities = capabilities, + settings = { + checkOnSave = { + command = "clippy", + } + } + + }, -- rust-analyzer options + + -- debugging stuff + dap = { + adapter = { + type = "executable", + command = "lldb-vscode", + name = "rt_lldb", + }, + }, +} + +require('zk').setup({ + picker = "telescope", + lsp = { + config = { + cmd = { "zk", "lsp" }, + name = "zk", + on_attach = on_attach, + }, + auto_attach = { + enable = true, + filetypes = { "markdown" } + }, + }, +}) + +-- Custom ZkOrphans that determines unlinked notes +-- `:ZkOrphans {tags = {"work"}}` +require('zk.commands').add("ZkOrphans", function(options) + options = vim.tbl_extend("force", { orphan = true }, options or {}) + -- zk.edit opens notes picker + require('zk').edit(options, { title = "Zk Orphans (unlinked notes)" }) +end) +-- ZkGrep: opens file picker +-- In the case where `match_ctor` is falsy, create a prompt. +-- This is so that we distinguish between ZkGrep and ZkNotes +-- Params: +-- match_ctor: string | {match= :string,...} | "" | nil +require('zk.commands').add("ZkGrep", function(match_ctor) + -- handle polymorphic `match_ctor` + local grep_str = match_ctor + local match + if match_ctor == nil or match_ctor == '' then + vim.fn.inputsave() + grep_str = vim.fn.input('Grep string: >') + vim.fn.inputrestore() + match = { match = grep_str } + elseif type(match_ctor) == 'string' then + match = { match = grep_str } + end + require('zk').edit(match, { title = "Grep: '" .. grep_str .. "'" }) +end) + +-- nvim-cmp +local cmp = require 'cmp' +local luasnip = require 'luasnip' +local lspkind = require('lspkind') +local source_mapping = { + buffer = '[Buffer]', + nvim_lsp = '[LSP]', + nvim_lua = '[Lua]', + -- cmp_tabnine = '[T9]', + path = '[Path]', +} + +cmp.setup { + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + mapping = cmp.mapping.preset.insert { + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.confirm { + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }, + [''] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + 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' }), + }, + formatting = { + format = function(entry, vim_item) + vim_item.kind = lspkind.symbolic(vim_item.kind, { mode = 'symbol' }) + vim_item.menu = source_mapping[entry.source_name] + -- if entry.source.name == "cmp_tabnine" then + -- local detail = (entry.completion_item.data or {}).detail + -- vim_item.kind = "" + -- if detail and detail:find('.*%%.*') then + -- vim_item.kind = vim_item.kind .. ' ' .. detail + -- end + -- + -- if (entry.completion_item.data or {}).multiline then + -- vim_item.kind = vim_item.kind .. ' ' .. '[ML]' + -- end + -- end + local maxwidth = 80 + vim_item.abbr = string.sub(vim_item.abbr, 1, maxwidth) + return vim_item + end, + }, + sources = { + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + -- { name = 'cmp_tabnine' }, + }, +} + +-- Gitsigns +require('gitsigns').setup { + signs = { + add = { text = '+' }, + change = { text = '~' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + } +} +require('lualine').setup { + options = { + icons_enabled = true, + }, + sections = { + lualine_a = { 'mode' }, + lualine_b = { 'branch', 'diff', 'diagnostics' }, + lualine_c = { + { 'filename', + file_status = true, + newfile_status = false, + path = 1, + symbols = { + modified = '[+]', + readonly = '[-]', + unnamed = '[Unnamed]', + newfile = '[New]', + }, + }, + }, + lualine_x = { 'encoding', 'fileformat', 'filetype', }, + lualine_y = { 'progress' }, + lualine_z = { 'location' }, + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { { 'filename', path = 1, file_status = true, }, }, + lualine_x = { 'location' }, + lualine_y = {}, + lualine_z = {}, + } +} + +require('nvim-surround').setup {} + +vim.cmd([[ +let g:conjure#mapping#doc_word = v:false +]]) diff --git a/neovim/scripts/deps.sh b/neovim/scripts/deps.sh new file mode 100644 index 0000000..7a39f30 --- /dev/null +++ b/neovim/scripts/deps.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +# This file installs dependencies needed for the Neovim plugins +echo "Please run this in sudo mode for sudo apt* commands" + +# Pip and Python3 +if [ ! python3 --version ] ; then + PYTHON_3=${PYTHON_3:-"python3.10"} + apt install $PYTHON_3 + $PYTHON_3 -m ensurepip --upgrade + $PYTHON_3 -m pip install --upgrade pip +fi + +# Neovim vim-plug +sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \ + https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' + + diff --git a/scripts/apply-system.sh b/scripts/apply-system.sh new file mode 100755 index 0000000..fc01750 --- /dev/null +++ b/scripts/apply-system.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env sh +set -xv + +# Where is this script located +SCRIPT_DIR=$(realpath $(dirname $0)) +echo "SCRIPT_DIR: ${SCRIPT_DIR}" +# Where should the symlink for this repo live in the system +CONFIG_DIR="~/.dotfiles" + +# Create a symlink for this directory to ~/.dotfiles +# if it already exists, error out +if [ -L ${CONFIG_DIR} ] && [ $(readlink -f ${CONFIG_DIR}) != ${SCRIPT_DIR} ]; then + echo "ERR: ${SCRIPT_DIR}/apply-system.sh: ${CONFIG_DIR} exists and not symlink to ${SCRIPT_DIR}" + exit 1 +fi +ln -s -T ${SCRIPT_DIR} ${CONFIG_DIR} + + +# $PWD to ~/.dotfiles +pushd ~/.dotfiles +sudo nixos-rebuild switch --flake .#nixos +popd diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf new file mode 100644 index 0000000..c324075 --- /dev/null +++ b/tmux/.tmux.conf @@ -0,0 +1,18 @@ +# Configuration for tmux +set -g default-terminal "screen-256color" # more colors +set -ga terminal-overrides ",xterm-256color*:Tc" # more colors +set -s escape-time 0 +set -g display-time 1500 + +# rebind C-b to C-a; easier to type on qwerty +unbind C-b +set -g prefix C-a + +bind r source-file ~/.tmux.conf \; display "tmux.conf reloaded at ~/.tmux.conf" +set -g base-index 1 # rebind to start from 0 +setw -g pane-base-index 1 +set-option -g renumber-windows on + +# status bar +set -g status-style 'bg=#333333 fg=#5eacd3' + diff --git a/zk/config.toml b/zk/config.toml new file mode 100644 index 0000000..6817b68 --- /dev/null +++ b/zk/config.toml @@ -0,0 +1,23 @@ +[note] # Settings that reflect the creation of a new note +language = "en" +default-title = "Untitled" +filename = "{{date now 'timestamp'}}" # Loyal to my current style: 202208201345 +extension = "md" # might switch to mdx + +[extra] +author = "Hung Tran" + +[format.markdown] +hashtags = true +multiword-tags = true +link-format = "wiki" +link-drop-extension = true + +[tool] +editor = "nvim" + +[lsp] +[lsp.diagnostics] +wiki-title = "hint" +dead-link = "error" +