From ebdd829aced12ae50c467428a52b6139cea190c5 Mon Sep 17 00:00:00 2001 From: Nicolai Van der Storm Date: Sun, 15 Oct 2023 20:03:41 +0200 Subject: [PATCH] added plazy plugin manager for nvim --- flake.lock | 18 +-- nix/users/base/neovim.nix | 6 +- nvim/init.lua | 13 +-- nvim/lua/core/colors.lua | 18 --- nvim/lua/core/functions.lua | 112 ------------------- nvim/lua/core/keymaps.lua | 93 --------------- nvim/lua/core/options.lua | 33 ------ nvim/lua/lazy.lua | 79 +------------ nvim/lua/plugins/colorschemes/catppuccin.lua | 49 -------- nvim/lua/plugins/colorschemes/dracula.lua | 48 -------- nvim/lua/plugins/colorschemes/gruvbox.lua | 27 ----- nvim/lua/plugins/colorschemes/onedarkpro.lua | 6 - nvim/lua/plugins/colorschemes/rosepine.lua | 54 --------- nvim/lua/plugins/colorschemes/tokyonight.lua | 40 ------- ~/.config/zsh/.zsh_history | 1 + 15 files changed, 19 insertions(+), 578 deletions(-) delete mode 100644 nvim/lua/core/colors.lua delete mode 100644 nvim/lua/core/functions.lua delete mode 100644 nvim/lua/core/keymaps.lua delete mode 100644 nvim/lua/core/options.lua delete mode 100644 nvim/lua/plugins/colorschemes/catppuccin.lua delete mode 100644 nvim/lua/plugins/colorschemes/dracula.lua delete mode 100644 nvim/lua/plugins/colorschemes/gruvbox.lua delete mode 100644 nvim/lua/plugins/colorschemes/onedarkpro.lua delete mode 100644 nvim/lua/plugins/colorschemes/rosepine.lua delete mode 100644 nvim/lua/plugins/colorschemes/tokyonight.lua create mode 100644 ~/.config/zsh/.zsh_history diff --git a/flake.lock b/flake.lock index ad46d2e..d0d8bd6 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1696940889, - "narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=", + "lastModified": 1697371398, + "narHash": "sha256-Tn5feZ5SoYHQM9BTjw5e06DuNu8wc21gC9+bq/kXA8Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "6bba64781e4b7c1f91a733583defbd3e46b49408", + "rev": "3b67ae3f665379c06999641f99d94dba75b53876", "type": "github" }, "original": { @@ -47,11 +47,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1697151905, - "narHash": "sha256-sfuiRn7D5D2NzDkXXN/DUUcs2d1ddlf3VmzDBzDO2Tk=", + "lastModified": 1697368971, + "narHash": "sha256-TVK2EN32mbHO8dtcUlzDpntKJ6yOC+uPJTFJhh6eDjw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "3a61350286de842c7f1566c38e2b42821080ddf4", + "rev": "43b39e0bc6a83ce190ff09054beb713e0431f19b", "type": "github" }, "original": { @@ -202,11 +202,11 @@ "nixpkgs-stable": [] }, "locked": { - "lastModified": 1697064251, - "narHash": "sha256-xxp2sB+4vqB6S6zC/L5J8LlRKgVbgIZOcYl9/TDrEzI=", + "lastModified": 1697339241, + "narHash": "sha256-ITsFtEtRbCBeEH9XrES1dxZBkE1fyNNUfIyQjQ2AYQs=", "owner": "mic92", "repo": "sops-nix", - "rev": "f995ea159252a53b25fa99824f2891e3b479d511", + "rev": "51186b8012068c417dac7c31fb12861726577898", "type": "github" }, "original": { diff --git a/nix/users/base/neovim.nix b/nix/users/base/neovim.nix index d154189..bae62f3 100644 --- a/nix/users/base/neovim.nix +++ b/nix/users/base/neovim.nix @@ -19,7 +19,7 @@ nodePackages_latest.dockerfile-language-server-nodejs #Dockerfiles nodePackages_latest.yaml-language-server #Yaml ]; - # xdg.configFile = { - # "nvim".source = "${inputs.self}/nvim"; - # }; + xdg.configFile = { + "nvim".source = "${inputs.self}/nvim"; + }; } diff --git a/nvim/init.lua b/nvim/init.lua index a134fcc..635646e 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,11 +1,2 @@ ---- Plugin Manager --- -require(".lazy") - ---- Colorschemes --- -vim.cmd("runtime! lua/plugins/colorschemes/*.lua") - ---- All Core Files --- -vim.cmd("runtime! lua/core/*.lua") - ---- All Other Plugins --- -vim.cmd("runtime! lua/plugins/*.lua") \ No newline at end of file +--- Plugin Managers --- +require(".lazy") \ No newline at end of file diff --git a/nvim/lua/core/colors.lua b/nvim/lua/core/colors.lua deleted file mode 100644 index 220f4f8..0000000 --- a/nvim/lua/core/colors.lua +++ /dev/null @@ -1,18 +0,0 @@ -local status, color = pcall(vim.cmd.colorscheme, "catppuccin") -if not status then - print(color, 'using murphy instead') - vim.cmd.colorscheme("murphy") -end - -vim.opt.fillchars:append { eob = " " } -- Gets rid of tilde after line numbers -vim.cmd.set("noshowmode") -- Hide mode mode at bottom -vim.cmd.set("noruler") - ----------- These are now handled by the transparent nvim plugin -------- --- vim.api.nvim_set_hl(0, "Normal", {bg = "none"}) --- vim.api.nvim_set_hl(0, "NonText", {bg = "none"}) --- vim.api.nvim_set_hl(0, "NormalFloat", {bg = "none"}) --- vim.api.nvim_set_hl(0, "LineNr", {bg = "none"}) --- vim.api.nvim_set_hl(0, "SignColumn", {bg = "none"}) --- vim.api.nvim_set_hl(0, "VertSplit", {bg = "none"}) --- vim.api.nvim_set_hl(0, "TabLine", {bg = "none"}) \ No newline at end of file diff --git a/nvim/lua/core/functions.lua b/nvim/lua/core/functions.lua deleted file mode 100644 index 32d1d74..0000000 --- a/nvim/lua/core/functions.lua +++ /dev/null @@ -1,112 +0,0 @@ -function edit_nvim() - vim.cmd(":e $MYVIMRC") - vim.cmd(":cd ~/.config/nvim") - vim.cmd(":NvimTreeOpen") -end - -function randomquote() - local quote = { - "Bing Chilling", - "The Stink Boys", - "Whopper Whopper Whopper Whopper Junior Double Triple Whopper", - "White Monster", - "The system plays us everday...", - "sudo systemctl restart justinlime", - "sudo systemctl start justinlime", - "sudo systemctl stop justinlime", - "sudo systemctl enable justinlime", - "sudo systemctl disable justinlime", - } - return quote[math.random(1,#quote)] -end - -function randomsplash() - local splash = { - { - [[ ⠀ ]], - [[ ⠀⠀ ⣞⢽⢪⢣⢣⢣⢫⡺⡵⣝⡮⣗⢷⢽⢽⢽⣮⡷⡽⣜⣜⢮⢺⣜⢷⢽⢝⡽⣝ ]], - [[ ⠀ ⠸⡸⠜⠕⠕⠁⢁⢇⢏⢽⢺⣪⡳⡝⣎⣏⢯⢞⡿⣟⣷⣳⢯⡷⣽⢽⢯⣳⣫⠇ ]], - [[ ⠀⠀ ⠀⢀⢀⢄⢬⢪⡪⡎⣆⡈⠚⠜⠕⠇⠗⠝⢕⢯⢫⣞⣯⣿⣻⡽⣏⢗⣗⠏ ⠀]], - [[ ⠀ ⠀ ⠪⡪⡪⣪⢪⢺⢸⢢⢓⢆⢤⢀⠀⠀⠀⠀⠈⢊⢞⡾⣿⡯⣏⢮⠷⠁⠀ ⠀ ]], - [[ ⠀ ⠀ ⠀⠀⠈⠊⠆⡃⠕⢕⢇⢇⢇⢇⢇⢏⢎⢎⢆⢄⠀⢑⣽⣿⢝⠲⠉⠀⠀⠀ ⠀]], - [[ ⠀ ⠀⠀⠀ ⠀⠀⡿⠂⠠⠀⡇⢇⠕⢈⣀⠀⠁⠡⠣⡣⡫⣂⣿⠯⢪⠰⠂⠀⠀⠀⠀ ]], - [[ ⠀⠀ ⠀⠀⠀⡦⡙⡂⢀⢤⢣⠣⡈⣾⡃⠠⠄⠀⡄⢱⣌⣶⢏⢊⠂⠀⠀⠀⠀⠀⠀ ]], - [[ ⠀ ⠀ ⠀⠀⠀⢝⡲⣜⡮⡏⢎⢌⢂⠙⠢⠐⢀⢘⢵⣽⣿⡿⠁⠁⠀⠀⠀⠀⠀⠀ ⠀]], - [[ ⠀ ⠀ ⠀⠀⠀⠨⣺⡺⡕⡕⡱⡑⡆⡕⡅⡕⡜⡼⢽⡻⠏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ]], - [[ ⠀ ⠀ ⠀⠀⠀⣼⣳⣫⣾⣵⣗⡵⡱⡡⢣⢑⢕⢜⢕⡝⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ]], - [[ ⠀ ⠀ ⠀⠀⣴⣿⣾⣿⣿⣿⡿⡽⡑⢌⠪⡢⡣⣣⡟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ]], - [[ ⠀ ⠀ ⠀⠀⡟⡾⣿⢿⢿⢵⣽⣾⣼⣘⢸⢸⣞⡟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ]], - [[ ⠀ ⠀ ⠀⠀⠀⠁⠇⠡⠩⡫⢿⣝⡻⡮⣒⢽⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ]], - [[ ⠀ _ _ _ ___ ]], - [[ ⠀ | \ | | (_) |__ \ ]], - [[ ⠀ | \| | ___ ___ __ __ _ _ __ ___ ) | ]], - [[ ⠀ | . ` | / _ \ / _ \\ \ / /| || '_ ` _ \ / / ]], - [[ ⠀ | |\ || __/| (_) |\ V / | || | | | | ||_| ]], - [[ ⠀ |_| \_| \___| \___/ \_/ |_||_| |_| |_|(_) ]], - [[ ⠀ ]], - [[______________________________________________________]], - [[ ⠀ ]], - [[ ⠀ ]], - }, - { - [[ ⠀ ]], - [[⠀⠀⠀⠀⠀⡰⢂⣾⠿⠛⠒⠚⠛⠃⠺⢶⡀⠀⠀⠀⠀⠀⠀⠀⠀]], - [[⠀⠀⠀⠀⢠⡣⠋⠁⠀⠀⠀⠀⠀⢀⡐⠒⢙⣄⠀⠀⠀⠀⠀⠀⠀]], - [[⠀⠀⠀⠀⡘⠀⠀⠀⠀⠀⠀⢄⠉⠀⠐⠀⠀⠙⢦⠀⠀⠀⠀⠀⠀]], - [[⠀⠀⠀⣾⠁⠀⠀⠄⠂⢈⣠⠎⠀⠀⣸⣿⡿⠓⢬⡇⠀⠀⠀⠀⠀]], - [[⠀⠀⢸⡟⠀⠔⣁⣤⣶⣿⠋⢰⠀⠀⣿⡟⠻⣦⠀⢳⠀⠀⠀⠀⠀]], - [[⠀⠀⣷⡇⢠⣾⢟⢭⣭⡭⡄⠀⡆⠀⣿⣷⣶⠺⡆⢸⡄⠀⠀⠀⠀]], - [[⠀⠀⠇⡇⠛⠡⣑⣈⣛⠝⢁⡀⠇⠀⣿⡿⠛⠒⣡⠇⣧⣀⠀⠀⠀]], - [[⠀⠀⢠⠁⠈⠐⠤⠄⠀⣠⢸⠈⠢⠀⣿⡇⠀⠀⠠⠚⣿⣿⠀⠀⠀]], - [[⡄⠀⢾⠀⡆⠠⣴⠞⠯⡀⠈⠙⠲⣶⣿⡇⠑⣦⡄⠀⣿⣿⠀⠀⠀]], - [[⠈⠺⡮⠀⢡⠀⠀⠀⠀⠀⠁⠐⠒⠒⠛⠃⠈⠛⠇⠀⡏⡏⠀⠀⠀]], - [[⠀⢰⠁⠀⠘⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⡄⠀⢷⠀⠀⠀]], - [[⠀⠘⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠃⠀⢸⠀⠀⠀]], - [[⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⡄⠀⠀]], - [[⠀⠀⢣⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⠸⡳⡀⠀]], - [[⠀⠀⠀⠑⢄⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣠⣯⣼⡇⠑⣄]], - [[ ]], - [[ ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ ]], - [[ ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ ]], - [[ ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ ]], - [[ ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ ]], - [[ ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ]], - [[ ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ ]], - [[ ⠀ ]], - [[______________________________________________________]], - [[ ⠀ ]], - [[ ⠀ ]], - }, - { - [[ ]], - [[⣿⣿⣿⣿⡏⣀⠀⠀⠀⠀⠀⠀⠀⣀⣤⣤⣤⣄⡀⠀⠀⠀⠀⠀⠀⠀⠙⢿⣿⣿]], - [[⣿⣿⣿⢏⣴⣿⣷⠀⠀⠀⠀⠀⢾⣿⣿⣿⣿⣿⣿⡆⠀⠀⠀⠀⠀⠀⠀⠈⣿⣿]], - [[⣿⣿⣟⣾⣿⡟⠁⠀⠀⠀⠀⠀⢀⣾⣿⣿⣿⣿⣿⣷⢢⠀⠀⠀⠀⠀⠀⠀⢸⣿]], - [[⣿⣿⣿⣿⣟⠀⡴⠄⠀⠀⠀⠀⠀⠀⠙⠻⣿⣿⣿⣿⣷⣄⠀⠀⠀⠀⠀⠀⠀⣿]], - [[⣿⣿⣿⠟⠻⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠶⢴⣿⣿⣿⣿⣿⣧⠀⠀⠀⠀⠀⠀⣿]], - [[⣿⣁⡀⠀⠀⢰⢠⣦⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⣿⣿⣿⣿⣿⡄⠀⣴⣶⣿⡄⣿]], - [[⣿⡋⠀⠀⠀⠎⢸⣿⡆⠀⠀⠀⠀⠀⠀⣴⣿⣿⣿⣿⣿⣿⣿⠗⢘⣿⣟⠛⠿⣼]], - [[⣿⣿⠋⢀⡌⢰⣿⡿⢿⡀⠀⠀⠀⠀⠀⠙⠿⣿⣿⣿⣿⣿⡇⠀⢸⣿⣿⣧⢀⣼]], - [[⣿⣿⣷⢻⠄⠘⠛⠋⠛⠃⠀⠀⠀⠀⠀⢿⣧⠈⠉⠙⠛⠋⠀⠀⠀⣿⣿⣿⣿⣿]], - [[⣿⣿⣧⠀⠈⢸⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠟⠀⠀⠀⠀⢀⢃⠀⠀⢸⣿⣿⣿⣿]], - [[⣿⣿⡿⠀⠴⢗⣠⣤⣴⡶⠶⠖⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⡸⠀⣿⣿⣿⣿]], - [[⣿⣿⣿⡀⢠⣾⣿⠏⠀⠠⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠛⠉⠀⣿⣿⣿⣿]], - [[⣿⣿⣿⣧⠈⢹⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣰⣿⣿⣿⣿]], - [[⣿⣿⣿⣿⡄⠈⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣠⣴⣾⣿⣿⣿⣿⣿]], - [[⣿⣿⣿⣿⣧⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣠⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿]], - [[⣿⣿⣿⣿⣷⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿]], - [[⣿⣿⣿⣿⣿⣦⣄⣀⣀⣀⣀⠀⠀⠀⠀⠘⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿]], - [[ __ ]], - [[ ___ ___ ___ __ __ /\_\ ___ ___ ]], - [[ / _ `\ / __`\ / __`\/\ \/\ \\/\ \ / __` __`\ ]], - [[/\ \/\ \/\ __//\ \_\ \ \ \_/ |\ \ \/\ \/\ \/\ \ ]], - [[\ \_\ \_\ \____\ \____/\ \___/ \ \_\ \_\ \_\ \_\]], - [[ \/_/\/_/\/____/\/___/ \/__/ \/_/\/_/\/_/\/_/]], - [[ ]], - [[______________________________________________________]], - [[ ]], - [[ ]], - }, - } - return splash[math.random(1,#splash)] -end diff --git a/nvim/lua/core/keymaps.lua b/nvim/lua/core/keymaps.lua deleted file mode 100644 index df27505..0000000 --- a/nvim/lua/core/keymaps.lua +++ /dev/null @@ -1,93 +0,0 @@ -local opts = { noremap = true, silent = true } -local map = vim.keymap.set - ---Leader Key -map("", "", "", opts) -vim.g.mapleader = " " -vim.g.maplocalleader = " " - ----------- Normal Mode ---------- - ---Window Resize -map("n", "", ":vertical resize +2", opts) -map("n", "", ":resize +2", opts) -map("n", "", ":resize -2", opts) -map("n", "", ":vertical resize -2", opts) - ----------- Insert Mode ---------- - ---jj gang rise up -map("i", "jj", "", opts) - ----------- Visual Mode ----------- - ---Move Selections -map("v", "", "< gv", opts) -map("v", "", ":m '>+1gv=gv", opts) -map("v", "", ":m '<-2gv=gv", opts) -map("v", "", "> gv", opts) - ----------- Terminal Mode ---------- - ---Escape Terminal -map('t', 'jj', [[]], opts) -map('t', '', [[]], opts) -map('t', '', [[]], opts) - ---------- Custom Functions ---------- - ---Edit Nvim -map("n", "en", ":lua edit_nvim()", opts) - ----------- Plugins ---------------- - ---Fugative -map("n", "ga", ":G add", opts) -map("n", "gs", ":G status", opts) -map("n", "gb", ":G branch", opts) -map("n", "gm", ":G merge", opts) -map("n", "gpl", ":G pull", opts) -map("n", "gplo", ":G pull origin", opts) -map("n", "gps", ":G push", opts) -map("n", "gpso", ":G push origin", opts) -map("n", "gc", ":G commit", opts) -map("n", "gcm", ":G commit -m", opts) -map("n", "gch", ":G checkout", opts) -map("n", "gchb", ":G checkout -b", opts) -map("n", "gcoe", ":G config user.email", opts) -map("n", "gcon", ":G config user.name", opts) - ---Nvim Tree -map("n", "dt", ":NvimTreeToggle", opts) - ---Transparency -map("n", "tt", ":TransparentToggle", opts) - ---Telescope -map('n', 'ff', ":Telescope find_files", opts) -map('n', 'fw', ":Telescope live_grep", opts) -map('n', 'fgc', ":Telescope git_commits", opts) -map('n', 'fgs', ":Telescope git_stash", opts) -map('n', 'fgb', ":Telescope git_branches", opts) -map('n', 'fv', ":Telescope treesitter", opts) -map('n', 'fs', ":Telescope spell_suggest", opts) -map('n', 'fc', ":Telescope colorscheme", opts) - ---BufferLine -map("n", "1", ":BufferLineGoToBuffer 1", opts) -map("n", "2", ":BufferLineGoToBuffer 2", opts) -map("n", "3", ":BufferLineGoToBuffer 3", opts) -map("n", "4", ":BufferLineGoToBuffer 4", opts) -map("n", "5", ":BufferLineGoToBuffer 5", opts) -map("n", "6", ":BufferLineGoToBuffer 6", opts) -map("n", "7", ":BufferLineGoToBuffer 7", opts) -map("n", "8", ":BufferLineGoToBuffer 8", opts) -map("n", "9", ":BufferLineGoToBuffer 9", opts) - -map("n", "h", ":BufferLineCyclePrev", opts) -map("n", "l", ":BufferLineCycleNext", opts) - -map("n", "", ":BufferLineMovePrev", opts) -map("n", "", ":BufferLineMoveNext", opts) - -map("n", "qq", ":bdelete", opts) -- Close current buffer diff --git a/nvim/lua/core/options.lua b/nvim/lua/core/options.lua deleted file mode 100644 index 6ccfa2f..0000000 --- a/nvim/lua/core/options.lua +++ /dev/null @@ -1,33 +0,0 @@ -local opt = vim.opt -opt.clipboard = "unnamedplus" -opt.guicursor = "a:blinkon0" --Disable cursor blink -opt.guicursor = "i:ver25-iCursor" --Change to beam cursor when in insert mode -opt.mouse = "a" -opt.smartcase = true -opt.smartindent = true -opt.number = true -opt.relativenumber = true -opt.cursorline = false -opt.cursorlineopt='number' -opt.wrap = false -opt.shiftwidth = 4 -opt.softtabstop = 4 -opt.tabstop = 4 -opt.backupdir = vim.fn.expand("~/.local/share/nvim/data/backup") -opt.undodir = vim.fn.expand("~/.local/share/nvim/data/undo") -opt.directory = vim.fn.expand("~/.local/share/nvim/data/swap") -opt.ignorecase = true -opt.splitbelow = true -opt.splitright = true -opt.swapfile = false -opt.undofile = true -opt.backup = false -opt.expandtab = true -opt.termguicolors = true -opt.scrolloff = 8 -opt.updatetime = 50 -opt.cursorline = true -vim.api.nvim_create_autocmd("FileType", { --Set indentation to 2 spaces for nix files - pattern = "nix", - command = "setlocal shiftwidth=2 tabstop=2" -}) diff --git a/nvim/lua/lazy.lua b/nvim/lua/lazy.lua index 8728956..b350869 100644 --- a/nvim/lua/lazy.lua +++ b/nvim/lua/lazy.lua @@ -1,83 +1,12 @@ -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +local lazypath = vim.fin.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - print([[ -Installing lazy.nvim and plugins..... -⠀⣞⢽⢪⢣⢣⢣⢫⡺⡵⣝⡮⣗⢷⢽⢽⢽⣮⡷⡽⣜⣜⢮⢺⣜⢷⢽⢝⡽⣝ -⠸⡸⠜⠕⠕⠁⢁⢇⢏⢽⢺⣪⡳⡝⣎⣏⢯⢞⡿⣟⣷⣳⢯⡷⣽⢽⢯⣳⣫⠇ -⠀⠀⢀⢀⢄⢬⢪⡪⡎⣆⡈⠚⠜⠕⠇⠗⠝⢕⢯⢫⣞⣯⣿⣻⡽⣏⢗⣗⠏⠀ -⠀⠪⡪⡪⣪⢪⢺⢸⢢⢓⢆⢤⢀⠀⠀⠀⠀⠈⢊⢞⡾⣿⡯⣏⢮⠷⠁⠀⠀ -⠀⠀⠀⠈⠊⠆⡃⠕⢕⢇⢇⢇⢇⢇⢏⢎⢎⢆⢄⠀⢑⣽⣿⢝⠲⠉⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⡿⠂⠠⠀⡇⢇⠕⢈⣀⠀⠁⠡⠣⡣⡫⣂⣿⠯⢪⠰⠂⠀⠀⠀⠀ -⠀⠀⠀⠀⡦⡙⡂⢀⢤⢣⠣⡈⣾⡃⠠⠄⠀⡄⢱⣌⣶⢏⢊⠂⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⢝⡲⣜⡮⡏⢎⢌⢂⠙⠢⠐⢀⢘⢵⣽⣿⡿⠁⠁⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠨⣺⡺⡕⡕⡱⡑⡆⡕⡅⡕⡜⡼⢽⡻⠏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⣼⣳⣫⣾⣵⣗⡵⡱⡡⢣⢑⢕⢜⢕⡝⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⣴⣿⣾⣿⣿⣿⡿⡽⡑⢌⠪⡢⡣⣣⡟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⡟⡾⣿⢿⢿⢵⣽⣾⣼⣘⢸⢸⣞⡟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠁⠇⠡⠩⡫⢿⣝⡻⡮⣒⢽⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ]]) + "--branch=stable", + lazypath }) end -vim.opt.rtp:prepend(lazypath) - -local plugins = { - --- Lazy --- - "folke/lazy.nvim", --Lazy will manage itself - - --- Colorschemes --- - { "catppuccin/nvim", name = "catppuccin", lazy = false, priority = 1000 }, - { 'rose-pine/neovim', name = 'rose-pine', lazy = false, priority = 1000 }, - { "olimorris/onedarkpro.nvim", lazy = false, priority = 1000 }, - { "Mofiqul/dracula.nvim", lazy = false, priority = 1000 }, - { 'folke/tokyonight.nvim', lazy = false, priority = 1000 }, - { "ellisonleao/gruvbox.nvim", lazy = false, priority = 1000 }, - - --- LSP--- - -- "jose-elias-alvarez/null-ls.nvim", - -- "neovim/nvim-lspconfig", --LSP - - -- -- CMP - -- "hrsh7th/nvim-cmp", --Completion - -- "hrsh7th/cmp-nvim-lsp", --Completion LSP integration - -- "hrsh7th/cmp-path", --Completion show system paths - -- "hrsh7th/cmp-buffer", --Completion shows text from current buffer - -- "hrsh7th/cmp-cmdline", - -- "hrsh7th/cmp-nvim-lua", - -- "saadparwaiz1/cmp_luasnip", --Completion snippets - -- { "L3MON4D3/LuaSnip", dependencies = { "rafamadriz/friendly-snippets" } }, --Extra snippets - - - -- --- The Rest ---- - -- "lukas-reineke/indent-blankline.nvim", --Sexy indent lines - -- "windwp/nvim-ts-autotag", --Auto tags for HTML - -- "norcalli/nvim-colorizer.lua", --Visualize Hex/RGB/etc - -- "lewis6991/gitsigns.nvim", --Shows deletions/additions/modifications if in git repo - -- "tpope/vim-fugitive", --Git command integration - -- "xiyaowong/transparent.nvim", --Transparency Toggle - -- "andweeb/presence.nvim", --Discord Rich Presence - -- "numToStr/Comment.nvim", --Easy full line or selection commenting out - -- { "folke/which-key.nvim", event = "VeryLazy" }, --Shows key combinations if youre dumb - -- { 'windwp/nvim-autopairs', event = "InsertEnter" }, --Automatic pairs for braces, brackets, quotes, etc. - -- { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" }, --Parser for better highlighting, use :TSUpdate - -- { 'akinsho/toggleterm.nvim', version = "*", config = true }, --Quick toggle terminal in neovim - -- { "nvim-tree/nvim-tree.lua", dependencies = { "nvim-tree/nvim-web-devicons" } }, --File Browser, Devicons need a hack nerd font - -- { "akinsho/bufferline.nvim", dependencies = { "nvim-tree/nvim-web-devicons" } }, --Tabs - -- { "nvim-lualine/lualine.nvim", dependencies = { "nvim-tree/nvim-web-devicons" } }, --Sexy bar at the bottom - -- { "nvim-telescope/telescope.nvim", dependencies = { "nvim-lua/plenary.nvim" } }, --Plenary needs g++ and gcc - -- { - -- 'glepnir/dashboard-nvim', - -- event = 'VimEnter', - -- dependencies = { - -- 'nvim-tree/nvim-web-devicons' } - -- }, --Dope ass dashboard -} - -local opts = {} -require("lazy").setup(plugins, opts) \ No newline at end of file +vim.opt.rtp:prepend(lazypath) \ No newline at end of file diff --git a/nvim/lua/plugins/colorschemes/catppuccin.lua b/nvim/lua/plugins/colorschemes/catppuccin.lua deleted file mode 100644 index d7210ec..0000000 --- a/nvim/lua/plugins/colorschemes/catppuccin.lua +++ /dev/null @@ -1,49 +0,0 @@ -local status, plugin = pcall(require,'catppuccin') -if not status then - print('Plugin Error: ', plugin) - return -end - -plugin.setup({ - flavour = "mocha", -- latte, frappe, macchiato, mocha - background = { -- :h background - light = "latte", - dark = "mocha", - }, - transparent_background = false, - show_end_of_buffer = false, -- show the '~' characters after the end of buffers - term_colors = false, - dim_inactive = { - enabled = false, - shade = "dark", - percentage = 0.15, - }, - no_italic = false, -- Force no italic - no_bold = false, -- Force no bold - no_underline = false, -- Force no underline - styles = { - comments = { "italic" }, - conditionals = { "italic" }, - loops = {}, - functions = {}, - keywords = {}, - strings = {}, - variables = {}, - numbers = {}, - booleans = {}, - properties = {}, - types = {}, - operators = {}, - }, - color_overrides = {}, - custom_highlights = {}, - integrations = { - cmp = true, - gitsigns = true, - nvimtree = true, - telescope = true, - notify = false, - mini = false, - -- For more plugins integrations please scroll down (https://github.com/catppuccin/nvim#integrations) - }, -}) diff --git a/nvim/lua/plugins/colorschemes/dracula.lua b/nvim/lua/plugins/colorschemes/dracula.lua deleted file mode 100644 index 66c83ed..0000000 --- a/nvim/lua/plugins/colorschemes/dracula.lua +++ /dev/null @@ -1,48 +0,0 @@ -local status, plugin = pcall(require,'dracula') -if not status then - print('Plugin Error: ', plugin) - return -end -plugin.setup({ - -- customize dracula color palette - colors = { - bg = "#282A36", - fg = "#F8F8F2", - selection = "#44475A", - comment = "#6272A4", - red = "#FF5555", - orange = "#FFB86C", - yellow = "#F1FA8C", - green = "#50fa7b", - purple = "#BD93F9", - cyan = "#8BE9FD", - pink = "#FF79C6", - bright_red = "#FF6E6E", - bright_green = "#69FF94", - bright_yellow = "#FFFFA5", - bright_blue = "#D6ACFF", - bright_magenta = "#FF92DF", - bright_cyan = "#A4FFFF", - bright_white = "#FFFFFF", - menu = "#21222C", - visual = "#3E4452", - gutter_fg = "#4B5263", - nontext = "#3B4048", - }, - -- show the '~' characters after the end of buffers - show_end_of_buffer = true, -- default false - -- use transparent background - transparent_bg = false, -- default false - -- set custom lualine background color - lualine_bg_color = "#44475a", -- default nil - -- set italic comment - italic_comment = true, -- default false - -- overrides the default highlights see `:h synIDattr` - overrides = { - -- Examples - -- NonText = { fg = dracula.colors().white }, -- set NonText fg to white - -- NvimTreeIndentMarker = { link = "NonText" }, -- link to NonText highlight - -- Nothing = {} -- clear highlight of Nothing - }, -}) - diff --git a/nvim/lua/plugins/colorschemes/gruvbox.lua b/nvim/lua/plugins/colorschemes/gruvbox.lua deleted file mode 100644 index f45825a..0000000 --- a/nvim/lua/plugins/colorschemes/gruvbox.lua +++ /dev/null @@ -1,27 +0,0 @@ -local status, plugin = pcall(require,'gruvbox') -if not status then - print('Plugin Error: ', plugin) - return -end -plugin.setup({ - undercurl = true, - underline = true, - bold = true, - italic = { - strings = true, - comments = true, - operators = false, - folds = true, - }, - strikethrough = true, - invert_selection = false, - invert_signs = false, - invert_tabline = false, - invert_intend_guides = false, - inverse = true, -- invert background for search, diffs, statuslines and errors - contrast = "", -- can be "hard", "soft" or empty string - palette_overrides = {}, - overrides = {}, - dim_inactive = false, - transparent_mode = false, -}) diff --git a/nvim/lua/plugins/colorschemes/onedarkpro.lua b/nvim/lua/plugins/colorschemes/onedarkpro.lua deleted file mode 100644 index bfb34c5..0000000 --- a/nvim/lua/plugins/colorschemes/onedarkpro.lua +++ /dev/null @@ -1,6 +0,0 @@ -local status, plugin = pcall(require,'onedarkpro') -if not status then - print('Plugin Error: ', plugin) - return -end -plugin.setup({}) diff --git a/nvim/lua/plugins/colorschemes/rosepine.lua b/nvim/lua/plugins/colorschemes/rosepine.lua deleted file mode 100644 index c9197cf..0000000 --- a/nvim/lua/plugins/colorschemes/rosepine.lua +++ /dev/null @@ -1,54 +0,0 @@ -local status, plugin = pcall(require,'rose-pine') -if not status then - print('Plugin Error: ', plugin) - return -end -plugin.setup({ - --- @usage 'auto'|'main'|'moon'|'dawn' - variant = 'auto', - --- @usage 'main'|'moon'|'dawn' - dark_variant = 'main', - bold_vert_split = false, - dim_nc_background = false, - disable_background = false, - disable_float_background = false, - disable_italics = false, - - --- @usage string hex value or named color from rosepinetheme.com/palette - groups = { - background = 'base', - background_nc = '_experimental_nc', - panel = 'surface', - panel_nc = 'base', - border = 'highlight_med', - comment = 'muted', - link = 'iris', - punctuation = 'subtle', - - error = 'love', - hint = 'iris', - info = 'foam', - warn = 'gold', - - headings = { - h1 = 'iris', - h2 = 'foam', - h3 = 'rose', - h4 = 'gold', - h5 = 'pine', - h6 = 'foam', - } - -- or set all headings at once - -- headings = 'subtle' - }, - - -- Change specific vim highlight groups - -- https://github.com/rose-pine/neovim/wiki/Recipes - highlight_groups = { - ColorColumn = { bg = 'rose' }, - - -- Blend colours against the "base" background - CursorLine = { bg = 'foam', blend = 10 }, - StatusLine = { fg = 'love', bg = 'love', blend = 10 }, - } -}) diff --git a/nvim/lua/plugins/colorschemes/tokyonight.lua b/nvim/lua/plugins/colorschemes/tokyonight.lua deleted file mode 100644 index 10d20e5..0000000 --- a/nvim/lua/plugins/colorschemes/tokyonight.lua +++ /dev/null @@ -1,40 +0,0 @@ -local status, plugin = pcall(require,'tokyonight') -if not status then - print('Plugin Error: ', plugin) - return -end -plugin.setup({ - -- your configuration comes here - -- or leave it empty to use the default settings - style = "moon", -- The theme comes in three styles, `storm`, `moon`, a darker variant `night` and `day` - light_style = "day", -- The theme is used when the background is set to light - transparent = false, -- Enable this to disable setting the background color - terminal_colors = true, -- Configure the colors used when opening a `:terminal` in Neovim - styles = { - -- Style to be applied to different syntax groups - -- Value is any valid attr-list value for `:help nvim_set_hl` - comments = { italic = true }, - keywords = { italic = true }, - functions = {}, - variables = {}, - -- Background styles. Can be "dark", "transparent" or "normal" - sidebars = "dark", -- style for sidebars, see below - floats = "dark", -- style for floating windows - }, - sidebars = { "qf", "help" }, -- Set a darker background on sidebar-like windows. For example: `["qf", "vista_kind", "terminal", "packer"]` - day_brightness = 0.3, -- Adjusts the brightness of the colors of the **Day** style. Number between 0 and 1, from dull to vibrant colors - hide_inactive_statusline = false, -- Enabling this option, will hide inactive statuslines and replace them with a thin border instead. Should work with the standard **StatusLine** and **LuaLine**. - dim_inactive = false, -- dims inactive windows - lualine_bold = false, -- When `true`, section headers in the lualine theme will be bold - - --- You can override specific color groups to use other groups or a hex color - --- function will be called with a ColorScheme table - ---@param colors ColorScheme - on_colors = function(colors) end, - - --- You can override specific highlights to use other groups or a hex color - --- function will be called with a Highlights and ColorScheme table - ---@param highlights Highlights - ---@param colors ColorScheme - on_highlights = function(highlights, colors) end, -}) diff --git a/~/.config/zsh/.zsh_history b/~/.config/zsh/.zsh_history new file mode 100644 index 0000000..5adc043 --- /dev/null +++ b/~/.config/zsh/.zsh_history @@ -0,0 +1 @@ +: 1697393021:0;git add . && git commit -m "added plazy plugin manager for nvim"