diff --git a/fish/config.fish b/fish/config.fish index c6198ec..3befb76 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -5,22 +5,5 @@ if status is-interactive starship init fish | source end -# XDG -set -x XDG_CONFIG_HOME "$HOME/.config" - -# bun -set -x BUN_INSTALL "$HOME/.local/bun" - -# devkitpro -set -x DEVKITPRO "/opt/devkitpro" -set -x DEVKITARM "/opt/devkitpro/devkitARM" - -# path -set -x PATH $HOME/.local/bin $BUN_INSTALL/bin $PATH - -# ssh agent -if test -z (pgrep ssh-agent | string collect) - eval (ssh-agent -c) - set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK - set -Ux SSH_AGENT_PID $SSH_AGENT_PID -end +# Created by `pipx` on 2023-11-04 13:29:11 +set PATH $PATH /home/ale/.local/bin diff --git a/hyfetch/hyfetch.json b/hyfetch/hyfetch.json deleted file mode 100644 index 136ecab..0000000 --- a/hyfetch/hyfetch.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "preset": "transgender", - "mode": "rgb", - "light_dark": "dark", - "lightness": 0.65, - "color_align": { - "mode": "horizontal", - "custom_colors": [], - "fore_back": null - }, - "backend": "neofetch", - "distro": null, - "pride_month_shown": [], - "pride_month_disable": false -} \ No newline at end of file diff --git a/nvim/init.lua b/nvim/init.lua index d7456f7..d3d6075 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -12,11 +12,203 @@ if not vim.loop.fs_stat(lazypath) then end vim.opt.rtp:prepend(lazypath) -require("lazy").setup({ - spec = { - { import = "plugins"} - } -}) +plugins = { + { + 'windwp/nvim-autopairs', + event = 'InsertEnter', + config = function () + require('nvim-autopairs').setup{} + end + }, + { + 'windwp/nvim-ts-autotag', + config = function () + require('nvim-ts-autotag').setup() + end + }, + { + 'williamboman/mason.nvim', + config = function() + require('mason').setup() + end + }, + { + 'neovim/nvim-lspconfig', + config = function() + local configs = require('lspconfig') + configs.lua_ls.setup{} + configs.pyright.setup{} + end + }, + { + 'hrsh7th/nvim-cmp', + config = function() + + require('luasnip.loaders.from_vscode').lazy_load() + + local cmp = require('cmp') + cmp.setup({ + snippet = { + expand = function(args) + require('luasnip').lsp_expand(args.body) + end + }, + mapping = cmp.mapping.preset.insert ({ + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.abort(), + [''] = cmp.mapping.confirm({ select = true }), + }), + sources = cmp.config.sources({ + {name = 'nvim_lsp'}, + {name = 'luasnip'}, + {name = 'buffer'} + }), + }) + end, + dependencies = { + {'hrsh7th/cmp-nvim-lsp'}, + {'saadparwaiz1/cmp_luasnip'}, + {'rafamadriz/friendly-snippets'}, + {'L3MON4D3/LuaSnip'} + } + }, + { + 'maxmx03/dracula.nvim', + lazy = false, + config = function () + local dracula = require 'dracula' + dracula.setup() + vim.cmd.colorscheme 'dracula' + end + }, + { + 'nvimdev/dashboard-nvim', + event = 'VimEnter', + config = function () + require('dashboard').setup{ + theme = "hyper" + } + end, + dependencies = {{'nvim-tree/nvim-web-devicons'}} + }, + { + 'akinsho/bufferline.nvim', + config = function () + require('bufferline').setup { + options = { + separator_style = "thin", + indicator = { + style = "none" + }, + diagnostics = "nvim_lsp", + always_show_bufferline = false, + offsets = { + { + filetype = "neo-tree", + text = "Explorer", + highlight = "directory", + separator = false + } + } + } + } + end, + dependencies = { + 'nvim-tree/nvim-web-devicons', + }, + }, + { + 'nvim-lualine/lualine.nvim', + config = function() + local colors_insert = { + line_background = '#282a36', + line_foreground = '#f8f8f2', + line_midtone = '#44475a', + pink = '#ff79c6', + ourple = '#bd93f9' + } + + local cake_theme_dracula = { + insert = { + a = { fg = colors_insert.line_background, bg = colors_insert.pink }, + b = { fg = colors_insert.line_foreground, bg = colors_insert.line_background }, + z = { fg = colors_insert.line_foreground, bg = colors_insert.line_background } + }, + normal = { + a = { fg = colors_insert.line_background, bg = colors_insert.ourple }, + + b = { fg = colors_insert.fg, bg = colors_insert.line_background }, + + z = { fg = colors_insert.fg, bg = colors_insert.line_background } + }, + visual = { + }, + replace = { + } + } + + require('lualine').setup { + options = { + theme = cake_theme_dracula, + disabled_filetypes = { + statusline = { + "neo-tree" + } + }, + section_separators = "", + component_separators = "", + }, + sections = { + lualine_a = {'mode'}, + lualine_b = {'filename', 'location'}, + lualine_c = {}, + lualine_x = {}, + lualine_y = {}, + lualine_z = {'diff','branch'} + } + } + end, + dependencies = {{'nvim-tree/nvim-web-devicons'}}, + }, + { + 'nvim-neo-tree/neo-tree.nvim', + branch = "v3.x", + dependencies = { + {'nvim-lua/plenary.nvim'}, + {'nvim-tree/nvim-web-devicons'}, + {'MunifTanjim/nui.nvim'} + }, + config = function () + require("neo-tree").setup { + enable_git_status = true, + enable_diagnostics = true, + + filesystem = { + follow_current_file = { + enabled = true + } + } + } + end + }, + { + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + config = function () + local configs = require("nvim-treesitter.configs") + configs.setup({ + ensure_installed = { "c", "rust", "lua", "vim", "vimdoc", "markdown" , "javascript", "html", "astro" }, + sync_install = false, + highlight = { enable = true }, + indent = { enable = true }, + }) + end + }, +} + +require("lazy").setup(plugins) if vim.g.neovide == true then vim.api.nvim_set_keymap('n', "", ":let g:neovide_fullscreen = !g:neovide_fullscreen", {}) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 6fbc275..01899b4 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -6,10 +6,10 @@ "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, "dracula.nvim": { "branch": "master", "commit": "2f396b6ba988ad4b3961c2e40d1b9ae436b8c26c" }, "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, + "git-blame.nvim": { "branch": "master", "commit": "f07e913b7143f19edd6787229f2d51759b478600" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, - "mkdnflow.nvim": { "branch": "main", "commit": "d10908058836afe3ec2867cf3f603c1fd78dd8fb" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "230ff118613fa07138ba579b89d13ec2201530b9" }, "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, @@ -18,7 +18,5 @@ "nvim-treesitter": { "branch": "master", "commit": "7da3cb6323d1e1fbfc4d7dc05cac74946458b8a0" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, "nvim-web-devicons": { "branch": "master", "commit": "cdbcca210cf3655aa9b31ebf2422763ecd85ee5c" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, - "telescope.nvim": { "branch": "master", "commit": "f336f8cfab38a82f9f00df380d28f0c2a572f862" }, - "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" } + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" } } \ No newline at end of file diff --git a/nvim/lua/plugins/bufferline.lua b/nvim/lua/plugins/bufferline.lua deleted file mode 100644 index 94b1a98..0000000 --- a/nvim/lua/plugins/bufferline.lua +++ /dev/null @@ -1,28 +0,0 @@ -return { - { - 'akinsho/bufferline.nvim', - config = function () - require('bufferline').setup { - options = { - separator_style = "thin", - indicator = { - style = "none" - }, - diagnostics = "nvim_lsp", - always_show_bufferline = false, - offsets = { - { - filetype = "neo-tree", - text = "Explorer", - highlight = "directory", - separator = false - } - } - } - } - end, - dependencies = { - 'nvim-tree/nvim-web-devicons', - }, - }, -} diff --git a/nvim/lua/plugins/dashboard.lua b/nvim/lua/plugins/dashboard.lua deleted file mode 100644 index 888503e..0000000 --- a/nvim/lua/plugins/dashboard.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - { - 'nvimdev/dashboard-nvim', - event = 'VimEnter', - config = function () - require('dashboard').setup{ - theme = "hyper" - } - end, - dependencies = {{'nvim-tree/nvim-web-devicons'}} - }, -} diff --git a/nvim/lua/plugins/dracula.lua b/nvim/lua/plugins/dracula.lua deleted file mode 100644 index f157d8d..0000000 --- a/nvim/lua/plugins/dracula.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - { - 'maxmx03/dracula.nvim', - lazy = false, - config = function () - local dracula = require 'dracula' - dracula.setup() - vim.cmd.colorscheme 'dracula' - end - } -} diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua deleted file mode 100644 index 29b3c8a..0000000 --- a/nvim/lua/plugins/lspconfig.lua +++ /dev/null @@ -1,47 +0,0 @@ -return { - { - 'neovim/nvim-lspconfig', - config = function() - local lsp = require('lspconfig') - lsp.rust_analyzer.setup{} - lsp.zls.setup{} - lsp.lua_ls.setup{} - lsp.csharp_ls.setup{} - lsp.pyright.setup{} - lsp.tsserver.setup{} - lsp.html.setup{} - lsp.cssls.setup{} - lsp.cssmodules_ls.setup{} - lsp.astro.setup{} - vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('UserLspConfig', {}), - callback = function(ev) - -- Enable completion triggered by - vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc' - - -- Buffer local mappings. - -- See `:help vim.lsp.*` for documentation on any of the below functions - local opts = { buffer = ev.buf } - vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts) - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts) - vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts) - vim.keymap.set('n', '', vim.lsp.buf.signature_help, opts) - vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, opts) - vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, opts) - vim.keymap.set('n', 'wl', function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, opts) - vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, opts) - vim.keymap.set('n', 'rn', vim.lsp.buf.rename, opts) - vim.keymap.set({ 'n', 'v' }, 'ca', vim.lsp.buf.code_action, opts) - vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts) - vim.keymap.set('n', 'f', function() - vim.lsp.buf.format { async = true } - end, opts) - end - }) - - end - } -} diff --git a/nvim/lua/plugins/lualine.lua b/nvim/lua/plugins/lualine.lua deleted file mode 100644 index 336e297..0000000 --- a/nvim/lua/plugins/lualine.lua +++ /dev/null @@ -1,55 +0,0 @@ -return { - { - 'nvim-lualine/lualine.nvim', - config = function() - local colors_insert = { - line_background = '#282a36', - line_foreground = '#f8f8f2', - line_midtone = '#44475a', - pink = '#ff79c6', - ourple = '#bd93f9' - } - - local cake_theme_dracula = { - insert = { - a = { fg = colors_insert.line_background, bg = colors_insert.pink }, - b = { fg = colors_insert.line_foreground, bg = colors_insert.line_background }, - z = { fg = colors_insert.line_foreground, bg = colors_insert.line_background } - }, - normal = { - a = { fg = colors_insert.line_background, bg = colors_insert.ourple }, - - b = { fg = colors_insert.fg, bg = colors_insert.line_background }, - - z = { fg = colors_insert.fg, bg = colors_insert.line_background } - }, - visual = { - }, - replace = { - } - } - - require('lualine').setup { - options = { - theme = cake_theme_dracula, - disabled_filetypes = { - statusline = { - "neo-tree" - } - }, - section_separators = "", - component_separators = "", - }, - sections = { - lualine_a = {'mode'}, - lualine_b = {'filename', 'location'}, - lualine_c = {}, - lualine_x = {}, - lualine_y = {}, - lualine_z = {'diff','branch'} - } - } - end, - dependencies = {{'nvim-tree/nvim-web-devicons'}}, - } -} diff --git a/nvim/lua/plugins/mason.lua b/nvim/lua/plugins/mason.lua deleted file mode 100644 index ff816f9..0000000 --- a/nvim/lua/plugins/mason.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - { - 'williamboman/mason.nvim', - config = function() - require('mason').setup() - end - } -} diff --git a/nvim/lua/plugins/mkdnflow.lua b/nvim/lua/plugins/mkdnflow.lua deleted file mode 100644 index 8f9b453..0000000 --- a/nvim/lua/plugins/mkdnflow.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - { - 'jakewvincent/mkdnflow.nvim', - config = function() - require('mkdnflow').setup({}) - end - } -} diff --git a/nvim/lua/plugins/neo-tree.lua b/nvim/lua/plugins/neo-tree.lua deleted file mode 100644 index fe674de..0000000 --- a/nvim/lua/plugins/neo-tree.lua +++ /dev/null @@ -1,23 +0,0 @@ -return { - { - 'nvim-neo-tree/neo-tree.nvim', - branch = "v3.x", - dependencies = { - {'nvim-lua/plenary.nvim'}, - {'nvim-tree/nvim-web-devicons'}, - {'MunifTanjim/nui.nvim'} - }, - config = function () - require("neo-tree").setup { - enable_git_status = true, - enable_diagnostics = true, - - filesystem = { - follow_current_file = { - enabled = true - } - } - } - end - } -} diff --git a/nvim/lua/plugins/nvim-autopairs.lua b/nvim/lua/plugins/nvim-autopairs.lua deleted file mode 100644 index a64ee6d..0000000 --- a/nvim/lua/plugins/nvim-autopairs.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - { - 'windwp/nvim-autopairs', - event = 'InsertEnter', - config = function () - require('nvim-autopairs').setup{} - end - } -} diff --git a/nvim/lua/plugins/nvim-cmp.lua b/nvim/lua/plugins/nvim-cmp.lua deleted file mode 100644 index db0c728..0000000 --- a/nvim/lua/plugins/nvim-cmp.lua +++ /dev/null @@ -1,37 +0,0 @@ -return { - { - 'hrsh7th/nvim-cmp', - config = function() - - require('luasnip.loaders.from_vscode').lazy_load() - - local cmp = require('cmp') - cmp.setup({ - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end - }, - mapping = cmp.mapping.preset.insert ({ - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.abort(), - [''] = cmp.mapping.confirm({ select = true }), - [''] = cmp.mapping.confirm({ select = true }), - }), - sources = cmp.config.sources({ - {name = 'nvim_lsp'}, - {name = 'luasnip'}, - {name = 'buffer'} - }), - }) - end, - dependencies = { - {'hrsh7th/cmp-nvim-lsp'}, - {'saadparwaiz1/cmp_luasnip'}, - {'rafamadriz/friendly-snippets'}, - {'L3MON4D3/LuaSnip'} - } - } -} diff --git a/nvim/lua/plugins/nvim-ts-autotag.lua b/nvim/lua/plugins/nvim-ts-autotag.lua deleted file mode 100644 index 3653896..0000000 --- a/nvim/lua/plugins/nvim-ts-autotag.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - { - 'windwp/nvim-ts-autotag', - config = function () - require('nvim-ts-autotag').setup() - end - } -} diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua deleted file mode 100644 index 42f52c4..0000000 --- a/nvim/lua/plugins/telescope.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - { - 'nvim-telescope/telescope.nvim', - dependencies = { 'nvim-lua/plenary.nvim' } - } -} diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua deleted file mode 100644 index 4554a7b..0000000 --- a/nvim/lua/plugins/treesitter.lua +++ /dev/null @@ -1,15 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - build = ":TSUpdate", - config = function () - local configs = require("nvim-treesitter.configs") - configs.setup({ - ensure_installed = { "c", "rust", "lua", "vim", "vimdoc", "markdown" , "javascript", "typescript", "python", "html", "astro", "tsx" }, - sync_install = false, - highlight = { enable = true }, - indent = { enable = true }, - }) - end - } -} diff --git a/nvim/lua/plugins/trouble.lua b/nvim/lua/plugins/trouble.lua deleted file mode 100644 index c2eaee3..0000000 --- a/nvim/lua/plugins/trouble.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - { - "folke/trouble.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - opts = { - auto_open = true, - auto_close = true, - height = 3, - padding = false - } - } -} diff --git a/nvim/readme.md b/nvim/readme.md index 01c1aa8..b354892 100644 --- a/nvim/readme.md +++ b/nvim/readme.md @@ -3,5 +3,3 @@ * requirements > base-devel, npm, pip, wl-clipboard -* lsp requirements - > astro-language-server, cssmodules-language-server, css-lsp, html-lsp, typescript-language-server, pyright diff --git a/starship/starship.toml b/starship/starship.toml index c7198c4..e69de29 100644 --- a/starship/starship.toml +++ b/starship/starship.toml @@ -1,5 +0,0 @@ -add_newline = true - -[character] -success_symbol = '[↪](bold green)' -error_symbol = '[⛌](bold red)'