From 7e653694847a8ba49e104dbc017a7e785ed0299e Mon Sep 17 00:00:00 2001 From: elkowar Date: Sat, 21 Dec 2024 22:42:30 +0100 Subject: [PATCH] Restructure stuff --- eggs/foot/{.config/foot => }/foot.ini | 0 eggs/niri/config.kdl | 42 ++++++++-------- eggs/nvim/{.config/nvim => }/.gitignore | 0 eggs/nvim/{.config/nvim => }/.nfnl.fnl | 0 .../{.config/nvim => }/fnl/dots/colors.fnl | 0 .../{.config/nvim => }/fnl/dots/keybinds.fnl | 0 .../nvim => }/fnl/dots/plugins/bufferline.fnl | 0 .../nvim => }/fnl/dots/plugins/cmp.fnl | 0 .../nvim => }/fnl/dots/plugins/copilot.fnl | 0 .../nvim => }/fnl/dots/plugins/diffview.fnl | 0 .../nvim => }/fnl/dots/plugins/emmet.fnl | 0 .../nvim => }/fnl/dots/plugins/feline.fnl | 0 .../fnl/dots/plugins/flutter-tools.fnl | 0 .../nvim => }/fnl/dots/plugins/gitsigns.fnl | 0 .../nvim => }/fnl/dots/plugins/gruvbox8.fnl | 0 .../nvim => }/fnl/dots/plugins/lsp.fnl | 0 .../nvim => }/fnl/dots/plugins/ltex-ls.fnl | 0 .../nvim => }/fnl/dots/plugins/noice.fnl | 0 .../fnl/dots/plugins/nvim-colorizer.fnl | 0 .../nvim => }/fnl/dots/plugins/obsidian.fnl | 0 .../nvim => }/fnl/dots/plugins/plugins.fnl | 0 .../nvim => }/fnl/dots/plugins/telescope.fnl | 0 .../fnl/dots/plugins/todo-comments.fnl | 0 .../nvim => }/fnl/dots/plugins/treesitter.fnl | 0 .../nvim => }/fnl/dots/plugins/trouble.fnl | 0 .../nvim => }/fnl/dots/plugins/vimtex.fnl | 0 .../{.config/nvim => }/fnl/dots/prelude.fnl | 0 .../{.config/nvim => }/fnl/dots/utils.fnl | 0 eggs/nvim/{.config/nvim => }/fnl/macros.fnl | 0 eggs/nvim/{.config/nvim => }/fnl/main.fnl | 0 eggs/nvim/{.config/nvim => }/init.lua | 0 eggs/nvim/{.config/nvim => }/lazy-lock.json | 0 .../{.config/nvim => }/lua/dots/basics.lua | 0 .../{.config/nvim => }/lua/dots/colors.lua | 0 .../nvim => }/lua/dots/help-thingy.lua | 0 .../{.config/nvim => }/lua/dots/keybinds.lua | 0 .../nvim => }/lua/dots/plugins/bufferline.lua | 0 .../nvim => }/lua/dots/plugins/cmp.lua | 0 .../nvim => }/lua/dots/plugins/copilot.lua | 0 .../nvim => }/lua/dots/plugins/diffview.lua | 0 .../nvim => }/lua/dots/plugins/emmet.lua | 0 .../nvim => }/lua/dots/plugins/feline.lua | 0 .../lua/dots/plugins/flutter-tools.lua | 0 .../nvim => }/lua/dots/plugins/gitsigns.lua | 0 .../nvim => }/lua/dots/plugins/gruvbox8.lua | 0 .../nvim => }/lua/dots/plugins/lsp.lua | 0 .../nvim => }/lua/dots/plugins/ltex-ls.lua | 0 .../nvim => }/lua/dots/plugins/noice.lua | 0 .../lua/dots/plugins/nvim-colorizer.lua | 0 .../nvim => }/lua/dots/plugins/obsidian.lua | 0 .../nvim => }/lua/dots/plugins/plugins.lua | 0 .../nvim => }/lua/dots/plugins/telescope.lua | 0 .../lua/dots/plugins/todo-comments.lua | 0 .../nvim => }/lua/dots/plugins/treesitter.lua | 0 .../nvim => }/lua/dots/plugins/trouble.lua | 0 .../nvim => }/lua/dots/plugins/vimtex.lua | 0 .../{.config/nvim => }/lua/dots/prelude.lua | 0 .../lua/dots/smart-compe-conjure.lua | 0 .../{.config/nvim => }/lua/dots/utils.lua | 0 eggs/nvim/{.config/nvim => }/lua/main.lua | 0 eggs/zed/{.config/zed => }/.gitignore | 0 eggs/zed/{.config/zed => }/keymap.json | 0 eggs/zed/{.config/zed => }/settings.json | 48 ++++++++++++++----- eggs/zed/{.config/zed => }/tasks.json | 0 eggs/zed/{.config/zed => }/themes/phine.json | 0 foo.rhai | 3 ++ yolk.rhai | 13 +++-- 67 files changed, 67 insertions(+), 39 deletions(-) rename eggs/foot/{.config/foot => }/foot.ini (100%) rename eggs/nvim/{.config/nvim => }/.gitignore (100%) rename eggs/nvim/{.config/nvim => }/.nfnl.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/colors.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/keybinds.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/bufferline.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/cmp.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/copilot.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/diffview.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/emmet.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/feline.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/flutter-tools.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/gitsigns.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/gruvbox8.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/lsp.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/ltex-ls.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/noice.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/nvim-colorizer.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/obsidian.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/plugins.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/telescope.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/todo-comments.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/treesitter.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/trouble.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/plugins/vimtex.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/prelude.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/dots/utils.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/macros.fnl (100%) rename eggs/nvim/{.config/nvim => }/fnl/main.fnl (100%) rename eggs/nvim/{.config/nvim => }/init.lua (100%) rename eggs/nvim/{.config/nvim => }/lazy-lock.json (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/basics.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/colors.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/help-thingy.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/keybinds.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/bufferline.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/cmp.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/copilot.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/diffview.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/emmet.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/feline.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/flutter-tools.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/gitsigns.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/gruvbox8.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/lsp.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/ltex-ls.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/noice.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/nvim-colorizer.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/obsidian.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/plugins.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/telescope.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/todo-comments.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/treesitter.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/trouble.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/plugins/vimtex.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/prelude.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/smart-compe-conjure.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/dots/utils.lua (100%) rename eggs/nvim/{.config/nvim => }/lua/main.lua (100%) rename eggs/zed/{.config/zed => }/.gitignore (100%) rename eggs/zed/{.config/zed => }/keymap.json (100%) rename eggs/zed/{.config/zed => }/settings.json (58%) rename eggs/zed/{.config/zed => }/tasks.json (100%) rename eggs/zed/{.config/zed => }/themes/phine.json (100%) create mode 100644 foo.rhai diff --git a/eggs/foot/.config/foot/foot.ini b/eggs/foot/foot.ini similarity index 100% rename from eggs/foot/.config/foot/foot.ini rename to eggs/foot/foot.ini diff --git a/eggs/niri/config.kdl b/eggs/niri/config.kdl index 70ead2e..ddb459b 100644 --- a/eggs/niri/config.kdl +++ b/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 set-column-width 33% \ - && niri msg action focus-column-left \ - && niri msg action set-column-width 67% + niri msg action focus-column-right + niri msg action set-column-width 33% + niri msg action focus-column-left + 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 focus-column-right \ - && niri msg action set-column-width 67% \ - && niri msg action focus-column-left + niri msg action set-column-width 33% + niri msg action focus-column-right + niri msg action set-column-width 67% + niri msg action focus-column-left "#; } Mod+Ctrl+T { spawn "sh" "-c" r#" - niri msg action set-column-width 50% \ - && niri msg action focus-column-right \ - && niri msg action set-column-width 50% \ - && niri msg action focus-column-left \ - && niri msg action focus-column-right \ - && niri msg action focus-column-left + niri msg action set-column-width 50% + niri msg action focus-column-right + niri msg action set-column-width 50% + niri msg action focus-column-left + niri msg action focus-column-right + niri msg action focus-column-left "#; } Mod+Ctrl+Shift+T { spawn "sh" "-c" r#" - niri msg action set-column-width 34% \ - && niri msg action focus-column-right \ - && niri msg action set-column-width 33% \ - && niri msg action focus-column-right \ - && 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 34% + niri msg action focus-column-right + niri msg action set-column-width 33% + niri msg action focus-column-right + niri msg action set-column-width 33% + niri msg action focus-column-left + niri msg action focus-column-left "#; } Mod+Shift+R { reset-window-height; } diff --git a/eggs/nvim/.config/nvim/.gitignore b/eggs/nvim/.gitignore similarity index 100% rename from eggs/nvim/.config/nvim/.gitignore rename to eggs/nvim/.gitignore diff --git a/eggs/nvim/.config/nvim/.nfnl.fnl b/eggs/nvim/.nfnl.fnl similarity index 100% rename from eggs/nvim/.config/nvim/.nfnl.fnl rename to eggs/nvim/.nfnl.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/colors.fnl b/eggs/nvim/fnl/dots/colors.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/colors.fnl rename to eggs/nvim/fnl/dots/colors.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/keybinds.fnl b/eggs/nvim/fnl/dots/keybinds.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/keybinds.fnl rename to eggs/nvim/fnl/dots/keybinds.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/bufferline.fnl b/eggs/nvim/fnl/dots/plugins/bufferline.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/bufferline.fnl rename to eggs/nvim/fnl/dots/plugins/bufferline.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/cmp.fnl b/eggs/nvim/fnl/dots/plugins/cmp.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/cmp.fnl rename to eggs/nvim/fnl/dots/plugins/cmp.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/copilot.fnl b/eggs/nvim/fnl/dots/plugins/copilot.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/copilot.fnl rename to eggs/nvim/fnl/dots/plugins/copilot.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/diffview.fnl b/eggs/nvim/fnl/dots/plugins/diffview.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/diffview.fnl rename to eggs/nvim/fnl/dots/plugins/diffview.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/emmet.fnl b/eggs/nvim/fnl/dots/plugins/emmet.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/emmet.fnl rename to eggs/nvim/fnl/dots/plugins/emmet.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/feline.fnl b/eggs/nvim/fnl/dots/plugins/feline.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/feline.fnl rename to eggs/nvim/fnl/dots/plugins/feline.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/flutter-tools.fnl b/eggs/nvim/fnl/dots/plugins/flutter-tools.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/flutter-tools.fnl rename to eggs/nvim/fnl/dots/plugins/flutter-tools.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/gitsigns.fnl b/eggs/nvim/fnl/dots/plugins/gitsigns.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/gitsigns.fnl rename to eggs/nvim/fnl/dots/plugins/gitsigns.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/gruvbox8.fnl b/eggs/nvim/fnl/dots/plugins/gruvbox8.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/gruvbox8.fnl rename to eggs/nvim/fnl/dots/plugins/gruvbox8.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl b/eggs/nvim/fnl/dots/plugins/lsp.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl rename to eggs/nvim/fnl/dots/plugins/lsp.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/ltex-ls.fnl b/eggs/nvim/fnl/dots/plugins/ltex-ls.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/ltex-ls.fnl rename to eggs/nvim/fnl/dots/plugins/ltex-ls.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/noice.fnl b/eggs/nvim/fnl/dots/plugins/noice.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/noice.fnl rename to eggs/nvim/fnl/dots/plugins/noice.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/nvim-colorizer.fnl b/eggs/nvim/fnl/dots/plugins/nvim-colorizer.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/nvim-colorizer.fnl rename to eggs/nvim/fnl/dots/plugins/nvim-colorizer.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/obsidian.fnl b/eggs/nvim/fnl/dots/plugins/obsidian.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/obsidian.fnl rename to eggs/nvim/fnl/dots/plugins/obsidian.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/plugins.fnl b/eggs/nvim/fnl/dots/plugins/plugins.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/plugins.fnl rename to eggs/nvim/fnl/dots/plugins/plugins.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/telescope.fnl b/eggs/nvim/fnl/dots/plugins/telescope.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/telescope.fnl rename to eggs/nvim/fnl/dots/plugins/telescope.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/todo-comments.fnl b/eggs/nvim/fnl/dots/plugins/todo-comments.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/todo-comments.fnl rename to eggs/nvim/fnl/dots/plugins/todo-comments.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/treesitter.fnl b/eggs/nvim/fnl/dots/plugins/treesitter.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/treesitter.fnl rename to eggs/nvim/fnl/dots/plugins/treesitter.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/trouble.fnl b/eggs/nvim/fnl/dots/plugins/trouble.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/trouble.fnl rename to eggs/nvim/fnl/dots/plugins/trouble.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/plugins/vimtex.fnl b/eggs/nvim/fnl/dots/plugins/vimtex.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/plugins/vimtex.fnl rename to eggs/nvim/fnl/dots/plugins/vimtex.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/prelude.fnl b/eggs/nvim/fnl/dots/prelude.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/prelude.fnl rename to eggs/nvim/fnl/dots/prelude.fnl diff --git a/eggs/nvim/.config/nvim/fnl/dots/utils.fnl b/eggs/nvim/fnl/dots/utils.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/dots/utils.fnl rename to eggs/nvim/fnl/dots/utils.fnl diff --git a/eggs/nvim/.config/nvim/fnl/macros.fnl b/eggs/nvim/fnl/macros.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/macros.fnl rename to eggs/nvim/fnl/macros.fnl diff --git a/eggs/nvim/.config/nvim/fnl/main.fnl b/eggs/nvim/fnl/main.fnl similarity index 100% rename from eggs/nvim/.config/nvim/fnl/main.fnl rename to eggs/nvim/fnl/main.fnl diff --git a/eggs/nvim/.config/nvim/init.lua b/eggs/nvim/init.lua similarity index 100% rename from eggs/nvim/.config/nvim/init.lua rename to eggs/nvim/init.lua diff --git a/eggs/nvim/.config/nvim/lazy-lock.json b/eggs/nvim/lazy-lock.json similarity index 100% rename from eggs/nvim/.config/nvim/lazy-lock.json rename to eggs/nvim/lazy-lock.json diff --git a/eggs/nvim/.config/nvim/lua/dots/basics.lua b/eggs/nvim/lua/dots/basics.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/basics.lua rename to eggs/nvim/lua/dots/basics.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/colors.lua b/eggs/nvim/lua/dots/colors.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/colors.lua rename to eggs/nvim/lua/dots/colors.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/help-thingy.lua b/eggs/nvim/lua/dots/help-thingy.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/help-thingy.lua rename to eggs/nvim/lua/dots/help-thingy.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/keybinds.lua b/eggs/nvim/lua/dots/keybinds.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/keybinds.lua rename to eggs/nvim/lua/dots/keybinds.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/bufferline.lua b/eggs/nvim/lua/dots/plugins/bufferline.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/bufferline.lua rename to eggs/nvim/lua/dots/plugins/bufferline.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/cmp.lua b/eggs/nvim/lua/dots/plugins/cmp.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/cmp.lua rename to eggs/nvim/lua/dots/plugins/cmp.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/copilot.lua b/eggs/nvim/lua/dots/plugins/copilot.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/copilot.lua rename to eggs/nvim/lua/dots/plugins/copilot.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/diffview.lua b/eggs/nvim/lua/dots/plugins/diffview.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/diffview.lua rename to eggs/nvim/lua/dots/plugins/diffview.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/emmet.lua b/eggs/nvim/lua/dots/plugins/emmet.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/emmet.lua rename to eggs/nvim/lua/dots/plugins/emmet.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/feline.lua b/eggs/nvim/lua/dots/plugins/feline.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/feline.lua rename to eggs/nvim/lua/dots/plugins/feline.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/flutter-tools.lua b/eggs/nvim/lua/dots/plugins/flutter-tools.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/flutter-tools.lua rename to eggs/nvim/lua/dots/plugins/flutter-tools.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/gitsigns.lua b/eggs/nvim/lua/dots/plugins/gitsigns.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/gitsigns.lua rename to eggs/nvim/lua/dots/plugins/gitsigns.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/gruvbox8.lua b/eggs/nvim/lua/dots/plugins/gruvbox8.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/gruvbox8.lua rename to eggs/nvim/lua/dots/plugins/gruvbox8.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/lsp.lua b/eggs/nvim/lua/dots/plugins/lsp.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/lsp.lua rename to eggs/nvim/lua/dots/plugins/lsp.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/ltex-ls.lua b/eggs/nvim/lua/dots/plugins/ltex-ls.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/ltex-ls.lua rename to eggs/nvim/lua/dots/plugins/ltex-ls.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/noice.lua b/eggs/nvim/lua/dots/plugins/noice.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/noice.lua rename to eggs/nvim/lua/dots/plugins/noice.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/nvim-colorizer.lua b/eggs/nvim/lua/dots/plugins/nvim-colorizer.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/nvim-colorizer.lua rename to eggs/nvim/lua/dots/plugins/nvim-colorizer.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/obsidian.lua b/eggs/nvim/lua/dots/plugins/obsidian.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/obsidian.lua rename to eggs/nvim/lua/dots/plugins/obsidian.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/plugins.lua b/eggs/nvim/lua/dots/plugins/plugins.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/plugins.lua rename to eggs/nvim/lua/dots/plugins/plugins.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/telescope.lua b/eggs/nvim/lua/dots/plugins/telescope.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/telescope.lua rename to eggs/nvim/lua/dots/plugins/telescope.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/todo-comments.lua b/eggs/nvim/lua/dots/plugins/todo-comments.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/todo-comments.lua rename to eggs/nvim/lua/dots/plugins/todo-comments.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/treesitter.lua b/eggs/nvim/lua/dots/plugins/treesitter.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/treesitter.lua rename to eggs/nvim/lua/dots/plugins/treesitter.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/trouble.lua b/eggs/nvim/lua/dots/plugins/trouble.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/trouble.lua rename to eggs/nvim/lua/dots/plugins/trouble.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/plugins/vimtex.lua b/eggs/nvim/lua/dots/plugins/vimtex.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/plugins/vimtex.lua rename to eggs/nvim/lua/dots/plugins/vimtex.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/prelude.lua b/eggs/nvim/lua/dots/prelude.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/prelude.lua rename to eggs/nvim/lua/dots/prelude.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/smart-compe-conjure.lua b/eggs/nvim/lua/dots/smart-compe-conjure.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/smart-compe-conjure.lua rename to eggs/nvim/lua/dots/smart-compe-conjure.lua diff --git a/eggs/nvim/.config/nvim/lua/dots/utils.lua b/eggs/nvim/lua/dots/utils.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/dots/utils.lua rename to eggs/nvim/lua/dots/utils.lua diff --git a/eggs/nvim/.config/nvim/lua/main.lua b/eggs/nvim/lua/main.lua similarity index 100% rename from eggs/nvim/.config/nvim/lua/main.lua rename to eggs/nvim/lua/main.lua diff --git a/eggs/zed/.config/zed/.gitignore b/eggs/zed/.gitignore similarity index 100% rename from eggs/zed/.config/zed/.gitignore rename to eggs/zed/.gitignore diff --git a/eggs/zed/.config/zed/keymap.json b/eggs/zed/keymap.json similarity index 100% rename from eggs/zed/.config/zed/keymap.json rename to eggs/zed/keymap.json diff --git a/eggs/zed/.config/zed/settings.json b/eggs/zed/settings.json similarity index 58% rename from eggs/zed/.config/zed/settings.json rename to eggs/zed/settings.json index 96e8671..f41ccb1 100644 --- a/eggs/zed/.config/zed/settings.json +++ b/eggs/zed/settings.json @@ -1,5 +1,6 @@ { "auto_signature_help": false, + "unnecessary_code_fade": 0.5, // "use_autoclose": true, // "always_treat_brackets_as_autoclosed": false, // "unstable.ui_density": "compact", @@ -14,7 +15,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", @@ -30,8 +31,26 @@ "line_numbers": false, "folds": false }, + "toolbar": { + "quick_actions": false + // "selections_menu": false + }, "vertical_scroll_margin": 5, - "tabs": { "git_status": true }, + "tabs": { + "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", @@ -48,17 +67,6 @@ } }, "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": { @@ -67,5 +75,19 @@ } } } + }, + "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" } } diff --git a/eggs/zed/.config/zed/tasks.json b/eggs/zed/tasks.json similarity index 100% rename from eggs/zed/.config/zed/tasks.json rename to eggs/zed/tasks.json diff --git a/eggs/zed/.config/zed/themes/phine.json b/eggs/zed/themes/phine.json similarity index 100% rename from eggs/zed/.config/zed/themes/phine.json rename to eggs/zed/themes/phine.json diff --git a/foo.rhai b/foo.rhai new file mode 100644 index 0000000..e2c8c8e --- /dev/null +++ b/foo.rhai @@ -0,0 +1,3 @@ +fn stuff() { + // re "hi" +} diff --git a/yolk.rhai b/yolk.rhai index 2687f11..cee5001 100644 --- a/yolk.rhai +++ b/yolk.rhai @@ -1,7 +1,10 @@ +import "foo" as stuff; + +// stuff::stuff(); export const device = #{ thinkix: SYSTEM.hostname == "thinkix", - desktop: SYSTEM.hostname == "fedora.fritz.box", + desktop: SYSTEM.hostname == "fedora.fritz.box" ||SYSTEM.hostname == "fedora", laptop: SYSTEM.hostname == "thinkix" || SYSTEM.hostname == "frissnix", macbook: false, }; @@ -15,14 +18,14 @@ export let eggs = #{ "alacritty": #{ targets: "~/.config/alacritty" }, "eww": merge_into_home(true, []), "eww-bar": merge_into_home(true, []), - "foot": #{ strategy: "merge", targets: "~", templates: [".config/foot/foot.ini"] }, + "foot": #{ targets: "~/.config/foot", templates: [".foot.ini"] }, "git": merge_into_home(true, [".gitconfig"]), "niri": #{ targets: "~/.config/niri", templates: ["**/*.kdl"] }, - "nvim": #{ strategy: "merge", targets: "~", main_file: ".config/nvim/fnl/main.fnl" }, - "profile": merge_into_home(true, []), + "nvim": #{ strategy: "put", targets: "~/.config/nvim", main_file: "fnl/main.fnl" }, + "profile": #{ strategy: "merge", targets: "~" }, "starship": merge_into_home(true, []), "sway": merge_into_home(true, []), - "zed": merge_into_home(true, []), + "zed": #{ strategy: "put", targets: "~/.config/zed" }, "zsh": merge_into_home(true, []), "rofi": merge_into_home(true, []), "gtk": merge_into_home(true, []),