Compare commits

...

2 Commits
master ... imac

Author SHA1 Message Date
junikimm717 f350c26d3b packer and remap 9 months ago
junikimm717 d59a37c6d5 change to gruvbox theme 9 months ago
  1. 6
      after/plugin/barbar.lua
  2. 4
      after/plugin/lsp.lua
  3. 2
      after/plugin/lualine.lua
  4. 6
      lua/junikim/packer.lua
  5. 9
      lua/junikim/remap.lua
  6. 14
      lua/junikim/theme.lua

6
after/plugin/barbar.lua

@ -42,5 +42,9 @@ map('n', '<Space>bw', '<Cmd>BufferOrderByWindowNumber<CR>', opts)
require('bufferline').setup {
animation = false,
icon_pinned = '',
icons = {
pinned = {
button = '',
},
},
}

4
after/plugin/lsp.lua

@ -88,7 +88,7 @@ require('mason').setup()
require("mason-nvim-dap").setup({
automatic_setup = true,
})
require 'mason-nvim-dap'.setup_handlers {}
--require 'mason-nvim-dap'.setup_handlers {}
require('mason-null-ls').setup({
@ -97,4 +97,4 @@ require('mason-null-ls').setup({
automatic_setup = true,
})
require('mason-null-ls').setup_handlers()
--require('mason-null-ls').setup_handlers()

2
after/plugin/lualine.lua

@ -9,7 +9,7 @@ require('lualine').setup {
icons_enabled = true,
--theme = 'auto',
--theme = 'onedark',
theme = "catppuccin",
theme = "gruvbox",
--component_separators = { left = '', right = '' },
--component_separators = { left = '', right = '' },
--section_separators = { left = '', right = '' },

6
lua/junikim/packer.lua

@ -4,18 +4,20 @@ return require('packer').startup(function(use)
-- Packer can manage itself
use 'wbthomason/packer.nvim'
use {
'nvim-telescope/telescope.nvim', tag = '0.1.1',
'nvim-telescope/telescope.nvim', tag = '0.1.4',
requires = { { 'nvim-lua/plenary.nvim' } }
}
use {
'windwp/nvim-autopairs'
}
use { "catppuccin/nvim", as = "catppuccin" }
--use { "catppuccin/nvim", as = "catppuccin" }
use { "ellisonleao/gruvbox.nvim", as = "gruvbox" }
use(
'nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }
)
use 'nvim-tree/nvim-web-devicons'
use { 'romgrk/barbar.nvim', wants = 'nvim-web-devicons' }
use 'hura/vim-asymptote'
use {
'nvim-lualine/lualine.nvim',

9
lua/junikim/remap.lua

@ -1,9 +1,5 @@
vim.g.mapleader = " "
vim.keymap.set("n", "<C-h>", "<C-w>h")
vim.keymap.set("n", "<C-j>", "<C-w>j")
vim.keymap.set("n", "<C-k>", "<C-w>k")
vim.keymap.set("n", "<C-l>", "<C-w>l")
vim.keymap.set("i", "<A-a>", "ā")
vim.keymap.set("i", "<A-e>", "ē")
@ -51,3 +47,8 @@ else
vim.keymap.set("n", "<C-f>", unavailable)
vim.keymap.set("n", "<C-y>", unavailable)
end
vim.keymap.set("n", "<C-h>", "<C-w>h")
vim.keymap.set("n", "<C-j>", "<C-w>j")
vim.keymap.set("n", "<C-k>", "<C-w>k")
vim.keymap.set("n", "<C-l>", "<C-w>l")

14
lua/junikim/theme.lua

@ -1,12 +1,11 @@
require('catppuccin').setup {
transparent_background = false,
require('gruvbox').setup {
}
local day = 9
local night = 18
local hour = os.date("*t").hour
local themes = { "catppuccin-macchiato", "catppuccin-mocha" }
local themes = { "gruvbox", "gruvbox" }
local theme = 1
if day <= hour and hour < night then
@ -15,14 +14,21 @@ else
theme = 2
end
vim.cmd.colorscheme(themes[theme])
vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
local function toggletheme()
if theme == 1 then
theme = 2
vim.cmd('set background=dark')
else
theme = 1
vim.cmd('set background=light')
end
vim.cmd.colorscheme(themes[theme])
--vim.cmd.colorscheme(themes[theme])
--vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
--vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
end
vim.api.nvim_create_user_command("ToggleTheme", toggletheme, {})
Loading…
Cancel
Save