Skip to content

Commit

Permalink
update stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
wrapperup committed Jan 20, 2025
1 parent 304e75e commit 457e825
Show file tree
Hide file tree
Showing 8 changed files with 612 additions and 65 deletions.
59 changes: 47 additions & 12 deletions lua/wrap/init.lua
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
require("wrap.lazy")
vim.g.b = {case_labels = 0}

require("wrap.remaps")
require("wrap.theme")
require("wrap.lsp")
require("wrap.setup")
require("wrap.lazy")

vim.g.netrw_browse_split = 0
vim.g.netrw_banner = 0
Expand All @@ -16,12 +13,50 @@ vim.o.hlsearch = true
vim.cmd.nohlsearch()

-- Set the shell to pwsh
-- vim.o.shell = vim.fn.executable("pwsh") and "pwsh" or "powershell"
-- vim.o.shellcmdflag = '-NoLogo -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.UTF8Encoding]::new();$PSDefaultParameterValues[\'Out-File:Encoding\']=\'utf8\';'
-- vim.o.shellredir = '2>&1 | %%{ "$_" } | Out-File %s; exit $LastExitCode'
-- vim.o.shellpipe = '2>&1 | %%{ "$_" } | Tee-Object %s; exit $LastExitCode'
-- vim.o.shellquote = ""
-- vim.o.shellxquote = ""
vim.o.shell = "pwsh" -- and "pwsh" or "powershell"
vim.o.shellcmdflag = '-NoLogo -NonInteractive -NoProfile -ExecutionPolicy RemoteSigned -Command [System.Environment]::SetEnvironmentVariable("TERM","dumb")'
vim.o.shellredir = '2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode'
vim.o.shellpipe = '2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode'
vim.o.shellquote = ''
vim.o.shellxquote = ''


-- local server = '\\\\.\\pipe\\nvim-pipe-1234'
-- vim.fn.serverstart(server)

if vim.g.neovide then
vim.keymap.set('n', '<C-S-v>', '"+P') -- Paste normal mode
vim.keymap.set('v', '<C-S-v>', '"+P') -- Paste visual mode
vim.keymap.set('c', '<C-S-v>', '<C-R>+') -- Paste command mode
vim.keymap.set('i', '<C-S-v>', '<ESC>l"+Pli')

vim.api.nvim_set_keymap('', '<C-S-v>', '+p<CR>', { noremap = true, silent = true})
vim.api.nvim_set_keymap('!', '<C-S-v>', '<C-R>+', { noremap = true, silent = true})
vim.api.nvim_set_keymap('t', '<C-S-v>', '<C-R>+', { noremap = true, silent = true})
vim.api.nvim_set_keymap('v', '<C-S-v>', '<C-R>+', { noremap = true, silent = true})

vim.o.guifont = "JetBrainsMonoNL NF:h10"

-- vim.fn.serverstart('\\\\.\\pipe\\nvim-pipe-1234')
vim.g.neovide_refresh_rate_idle = 160
vim.g.neovide_refresh_rate = 240

vim.g.neovide_theme = 'auto'

vim.g.neovide_cursor_animation_length = 0.03
vim.g.neovide_cursor_trail_size = 0.8

vim.g.neovide_padding_top = 0
vim.g.neovide_padding_bottom = 0
vim.g.neovide_padding_right = 0
vim.g.neovide_padding_left = 0

vim.g.neovide_scroll_animation_length = 0.1
vim.g.neovide_scroll_animation_far_lines = 999999

vim.g.neovide_cursor_vfx_mode = ""
end

require("wrap.remaps")
require("wrap.theme")
require("wrap.lsp")
require("wrap.setup")
78 changes: 58 additions & 20 deletions lua/wrap/lazy.lua
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@ require('lazy').setup({
{ 'stevearc/oil.nvim' },

-- navigation / controls
{ 'ggandor/leap.nvim' },
{
'ggandor/leap.nvim',
event = "VeryLazy",
},

{
"kylechui/nvim-surround",
Expand All @@ -77,7 +80,7 @@ require('lazy').setup({
dependencies = {
-- LSP Support
{ 'neovim/nvim-lspconfig' }, -- Required
{ -- Optional
{ -- Optional
'williamboman/mason.nvim',
build = function()
pcall(vim.cmd, 'MasonUpdate')
Expand All @@ -86,15 +89,18 @@ require('lazy').setup({
{ 'williamboman/mason-lspconfig.nvim' }, -- Optional

-- Autocompletion
{ 'hrsh7th/nvim-cmp' }, -- Required
{ 'hrsh7th/cmp-nvim-lsp' }, -- Required
{ 'L3MON4D3/LuaSnip', tag = "v2.2.0" }, -- Required
{ 'hrsh7th/nvim-cmp' }, -- Required
{ 'hrsh7th/cmp-nvim-lsp' }, -- Required
{ 'L3MON4D3/LuaSnip' }, -- Required
}
},

{ "ray-x/lsp_signature.nvim" },
{
"ray-x/lsp_signature.nvim",
event = "VeryLazy",
},

{ "github/copilot.vim" },
-- { "github/copilot.vim" },

{
"folke/trouble.nvim",
Expand All @@ -109,17 +115,20 @@ require('lazy').setup({
},

-- status line
{ 'nvim-lualine/lualine.nvim', dependencies = { 'nvim-tree/nvim-web-devicons' } },
{ 'arkav/lualine-lsp-progress' },
{
'nvim-lualine/lualine.nvim',
dependencies = { 'nvim-tree/nvim-web-devicons' },
event = "VeryLazy",
},

{ 'ThePrimeagen/vim-be-good' },
{ 'ThePrimeagen/harpoon' },
{
'saecki/crates.nvim',
dependencies = 'nvim-lua/plenary.nvim',
config = function()
require('crates').setup()
end,
'arkav/lualine-lsp-progress',
event = "VeryLazy",
},

{
'ThePrimeagen/harpoon',
event = "VeryLazy",
},

{
Expand All @@ -132,6 +141,7 @@ require('lazy').setup({
-- formatting
{
'stevearc/conform.nvim',
event = "VeryLazy",
opts = {},
},

Expand All @@ -141,8 +151,6 @@ require('lazy').setup({
end,
},

{ "folke/neodev.nvim", opts = {} },

{
"nvimdev/hlsearch.nvim",
event = 'BufRead',
Expand All @@ -151,7 +159,37 @@ require('lazy').setup({
end
},

{ "zadirion/Unreal.nvim", dependencies = { "tpope/vim-dispatch" } },
{
'stevearc/overseer.nvim',
event = "VeryLazy",
opts = {},
},

{ "jansedivy/jai.vim" },
{
'gabrielpoca/replacer.nvim',
event = "VeryLazy",
opts = { rename_files = false },
keys = {
{
'<leader>h',
function() require('replacer').run() end,
desc = "run replacer.nvim"
}
},
},

-- {
-- 'windwp/nvim-autopairs',
-- event = "InsertEnter",
-- config = true
-- -- use opts = {} for passing setup options
-- -- this is equalent to setup({}) function
-- },

{
'rluba/jai.vim',
init = function ()
vim.g.b = {case_labels = 0}
end
},
})
Loading

0 comments on commit 457e825

Please sign in to comment.