diff --git a/README.md b/README.md index 41139505..5287c97f 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ fork to your machine using one of the commands below, depending on your OS. > [!NOTE] > Your fork's URL will be something like this: -> `https://github.com//kickstart.nvim.git` +> `https://github.com//kickstart.nvim.jenson` You likely want to remove `lazy-lock.json` from your fork's `.gitignore` file too - it's ignored in the kickstart repo to make maintenance easier, but it's @@ -74,7 +74,7 @@ too - it's ignored in the kickstart repo to make maintenance easier, but it's
Linux and Mac ```sh -git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim +git clone https://github.com/jensonjohnathon/kickstart.nvim.jenson "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim ```
@@ -84,13 +84,13 @@ git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME:-$HO If you're using `cmd.exe`: ``` -git clone https://github.com/nvim-lua/kickstart.nvim.git "%localappdata%\nvim" +git clone https://github.com/jensonjohnathon/kickstart.nvim.jenson "%localappdata%\nvim" ``` If you're using `powershell.exe` ``` -git clone https://github.com/nvim-lua/kickstart.nvim.git "${env:LOCALAPPDATA}\nvim" +git clone https://github.com/jensonjohnathon/kickstart.nvim.jenson "${env:LOCALAPPDATA}\nvim" ``` @@ -147,8 +147,8 @@ examples of adding popularly requested plugins. same functionality is available here: * [kickstart-modular.nvim](https://github.com/dam9000/kickstart-modular.nvim) * Discussions on this topic can be found here: - * [Restructure the configuration](https://github.com/nvim-lua/kickstart.nvim/issues/218) - * [Reorganize init.lua into a multi-file setup](https://github.com/nvim-lua/kickstart.nvim/pull/473) + * [Restructure the configuration](https://github.com/jensonjohnathon/kickstart.nvim/issues/218) + * [Reorganize init.lua into a multi-file setup](https://github.com/jensonjohnathon/kickstart.nvim/pull/473) ### Install Recipes diff --git a/init.lua b/init.lua index be4296ee..34351e7d 100644 --- a/init.lua +++ b/init.lua @@ -118,6 +118,19 @@ vim.schedule(function() vim.o.clipboard = 'unnamedplus' end) +vim.g.clipboard = { + name = 'wl-clipboard', + copy = { + ['+'] = 'wl-copy', + ['*'] = 'wl-copy', + }, + paste = { + ['+'] = 'wl-paste', + ['*'] = 'wl-paste', + }, + cache_enabled = true, +} + -- Enable break indent vim.o.breakindent = true @@ -520,8 +533,8 @@ require('lazy').setup({ -- Automatically install LSPs and related tools to stdpath for Neovim -- Mason must be loaded before its dependents so we need to set it up here. -- NOTE: `opts = {}` is the same as calling `require('mason').setup({})` - { 'mason-org/mason.nvim', opts = {} }, - 'mason-org/mason-lspconfig.nvim', + { 'williamboman/mason.nvim', opts = {} }, + 'williamboman/mason-lspconfig.nvim', 'WhoIsSethDaniel/mason-tool-installer.nvim', -- Useful status updates for LSP. @@ -710,7 +723,7 @@ require('lazy').setup({ -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/ local servers = { -- clangd = {}, - -- gopls = {}, + gopls = {}, -- pyright = {}, -- rust_analyzer = {}, -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs @@ -919,11 +932,13 @@ require('lazy').setup({ -- change the command in the config to whatever the name of that colorscheme is. -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'folke/tokyonight.nvim', + -- 'folke/tokyonight.nvim', + -- 'navarasu/onedark.nvim', + 'scottmckendry/cyberdream.nvim', priority = 1000, -- Make sure to load this before all the other start plugins. config = function() ---@diagnostic disable-next-line: missing-fields - require('tokyonight').setup { + require('cyberdream').setup { styles = { comments = { italic = false }, -- Disable italics in comments }, @@ -932,7 +947,7 @@ require('lazy').setup({ -- Load the colorscheme here. -- Like many other themes, this one has different styles, and you could load -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-night' + vim.cmd.colorscheme 'cyberdream' end, }, @@ -982,7 +997,7 @@ require('lazy').setup({ main = 'nvim-treesitter.configs', -- Sets main module to use for opts -- [[ Configure Treesitter ]] See `:help nvim-treesitter` opts = { - ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' }, + ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'go' }, -- Autoinstall languages that are not installed auto_install = true, highlight = { @@ -1022,7 +1037,8 @@ require('lazy').setup({ -- This is the easiest way to modularize your config. -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, + -- -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` -- Or use telescope! diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index be0eb9d8..db658aad 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -2,4 +2,13 @@ -- I promise not to create any merge conflicts in this directory :) -- -- See the kickstart.nvim README for more information -return {} +return { + { + 'davidmh/mdx.nvim', + dependencies = { 'nvim-treesitter/nvim-treesitter' }, + lazy = false, + config = function() + require('mdx').setup() + end, + }, +}