eggs/foot/.config/foot/foot.ini

@@ -14,7 +14,7 @@
 # {% if device.laptop %}
 #<yolk> font=Terminus:size=12
 # {% else %}
-font=Fira Code Nerd Font:size=12
+#font=Fira Code Nerd Font:size=12
 # {% end %}
 
 # font-bold=<bold variant of regular font>

eggs/niri/config.kdl

@@ -331,36 +331,36 @@ binds {
 
     Mod+R { switch-preset-column-width; }
     Mod+Ctrl+R { spawn "sh" "-c" r#"
-        niri msg action focus-column-right
+        niri msg action focus-column-right \
-        niri msg action set-column-width 33%
+        && niri msg action set-column-width 33% \
-        niri msg action focus-column-left
+        && niri msg action focus-column-left \
-        niri msg action set-column-width 67%
+        && niri msg action set-column-width 67%
        "#;
     }
     Mod+Ctrl+Shift+R { spawn "sh" "-c" r#"
-        niri msg action set-column-width 33%
+        niri msg action set-column-width 33% \
-        niri msg action focus-column-right
+        && niri msg action focus-column-right \
-        niri msg action set-column-width 67%
+        && niri msg action set-column-width 67% \
-        niri msg action focus-column-left
+        && niri msg action focus-column-left
        "#;
     }
     Mod+Ctrl+T { spawn "sh" "-c" r#"
-        niri msg action set-column-width 50%
+        niri msg action set-column-width 50% \
-        niri msg action focus-column-right
+        && niri msg action focus-column-right \
-        niri msg action set-column-width 50%
+        && niri msg action set-column-width 50% \
-        niri msg action focus-column-left
+        && niri msg action focus-column-left \
-        niri msg action focus-column-right
+        && niri msg action focus-column-right \
-        niri msg action focus-column-left
+        && niri msg action focus-column-left
        "#;
     }
     Mod+Ctrl+Shift+T { spawn "sh" "-c" r#"
-        niri msg action set-column-width 34%
+        niri msg action set-column-width 34% \
-        niri msg action focus-column-right
+        && niri msg action focus-column-right \
-        niri msg action set-column-width 33%
+        && niri msg action set-column-width 33% \
-        niri msg action focus-column-right
+        && niri msg action focus-column-right \
-        niri msg action set-column-width 33%
+        && niri msg action set-column-width 33% \
-        niri msg action focus-column-left
+        && niri msg action focus-column-left \
-        niri msg action focus-column-left
+        && niri msg action focus-column-left
        "#;
     }
     Mod+Shift+R { reset-window-height; }

eggs/zed/.config/zed/settings.json

@@ -1,6 +1,5 @@
 {
   "auto_signature_help": false,
-  "unnecessary_code_fade": 0.5,
   // "use_autoclose": true,
   // "always_treat_brackets_as_autoclosed": false,
   // "unstable.ui_density": "compact",
@@ -15,7 +14,7 @@
   "buffer_font_size": 14,
   "buffer_font_family": "Input",
   // "buffer_font_family": "FiraCode Nerd Font",
-  // "buffer_font_family": "JetBrainsMono Nerd Font Mono",
+  //"buffer_font_family": "JetBrainsMono Nerd Font Mono",
   // "buffer_line_height": { "custom": 1.55 },
   // "ui_font_family": "Noto Sans",
   // "buffer_font_family": "Zed Mono",
@@ -31,26 +30,8 @@
     "line_numbers": false,
     "folds": false
   },
-  "toolbar": {
-    "quick_actions": false
-    // "selections_menu": false
-  },
   "vertical_scroll_margin": 5,
-  "tabs": {
+  "tabs": { "git_status": true },
-    "git_status": true,
-    "file_icons": true,
-    "show_diagnostics": "errors"
-  },
-  "use_smartcase_search": true,
-  "preview_tabs": {
-    "enabled": true,
-    "enable_preview_from_file_finder": true,
-    "enable_preview_from_code_navigation": true
-  },
-
-  "message_editor": {
-    "auto_replace_emoji_shortcode": true
-  },
 
   "terminal": {
     "font_family": "JetBrainsMono Nerd Font",
@@ -67,6 +48,17 @@
     }
   },
   "lsp": {
+    "luau-lsp": {
+      "sourcemap": {
+        "enabled": false
+      },
+      "initializationOptions": {
+        "definitions": "/home/elk/.config/yolk/globalTypes.d.luau"
+      },
+      "types": {
+        "definitionFiles": ["/home/elk/.config/yolk/globalTypes.d.luau"]
+      }
+    },
     "rust-analyzer": {
       "initialization_options": {
         "typing": {
@@ -75,19 +67,5 @@
         }
       }
     }
-  },
-  "drop_target_size": 0.3,
-  "indent_guides": {
-    "coloring": "fixed"
-  },
-  "experimental.theme_overrides": {
-    "editor.indent_guide": "#ffffff08",
-    "panel.indent_guide": "#ffffff08",
-    "panel.indent_guide_active": "#ffffff11",
-    "panel.indent_guide_hover": "#ffffff13",
-
-    "panel.background": "#282828",
-    "tab_bar.background": "#282828",
-    "border": "#3c3836"
   }
 }

foo.rhai

@@ -1,3 +0,0 @@
-fn stuff() {
-    // re "hi"
-}

yolk.rhai

@@ -1,10 +1,7 @@
-import "foo" as stuff;
-
-// stuff::stuff();
 
 export const device = #{
     thinkix: SYSTEM.hostname == "thinkix",
-    desktop: SYSTEM.hostname == "fedora.fritz.box" ||SYSTEM.hostname == "fedora",
+    desktop: SYSTEM.hostname == "fedora.fritz.box",
     laptop: SYSTEM.hostname == "thinkix" || SYSTEM.hostname == "frissnix",
     macbook: false,
 };
@@ -18,15 +15,14 @@ export let eggs = #{
     "alacritty": #{ targets: "~/.config/alacritty" },
     "eww": merge_into_home(device.desktop, []),
     "eww-bar": merge_into_home(device.desktop, []),
-    "foot": #{ targets: "~/.config/foot", templates: ["foot.ini"] },
+    "foot": #{ strategy: "merge", targets: "~", templates: [".config/foot/foot.ini"] },
     "git": merge_into_home(true, [".gitconfig"]),
     "niri": #{ targets: "~/.config/niri", templates: ["**/*.kdl"] },
-    "nvim": #{ strategy: "put", targets: "~/.config/nvim", main_file: "fnl/main.fnl" },
+    "nvim": #{ strategy: "merge", targets: "~", main_file: ".config/nvim/fnl/main.fnl" },
-    "profile": #{ strategy: "merge", targets: "~" },
+    "profile": merge_into_home(true, []),
     "starship": merge_into_home(true, []),
-
     "sway": merge_into_home(device.desktop, []),
-    "zed": #{ strategy: "put", targets: "~/.config/zed" },
+    "zed": merge_into_home(true, []),
     "zsh": merge_into_home(true, []),
     "rofi": merge_into_home(true, []),
     "gtk": merge_into_home(true, []),