Skip to content

Commit 101ec34

Browse files
committed
updates
1 parent 52b37c2 commit 101ec34

File tree

6 files changed

+58
-40
lines changed

6 files changed

+58
-40
lines changed

config/ghostty/config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ keybind = alt+shift+,=previous_tab
4646

4747
# OS-Specific Configs
4848
config-file = ?config.osx
49+
keybind = shift+enter=text:\x1b\r

config/nvim-snacks/lazy-lock.json

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
11
{
2-
"blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
2+
"blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
33
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
4-
"gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
5-
"go.nvim": { "branch": "master", "commit": "2f7cd3a20a2940320d5cad338722601ffa3ce31b" },
6-
"guihua.lua": { "branch": "master", "commit": "87bea7b98429405caf2a0ce4d029b027bb017c70" },
4+
"gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" },
5+
"go.nvim": { "branch": "master", "commit": "db20146ef63322949af69b0955f80ee7d98145bd" },
6+
"guihua.lua": { "branch": "master", "commit": "c49a0fb7346586a1b1431d7e407f943c4164d8cb" },
77
"hydra.nvim": { "branch": "main", "commit": "8c4a9f621ec7cdc30411a1f3b6d5eebb12b469dc" },
8-
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
9-
"lsp-progress.nvim": { "branch": "main", "commit": "f61cb7a788e4695ed9ae5e1b6b01bfff8f136f8b" },
10-
"lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
8+
"lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" },
9+
"lsp-progress.nvim": { "branch": "main", "commit": "ae52979ad412371ea6dc39ff70c8dfc681fb42b8" },
10+
"lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
11+
"mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
1112
"mini.comment": { "branch": "main", "commit": "fb867a9246f9b892cf51a8c84a3f8479cdf1558c" },
1213
"mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
13-
"mini.move": { "branch": "main", "commit": "710ff226e31a3b9dd7e14bc9e2993f24d653df20" },
14+
"mini.move": { "branch": "main", "commit": "f33406ae7d95b931c6a0d3ba11e50983fe800afb" },
1415
"mini.surround": { "branch": "main", "commit": "5aab42fcdcf31fa010f012771eda5631c077840a" },
1516
"mini.trailspace": { "branch": "main", "commit": "39a0460c025a605519fdd6bea1ce870642429996" },
1617
"multicursors.nvim": { "branch": "main", "commit": "72225ea9e4443c3f4b9df91d0193e07c4ee8d382" },
17-
"nord.nvim": { "branch": "main", "commit": "6f85774a2572699896c445e90c3a8ce799eaf5fd" },
18-
"nvim-dr-lsp": { "branch": "main", "commit": "e4a418ad2bc426d6cbd4b8b084b5e6722c0a0b8f" },
19-
"nvim-lspconfig": { "branch": "master", "commit": "c8b90ae5cbe21d547b342b05c9266dcb8ca0de8f" },
18+
"nord.nvim": { "branch": "main", "commit": "07647ad23e5b7fc1599a841dcd8f173b9aeb0419" },
19+
"nvim-dr-lsp": { "branch": "main", "commit": "3d6e67c39032397fd01358e04c745cd3c0a2b97d" },
20+
"nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" },
2021
"nvim-spectre": { "branch": "master", "commit": "72f56f7585903cd7bf92c665351aa585e150af0f" },
2122
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
2223
"nvim-treesitter-endwise": { "branch": "master", "commit": "a61a9de7965324d4019fb1637b66bfacdcb01f51" },
23-
"nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
24+
"nvim-treesitter-textobjects": { "branch": "master", "commit": "a9742cbc1f95db9eaf3293bf8cd0622ca36542bb" },
2425
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
25-
"render-markdown.nvim": { "branch": "main", "commit": "63e0705b2e6caf500f01626181d74a33df17ce8e" },
26-
"snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
27-
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
28-
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
26+
"render-markdown.nvim": { "branch": "main", "commit": "475d3ad8cae486b0df6fc6050cf5b5ea1de42db8" },
27+
"roslyn.nvim": { "branch": "main", "commit": "7d8819239c5e2c4a0d8150da1c00fa583f761704" },
28+
"snacks.nvim": { "branch": "main", "commit": "903bf3ffb25bcb4b01168e2d9ed4e9a3fa7434d4" },
29+
"todo-comments.nvim": { "branch": "main", "commit": "19d461ddd543e938eb22505fb03fa878800270b6" },
30+
"trouble.nvim": { "branch": "main", "commit": "c098362fe603d3922095e7db595961e020bdf2d0" },
2931
"vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" },
3032
"vim-eunuch": { "branch": "master", "commit": "e86bb794a1c10a2edac130feb0ea590a00d03f1e" },
31-
"vim-matchup": { "branch": "master", "commit": "b23ba393ee600f4f637999f2c02b06a17838e2f0" },
32-
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
33+
"vim-matchup": { "branch": "master", "commit": "ca538c3bb02836510526ff7d07cf7e4c8e9a3b90" },
34+
"which-key.nvim": { "branch": "main", "commit": "b4177e3eaf15fe5eb8357ebac2286d488be1ed00" }
3335
}

config/nvim-snacks/lua/plugins/lsp.lua

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ return {
22
{ 'neovim/nvim-lspconfig',
33
config = function()
44
-- setup language servers
5-
local lspconfig = require('lspconfig')
6-
lspconfig.bashls.setup {}
7-
lspconfig.dockerls.setup {}
8-
lspconfig.just.setup {}
9-
lspconfig.lua_ls.setup {
5+
vim.lsp.enable('bashls')
6+
vim.lsp.enable('dockerls')
7+
vim.lsp.enable('just')
8+
vim.lsp.config('lua_ls', {
109
on_init = function(client)
1110
local path = client.workspace_folders[1].name
1211
if not vim.loop.fs_stat(path..'/.luarc.json') and not vim.loop.fs_stat(path..'/.luarc.jsonc') then
@@ -35,18 +34,17 @@ return {
3534
end
3635
return true
3736
end
38-
}
39-
lspconfig.gopls.setup {}
40-
lspconfig.golangci_lint_ls.setup {}
41-
lspconfig.omnisharp.setup {
42-
cmd = { "dotnet", "/Users/jigish/.omnisharp/latest/OmniSharp.dll" },
43-
}
44-
lspconfig.pyright.setup {}
45-
lspconfig.rust_analyzer.setup {}
46-
lspconfig.sqls.setup {}
47-
lspconfig.ts_ls.setup {}
48-
lspconfig.terraformls.setup {}
49-
lspconfig.yamlls.setup {}
37+
})
38+
vim.lsp.enable('lua_ls')
39+
vim.lsp.enable('gopls')
40+
vim.lsp.enable('golangci_lint_ls')
41+
vim.lsp.enable('roslyn')
42+
vim.lsp.enable('pyright')
43+
vim.lsp.enable('rust_analyzer')
44+
vim.lsp.enable('sqls')
45+
vim.lsp.enable('ts_ls')
46+
vim.lsp.enable('terraformls')
47+
vim.lsp.enable('yamlls')
5048

5149
-- Hover to show error (remove inline error message)
5250
vim.o.updatetime = 250
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
return {
2+
"mason-org/mason.nvim",
3+
opts = {
4+
registries = {
5+
"github:mason-org/mason-registry",
6+
"github:crashdummyy/mason-registry"
7+
}
8+
}
9+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
return {
2+
"seblyng/roslyn.nvim",
3+
ft = "cs",
4+
opts = {
5+
filewatching = "roslyn"
6+
}
7+
}

gitconfig

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,28 @@
3434
cp = cherry-pick
3535
wc = whatchanged
3636
l = log --graph --pretty=format:'%Cred[%h]%Creset%Cgreen[%ci]%C(bold blue)[%an]%Creset%C(yellow)%d%Creset %s'
37+
la = log --graph --all --pretty=format:'%Cred[%h]%Creset%Cgreen[%ci]%C(bold blue)[%an]%Creset%C(yellow)%d%Creset %s'
38+
lr = log --graph --pretty=format:'%Cred[%h]%Creset%Cgreen[%ci]%C(bold blue)[%an]%Creset%C(yellow)%d%Creset %s' --remotes='origin/release/*' main
3739
f = fetch
3840
fo = fetch origin
39-
fom = fetch origin master:master
40-
fon = fetch origin main:main
41+
fom = fetch origin main:main
4142
fod = fetch origin develop:develop
4243
fop = fetch origin production:production
4344
fu = fetch upstream
44-
fum = fetch upstream master
45+
fum = fetch upstream main
4546
b = branch
4647
bd = branch -d
4748
bD = branch -D
4849
sub = submodule
4950
suba = submodule add
5051
subu = submodule update --init
51-
pom = push origin master
52+
pom = push origin main
5253
po = push -u origin
5354
pob = !sh -c 'git push -u origin `git r`'
5455
pdo = push --delete origin
5556
r = rev-parse --abbrev-ref HEAD
5657
h = rev-parse HEAD
57-
pr = pull-request -b master
58+
pr = pull-request -b main
5859
prd = pull-request -b develop
5960
[branch]
6061
autosetuprebase = always

0 commit comments

Comments
 (0)