okay, for real this time

This commit is contained in:
mehbark 2023-10-31 19:06:45 -04:00
parent 1ab81455e3
commit d3d92528b9
2 changed files with 610 additions and 380 deletions

View file

@ -87,7 +87,7 @@ in
enableUpdateCheck = false; enableUpdateCheck = false;
# i prefer to let vscode manage stuff # i prefer to let vscode manage stuff
mutableExtensionsDir = true; mutableExtensionsDir = true;
userSettings = builtins.fromJSON (import ./vscode-settings.nix); userSettings = import ./vscode-settings.nix;
}; };
programs.neovim = { programs.neovim = {

View file

@ -1,3 +1,4 @@
builtins.fromJSON
'' ''
{ {
"workbench.editor.enablePreviewFromQuickOpen": false, "workbench.editor.enablePreviewFromQuickOpen": false,
@ -36,166 +37,389 @@
"vim.leader": ";", "vim.leader": ";",
"vim.normalModeKeyBindings": [ "vim.normalModeKeyBindings": [
{ {
"before": ["j"], "before": [
"after": ["g", "j"] "j"
],
"after": [
"g",
"j"
]
}, },
{ {
"before": ["k"], "before": [
"after": ["g", "k"] "k"
],
"after": [
"g",
"k"
]
}, },
{ {
"before": ["0"], "before": [
"after": ["^"] "0"
],
"after": [
"^"
]
}, },
{ {
"before": ["t", "j"], "before": [
"commands": ["workbench.action.nextEditor"] "t",
"j"
],
"commands": [
"workbench.action.nextEditor"
]
}, },
{ {
"before": ["t", "k"], "before": [
"commands": ["workbench.action.previousEditor"] "t",
"k"
],
"commands": [
"workbench.action.previousEditor"
]
}, },
{ {
"before": ["t", "w"], "before": [
"commands": ["workbench.action.closeActiveEditor"] "t",
"w"
],
"commands": [
"workbench.action.closeActiveEditor"
]
}, },
{ {
"before": ["f", "f"], "before": [
"commands": ["workbench.action.quickOpen"] "f",
"f"
],
"commands": [
"workbench.action.quickOpen"
]
}, },
{ {
"before": ["f", "e"], "before": [
"commands": ["workbench.action.showAllEditorsByMostRecentlyUsed"] "f",
"e"
],
"commands": [
"workbench.action.showAllEditorsByMostRecentlyUsed"
]
}, },
{ {
"before": ["f", "s"], "before": [
"commands": ["workbench.action.gotoSymbol"] "f",
"s"
],
"commands": [
"workbench.action.gotoSymbol"
]
}, },
{ {
"before": ["<leader>", "z"], "before": [
"commands": ["workbench.action.toggleZenMode"] "<leader>",
"z"
],
"commands": [
"workbench.action.toggleZenMode"
]
}, },
{ {
"before": ["<leader>", "w"], "before": [
"commands": [":w"] "<leader>",
"w"
],
"commands": [
":w"
]
}, },
{ {
"before": ["<leader>", "q"], "before": [
"commands": [":q"] "<leader>",
"q"
],
"commands": [
":q"
]
}, },
{ {
"before": ["<leader>", "d"], "before": [
"commands": ["editor.action.showHover"] "<leader>",
"d"
],
"commands": [
"editor.action.showHover"
]
}, },
{ {
"before": ["<leader>", "f"], "before": [
"commands": ["editor.action.quickFix"] "<leader>",
"f"
],
"commands": [
"editor.action.quickFix"
]
}, },
{ {
"before": ["<leader>", "t"], "before": [
"commands": ["editor.action.peekTypeDefinition"] "<leader>",
"t"
],
"commands": [
"editor.action.peekTypeDefinition"
]
}, },
{ {
"before": ["<leader>", "g"], "before": [
"commands": ["editor.action.revealDefinition"] "<leader>",
"g"
],
"commands": [
"editor.action.revealDefinition"
]
}, },
{ {
"before": ["<leader>", "c"], "before": [
"commands": ["rust-analyzer.run"] "<leader>",
"c"
],
"commands": [
"rust-analyzer.run"
]
}, },
{ {
"before": ["<leader>", "r", "n"], "before": [
"commands": ["editor.action.rename"] "<leader>",
"r",
"n"
],
"commands": [
"editor.action.rename"
]
}, },
{ {
"before": ["<c-j>"], "before": [
"commands": ["editor.action.marker.nextInFiles"] "<c-j>"
],
"commands": [
"editor.action.marker.nextInFiles"
]
}, },
{ {
"before": ["<c-k>"], "before": [
"commands": ["editor.action.marker.prevInFiles"] "<c-k>"
],
"commands": [
"editor.action.marker.prevInFiles"
]
}, },
{ {
"before": ["<leader>", "p", "c"], "before": [
"commands": ["picat.run.document"] "<leader>",
}, "p",
// clojure "c"
{ ],
"before": ["<leader>", "s", "h"], "commands": [
"commands": ["paredit.slurpSexpBackward"] "picat.run.document"
]
}, },
{ {
"before": ["<leader>", "s", "l"], "before": [
"commands": ["paredit.slurpSexpForward"] "<leader>",
"s",
"h"
],
"commands": [
"paredit.slurpSexpBackward"
]
}, },
{ {
"before": ["<leader>", "s", "w", "p"], "before": [
"commands": ["paredit.wrapAroundParens"] "<leader>",
"s",
"l"
],
"commands": [
"paredit.slurpSexpForward"
]
}, },
{ {
"before": ["<leader>", "s", "w", "b"], "before": [
"commands": ["paredit.wrapAroundSquare"] "<leader>",
"s",
"w",
"p"
],
"commands": [
"paredit.wrapAroundParens"
]
}, },
{ {
"before": ["<leader>", "s", "w", "c"], "before": [
"commands": ["paredit.wrapAroundCurly"] "<leader>",
"s",
"w",
"b"
],
"commands": [
"paredit.wrapAroundSquare"
]
}, },
{ {
"before": ["<leader>", "s", "w", "p"], "before": [
"commands": ["paredit.wrapAroundParens"] "<leader>",
"s",
"w",
"c"
],
"commands": [
"paredit.wrapAroundCurly"
]
}, },
{ {
"before": ["<leader>", "b", "h"], "before": [
"commands": ["paredit.barfSexpBackward"] "<leader>",
"s",
"w",
"p"
],
"commands": [
"paredit.wrapAroundParens"
]
}, },
{ {
"before": ["<leader>", "b", "l"], "before": [
"commands": ["paredit.barfSexpForward"] "<leader>",
"b",
"h"
],
"commands": [
"paredit.barfSexpBackward"
]
}, },
{ {
"before": ["<leader>", "s", "t"], "before": [
"commands": ["paredit.transpose"] "<leader>",
"b",
"l"
],
"commands": [
"paredit.barfSexpForward"
]
}, },
{ {
"before": ["<leader>", "s", "t"], "before": [
"commands": ["paredit.transpose"] "<leader>",
"s",
"t"
],
"commands": [
"paredit.transpose"
]
}, },
{ {
"before": ["<leader>", "s", "e"], "before": [
"commands": ["calva.evaluateCurrentTopLevelForm"] "<leader>",
"s",
"t"
],
"commands": [
"paredit.transpose"
]
}, },
{ {
"before": ["<leader>", "s", "s"], "before": [
"commands": ["calva.evaluateSelection"] "<leader>",
"s",
"e"
],
"commands": [
"calva.evaluateCurrentTopLevelForm"
]
}, },
{ {
"before": ["<leader>", "s", "f"], "before": [
"commands": ["calva.sendCurrentFormToOutputWindow"] "<leader>",
"s",
"s"
],
"commands": [
"calva.evaluateSelection"
]
}, },
{ {
"before": ["<leader>", "s", "o"], "before": [
"commands": ["calva.showOutputWindow"] "<leader>",
}, "s",
// idris "f"
{ ],
"before": ["<leader>", "i", "l"], "commands": [
"commands": ["idris.make-lemma"] "calva.sendCurrentFormToOutputWindow"
]
}, },
{ {
"before": ["<leader>", "i", "f", "h"], "before": [
"commands": ["idris.proof-search"] "<leader>",
"s",
"o"
],
"commands": [
"calva.showOutputWindow"
]
}, },
{ {
"before": ["<leader>", "i", "c", "s"], "before": [
"commands": ["idris.case-split"] "<leader>",
"i",
"l"
],
"commands": [
"idris.make-lemma"
]
}, },
{ {
"before": ["<leader>", "i", "t", "c"], "before": [
"commands": ["idris.typecheck"] "<leader>",
"i",
"f",
"h"
],
"commands": [
"idris.proof-search"
]
}, },
{ {
"before": ["<leader>", "i", "m"], "before": [
"commands": ["idris.add-clause"] "<leader>",
"i",
"c",
"s"
],
"commands": [
"idris.case-split"
]
},
{
"before": [
"<leader>",
"i",
"t",
"c"
],
"commands": [
"idris.typecheck"
]
},
{
"before": [
"<leader>",
"i",
"m"
],
"commands": [
"idris.add-clause"
]
} }
], ],
"vim.useSystemClipboard": true, "vim.useSystemClipboard": true,
@ -206,9 +430,6 @@
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
}, },
"editor.fontFamily": "JetBrainsMono Nerd Font", "editor.fontFamily": "JetBrainsMono Nerd Font",
// "editor.fontFamily": "IntelOne Mono",
// "editor.fontFamily": "CMU Serif",
// "editor.fontFamily": "JuliaMono",
"editor.fontLigatures": true, "editor.fontLigatures": true,
"git.confirmSync": false, "git.confirmSync": false,
"terminal.integrated.scrollback": 100000, "terminal.integrated.scrollback": 100000,
@ -217,7 +438,9 @@
"editor.defaultFormatter": null, "editor.defaultFormatter": null,
"editor.formatOnSave": true "editor.formatOnSave": true
}, },
"terminal.integrated.commandsToSkipShell": ["-workbench.action.quickOpen"], "terminal.integrated.commandsToSkipShell": [
"-workbench.action.quickOpen"
],
"[typescript]": { "[typescript]": {
"editor.formatOnSave": true, "editor.formatOnSave": true,
"editor.defaultFormatter": "denoland.vscode-deno" "editor.defaultFormatter": "denoland.vscode-deno"
@ -225,7 +448,10 @@
"[json]": { "[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
}, },
"editor.rulers": [80, 100], "editor.rulers": [
80,
100
],
"git.enableSmartCommit": true, "git.enableSmartCommit": true,
"typescript.updateImportsOnFileMove.enabled": "always", "typescript.updateImportsOnFileMove.enabled": "always",
"[typescriptreact]": { "[typescriptreact]": {
@ -236,12 +462,10 @@
}, },
"terminal.integrated.tabs.enabled": true, "terminal.integrated.tabs.enabled": true,
"terminal.integrated.defaultProfile.linux": "fish", "terminal.integrated.defaultProfile.linux": "fish",
//"workbench.preferredDarkColorTheme": "GitHub Dark",
//"workbench.preferredLightColorTheme": "GitHub Light",
"editor.tabSize": 4, "editor.tabSize": 4,
"editor.cursorStyle": "line", "editor.cursorStyle": "line",
"editor.lineNumbers": "on", "editor.lineNumbers": "on",
"editor.wordSeparators": "/\\()\"':,.;<>~!@#$%^&*|+=[]{}`?-", "editor.wordSeparators": "/\\()\"':,;<>~!@#$$%^&*|+=[]{}`?-",
"editor.wordWrap": "off", "editor.wordWrap": "off",
"window.restoreWindows": "none", "window.restoreWindows": "none",
"editor.quickSuggestions": { "editor.quickSuggestions": {
@ -301,9 +525,6 @@
"lua" "lua"
], ],
"editor.suggest.localityBonus": true, "editor.suggest.localityBonus": true,
// "rust-analyzer.inlayHints.chainingHints.enable": false,
// "rust-analyzer.inlayHints.parameterHints.enable": false,
// "rust-analyzer.inlayHints.typeHints.enable": false,
"[css]": { "[css]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
}, },
@ -325,10 +546,16 @@
"rust-analyzer.inlayHints.lifetimeElisionHints.enable": "always", "rust-analyzer.inlayHints.lifetimeElisionHints.enable": "always",
"rust-analyzer.inlayHints.lifetimeElisionHints.useParameterNames": true, "rust-analyzer.inlayHints.lifetimeElisionHints.useParameterNames": true,
"rust-analyzer.inlayHints.reborrowHints.enable": "always", "rust-analyzer.inlayHints.reborrowHints.enable": "always",
"rust-analyzer.checkOnSave.extraArgs": ["--", "-W", "clippy::pedantic"], "rust-analyzer.checkOnSave.extraArgs": [
"--",
"-W",
"clippy::pedantic"
],
"editor.unicodeHighlight.invisibleCharacters": false, "editor.unicodeHighlight.invisibleCharacters": false,
"remote.extensionKind": { "remote.extensionKind": {
"pub.name": ["ui"] "pub.name": [
"ui"
]
}, },
"docker.commands.attach": "$${config:docker.dockerPath} exec -it $${containerId} $${shellCommand}", "docker.commands.attach": "$${config:docker.dockerPath} exec -it $${containerId} $${shellCommand}",
"C_Cpp.clang_format_fallbackStyle": "WebKit", "C_Cpp.clang_format_fallbackStyle": "WebKit",
@ -356,7 +583,10 @@
"[javascriptreact]": { "[javascriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
}, },
"errorLens.excludeBySource": ["eslint(eqeqeq)", "ts(2551)"], "errorLens.excludeBySource": [
"eslint(eqeqeq)",
"ts(2551)"
],
"terminal.integrated.fontSize": 15, "terminal.integrated.fontSize": 15,
"dafny.verificationTimeLimit": 3600, "dafny.verificationTimeLimit": 3600,
"dafny.verificationVirtualCores": 0, "dafny.verificationVirtualCores": 0,