Merge branch 'main' into macos

This commit is contained in:
Tyler Mayoff 2024-12-05 08:42:57 -05:00
commit dbc85aea94
3 changed files with 109 additions and 0 deletions

View file

@ -24,6 +24,21 @@
# programs.vscode.enable = true; # programs.vscode.enable = true;
programs.kitty = {
enable = true;
package = config.lib.nixGL.wrap pkgs.kitty;
font = {
name = "JetBrainsMono Nerd Font";
# package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
};
settings = {
disable_ligatures = "cursor";
};
themeFile = "Catppuccin-Macchiato";
};
programs.alacritty = { programs.alacritty = {
enable = true; enable = true;
package = config.lib.nixGL.wrap pkgs.alacritty; package = config.lib.nixGL.wrap pkgs.alacritty;

View file

@ -0,0 +1,35 @@
theme = "catppuccin_macchiato"
[editor]
auto-format = false
#gutters = ["line-numbers", "diagnostics", "diff"]
[editor.statusline]
left = ["mode", "spinner", "spacer", "version-control", "file-name"]
[editor.file-picker]
#git-ignore = false
[editor.lsp]
display-inlay-hints = true
display-messages = true
[editor.cursor-shape]
insert = "bar"
[editor.soft-wrap]
enable = true
[keys.normal]
C-right = "move_next_word_start"
C-left = "move_prev_word_end"
a = "insert_mode"
i = "append_mode"
"=" = ":format"
[keys.normal.space]
F = "file_picker_in_current_buffer_directory"
[keys.insert]
C-right = "move_next_word_start"
C-left = "move_prev_word_end"

View file

@ -0,0 +1,59 @@
[language-server]
clangd = { command = "clangd", args = ["--header-insertion=never"]}
biome = { command = "biome", args = ["lsp-proxy"] }
fish_lsp = {command = "fish-lsp", args = ["start"]}
[[language]]
name = "fish"
scope = "source.fish"
auto-format = true
language-servers = [{ name = "fish_lsp" }]
[[language]]
name = "meson"
scope = "source.meson"
injection-regex = "meson"
#file-types = [{ glob = "meson.build" }, { glob = "meson_options.txt" }]
comment-token = "#"
indent = { tab-width = 2, unit = " " }
auto-format = true
formatter = {command = "muon", args = ["fmt", "-"]}
[[language]]
name = "nix"
scope = "source.nix"
#file-types = ["nix"]
auto-format = true
formatter = { command = "alejandra", args = ["-q"] }
##################
### BiomeJS Setup
##################
[[language]]
name = "javascript"
language-servers = [ { name = "typescript-language-server", except-features = [ "format" ] }, "biome" ]
auto-format = true
formatter = { command = "biome", args = ["format", "--stdin-file-path", "a.js"] }
[[language]]
name = "typescript"
language-servers = [ { name = "typescript-language-server", except-features = [ "format" ] }, "biome" ]
auto-format = true
formatter = { command = "biome", args = ["format", "--stdin-file-path", "a.ts"] }
[[language]]
name = "tsx"
auto-format = true
language-servers = [ { name = "typescript-language-server", except-features = [ "format" ] }, "biome" ]
formatter = { command = "biome", args = ["format", "--stdin-file-path", "a.tsx"] }
[[language]]
name = "jsx"
auto-format = true
language-servers = [ { name = "typescript-language-server", except-features = [ "format" ] }, "biome" ]
formatter = { command = "biome", args = ["format", "--stdin-file-path", "a.jsx"] }
[[language]]
name = "json"
language-servers = [ { name = "vscode-json-language-server", except-features = [ "format" ] }, "biome" ]