summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWayne-Cole <77279425+Wacky404@users.noreply.github.com>2024-07-13 18:45:14 -0500
committerWayne-Cole <77279425+Wacky404@users.noreply.github.com>2024-07-13 18:45:14 -0500
commit34ef6da2318684a677f4e1a747d18c3a3de49c48 (patch)
treeb30c3bd62ed30d9abea8f506846fa14334263c40
parent0b836aeb54bea740a3cd9e8c4da54e72eb5d74c9 (diff)
downloadwackys-dev-env-34ef6da2318684a677f4e1a747d18c3a3de49c48.tar.xz
wackys-dev-env-34ef6da2318684a677f4e1a747d18c3a3de49c48.zip
update: dot files update
-rw-r--r--.config/nvim/init.lua2
-rw-r--r--.config/nvim/lua/cole/core/colorscheme.lua59
-rw-r--r--.config/nvim/lua/cole/plugins-setup.lua3
-rw-r--r--.config/nvim/lua/cole/plugins/formatter.lua1
-rw-r--r--.config/nvim/lua/cole/plugins/linter-setup.lua16
-rw-r--r--.config/nvim/lua/cole/plugins/lsp/lspconfig.lua8
-rw-r--r--.config/nvim/lua/cole/plugins/lsp/mason.lua6
-rw-r--r--.config/nvim/lua/cole/plugins/nvim-tree.lua78
-rw-r--r--.config/nvim/lua/cole/plugins/vimtex-setup.lua34
-rw-r--r--.config/nvim/plugin/packer_compiled.lua24
-rw-r--r--README.md12
11 files changed, 162 insertions, 81 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index b54e4c7..1e046e8 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -15,3 +15,5 @@ require("cole.plugins.autopairs")
require("cole.plugins.treesitter")
require("cole.plugins.gitsigns")
require("cole.plugins.formatter")
+require("cole.plugins.vimtex-setup")
+require("cole.plugins.linter-setup")
diff --git a/.config/nvim/lua/cole/core/colorscheme.lua b/.config/nvim/lua/cole/core/colorscheme.lua
index 2a14a15..9c35834 100644
--- a/.config/nvim/lua/cole/core/colorscheme.lua
+++ b/.config/nvim/lua/cole/core/colorscheme.lua
@@ -1,29 +1,38 @@
-local tokyonight, _ = pcall(vim.cmd, "colorscheme tokyonight-day")
-if not tokyonight then
+local status, err = pcall(vim.cmd, "colorscheme bluloco")
+if not status then
+ print(err)
return
end
-require("tokyonight").setup({
- -- your configuration comes here
- -- or leave it empty to use the default settings
- style = "storm", -- The theme comes in three styles, `storm`, `moon`, a darker variant `night` and `day`
- light_style = "day", -- The theme is used when the background is set to light
- transparent = true, -- Enable this to disable setting the background color
- terminal_colors = false, -- Configure the colors used when opening a `:terminal` in [Neovim](https://github.com/neovim/neovim)
- styles = {
- -- Style to be applied to different syntax groups
- -- Value is any valid attr-list value for `:help nvim_set_hl`
- comments = { italic = true },
- keywords = { italic = true },
- functions = {},
- variables = {},
- -- Background styles. Can be "dark", "transparent" or "normal"
- sidebars = "transparent", -- style for sidebars, see below
- floats = "transparent", -- style for floating windows
- },
- sidebars = { "terminal", "help" }, -- Set a darker background on sidebar-like windows. For example: `["qf", "vista_kind", "terminal", "packer"]`
- day_brightness = 0.5, -- Adjusts the brightness of the colors of the **Day** style. Number between 0 and 1, from dull to vibrant colors
- hide_inactive_statusline = false, -- Enabling this option, will hide inactive statuslines and replace them with a thin border instead. Should work with the standard **StatusLine** and **LuaLine**.
- dim_inactive = false, -- dims inactive windows
- lualine_bold = false, -- When `true`, section headers in the lualine theme will be bold
+require("bluloco").setup({
+ style = "light", -- "auto" | "dark" | "light"
+ transparent = true,
+ italics = false,
+ terminal = vim.fn.has("gui_running") == 1, -- bluoco colors are enabled in gui terminals per default.
+ guicursor = true,
})
+
+-- require("tokyonight").setup({
+-- -- your configuration comes here
+-- -- or leave it empty to use the default settings
+-- style = "storm", -- The theme comes in three styles, `storm`, `moon`, a darker variant `night` and `day`
+-- light_style = "day", -- The theme is used when the background is set to light
+-- transparent = true, -- Enable this to disable setting the background color
+-- terminal_colors = false, -- Configure the colors used when opening a `:terminal` in [Neovim](https://github.com/neovim/neovim)
+-- styles = {
+-- -- Style to be applied to different syntax groups
+-- -- Value is any valid attr-list value for `:help nvim_set_hl`
+-- comments = { italic = true },
+-- keywords = { italic = true },
+-- functions = {},
+-- variables = {},
+-- -- Background styles. Can be "dark", "transparent" or "normal"
+-- sidebars = "transparent", -- style for sidebars, see below
+-- floats = "transparent", -- style for floating windows
+-- },
+-- sidebars = { "terminal", "help" }, -- Set a darker background on sidebar-like windows. For example: `["qf", "vista_kind", "terminal", "packer"]`
+-- day_brightness = 0.5, -- Adjusts the brightness of the colors of the **Day** style. Number between 0 and 1, from dull to vibrant colors
+-- hide_inactive_statusline = false, -- Enabling this option, will hide inactive statuslines and replace them with a thin border instead. Should work with the standard **StatusLine** and **LuaLine**.
+-- dim_inactive = false, -- dims inactive windows
+-- lualine_bold = false, -- When `true`, section headers in the lualine theme will be bold
+-- })
diff --git a/.config/nvim/lua/cole/plugins-setup.lua b/.config/nvim/lua/cole/plugins-setup.lua
index 6644f2a..fd54dab 100644
--- a/.config/nvim/lua/cole/plugins-setup.lua
+++ b/.config/nvim/lua/cole/plugins-setup.lua
@@ -37,7 +37,7 @@ return packer.startup(function(use)
use("xiyaowong/transparent.nvim")
-- Color Scheme is here!!!
- use("folke/tokyonight.nvim") -- preferred colorscheme
+ use({ "uloco/bluloco.nvim", requires = { "rktjmp/lush.nvim" } }) -- preferred colorscheme atm
use("christoomey/vim-tmux-navigator") -- tmux & split window navigation
@@ -79,6 +79,7 @@ return packer.startup(function(use)
-- managing & installing lsp servers, linters & formatters
use("williamboman/mason.nvim") -- in charge of managing lsp servers, linters & formatters
use("williamboman/mason-lspconfig.nvim") -- bridges gap b/w mason & lspconfig
+ use("mfussenegger/nvim-lint") -- installed because of mypy linter
-- configuring lsp servers
use("neovim/nvim-lspconfig") -- easily configure language servers
diff --git a/.config/nvim/lua/cole/plugins/formatter.lua b/.config/nvim/lua/cole/plugins/formatter.lua
index 40b3852..84d503f 100644
--- a/.config/nvim/lua/cole/plugins/formatter.lua
+++ b/.config/nvim/lua/cole/plugins/formatter.lua
@@ -15,6 +15,7 @@ require("formatter").setup({
c = { require("formatter.filetypes.cpp").clangformat },
latex = { require("formatter.filetypes.latex").latexindent },
markdown = { require("formatter.filetypes.markdown").prettier },
+ html = { require("formatter.filetypes.html").prettier },
-- Formatter configurations for filetype "lua" go here
-- and will be executed in order
lua = {
diff --git a/.config/nvim/lua/cole/plugins/linter-setup.lua b/.config/nvim/lua/cole/plugins/linter-setup.lua
new file mode 100644
index 0000000..186cfb2
--- /dev/null
+++ b/.config/nvim/lua/cole/plugins/linter-setup.lua
@@ -0,0 +1,16 @@
+-- specifies linter for each filetype
+require("lint").linters_by_ft = {
+ python = { "mypy" },
+}
+
+vim.api.nvim_create_autocmd({ "BufWritePost" }, {
+ callback = function()
+ -- try_lint without arguments runs the linters defined in `linters_by_ft`
+ -- for the current filetype
+ require("lint").try_lint()
+
+ -- You can call `try_lint` with a linter name or a list of names to always
+ -- run specific linters, independent of the `linters_by_ft` configuration
+ -- require("lint").try_lint("cspell")
+ end,
+})
diff --git a/.config/nvim/lua/cole/plugins/lsp/lspconfig.lua b/.config/nvim/lua/cole/plugins/lsp/lspconfig.lua
index bce89ab..7ad20d3 100644
--- a/.config/nvim/lua/cole/plugins/lsp/lspconfig.lua
+++ b/.config/nvim/lua/cole/plugins/lsp/lspconfig.lua
@@ -44,7 +44,13 @@ for type, icon in pairs(signs) do
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
end
-local servers = { "clangd", "arduino_language_server", "ltex", "jedi_language_server" }
+local servers = {
+ "clangd",
+ "arduino_language_server",
+ "ltex",
+ "jedi_language_server",
+ "biome",
+}
for _, lsp in pairs(servers) do
require("lspconfig")[lsp].setup({
diff --git a/.config/nvim/lua/cole/plugins/lsp/mason.lua b/.config/nvim/lua/cole/plugins/lsp/mason.lua
index e9196cc..5a71612 100644
--- a/.config/nvim/lua/cole/plugins/lsp/mason.lua
+++ b/.config/nvim/lua/cole/plugins/lsp/mason.lua
@@ -10,7 +10,6 @@ if not mason_lspconfig_status then
return
end
-
-- enable mason and configure icons
mason.setup({
ui = {
@@ -30,9 +29,10 @@ mason_lspconfig.setup({
"arduino_language_server",
"ltex",
"jedi_language_server",
+ "html",
+ "tailwindcss",
+ "biome",
},
-- auto-install configured servers (with lspconfig)
automatic_installation = true, -- not the same as ensure_installed
})
-
-
diff --git a/.config/nvim/lua/cole/plugins/nvim-tree.lua b/.config/nvim/lua/cole/plugins/nvim-tree.lua
index fea9a85..fb5a889 100644
--- a/.config/nvim/lua/cole/plugins/nvim-tree.lua
+++ b/.config/nvim/lua/cole/plugins/nvim-tree.lua
@@ -1,6 +1,6 @@
local setup, nvimtree = pcall(require, "nvim-tree")
-if not setup then
- return
+if not setup then
+ return
end
-- recommended settings from nvim-tree documentation
@@ -12,52 +12,52 @@ vim.cmd([[ highlight NvimTreeIndentMarker guifg=#3FC5FF ]])
-- configure nvim-tree
nvimtree.setup({
- -- change folder arrow icons
- renderer = {
- icons = {
- glyphs = {
- folder = {
- arrow_closed = "", -- arrow when folder is closed
- arrow_open = "", -- arrow when folder is open
- },
- },
- },
- },
- -- disable window_picker for
- -- explorer to work well with
- -- window splits
- actions = {
- open_file = {
- window_picker = {
- enable = false,
- },
- },
- },
- -- git = {
- -- ignore = false,
- -- },
+ -- change folder arrow icons
+ renderer = {
+ icons = {
+ glyphs = {
+ folder = {
+ arrow_closed = "", -- arrow when folder is closed
+ arrow_open = "", -- arrow when folder is open
+ },
+ },
+ },
+ },
+ -- disable window_picker for
+ -- explorer to work well with
+ -- window splits
+ actions = {
+ open_file = {
+ window_picker = {
+ enable = false,
+ },
+ },
+ },
+ -- git = {
+ -- ignore = false,
+ -- },
})
-- open nvim-tree on setup
local function open_nvim_tree(data)
- -- buffer is a [No Name]
- local no_name = data.file == "" and vim.bo[data.buf].buftype == ""
+ -- buffer is a [No Name]
+ local no_name = data.file == "" and vim.bo[data.buf].buftype == ""
- -- buffer is a directory
- local directory = vim.fn.isdirectory(data.file) == 1
+ -- buffer is a directory
+ local directory = vim.fn.isdirectory(data.file) == 1
- if not no_name and not directory then
- return
- end
+ if not no_name and not directory then
+ return
+ end
- -- change to the directory
- if directory then
- vim.cmd.cd(data.file)
- end
+ -- change to the directory
+ if directory then
+ vim.cmd.cd(data.file)
+ end
- -- open the tree
- require("nvim-tree.api").tree.open()
+ -- open the tree
+ require("nvim-tree.api").tree.open()
end
vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
diff --git a/.config/nvim/lua/cole/plugins/vimtex-setup.lua b/.config/nvim/lua/cole/plugins/vimtex-setup.lua
index e69de29..64f9f17 100644
--- a/.config/nvim/lua/cole/plugins/vimtex-setup.lua
+++ b/.config/nvim/lua/cole/plugins/vimtex-setup.lua
@@ -0,0 +1,34 @@
+-- Fixes focus loss problems on macOS
+-- wrapping in vim.cmd()
+-- vim.cd() Executes Vim Script commands
+vim.cmd([[
+function! s:TexFocusVim() abort
+ silent execute "!open -a iTerm"
+ redraw!
+endfunction
+
+augroup vimtex_event_focus
+ au!
+ au User VimTexEventViewReverse call s:TexFocusVim()
+augroup END
+]])
+
+-- Viewer method, upon compilation
+vim.g.vimtex_view_method = "skim"
+
+-- View Option
+vim.g.vimtex_view_general_viewer = "skim"
+vim.g.vimtex_view_general_options = "--unique"
+
+-- Determine to automatically open PDF viewer after compilation
+vim.g.vimtex_view_automatic = 1
+
+-- Most VimTex mappings rely on localleader and this can be changed
+-- with the following line:
+vim.g.maplocalleader = ","
+
+-- Keymappings for VimTeX
+
+-- Trigger VimTexView
+-- nmap <localleader>v <plug>(vimtex-view)
+vim.api.nvim_set_keymap("n", "<localleader>v", "<plug>(vimtex-view)", { noremap = true })
diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua
index 3e05476..8c85fc6 100644
--- a/.config/nvim/plugin/packer_compiled.lua
+++ b/.config/nvim/plugin/packer_compiled.lua
@@ -49,8 +49,8 @@ local function save_profiles(threshold)
end
time([[Luarocks path setup]], true)
-local package_path_str = "/Users/cole/.cache/nvim/packer_hererocks/2.1.1700008891/share/lua/5.1/?.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1700008891/share/lua/5.1/?/init.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1700008891/lib/luarocks/rocks-5.1/?.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1700008891/lib/luarocks/rocks-5.1/?/init.lua"
-local install_cpath_pattern = "/Users/cole/.cache/nvim/packer_hererocks/2.1.1700008891/lib/lua/5.1/?.so"
+local package_path_str = "/Users/cole/.cache/nvim/packer_hererocks/2.1.1710088188/share/lua/5.1/?.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1710088188/share/lua/5.1/?/init.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1710088188/lib/luarocks/rocks-5.1/?.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1710088188/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/Users/cole/.cache/nvim/packer_hererocks/2.1.1710088188/lib/lua/5.1/?.so"
if not string.find(package.path, package_path_str, 1, true) then
package.path = package.path .. ';' .. package_path_str
end
@@ -84,6 +84,11 @@ _G.packer_plugins = {
path = "/Users/cole/.local/share/nvim/site/pack/packer/start/LuaSnip",
url = "https://github.com/L3MON4D3/LuaSnip"
},
+ ["bluloco.nvim"] = {
+ loaded = true,
+ path = "/Users/cole/.local/share/nvim/site/pack/packer/start/bluloco.nvim",
+ url = "https://github.com/uloco/bluloco.nvim"
+ },
["cmp-buffer"] = {
loaded = true,
path = "/Users/cole/.local/share/nvim/site/pack/packer/start/cmp-buffer",
@@ -134,6 +139,11 @@ _G.packer_plugins = {
path = "/Users/cole/.local/share/nvim/site/pack/packer/start/lualine.nvim",
url = "https://github.com/nvim-lualine/lualine.nvim"
},
+ ["lush.nvim"] = {
+ loaded = true,
+ path = "/Users/cole/.local/share/nvim/site/pack/packer/start/lush.nvim",
+ url = "https://github.com/rktjmp/lush.nvim"
+ },
["markdown-preview.nvim"] = {
loaded = false,
needs_bufread = false,
@@ -161,6 +171,11 @@ _G.packer_plugins = {
path = "/Users/cole/.local/share/nvim/site/pack/packer/start/nvim-cmp",
url = "https://github.com/hrsh7th/nvim-cmp"
},
+ ["nvim-lint"] = {
+ loaded = true,
+ path = "/Users/cole/.local/share/nvim/site/pack/packer/start/nvim-lint",
+ url = "https://github.com/mfussenegger/nvim-lint"
+ },
["nvim-lspconfig"] = {
loaded = true,
path = "/Users/cole/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
@@ -214,11 +229,6 @@ _G.packer_plugins = {
path = "/Users/cole/.local/share/nvim/site/pack/packer/start/toggleterm.nvim",
url = "https://github.com/akinsho/toggleterm.nvim"
},
- ["tokyonight.nvim"] = {
- loaded = true,
- path = "/Users/cole/.local/share/nvim/site/pack/packer/start/tokyonight.nvim",
- url = "https://github.com/folke/tokyonight.nvim"
- },
["transparent.nvim"] = {
loaded = true,
path = "/Users/cole/.local/share/nvim/site/pack/packer/start/transparent.nvim",
diff --git a/README.md b/README.md
index 959a139..9d000d6 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,19 @@
# Wacky's Dev Environment 💻
-> In case of a nuclear strike on a state that no one cares about, my config shall live on.
+> In case of a nuclear strike on a state that no one cares about, my config shall live on.
### ✨ If your looking at this, try to garner some inspiration ✨
-> This config is specifically tailored for my needs and wants on MacOS. As of right now
+> This config is specifically tailored for my needs and wants on MacOS. As of right now
> I'm currently developing in Python, C++, and C. I tried to keep my NeoVim fairly 'light'.
-### My Essentials:
-> - treesh*tter
+### My Essentials:
+> - treessitter
> - telescope
> - lsp, linting, formatting
> - autocompletion
> - terminal integration (.zsh btw)
> - markdown preview; for readme and notetaking
+> - latexmk
🛑 If you want to see my keybindings and current color scheme 🛑
> navigate to keymaps.lua
->
+>
> navigate to colorscheme.lua
+> *some of my keybindings are also included in the setup of the plugin