Compare commits

..

10 commits

Author SHA1 Message Date
Ale
ceaa24c2b6 nvim 2024-03-11 15:09:18 +01:00
Ale
d474ae420a ssh agent 2024-03-02 18:43:53 +01:00
Ale
b9aa8c6542 nvim reworked config and hyfetch 2024-03-02 17:25:11 +01:00
Ale
6c98426766 starship 2023-12-30 15:30:09 +01:00
Ale
645f7a8784 nvim 2023-12-24 00:58:21 +01:00
Ale
f51ab02f7f merge 2023-12-23 16:36:46 +01:00
GlaDOS
a69fc05d5c FEAT: nvim lsp rust 2023-12-23 14:14:37 +01:00
Ale
065699004b FEAT: fish 2023-12-21 00:55:24 +01:00
Ale
bfea58ffdb FEAT: fish nvim 2023-12-12 23:17:23 +01:00
Ale
b47bc91789 nvim 2023-11-25 02:21:37 +01:00
20 changed files with 329 additions and 201 deletions

View file

@ -5,5 +5,22 @@ if status is-interactive
starship init fish | source starship init fish | source
end end
# Created by `pipx` on 2023-11-04 13:29:11 # XDG
set PATH $PATH /home/ale/.local/bin 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

15
hyfetch/hyfetch.json Normal file
View file

@ -0,0 +1,15 @@
{
"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
}

View file

@ -12,203 +12,11 @@ if not vim.loop.fs_stat(lazypath) then
end end
vim.opt.rtp:prepend(lazypath) vim.opt.rtp:prepend(lazypath)
plugins = { require("lazy").setup({
{ spec = {
'windwp/nvim-autopairs', { import = "plugins"}
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 ({
['<C-b>'] = cmp.mapping.scroll_docs(-4),
['<C-f>'] = cmp.mapping.scroll_docs(4),
['<C-Space>'] = cmp.mapping.complete(),
['<C-e>'] = cmp.mapping.abort(),
['<CR>'] = 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 if vim.g.neovide == true then
vim.api.nvim_set_keymap('n', "<F11>", ":let g:neovide_fullscreen = !g:neovide_fullscreen<CR>", {}) vim.api.nvim_set_keymap('n', "<F11>", ":let g:neovide_fullscreen = !g:neovide_fullscreen<CR>", {})

View file

@ -6,10 +6,10 @@
"dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" },
"dracula.nvim": { "branch": "master", "commit": "2f396b6ba988ad4b3961c2e40d1b9ae436b8c26c" }, "dracula.nvim": { "branch": "master", "commit": "2f396b6ba988ad4b3961c2e40d1b9ae436b8c26c" },
"friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
"git-blame.nvim": { "branch": "master", "commit": "f07e913b7143f19edd6787229f2d51759b478600" },
"lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
"lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
"mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
"mkdnflow.nvim": { "branch": "main", "commit": "d10908058836afe3ec2867cf3f603c1fd78dd8fb" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "230ff118613fa07138ba579b89d13ec2201530b9" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "230ff118613fa07138ba579b89d13ec2201530b9" },
"nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" },
"nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" },
@ -18,5 +18,7 @@
"nvim-treesitter": { "branch": "master", "commit": "7da3cb6323d1e1fbfc4d7dc05cac74946458b8a0" }, "nvim-treesitter": { "branch": "master", "commit": "7da3cb6323d1e1fbfc4d7dc05cac74946458b8a0" },
"nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
"nvim-web-devicons": { "branch": "master", "commit": "cdbcca210cf3655aa9b31ebf2422763ecd85ee5c" }, "nvim-web-devicons": { "branch": "master", "commit": "cdbcca210cf3655aa9b31ebf2422763ecd85ee5c" },
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" } "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
"telescope.nvim": { "branch": "master", "commit": "f336f8cfab38a82f9f00df380d28f0c2a572f862" },
"trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }
} }

View file

@ -0,0 +1,28 @@
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',
},
},
}

View file

@ -0,0 +1,12 @@
return {
{
'nvimdev/dashboard-nvim',
event = 'VimEnter',
config = function ()
require('dashboard').setup{
theme = "hyper"
}
end,
dependencies = {{'nvim-tree/nvim-web-devicons'}}
},
}

View file

@ -0,0 +1,11 @@
return {
{
'maxmx03/dracula.nvim',
lazy = false,
config = function ()
local dracula = require 'dracula'
dracula.setup()
vim.cmd.colorscheme 'dracula'
end
}
}

View file

@ -0,0 +1,47 @@
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 <c-x><c-o>
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', '<C-k>', vim.lsp.buf.signature_help, opts)
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
vim.keymap.set('n', '<space>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, opts)
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts)
vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
vim.keymap.set('n', '<space>f', function()
vim.lsp.buf.format { async = true }
end, opts)
end
})
end
}
}

View file

@ -0,0 +1,55 @@
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'}},
}
}

View file

@ -0,0 +1,8 @@
return {
{
'williamboman/mason.nvim',
config = function()
require('mason').setup()
end
}
}

View file

@ -0,0 +1,8 @@
return {
{
'jakewvincent/mkdnflow.nvim',
config = function()
require('mkdnflow').setup({})
end
}
}

View file

@ -0,0 +1,23 @@
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
}
}

View file

@ -0,0 +1,9 @@
return {
{
'windwp/nvim-autopairs',
event = 'InsertEnter',
config = function ()
require('nvim-autopairs').setup{}
end
}
}

View file

@ -0,0 +1,37 @@
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 ({
['<C-b>'] = cmp.mapping.scroll_docs(-4),
['<C-f>'] = cmp.mapping.scroll_docs(4),
['<C-Space>'] = cmp.mapping.complete(),
['<C-e>'] = cmp.mapping.abort(),
['<CR>'] = cmp.mapping.confirm({ select = true }),
['<TAB>'] = 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'}
}
}
}

View file

@ -0,0 +1,8 @@
return {
{
'windwp/nvim-ts-autotag',
config = function ()
require('nvim-ts-autotag').setup()
end
}
}

View file

@ -0,0 +1,6 @@
return {
{
'nvim-telescope/telescope.nvim',
dependencies = { 'nvim-lua/plenary.nvim' }
}
}

View file

@ -0,0 +1,15 @@
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
}
}

View file

@ -0,0 +1,12 @@
return {
{
"folke/trouble.nvim",
dependencies = { "nvim-tree/nvim-web-devicons" },
opts = {
auto_open = true,
auto_close = true,
height = 3,
padding = false
}
}
}

View file

@ -3,3 +3,5 @@
* requirements * requirements
> base-devel, npm, pip, wl-clipboard > base-devel, npm, pip, wl-clipboard
* lsp requirements
> astro-language-server, cssmodules-language-server, css-lsp, html-lsp, typescript-language-server, pyright

View file

@ -0,0 +1,5 @@
add_newline = true
[character]
success_symbol = '[↪](bold green)'
error_symbol = '[⛌](bold red)'