commit 776e0342d7e453dcade36832e2454d044ea44f7f
parent 979e7ad6310ce368a18b31c224a8e2573134d2de
Author: Robert Russell <robert@rr3.xyz>
Date: Tue, 14 Oct 2025 21:38:51 -0700
Update
Diffstat:
3 files changed, 82 insertions(+), 80 deletions(-)
diff --git a/.bashrc b/.bashrc
@@ -22,4 +22,5 @@ PS2='\[\e[32m\]▷\[\e[m\] '
source ~/app/z/z.sh
-[ -f "/home/rob/.ghcup/env" ] && . "/home/rob/.ghcup/env" # ghcup-env
-\ No newline at end of file
+[ -f "/home/rob/.ghcup/env" ] && . "/home/rob/.ghcup/env" # ghcup-env
+. "$HOME/.cargo/env"
diff --git a/.profile b/.profile
@@ -9,3 +9,4 @@ export PATSHOME="/opt/ats2/lib/ats2-postiats-0.4.2"
test -r $HOME/.opam/opam-init/init.sh && . $HOME/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
[ -f "$HOME/.ghcup/env" ] && . "$HOME/.ghcup/env" # ghcup-env
+. "$HOME/.cargo/env"
diff --git a/zed/settings.json b/zed/settings.json
@@ -1,85 +1,86 @@
{
- // Keybindings
- "base_keymap": "None",
- "vim_mode": true,
+ // Keybindings
+ "base_keymap": "None",
+ "vim_mode": true,
- // Editor
- "tab_size": 4,
- "use_autoclose": false,
- "cursor_blink": false,
- "vertical_scroll_margin": 3,
- "search": { "regex": true },
- "gutter": { "folds": false },
- "wrap_guides": [80, 120, 160],
- "relative_line_numbers": true,
- "preferred_line_length": 160, // This only affects soft wrap.
+ // Editor
+ "hard_tabs": true,
+ "tab_size": 4,
+ "use_autoclose": false,
+ "cursor_blink": false,
+ "vertical_scroll_margin": 3,
+ "search": { "regex": true },
+ "gutter": { "folds": false },
+ "wrap_guides": [80, 120, 160],
+ "relative_line_numbers": true,
+ "preferred_line_length": 160, // This only affects soft wrap.
- // UI
- "tabs": { "show_close_button": "hidden" }, // I don't want to accidentally close tabs.
- "git_panel": { "dock": "right" },
- "outline_panel": { "dock": "right" },
- "project_panel": { "auto_reveal_entries": false },
+ // UI
+ "tabs": { "show_close_button": "hidden" }, // I don't want to accidentally close tabs.
+ "git_panel": { "dock": "right" },
+ "outline_panel": { "dock": "right" },
+ "project_panel": { "auto_reveal_entries": false },
- // Style
- "ui_font_size": 15,
- "buffer_font_size": 15,
- // Zed font features currently don't work on Linux, so we use a variant of
- // JuliaMono with ligatures hard-coded off, created with
- // https://mutsuntsai.github.io/fontfreeze.
- "buffer_font_family": "JuliaMono Freeze",
- "theme": {
- "mode": "system",
- "light": "KTRZ Monokai",
- "dark": "KTRZ Monokai"
- },
- "experimental.theme_overrides": {
- "syntax": {
- "boolean": { "color": "#00cc55" },
- "comment": { "color": "#808080", "font_style": "italic" },
- "constructor": { "color": "#00cc55" },
- "function": { "color": "#d7d7d7" },
- "property": { "color": "#d7d7d7" },
- "punctuation.bracket": { "color": "#a7a7a7" },
- "punctuation.delimiter": { "color": "#a7a7a7" },
- "title": { "color": "#d7d7d7" },
- "variable": { "color": "#d7d7d7" }
- }
- },
+ // Style
+ "ui_font_size": 15,
+ "buffer_font_size": 15,
+ // Zed font features currently don't work on Linux, so we use a variant of
+ // JuliaMono with ligatures hard-coded off, created with
+ // https://mutsuntsai.github.io/fontfreeze.
+ "buffer_font_family": "JuliaMono Freeze",
+ "theme": {
+ "mode": "system",
+ "light": "KTRZ Monokai",
+ "dark": "KTRZ Monokai"
+ },
+ "experimental.theme_overrides": {
+ "syntax": {
+ "boolean": { "color": "#00cc55" },
+ "comment": { "color": "#808080", "font_style": "italic" },
+ "constructor": { "color": "#00cc55" },
+ "function": { "color": "#d7d7d7" },
+ "property": { "color": "#d7d7d7" },
+ "punctuation.bracket": { "color": "#a7a7a7" },
+ "punctuation.delimiter": { "color": "#a7a7a7" },
+ "title": { "color": "#d7d7d7" },
+ "variable": { "color": "#d7d7d7" }
+ }
+ },
- // LSP
- "lsp": {
- "hls": {
- "initialization_options": {
- "haskell": { "formattingProvider": "fourmolu" }
- }
- }
- },
- "languages": {
- "C": { "hard_tabs": true },
- "Haskell": {
- "formatter": {
- "external": {
- "command": "fourmolu",
- "arguments": ["--haddock-style=single-line", "--newlines-between-decls=0", "--stdin-input-file={buffer_path}", "--in-style=no-space"]
- }
- }
- }
- },
+ // LSP
+ "lsp": {
+ "hls": {
+ "initialization_options": {
+ "haskell": { "formattingProvider": "fourmolu" }
+ }
+ }
+ },
+ "languages": {
+ "Haskell": {
+ "hard_tabs": false,
+ "formatter": {
+ "external": {
+ "command": "fourmolu",
+ "arguments": ["--haddock-style=single-line", "--newlines-between-decls=0", "--stdin-input-file={buffer_path}", "--in-style=no-space"]
+ }
+ }
+ }
+ },
- // Disable some crap
- "assistant": {
- "version": "1", // I don't know what this is. The settings linter says it's necessary.
- "button": false
- },
- "features": { "edit_prediction_provider": "none" },
- "collaboration_panel": { "button": false },
- "tab_bar": {
- "show_nav_history_buttons": false,
- "show_tab_bar_buttons": false
- },
- "terminal": { "button": false },
- "telemetry": {
- "diagnostics": false,
- "metrics": false
- }
+ // Disable some crap
+ "assistant": {
+ "version": "1", // I don't know what this is. The settings linter says it's necessary.
+ "button": false
+ },
+ "features": { "edit_prediction_provider": "none" },
+ "collaboration_panel": { "button": false },
+ "tab_bar": {
+ "show_nav_history_buttons": false,
+ "show_tab_bar_buttons": false
+ },
+ "terminal": { "button": false },
+ "telemetry": {
+ "diagnostics": false,
+ "metrics": false
+ }
}