diff --git a/dot_config/xonsh/rc.d/env.xsh b/dot_config/xonsh/rc.d/env.xsh index 77cf01f..9914c55 100644 --- a/dot_config/xonsh/rc.d/env.xsh +++ b/dot_config/xonsh/rc.d/env.xsh @@ -32,6 +32,8 @@ $OPTCLUSTER = "compute.optimisation-2020.cloud.edu.au" #> CMake settings $CMAKE_EXPORT_COMPILE_COMMANDS = "1" # output compile-commands.json for clangd $CMAKE_GENERATOR = "Ninja Multi-Config" # use Ninja generator by default +$CMAKE_C_COMPILER_LAUNCHER = "ccache" +$CMAKE_CXX_COMPILER_LAUNCHER = "ccache" #> FZF $FZF_DEFAULT_COMMAND = "fd --type f" diff --git a/private_Library/private_Application Support/private_VSCodium/User/settings.json b/private_Library/private_Application Support/private_VSCodium/User/settings.json index 66dfeea..be4263c 100644 --- a/private_Library/private_Application Support/private_VSCodium/User/settings.json +++ b/private_Library/private_Application Support/private_VSCodium/User/settings.json @@ -1,9 +1,17 @@ { + "clangd.arguments": [ + "--compile-commands-dir=./build.nosync/" + ], + "clangd.checkUpdates": true, "cmake.buildDirectory": "${workspaceFolder}/build.nosync", "cmake.configureOnOpen": false, + "cmake.environment": { + "CMAKE_C_COMPILER_LAUNCHER": "ccache", + "CMAKE_CXX_COMPILER_LAUNCHER": "ccache" + }, "cmake.generator": "Ninja Multi-Config", "cmake.installPrefix": "${workspaceFolder}/build.nosync/install", - "editor.fontFamily": "Iosevka Slab, Iosevka, Menlo, Monaco, 'Courier New', monospace", + "editor.fontFamily": "'Iosevka Slab', Iosevka, Menlo, Monaco, 'Courier New', monospace", "editor.fontLigatures": true, "editor.fontSize": 14, "editor.formatOnSave": true, @@ -13,23 +21,50 @@ "extensions.ignoreRecommendations": true, "files.autoSave": "onWindowChange", "files.insertFinalNewline": true, - "lldb.consoleMode": "evaluate", + "lldb.showDisassembly": "never", "ltex.additionalRules.enablePickyRules": true, "ltex.language": "en-GB", "python.formatting.blackPath": "/opt/homebrew/bin/black", "python.formatting.provider": "black", "rust-analyzer.debug.engine": "vadimcn.vscode-lldb", "terminal.external.osxExec": "kitty.app", + "terminal.integrated.defaultProfile.osx": "xonsh", + "terminal.integrated.profiles.osx": { + "bash": { + "args": [ + "-l" + ], + "icon": "terminal-bash", + "path": "bash" + }, + "fish": { + "args": [ + "-l" + ], + "path": "fish" + }, + "pwsh": { + "icon": "terminal-powershell", + "path": "pwsh" + }, + "tmux": { + "icon": "terminal-tmux", + "path": "tmux" + }, + "xonsh": { + "path": "xonsh" + }, + "zsh": { + "args": [ + "-l" + ], + "path": "zsh" + } + }, "terminal.integrated.scrollback": 10000, - "terminal.integrated.shell.osx": "xonsh", "window.autoDetectColorScheme": true, - "window.commandCenter": true, "workbench.colorTheme": "Catppuccin Latte", "workbench.preferredDarkColorTheme": "Catppuccin Macchiato", "workbench.preferredLightColorTheme": "Catppuccin Latte", - "workbench.startupEditor": "none", - "clangd.checkUpdates": true, - "clangd.arguments": [ - "--compile-commands-dir=./build.nosync/" - ], + "terminal.integrated.confirmOnExit": "hasChildProcesses", }