From b33adedd66212521402b8b2bb63e05bc73292140 Mon Sep 17 00:00:00 2001 From: Juni Kim Date: Mon, 30 Jan 2023 23:14:19 -0500 Subject: [PATCH] extended theme toggling --- lua/junikim/options.lua | 2 +- lua/junikim/remap.lua | 23 ++++++++++++++++++++++- lua/junikim/theme.lua | 20 ++++++++++++++++++-- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/lua/junikim/options.lua b/lua/junikim/options.lua index 4cdfeec..27f7f67 100644 --- a/lua/junikim/options.lua +++ b/lua/junikim/options.lua @@ -79,7 +79,7 @@ vim.api.nvim_create_autocmd("FileType", { }) vim.api.nvim_create_autocmd("BufWritePre", { - pattern = { "*.go", "*.py", "*.lua", "*.ts", "*.tsx", "*.js", "*.md", "*.json" }, + pattern = { "*.go", "*.py", "*.lua", "*.ts", "*.tsx", "*.js", "*.md", "*.json", "*.rs" }, callback = function(args) vim.lsp.buf.formatting_sync() end diff --git a/lua/junikim/remap.lua b/lua/junikim/remap.lua index 9818658..c29884f 100644 --- a/lua/junikim/remap.lua +++ b/lua/junikim/remap.lua @@ -26,11 +26,22 @@ map("n", "", ":w|:!texbld run compile") map("n", "", ":w|:!./test.sh") -- hacks +vim.keymap.set("v", "J", ":m '>+1gv=gv") +vim.keymap.set("v", "K", ":m '<-2gv=gv") + +vim.keymap.set("n", "J", "mzJ`z") +vim.keymap.set("n", "", "zz") +vim.keymap.set("n", "", "zz") +vim.keymap.set("n", "n", "nzzzv") +vim.keymap.set("n", "N", "Nzzzv") + vim.keymap.set("x", "p", [["_dP]]) vim.keymap.set({ "n", "v" }, "y", [["+y]]) vim.keymap.set("n", "Y", [["+Y]]) vim.keymap.set("n", "x", "!chmod +x %", { silent = true }) vim.keymap.set("n", "X", "!chmod -x %", { silent = true }) + + -- execute file vim.keymap.set("n", "e", "!%:p", { silent = true }) @@ -41,4 +52,14 @@ vim.keymap.set("n", "fmt", function() vim.lsp.buf.formatting_sync() end) -vim.keymap.set("n", "", "silent !tmux neww tmuxs") +if os.getenv("TMUX") ~= nil then + vim.keymap.set("n", "", "silent !tmux neww tmuxs") + vim.keymap.set("n", "", "silent !tmux neww ncmpcpp") +else + local function unavailable() + print("Not in a tmux session") + end + + vim.keymap.set("n", "", unavailable) + vim.keymap.set("n", "", unavailable) +end diff --git a/lua/junikim/theme.lua b/lua/junikim/theme.lua index 06db0c2..1e90974 100644 --- a/lua/junikim/theme.lua +++ b/lua/junikim/theme.lua @@ -1,9 +1,25 @@ local day = 9 local night = 19 local hour = os.date("*t").hour +print("hour" .. hour) + +local themes = { "catppuccin-latte", "catppuccin-mocha" } +local theme = 1 if day <= hour and hour < night then - vim.cmd([[ colorscheme catppuccin-latte ]]) + theme = 1 else - vim.cmd([[ colorscheme catppuccin-mocha ]]) + theme = 2 +end +vim.cmd.colorscheme(themes[theme]) + +local function toggletheme() + if theme == 1 then + theme = 2 + else + theme = 1 + end + vim.cmd.colorscheme(themes[theme]) end + +vim.api.nvim_create_user_command("ToggleTheme", toggletheme, {})