PowerUser/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git.blakenorth.net/home/git/dotfiles

Browse source
This commit is contained in:
PowerUser64 2022-06-04 22:27:34 -07:00
commit dc771d203e
4 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.config/nvim/init.lua
View file

@ -4,6 +4,7 @@
require('blake.plugins') require('blake.plugins')
-- basic settings: ~/.config/nvim/lua/blake/settings.lua -- basic settings: ~/.config/nvim/lua/blake/settings.lua
require('blake.settings') require('blake.settings')
vim.cmd 'colorscheme tokyonight'
-- TODO: -- TODO:
-- Make plugins more modular -- Make plugins more modular

6
.config/nvim/lua/blake/lsp.lua
View file

@ -212,7 +212,7 @@ M.lspconfig = function()
local buffmap = vim.api.nvim_buf_set_keymap local buffmap = vim.api.nvim_buf_set_keymap
local buffopt = vim.api.nvim_buf_set_option local buffopt = vim.api.nvim_buf_set_option
map('n', '<leader>e', '<cmd>lua vim.diagnostic.open_float()<CR>', opts) map('n', '<leader>e', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
map('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts) map('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
map('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts) map('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
map('n', '<leader>q', '<cmd>lua require("telescope.builtin").diagnostics()<CR>', opts) -- Telescope map('n', '<leader>q', '<cmd>lua require("telescope.builtin").diagnostics()<CR>', opts) -- Telescope
@ -235,9 +235,9 @@ M.lspconfig = function()
buffmap(bufnr, 'n', '<leader>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts) buffmap(bufnr, 'n', '<leader>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
buffmap(bufnr, 'n', '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts) buffmap(bufnr, 'n', '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
buffmap(bufnr, 'n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts) buffmap(bufnr, 'n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
buffmap(bufnr, 'n', '<leader>ca', '<cmd>lua require("telescope.builtin").lsp_code_actions()<CR>', opts) -- Telescope buffmap(bufnr, 'n', '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
buffmap(bufnr, 'n', 'gr', '<cmd>lua require("telescope.builtin").lsp_references()<CR>', opts) -- Telescope buffmap(bufnr, 'n', 'gr', '<cmd>lua require("telescope.builtin").lsp_references()<CR>', opts) -- Telescope
buffmap(bufnr, 'n', '<leader>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts) buffmap(bufnr, 'n', '<leader>f', '<cmd>lua vim.lsp.buf.format { async = true }<CR>', opts)
buffmap(bufnr, 'n', '<leader>so', '<cmd>lua require("telescope.builtin").lsp_document_symbols()<CR>', opts) buffmap(bufnr, 'n', '<leader>so', '<cmd>lua require("telescope.builtin").lsp_document_symbols()<CR>', opts)
end -- <<< end -- <<<

36
.config/nvim/lua/blake/other.lua
View file

@ -245,18 +245,32 @@ M.lualine = function()
-- Color table for highlights -- Color table for highlights
-- stylua: ignore -- stylua: ignore
-- Onedark colors
-- local colors = {
-- bg = '#21242B',
-- fg = '#bbc2cf',
-- yellow = '#ECBE7B',
-- cyan = '#008080',
-- darkblue = '#081633',
-- green = '#98be65',
-- orange = '#FF8800',
-- violet = '#a9a1e1',
-- magenta = '#c678dd',
-- blue = '#51afef',
-- red = '#ec5f67',
-- }
local colors = { local colors = {
bg = '#21242B', bg = '#1a1b26',
fg = '#bbc2cf', fg = '#c0caf5',
yellow = '#ECBE7B', red = '#f7768e',
cyan = '#008080', orange = '#ff9e64',
darkblue = '#081633', yellow = '#e0af68',
green = '#98be65', green = '#9ece6a',
orange = '#FF8800', cyan = '#7dcfff',
violet = '#a9a1e1', blue = '#7aa2f7',
magenta = '#c678dd', darkblue = '#7aa2f7',
blue = '#51afef', violet = '#15161E',
red = '#ec5f67', magenta = '#bb9af7',
} }
local conditions = { local conditions = {

4
.config/nvim/lua/blake/plugins.lua
View file

@ -45,10 +45,12 @@ return require('packer').startup({function()
"au ColorScheme onedark hi TabLine gui=none guibg='#282C34' guifg='#5C6370' " all tabs color "au ColorScheme onedark hi TabLine gui=none guibg='#282C34' guifg='#5C6370' " all tabs color
au ColorScheme onedark hi TabLineSel guibg='#282C34' guifg='#B5BBC7' " Highlighted tab color au ColorScheme onedark hi TabLineSel guibg='#282C34' guifg='#B5BBC7' " Highlighted tab color
"au ColorScheme onedark hi TabLineFill guibg='#282C34' " tabline portion without tabs (right-hand side) "au ColorScheme onedark hi TabLineFill guibg='#282C34' " tabline portion without tabs (right-hand side)
colorscheme onedark
]] ]]
end end
} }
use { -- tokyonight theme
'folke/tokyonight.nvim',
}
use { -- newspring: Good light theme for writing use { -- newspring: Good light theme for writing
'NLKNguyen/papercolor-theme', 'NLKNguyen/papercolor-theme',
} }