Compare commits

..

No commits in common. "bd8d6c407b801a5abb6266258eb07ae149b2edbd" and "64ae6ef9ff804cf28e80d28b453ca23f0e1db73f" have entirely different histories.

3 changed files with 5 additions and 51 deletions

6
flake.lock generated
View file

@ -181,11 +181,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1747542820, "lastModified": 1743095683,
"narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -8,36 +8,9 @@ vim.bo.expandtab = true
local lsp = require('user.lsp') local lsp = require('user.lsp')
-- TODO: make a helper function that does the wildcard matching to find the root dir
local root_files = {
'.git',
-- '*.sln',
-- '*.csproj',
-- 'omnisharp.json',
}
vim.lsp.start { vim.lsp.start {
name = 'roslyn', name = 'roslyn',
cmd = { cmd = { 'OmniSharp', '-z', 'DotNet:enablePackageRestore=false', '--encoding', 'utf-8', '--languageserver' },
'OmniSharp',
'-z',
'DotNet:enablePackageRestore=false',
'--encoding',
'utf-8',
'--languageserver',
},
root_dir = vim.fs.dirname(vim.fs.find(root_files, { upward = true })[1]),
capabilities = lsp.make_client_capabilities(), capabilities = lsp.make_client_capabilities(),
on_attach = lsp.on_attach, on_attach = lsp.on_attach,
settings = {
FormattingOptions = {
EnableEditorConfigSupport = true,
},
MsBuild = {},
RenameOptions = {},
RoslynExtensionsOptions = {},
Sdk = {
IncludePrereleases = true,
},
},
} }

View file

@ -1,25 +1,6 @@
local colors_file = io.open(os.getenv('HOME') .. '/.cache/mutagen/colors.json', 'r') local colors_file = io.open(os.getenv('HOME') .. '/.cache/mutagen/colors.json', 'r')
if not colors_file then if not colors_file then
local base16_colors = { -- vim.notify('Mutagen colors file not found', vim.log.levels.ERROR)
base00 = '#131313',
base01 = '#1f1f1f',
base02 = '#2a2a2a',
base03 = '#919191',
base04 = '#c6c6c6',
base05 = '#e2e2e2',
base06 = '#e2e2e2',
base07 = '#303030',
base08 = '#ffb4ab',
base09 = '#dec38c',
base0A = '#e7bdb6',
base0B = '#ffb4a8',
base0C = '#705c2e',
base0D = '#9c4236',
base0E = '#775651',
base0F = '#ba1a1a',
}
require('base16-colorscheme').setup(base16_colors)
return return
end end