From 2677a36ab948c943bdc0cb0643668ba10de4f3d9 Mon Sep 17 00:00:00 2001
From: Juni Kim <junikimm717@gmail.com>
Date: Tue, 31 Jan 2023 14:34:30 -0500
Subject: [PATCH] lualine+lsp

---
 after/plugin/lsp.lua     |  1 +
 after/plugin/lualine.lua |  3 ++-
 lua/junikim/packer.lua   | 11 -----------
 lua/junikim/remap.lua    | 38 +++++++++++++++-----------------------
 4 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua
index 18d6851..91d549f 100644
--- a/after/plugin/lsp.lua
+++ b/after/plugin/lsp.lua
@@ -45,6 +45,7 @@ lsp.configure("efm", {
 lsp.on_attach(function(client, bufnr)
   local opts = { buffer = bufnr, remap = false }
   vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
+  vim.keymap.set("n", "<leader>rn", function() vim.lsp.buf.rename() end, opts)
 end)
 
 
diff --git a/after/plugin/lualine.lua b/after/plugin/lualine.lua
index 2560358..0e59244 100644
--- a/after/plugin/lualine.lua
+++ b/after/plugin/lualine.lua
@@ -6,7 +6,8 @@ require('lualine').setup {
   options = {
     icons_enabled = true,
     --theme = 'auto',
-    theme = 'onedark',
+    --theme = 'onedark',
+    theme = "catppuccin",
     --component_separators = { left = '', right = '' },
     --component_separators = { left = '', right = '' },
     --section_separators = { left = '', right = '' },
diff --git a/lua/junikim/packer.lua b/lua/junikim/packer.lua
index f7fec77..7eb1a1d 100644
--- a/lua/junikim/packer.lua
+++ b/lua/junikim/packer.lua
@@ -9,17 +9,6 @@ return require('packer').startup(function(use)
   }
   use 'Townk/vim-autoclose'
   use { "catppuccin/nvim", as = "catppuccin" }
---[[
-  use { "jonstoler/werewolf.vim", config = function()
-    -- default 8, use 24 hour format
-    vim.g.werewolf_day_start = 8
-    vim.g.werewolf_day_end = 18
-    -- werewolf
-    vim.g.werewolf_day_themes = { 'catppuccin-latte' }
-    vim.g.werewolf_night_themes = { 'catppuccin-mocha' }
-  end
-  }
-  ]]--
   use(
     'nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }
   )
diff --git a/lua/junikim/remap.lua b/lua/junikim/remap.lua
index 8d53d7b..4d6b1a4 100644
--- a/lua/junikim/remap.lua
+++ b/lua/junikim/remap.lua
@@ -1,29 +1,21 @@
-local function map(mode, lhs, rhs, opts)
-  local options = { noremap = true }
-  if opts then
-    options = vim.tbl_extend("force", options, opts)
-  end
-  vim.api.nvim_set_keymap(mode, lhs, rhs, options)
-end
-
 vim.g.mapleader = " "
 
-map("n", "j", "gj")
-map("n", "k", "gk")
+vim.keymap.set("n", "j", "gj")
+vim.keymap.set("n", "k", "gk")
 
-map("n", "<C-h>", "<C-w>h")
-map("n", "<C-j>", "<C-w>j")
-map("n", "<C-k>", "<C-w>k")
-map("n", "<C-l>", "<C-w>l")
+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")
 
-map("i", "<A-a>", "ā")
-map("i", "<A-e>", "ē")
-map("i", "<A-i>", "ī")
-map("i", "<A-o>", "ō")
-map("i", "<A-u>", "ū")
+vim.keymap.set("i", "<A-a>", "ā")
+vim.keymap.set("i", "<A-e>", "ē")
+vim.keymap.set("i", "<A-i>", "ī")
+vim.keymap.set("i", "<A-o>", "ō")
+vim.keymap.set("i", "<A-u>", "ū")
 
-map("n", "<F12>", ":w|:!texbld run compile<CR>")
-map("n", "<F5>", ":w|:!./test.sh<CR>")
+vim.keymap.set("n", "<F12>", ":w|:!texbld run compile<CR>")
+vim.keymap.set("n", "<F5>", ":w|:!./test.sh<CR>")
 
 -- hacks
 vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
@@ -43,18 +35,18 @@ vim.keymap.set("n", "<leader>X", "<cmd>!chmod -x %<CR>", { silent = true })
 
 
 -- execute file
-vim.keymap.set("n", "<leader>,", "<cmd>e ~/.config/nvim<CR>");
 vim.keymap.set("n", "<leader>r", "<cmd>so ~/.config/nvim/init.lua<CR>")
 vim.keymap.set("n", "<leader>e", "<cmd>!%:p<CR>", { silent = true })
 
 vim.keymap.set("n", "<leader>vz", "<cmd>e ~/.zshrc<CR>");
+vim.keymap.set("n", "<leader>vc", "<cmd>e ~/.config/nvim<CR>");
 
 vim.keymap.set("n", "<leader>fmt", function()
   vim.lsp.buf.formatting_sync()
 end)
 
 if os.getenv("TMUX") ~= nil then
-  vim.keymap.set("n", "<C-f>", [[<cmd>silent !tmux neww "zsh -c '. ~/.zshenv; tmuxs'"<CR>]])
+  vim.keymap.set("n", "<C-f>", [[<cmd>silent !tmux neww tmuxs\; setenv WORKSPACES $WORKSPACES \;<CR>]])
   vim.keymap.set("n", "<C-y>", [[<cmd>silent !tmux neww ncmpcpp<CR>]])
 else
   local function unavailable()