Merge branch 'main' of github.com:tmayoff/.dotfiles

dot_config/flake/home/gui.nix

@@ -21,6 +21,8 @@
     # Office
     libreoffice
     obsidian
+
+    (config.lib.nixGL.wrap unstable.onagre)
   ];
 
   # programs.vscode.enable = true;

dot_config/flake/home/wash/wash.nix

@@ -1,7 +1,12 @@
-{pkgs, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   imports = [../common.nix ../gnome.nix ../home-backup.nix ../gui.nix];
 
   home.packages = with pkgs; [
     ventoy
+    (config.lib.nixGL.wrap renderdoc)
   ];
 }

dot_config/helix/languages.toml

@@ -2,6 +2,7 @@
 clangd = { command = "clangd", args = ["--header-insertion=never"]}
 biome = { command = "biome", args = ["lsp-proxy"] }
 fish_lsp = {command = "fish-lsp", args = ["start"]}
+slangd = {command = "slangd"}
 
 [[language]]
 name = "fish"
@@ -40,6 +41,19 @@ language-servers = [ {name = "clangd"} ]
 name = "objc"
 source = { git = "https://github.com/tree-sitter-grammars/tree-sitter-objc", rev = "18802acf31d0b5c1c1d50bdbc9eb0e1636cab9ed" }
 
+
+[[language]]
+name = "slang"
+scope = "source.slang"
+file-types = ["slang"]
+auto-format = true
+language-servers = [{name = "slangd"}]
+comment-token = "//"
+
+[[grammar]]
+name = "slang"
+source = { git = "https://github.com/tree-sitter-grammars/tree-sitter-slang", rev = "3ed23c04a412a0559162d9cadf96dfff7cb36079" }
+
 ##################
 ### BiomeJS Setup
 ##################

dot_config/helix/languages.toml.orig

@@ -0,0 +1,87 @@
+[language-server]
+clangd = { command = "clangd", args = ["--header-insertion=never"]}
+biome = { command = "biome", args = ["lsp-proxy"] }
+fish_lsp = {command = "fish-lsp", args = ["start"]}
+slangd = {command = "slangd"}
+
+[[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"] }
+
+[[language]]
+<<<<<<< HEAD
+name = "objc"
+scope = "source.objc"
+file-types = ["m", "mm", "M"]
+injection-regex = "objc"
+roots = ["xcodeproj"]
+comment-token = "//"
+indent = { tab-width = 2, unit = "  " }
+language-servers = [ {name = "clangd"} ]
+
+[[grammar]]
+name = "objc"
+source = { git = "https://github.com/tree-sitter-grammars/tree-sitter-objc", rev = "18802acf31d0b5c1c1d50bdbc9eb0e1636cab9ed" }
+=======
+name = "slang"
+scope = "source.slang"
+file-types = ["slang"]
+auto-format = true
+language-servers = [{name = "slangd"}]
+comment-token = "//"
+
+[[grammar]]
+name = "slang"
+source = { git = "https://github.com/tree-sitter-grammars/tree-sitter-slang", rev = "3ed23c04a412a0559162d9cadf96dfff7cb36079" }
+>>>>>>> 5005128920481963efea6c62053d2dcb192c3116
+
+##################
+### 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" ]

dot_config/yazi/empty_yazi.toml

@@ -1,2 +1,2 @@
 [manager]
-ratio = [1, 1, 0]
+ratio = [0, 4, 0]

dot_config/zellij/layouts/empty_default.kdl

@@ -1,12 +1,20 @@
 layout {
-	pane size=1 borderless=true {
+	default_tab_template {
-		plugin location="tab-bar"
+        pane size=1 borderless=true {
-	}
+            plugin location="zellij:tab-bar"
-	pane split_direction="vertical" {
+        }
-		pane size="33%" command="yazi"
+        children
-		pane
+        pane size=2 borderless=true {
-	}
+            plugin location="zellij:status-bar"
-	pane size=2 borderless=true {
+        }
-		plugin location="zellij:status-bar"
+    }
+
+	tab name="IDE" {
+		pane split_direction="vertical" {
+			pane command="yazi" size="20%"
+			pane command="hx"
+		}
 	}
+
+	tab name="shell"
 }