From d21dfaf8dad005f3dda731824777f8ce87f296c5 Mon Sep 17 00:00:00 2001 From: hellisabove Date: Sat, 1 Feb 2025 21:35:19 +0200 Subject: [PATCH] Removed config folder --- config/fish/config.fish | 14 ---- config/fish/fish_variables | 30 -------- config/fish/mutt-wizard | 1 - config/nvim/init.lua | 44 ------------ config/nvim/lua/bar.lua | 10 --- config/nvim/lua/colorscheme.lua | 1 - config/nvim/lua/gitsign.lua | 6 -- config/nvim/lua/keymaps.lua | 31 --------- config/nvim/lua/lsp/lspconfig.lua | 111 ------------------------------ config/nvim/lua/lsp/lspsaga.lua | 19 ----- config/nvim/lua/lsp/mason.lua | 27 -------- config/nvim/lua/lsp/null-ls.lua | 41 ----------- config/nvim/lua/nvimcmp.lua | 38 ---------- config/nvim/lua/p-tree.lua | 37 ---------- config/nvim/lua/plugins.lua | 48 ------------- config/nvim/lua/teleop.lua | 23 ------- 16 files changed, 481 deletions(-) delete mode 100644 config/fish/config.fish delete mode 100644 config/fish/fish_variables delete mode 160000 config/fish/mutt-wizard delete mode 100644 config/nvim/init.lua delete mode 100644 config/nvim/lua/bar.lua delete mode 100644 config/nvim/lua/colorscheme.lua delete mode 100644 config/nvim/lua/gitsign.lua delete mode 100644 config/nvim/lua/keymaps.lua delete mode 100644 config/nvim/lua/lsp/lspconfig.lua delete mode 100644 config/nvim/lua/lsp/lspsaga.lua delete mode 100644 config/nvim/lua/lsp/mason.lua delete mode 100644 config/nvim/lua/lsp/null-ls.lua delete mode 100644 config/nvim/lua/nvimcmp.lua delete mode 100644 config/nvim/lua/p-tree.lua delete mode 100644 config/nvim/lua/plugins.lua delete mode 100644 config/nvim/lua/teleop.lua diff --git a/config/fish/config.fish b/config/fish/config.fish deleted file mode 100644 index 9eb1472..0000000 --- a/config/fish/config.fish +++ /dev/null @@ -1,14 +0,0 @@ -# Sets Path -set -gx PATH ~/.local/bin $PATH - -# Sets aliases -alias ls='exa -lh' -alias sudo=doas -alias push='git push' -alias pull='git pull' - -# Sets prompt -starship init fish | source - -# Launches uwufetch -uwufetch diff --git a/config/fish/fish_variables b/config/fish/fish_variables deleted file mode 100644 index 1b4481a..0000000 --- a/config/fish/fish_variables +++ /dev/null @@ -1,30 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR __fish_initialized:3100 -SETUVAR fish_color_autosuggestion:555\x1ebrblack -SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:005fd7 -SETUVAR fish_color_comment:990000 -SETUVAR fish_color_cwd:green -SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:009900 -SETUVAR fish_color_error:ff0000 -SETUVAR fish_color_escape:00a6b2 -SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:00a6b2 -SETUVAR fish_color_param:00afff -SETUVAR fish_color_quote:999900 -SETUVAR fish_color_redirection:00afff -SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_status:red -SETUVAR fish_color_user:brgreen -SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_key_bindings:fish_default_key_bindings -SETUVAR fish_pager_color_completion:\x1d -SETUVAR fish_pager_color_description:B3A06D\x1eyellow -SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan diff --git a/config/fish/mutt-wizard b/config/fish/mutt-wizard deleted file mode 160000 index 445283b..0000000 --- a/config/fish/mutt-wizard +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 445283bf13941ebb5127384cfd1e50fa6d82b376 diff --git a/config/nvim/init.lua b/config/nvim/init.lua deleted file mode 100644 index b2342fc..0000000 --- a/config/nvim/init.lua +++ /dev/null @@ -1,44 +0,0 @@ -local opt = vim.opt -- for conciseness - --- line numbers -opt.number = true -opt.relativenumber = true - --- tabs & indentation -opt.tabstop = 4 -opt.shiftwidth = 4 -opt.expandtab = true -opt.autoindent = true - --- line wrapping -opt.wrap = false - --- search settings -opt.ignorecase = true -opt.smartcase = true - --- cursor line -opt.cursorline = true - --- appearance -opt.termguicolors = true -opt.background = "dark" -opt.signcolumn = "yes" - --- backspace -opt.backspace = "indent,eol,start" - --- split windows -opt.splitright = true -opt.splitbelow = true - -opt.iskeyword:append("-") - -require('plugins') -require('p-tree') -require('colorscheme') -require('keymaps') -require('bar') -require('teleop') -require('nvimcmp') -require('gitsign') diff --git a/config/nvim/lua/bar.lua b/config/nvim/lua/bar.lua deleted file mode 100644 index 3033176..0000000 --- a/config/nvim/lua/bar.lua +++ /dev/null @@ -1,10 +0,0 @@ -local status, lualine = pcall(require, "lualine") -if not status then - return -end - -lualine.setup({ - options = { - theme = 'solarized_dark' - } -}) diff --git a/config/nvim/lua/colorscheme.lua b/config/nvim/lua/colorscheme.lua deleted file mode 100644 index 7a1ab71..0000000 --- a/config/nvim/lua/colorscheme.lua +++ /dev/null @@ -1 +0,0 @@ -vim.cmd.colorscheme "catppuccin-frappe" diff --git a/config/nvim/lua/gitsign.lua b/config/nvim/lua/gitsign.lua deleted file mode 100644 index c25a8f2..0000000 --- a/config/nvim/lua/gitsign.lua +++ /dev/null @@ -1,6 +0,0 @@ -local setup, gitsigns = pcall(require, "gitsigns") -if not setup then - return -end - -gitsigns.setup() diff --git a/config/nvim/lua/keymaps.lua b/config/nvim/lua/keymaps.lua deleted file mode 100644 index b1f4cc8..0000000 --- a/config/nvim/lua/keymaps.lua +++ /dev/null @@ -1,31 +0,0 @@ -vim.g.mapleader = " " - -local keymap = vim.keymap -- for conciseness - --- general keymaps -keymap.set("n","to",":tabnew") -- open new tab -keymap.set("n","tx",":tabclose") -- close current tab -keymap.set("n","tn",":tabn") -- go to next tab -keymap.set("n","tp",":tabp") -- go to previous tab - -keymap.set("n","sv","v") -- split window vertically -keymap.set("n","sh","s") -- split window horizontally -keymap.set("n","se","=") -- make split windows equal width -keymap.set("n","sx",":close") -- close current split window - --- nvim-tree -keymap.set("n", "e", ":NvimTreeToggle") -- toggle file explorer - --- telescope -keymap.set("n","ff", "Telescope find_files") -keymap.set("n","fs", "Telescope live_grep") -keymap.set("n","fc", "Telescope grep_string") -keymap.set("n","fb", "Telescope buffers") -keymap.set("n","fh", "Telescope help_tags") -keymap.set("n", "gc", "Telescope git_commits") -keymap.set("n", "gfc", "Telescope git_bcommits") -keymap.set("n", "gb", "Telescope git_branches") -keymap.set("n", "gs", "Telescope git_status") - --- restart lsp server -keymap.set("n", "rs", ":LspRestart") -- mapping to restart lsp if necessary diff --git a/config/nvim/lua/lsp/lspconfig.lua b/config/nvim/lua/lsp/lspconfig.lua deleted file mode 100644 index 78b94a3..0000000 --- a/config/nvim/lua/lsp/lspconfig.lua +++ /dev/null @@ -1,111 +0,0 @@ --- import lspconfig plugin safely -local lspconfig_status, lspconfig = pcall(require, "lspconfig") -if not lspconfig_status then - return -end - --- import cmp-nvim-lsp plugin safely -local cmp_nvim_lsp_status, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp") -if not cmp_nvim_lsp_status then - return -end - --- import typescript plugin safely -local typescript_setup, typescript = pcall(require, "typescript") -if not typescript_setup then - return -end - -local keymap = vim.keymap -- for conciseness - --- enable keybinds only for when lsp server available -local on_attach = function(client, bufnr) - -- keybind options - local opts = { noremap = true, silent = true, buffer = bufnr } - - -- set keybinds - keymap.set("n", "gf", "Lspsaga lsp_finder", opts) -- show definition, references - keymap.set("n", "gD", "lua vim.lsp.buf.declaration()", opts) -- got to declaration - keymap.set("n", "gd", "Lspsaga peek_definition", opts) -- see definition and make edits in window - keymap.set("n", "gi", "lua vim.lsp.buf.implementation()", opts) -- go to implementation - keymap.set("n", "ca", "Lspsaga code_action", opts) -- see available code actions - keymap.set("n", "rn", "Lspsaga rename", opts) -- smart rename - keymap.set("n", "D", "Lspsaga show_line_diagnostics", opts) -- show diagnostics for line - keymap.set("n", "d", "Lspsaga show_cursor_diagnostics", opts) -- show diagnostics for cursor - keymap.set("n", "[d", "Lspsaga diagnostic_jump_prev", opts) -- jump to previous diagnostic in buffer - keymap.set("n", "]d", "Lspsaga diagnostic_jump_next", opts) -- jump to next diagnostic in buffer - keymap.set("n", "K", "Lspsaga hover_doc", opts) -- show documentation for what is under cursor - keymap.set("n", "o", "LSoutlineToggle", opts) -- see outline on right hand side - - -- typescript specific keymaps (e.g. rename file and update imports) - if client.name == "tsserver" then - keymap.set("n", "rf", ":TypescriptRenameFile") -- rename file and update imports - keymap.set("n", "oi", ":TypescriptOrganizeImports") -- organize imports (not in youtube nvim video) - keymap.set("n", "ru", ":TypescriptRemoveUnused") -- remove unused variables (not in youtube nvim video) - end -end - --- used to enable autocompletion (assign to every lsp server config) -local capabilities = cmp_nvim_lsp.default_capabilities() - --- Change the Diagnostic symbols in the sign column (gutter) --- (not in youtube nvim video) -local signs = { Error = " ", Warn = " ", Hint = "ﴞ ", Info = " " } -for type, icon in pairs(signs) do - local hl = "DiagnosticSign" .. type - vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" }) -end - --- configure html server -lspconfig["html"].setup({ - capabilities = capabilities, - on_attach = on_attach, -}) - --- configure typescript server with plugin -typescript.setup({ - server = { - capabilities = capabilities, - on_attach = on_attach, - }, -}) - --- configure css server -lspconfig["cssls"].setup({ - capabilities = capabilities, - on_attach = on_attach, -}) - --- configure tailwindcss server -lspconfig["tailwindcss"].setup({ - capabilities = capabilities, - on_attach = on_attach, -}) - --- configure emmet language server -lspconfig["emmet_ls"].setup({ - capabilities = capabilities, - on_attach = on_attach, - filetypes = { "html", "typescriptreact", "javascriptreact", "css", "sass", "scss", "less", "svelte" }, -}) - --- configure lua server (with special settings) -lspconfig["sumneko_lua"].setup({ - capabilities = capabilities, - on_attach = on_attach, - settings = { -- custom settings for lua - Lua = { - -- make the language server recognize "vim" global - diagnostics = { - globals = { "vim" }, - }, - workspace = { - -- make language server aware of runtime files - library = { - [vim.fn.expand("$VIMRUNTIME/lua")] = true, - [vim.fn.stdpath("config") .. "/lua"] = true, - }, - }, - }, - }, -}) diff --git a/config/nvim/lua/lsp/lspsaga.lua b/config/nvim/lua/lsp/lspsaga.lua deleted file mode 100644 index cd2274e..0000000 --- a/config/nvim/lua/lsp/lspsaga.lua +++ /dev/null @@ -1,19 +0,0 @@ -local saga_status, saga = pcall(require, "lspsaga") -if not saga_status then - return -end - -saga.setup({ - scroll_preview = { - scroll_down = "", - scroll_up = "" - }, - definition = { - edit = "" - }, - ui = { - colors = { - normal_bg = "#022746", - }, - }, -}) diff --git a/config/nvim/lua/lsp/mason.lua b/config/nvim/lua/lsp/mason.lua deleted file mode 100644 index b2e4883..0000000 --- a/config/nvim/lua/lsp/mason.lua +++ /dev/null @@ -1,27 +0,0 @@ -require("mason").setup({ - ui = { - icons = { - package_installed = "✓", - package_pending = "➜", - package_uninstalled = "✗", - }, - }, -}) - -require("mason-lspconfig").setup({ - ensure_installed = { - "clangd", - "rust_analyzer", - "vls", - }, - automatic_installation = true, -}) - -require("mason-null-ls").setup({ - ensure_installed = { - "prettier", - "stylua", - "eslint_d", - }, - automatic_installation = true, -}) diff --git a/config/nvim/lua/lsp/null-ls.lua b/config/nvim/lua/lsp/null-ls.lua deleted file mode 100644 index 8536d85..0000000 --- a/config/nvim/lua/lsp/null-ls.lua +++ /dev/null @@ -1,41 +0,0 @@ -local setup, null_ls = pcall(require, "null-ls") -if not setup then - return -end - -local formatting = null_ls.builtins.formatting -local diagnostics = null_ls.builtins.diagnostics - -local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) - -null_ls.setup({ - sources = { - formatting.prettier, - formatting.stylua, - formatting.eslint_d.with({ - condition = function(utils) - return utils.root_has_file('.eslintrc.js') - end, - }), - }, - on_attach = function(current_client, bufnr) - if current_client.supports_method("textDocument/formatting") then - vim.api.nvim_clear_autocmds({ - group = augroup, - buffer = bufnr - }) - vim.api.nvim_create_autocmd("BufWritePre", { - group = augroup, - buffer = bufnr, - callback = function() - vim.lsp.buf.format({ - filter = function(client) - return client.name == "null-ls" - end, - bufnr = bufnr, - }) - end, - }) - end - end, -}) diff --git a/config/nvim/lua/nvimcmp.lua b/config/nvim/lua/nvimcmp.lua deleted file mode 100644 index 161b305..0000000 --- a/config/nvim/lua/nvimcmp.lua +++ /dev/null @@ -1,38 +0,0 @@ -local cmp_status, cmp = pcall(require, "cmp") -if not cmp_status then - return -end - -local luasnip_status, luasnip = pcall(require, "luasnip") -if not luasnip_status then - return -end - --- load friendly-snippets -require("luasnip/loaders/from_vscode").lazy_load() - -vim.opt.completeopt = "menu,menuone,noselect" - -cmp.setup({ - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - - mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping.select_prev_item(), -- previous suggestion - [""] = cmp.mapping.select_next_item(), -- next suggestion - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), -- show completion suggestions - [""] = cmp.mapping.abort(), -- close completion window - [""] = cmp.mapping.confirm({ select = false }), - }), - - sources = cmp.config.sources({ - { name = "luasnip" }, - { name = "buffer" }, - { name = "path" }, - }), -}) diff --git a/config/nvim/lua/p-tree.lua b/config/nvim/lua/p-tree.lua deleted file mode 100644 index 2df1938..0000000 --- a/config/nvim/lua/p-tree.lua +++ /dev/null @@ -1,37 +0,0 @@ -vim.g.loaded_netrw = 1 -vim.g.loaded_netrwPlugin = 1 - -vim.opt.termguicolors = true - -require("nvim-tree").setup({ - actions = { - open_file = {quit_on_open=true} - }, - update_focused_file = { - enable = true, - update_cwd = true - }, - filters = { - custom = { '^.git$','node_modules$' } - }, - git = { - enable = true - }, - log = { - enable = true, - types = { - diagnostics = true - } - }, - diagnostics = { - enable = true, - show_on_dirs=false, - debounce_delay=50, - icons = { - hint = 'H', - info = 'I', - warning = 'W', - error = 'E' - } - } -}) diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua deleted file mode 100644 index f7d11f0..0000000 --- a/config/nvim/lua/plugins.lua +++ /dev/null @@ -1,48 +0,0 @@ -vim.cmd [[packadd packer.nvim]] - -return require('packer').startup(function(use) - use 'wbthomason/packer.nvim' - - -- better bar - use 'nvim-lualine/lualine.nvim' - - -- autocpompletion - use 'hrsh7th/nvim-cmp' - use 'hrsh7th/cmp-buffer' - use 'hrsh7th/cmp-path' - - -- fuzzy finding - use { - 'nvim-telescope/telescope.nvim', - tag = '0.1.1', - requires = { - 'nvim-lua/plenary.nvim', - } - } - use { - 'nvim-telescope/telescope-fzf-native.nvim', - run = 'make' - } - - -- colorschemes - use 'folke/tokyonight.nvim' - use { - 'catppuccin/nvim', - as = 'catppuccin' - } - - -- neovim explorer - use { - 'nvim-tree/nvim-tree.lua', - requires = { - 'nvim-tree/nvim-web-devicons', - }, - } - - -- formatting & linting - use 'jose-elias-alvarez/null-ls.nvim' -- configure formatters & linters - use 'jayp0521/mason-null-ls.nvim' -- bridges gap b/w mason & null-ls - - -- git integration - use 'lewis6991/gitsigns.nvim' -end) diff --git a/config/nvim/lua/teleop.lua b/config/nvim/lua/teleop.lua deleted file mode 100644 index 46f395c..0000000 --- a/config/nvim/lua/teleop.lua +++ /dev/null @@ -1,23 +0,0 @@ -local telescope_setup, telescope = pcall(require, "telescope") -if not telescope_setup then - return -end - -local actions_setup, actions = pcall(require, "telescope.actions") -if not actions_setup then - return -end - -telescope.setup({ - defaults = { - mappings = { - i = { - [""] = actions.move_selection_previous, - [""] = actions.move_selection_next, - [""] = actions.send_selected_to_qflist + actions.open_qflist, - } - } - } -}) - -telescope.load_extension("fzf")