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;
# i prefer to let vscode manage stuff
mutableExtensionsDir = true;
userSettings = builtins.fromJSON (import ./vscode-settings.nix);
userSettings = import ./vscode-settings.nix;
};
programs.neovim = {

View file

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