diff --git a/colors/noctalia.lua b/colors/noctalia.lua new file mode 100644 index 0000000..6133fb9 --- /dev/null +++ b/colors/noctalia.lua @@ -0,0 +1,7 @@ +return { + bg = "#291414", + fg = "#f3f2f2", + accent = "#e46767", + error = "#fd4663", + warning = "#cccc66", +} diff --git a/colors/testTheme.lua b/colors/testTheme.lua new file mode 100644 index 0000000..7e76824 --- /dev/null +++ b/colors/testTheme.lua @@ -0,0 +1,57 @@ +return { + + -- color approach + + red = "#ff3d00", + orange = "#e58e44", + green = "#77b886", + yellow = "#f7cb92", + blue = "#7689d9", + magenta = "#8f509d", + cyan = "#8fb9f4", + black = "#000000", + bright_red = "#ff6347", + bright_orange = "#f6aa6b", + bright_green = "#a3d6a5", + bright_yellow = "#ffe56e", + bright_blue = "#9eabe6", + bright_magenta = "#b78fc2", + bright_cyan = "#a4c4ff", + white = "#ffffff", + gutter_fg = "#78808f", + nontext = "#d2d6dc", + -- element approach + bg = "#0f1c2e", + fg = "#e6e8ee", + cursorline = "#1c2b3a", + selection = "#2e3c55", + linenr = "#4a5a70", + comment = "#7d88a1", + + -- Syntax + keyword = "#f28fad", + Function = "#89b4fa", + string = "#f9e2af", + constant = "#cdd6f4", + type = "#cba6f7", + number = "#fab387", + boolean = "#f38ba8", + operator = "#94a3b8", + variable = "#e0def4", + + -- UI + cursor = "#f5a97f", + visual = "#2e3c55", + search = "#f5c2e7", + statusline = "#1e293b", + menu_bg = "#1a2535", + menu_sel = "#3b4252", + fold = "#3e4a5a", + split = "#334155", + + -- Diagnostics + diag_error = "#f38ba8", + diag_warn = "#fab387", + diag_info = "#89dceb", + diag_hint = "#b4befe", +} diff --git a/init.lua b/init.lua index 34867b5..9e387dc 100644 --- a/init.lua +++ b/init.lua @@ -7,11 +7,16 @@ vim.g.maplocalleader = ' ' vim.g.have_nerd_font = true -vim.g.netrw_liststyle = 3 +vim.g.netrw_liststyle = 3 --tree view vim.g.netrw_banner = 1 +vim.g.netrw_winsize = 70 -- Set the width of the "drawer" +vim.g.netrw_browse_split = 4 -- Open files in previous window. This emulates the typical "drawer" behavior +vim.g.netrw_preview = 1 -- opens in vertical if no open buffer vim.g.netrw_altv = 1 -- Create the split of the Netrw window to the left -vim.g.netrw_winsize = 30 -- Set the width of the "drawer" -vim.g.netrw_browse_split = 4 -- Open files in previous window. This emulates the typical "drawer" behaviorkjk + +vim.keymap.set('n', '', ':bnext') +vim.keymap.set('n', '', ':bprev') +vim.keymap.set('n', 'x', ':bdelete') -- [[Setting options]] -- See `:help vim.o` @@ -44,8 +49,8 @@ vim.o.updatetime = 250 -- Decrease mapped sequence wait time vim.o.timeoutlen = 300 -- Configure how new splits should be opened -vim.o.splitright = true -vim.o.splitbelow = true +-- vim.o.splitright = false +-- vim.o.splitbelow = true vim.o.list = true vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } -- Preview substitutions live, as you type! @@ -67,6 +72,7 @@ vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagn vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) +vim.keymap.set("n", "a", ":IncRename ", {desc = 'ren[a]me variable under cursor'}) -- run clear and make in open terminal vim @@ -75,8 +81,27 @@ vim .keymap .set('n','n', 'ToggleTerm direction=vertical name=compile size=70', { desc = 'open a [n]ew terminal' }) vim.keymap.set('n','t', 'ToggleTerm', {desc = '[T]oggle all terminals'}) -vim.keymap.set('n','l', 'TermExec cmd="eval (history | head -n 1)"') --- vim.keymap.set('n','l', 'a') + +vim.keymap.set("n", "l", function() + -- Get terminal ID 1 + -- Save position and buffer context + + + local term = require("toggleterm.terminal").get(1) + if term then + local original_window = vim.api.nvim_get_current_win() + local saved_view = vim.fn.winsaveview() + -- Using \r (carriage return) or \n\n often bypasses shell interceptors + term:send("clear\r") + term:send("!-2\r") + vim.api.nvim_set_current_win(original_window) + vim.fn.winrestview(saved_view) + else + vim.notify("Terminal 1 is not open yet!", vim.log.levels.WARN) + end + -- Return logic +end, { desc = "Run [L]ast command in terminal 1" }) + -- TIP: Disable arrow keys in normal mode vim.keymap.set('n', '', 'echo "Use h to move!!"') diff --git a/lua/plugins/simple.lua b/lua/plugins/simple.lua index 1e1903d..85ff37c 100644 --- a/lua/plugins/simple.lua +++ b/lua/plugins/simple.lua @@ -16,6 +16,8 @@ return { {'akinsho/toggleterm.nvim', version = "*", config = true}, -- terminal toggling and commands {'RRethy/base16-nvim'}, { 'nvim-java/nvim-java', config = function() require('java').setup() vim.lsp.enable('jdtls') end, }, -{'vyfor/cord.nvim'}, --discord rich presence + {'vyfor/cord.nvim'}, --discord rich presence + { "catppuccin/nvim", name = "catppuccin", priority = 1000 }, + {"smjonas/inc-rename.nvim"}, {'basola21/PDFview'} } diff --git a/lua/plugins/themery.nvim.lua b/lua/plugins/themery.nvim.lua index a2ed227..a913030 100644 --- a/lua/plugins/themery.nvim.lua +++ b/lua/plugins/themery.nvim.lua @@ -7,15 +7,20 @@ return { config = function() require('themery').setup { themes = { + 'catppuccin-latte', + 'catppuccin-frappe', + 'catppuccin-macchiato', + 'catppuccin-mocha', + 'noctalia', 'zellner', 'zaibatsu', 'wildcharm', 'vim', 'unokai', 'torte', - 'tokyonight-storm', - 'tokyonight-night', - 'tokyonight-day', + -- 'tokyonight-storm', + -- 'tokyonight-night', + -- 'tokyonight-day', 'sorbet', 'slate', 'shine', diff --git a/sc b/sc new file mode 100644 index 0000000..50f110d --- /dev/null +++ b/sc @@ -0,0 +1,7 @@ +admin user list +non admin user lsit +remove non-admin + +sssd +ldap +AD