From fb806e8b65f3b746c4fd51bea681fbc7cefc3026 Mon Sep 17 00:00:00 2001 From: NotAI Date: Sun, 3 Dec 2023 18:28:08 -0500 Subject: [PATCH] Changed theme to emark --- init.lua | 59 ++++++------------------------------- lazy-lock.json | 2 +- lua/custom/plugins/init.lua | 7 ++++- 3 files changed, 16 insertions(+), 52 deletions(-) diff --git a/init.lua b/init.lua index c55bf0fe..32e7715f 100644 --- a/init.lua +++ b/init.lua @@ -1,43 +1,3 @@ ---[[ - -===================================================================== -==================== READ THIS BEFORE CONTINUING ==================== -===================================================================== - -Kickstart.nvim is *not* a distribution. - -Kickstart.nvim is a template for your own configuration. - The goal is that you can read every line of code, top-to-bottom, understand - what your configuration is doing, and modify it to suit your needs. - - Once you've done that, you should start exploring, configuring and tinkering to - explore Neovim! - - If you don't know anything about Lua, I recommend taking some time to read through - a guide. One possible example: - - https://learnxinyminutes.com/docs/lua/ - - - And then you can explore or search through `:help lua-guide` - - https://neovim.io/doc/user/lua-guide.html - - -Kickstart Guide: - -I have left several `:help X` comments throughout the init.lua -You should run that command and read that help section for more information. - -In addition, I have some `NOTE:` items throughout the file. -These are for you, the reader to help understand what is happening. Feel free to delete -them once you know what you're doing, but they should serve as a guide for when you -are first encountering a few different constructs in your nvim config. - -I hope you enjoy your Neovim journey, -- TJ - -P.S. You can delete this when you're done too. It's your config now :) ---]] - -- Set as the leader key -- See `:help mapleader` -- NOTE: Must happen before plugins are required (otherwise wrong leader will be used) @@ -150,17 +110,15 @@ require('lazy').setup({ end, { expr = true, buffer = bufnr, desc = 'Jump to previous hunk' }) end, }, + config = function() + end }, - { - -- Theme inspired by Atom - 'navarasu/onedark.nvim', - priority = 1000, + "embark-theme/vim", config = function() - vim.cmd.colorscheme 'onedark' - end, + vim.cmd.colorscheme 'embark' + end }, - { -- Set lualine as statusline 'nvim-lualine/lualine.nvim', @@ -168,7 +126,7 @@ require('lazy').setup({ opts = { options = { icons_enabled = false, - theme = 'onedark', + theme = 'embark', component_separators = '|', section_separators = '', }, @@ -235,7 +193,7 @@ require('lazy').setup({ -- [[ Setting options ]] -- See `:help vim.o` -- NOTE: You can change these options as you wish! - +-- -- Set highlight on search vim.o.hlsearch = false @@ -525,6 +483,8 @@ local servers = { -- html = { filetypes = { 'html', 'twig', 'hbs'} }, lua_ls = { + config = { + }; Lua = { workspace = { checkThirdParty = false }, telemetry = { enable = false }, @@ -610,5 +570,4 @@ cmp.setup { }, } --- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/lazy-lock.json b/lazy-lock.json index 78b895a5..a73958c6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -16,10 +16,10 @@ "nvim-lspconfig": { "branch": "master", "commit": "694aaec65733e2d54d393abf80e526f86726c988" }, "nvim-treesitter": { "branch": "master", "commit": "80a16deb5146a3eb4648effccda1ab9f45e43e76" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" }, - "onedark.nvim": { "branch": "master", "commit": "e7c656ac6b6460aaab817cbd0c9d5c043eda4b43" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "vim": { "branch": "main", "commit": "7efd788d2e7b2d0a923cb6dabad7e2c11ab7aa95" }, "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index be0eb9d8..ca6ef8f7 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -2,4 +2,9 @@ -- I promise not to create any merge conflicts in this directory :) -- -- See the kickstart.nvim README for more information -return {} +return { + { + "nvim-telescope/telescope-file-browser.nvim", + dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" } + }; +}