Compare commits

...

3 commits

Author SHA1 Message Date
6c63915971
Cleanup zed dir 2024-12-15 23:44:45 +01:00
1e68778d9d
Update stuff 2024-12-15 23:41:34 +01:00
62600f1851
Update to latest yolk 2024-12-15 23:05:35 +01:00
35 changed files with 97 additions and 150436 deletions

1
eggs.rhai Normal file
View file

@ -0,0 +1 @@

View file

@ -8,7 +8,7 @@
[core] [core]
autocrlf = input autocrlf = input
; {# if command_available("delta") #} ; {# if io::command_available("delta") #}
;<yolk> pager = delta ;<yolk> pager = delta
[pull] [pull]

View file

@ -31,7 +31,7 @@ input {
} }
cursor { cursor {
xcursor-size 32 // {< rnum(if device.laptop() then 12 else 32) >} xcursor-size 32 // {< rnum(if device.laptop { 12 } else { 32 }) >}
xcursor-theme "phinger-cursors-light" xcursor-theme "phinger-cursors-light"
hide-when-typing hide-when-typing
} }
@ -41,14 +41,24 @@ environment {
// GDK_BACKEND "x11" // GDK_BACKEND "x11"
} }
// {% if device.thinkix() %} output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" {
//<yolk> output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" { mode "3440x1440@60"
//<yolk> mode "3440x1440@60" scale 1
transform "normal"
// {% if device.desktop %}
//<yolk> position x=2560 y=0
// {% else %}
position x=0 y=0
// {% end %}
}
// {% if device.desktop %}
//<yolk> output "HDMI-A-1" {
//<yolk> mode "2560x1440"
//<yolk> scale 1 //<yolk> scale 1
//<yolk> transform "normal"
//<yolk> position x=0 y=0 //<yolk> position x=0 y=0
//<yolk> } //<yolk> }
// {% elif device.thinkix %}
//<yolk> output "HDMI-A-1" { //<yolk> output "HDMI-A-1" {
//<yolk> mode "1920x1080" //<yolk> mode "1920x1080"
//<yolk> scale 1 //<yolk> scale 1
@ -62,25 +72,11 @@ environment {
//<yolk> transform "normal" //<yolk> transform "normal"
//<yolk> position x=0 y=1440 //<yolk> position x=0 y=1440
//<yolk> } //<yolk> }
// {% elif device.desktop() %}
//<yolk> output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" {
//<yolk> mode "3440x1440@99.982"
//<yolk> scale 1
//<yolk> transform "normal"
//<yolk> variable-refresh-rate on-demand=true
//<yolk> position x=2560 y=0
//<yolk> }
//<yolk> output "HDMI-A-1" {
//<yolk> mode "2560x1440"
//<yolk> scale 1
//<yolk> position x=0 y=0
//<yolk> }
// {% end %} // {% end %}
layout { layout {
gaps 16 gaps 16
// center-focused-column "always" // - "never", "always" "on-overflow" // center-focused-column "always" // - "never", "always" "on-overflow"
@ -94,7 +90,7 @@ layout {
default-column-width { proportion 0.33333; } default-column-width { proportion 0.33333; }
focus-ring { focus-ring {
width 2 // {< rnum(if device.laptop() then 1 else 2)>} width 2 // {< rnum(if device.laptop {1} else {2})>}
active-color "#8ec07c" active-color "#8ec07c"
inactive-color "#1d2021" inactive-color "#1d2021"
} }
@ -102,7 +98,7 @@ layout {
} }
// {% if device.laptop() %} // {% if device.laptop %}
//<yolk> spawn-at-startup "bash" "-c" "swayidle -w timeout 601 'niri msg action power-off-monitors' timeout 600 'hyprlock' before-sleep 'hyprlock' timeout 3600 'systemctl suspend' timeout 60000 'systemctl hibernate'" //<yolk> spawn-at-startup "bash" "-c" "swayidle -w timeout 601 'niri msg action power-off-monitors' timeout 600 'hyprlock' before-sleep 'hyprlock' timeout 3600 'systemctl suspend' timeout 60000 'systemctl hibernate'"
//<yolk> spawn-at-startup "waybar" //<yolk> spawn-at-startup "waybar"
// {% end %} // {% end %}

View file

@ -145,6 +145,7 @@
:config #(set vim.g.vlime_overlay "slimv")}) :config #(set vim.g.vlime_overlay "slimv")})
(plugin :rhaiscript/vim-rhai)
(plugin :rust-lang/rust.vim (plugin :rust-lang/rust.vim
{:ft ["rust"] {:ft ["rust"]
:dependencies ["mattn/webapi-vim"] :dependencies ["mattn/webapi-vim"]

View file

@ -90,6 +90,7 @@
"vim-nix": { "branch": "master", "commit": "e25cd0f2e5922f1f4d3cd969f92e35a9a327ffb0" }, "vim-nix": { "branch": "master", "commit": "e25cd0f2e5922f1f4d3cd969f92e35a9a327ffb0" },
"vim-raku": { "branch": "master", "commit": "f4496123353cce789fc6645ceb686f5cf51acca3" }, "vim-raku": { "branch": "master", "commit": "f4496123353cce789fc6645ceb686f5cf51acca3" },
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
"vim-rhai": { "branch": "main", "commit": "b0585e2c92a4a64edcd060836ae41d1e698ebc20" },
"vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
"vim-smoothie": { "branch": "master", "commit": "df1e324e9f3395c630c1c523d0555a01d2eb1b7e" }, "vim-smoothie": { "branch": "master", "commit": "df1e324e9f3395c630c1c523d0555a01d2eb1b7e" },
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },

View file

@ -23,4 +23,4 @@ local function _6_()
vim.g.rustfmt_fail_silently = 1 vim.g.rustfmt_fail_silently = 1
return nil return nil
end end
return {"Olical/aniseed", "Olical/nfnl", "nvim-lua/plenary.nvim", "norcalli/nvim.lua", "kyazdani42/nvim-web-devicons", "folke/which-key.nvim", {"ckipp01/nvim-jenkinsfile-linter", dependencies = {"nvim-lua/plenary.nvim"}}, "psliwka/vim-smoothie", {"nathanaelkane/vim-indent-guides", cmd = {"IndentGuidesToggle"}}, {"luukvbaal/stabilize.nvim", config = true}, {"stevearc/dressing.nvim", config = true}, {"tweekmonster/startuptime.vim", cmd = {"StartupTime"}}, {"moll/vim-bbye", lazy = true, cmd = {"Bdelete", "Bwipeout"}}, {"petertriho/nvim-scrollbar", event = "VeryLazy", lazy = true, config = true}, {"TimUntersberger/neogit", opts = {integrations = {diffview = true}}, cmd = {"Neogit"}}, {"folke/persistence.nvim", opts = {dir = vim.fn.expand((vim.fn.stdpath("cache") .. "/sessions/"))}}, {"https://git.sr.ht/~whynothugo/lsp_lines.nvim", config = _1_}, "jiangmiao/auto-pairs", "tpope/vim-repeat", {"preservim/nerdcommenter", event = "VeryLazy", lazy = true, priority = 1000}, {"godlygeek/tabular", cmd = {"Tabularize"}}, "tpope/vim-surround", "hauleth/sad.vim", "wellle/targets.vim", {"mg979/vim-visual-multi", lazy = true, event = "VeryLazy"}, "tommcdo/vim-exchange", {"phaazon/hop.nvim", lazy = true, event = "VeryLazy", opts = {keys = "jfkdls;amvieurow"}}, {"rcarriga/nvim-dap-ui", lazy = true, config = true, dependencies = {"mfussenegger/nvim-dap", "nvim-neotest/nvim-nio"}}, {"mfussenegger/nvim-dap", lazy = true}, {"nvim-telescope/telescope-dap.nvim", lazy = true, dependencies = {"nvim-telescope/telescope.nvim", "mfussenegger/nvim-dap"}}, {"ldelossa/gh.nvim", lazy = true, config = _2_, dependencies = {"ldelossa/litee.nvim"}}, {"pwntester/octo.nvim", lazy = true, dependencies = {"nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim", "kyazdani42/nvim-web-devicons"}, config = true}, "ruanyl/vim-gh-line", "rhysd/conflict-marker.vim", {"tpope/vim-fugitive", lazy = true, event = "VeryLazy"}, {"ray-x/lsp_signature.nvim", event = "BufEnter"}, {"weilbith/nvim-code-action-menu", cmd = "CodeActionMenu", config = _3_}, {"dnlhc/glance.nvim", lazy = true, config = true}, {"smjonas/inc-rename.nvim", opts = {input_buffer_type = "dressing"}}, {"monkoose/nvlime", ft = {"lisp"}, dependencies = {"monkoose/parsley"}}, "imsnif/kdl.vim", "tpope/vim-sleuth", "editorconfig/editorconfig-vim", "sbdchd/neoformat", {"elkowar/antifennel-nvim", config = _4_}, {"Olical/conjure", ft = {"fennel"}}, {"eraserhd/parinfer-rust", build = "cargo build --release"}, "kmonad/kmonad-vim", {"elkowar/yuck.vim", ft = {"yuck"}}, {"cespare/vim-toml", ft = {"toml"}}, {"bduggan/vim-raku", ft = {"raku"}}, {"LnL7/vim-nix", ft = {"nix"}}, {"kevinoid/vim-jsonc"}, {"pangloss/vim-javascript", ft = {"javascript"}}, {"ianks/vim-tsx", ft = {"typescript-react"}}, {"leafgarland/typescript-vim", ft = {"typescript", "typescript-react", "javascript"}}, {"HerringtonDarkholme/yats.vim"}, {"mxw/vim-jsx"}, {"purescript-contrib/purescript-vim", ft = {"purescript"}}, {"derekelkins/agda-vim", ft = {"agda"}}, {"neovimhaskell/haskell-vim", ft = {"haskell"}}, {"monkoose/nvlime", ft = {"lisp"}, dependencies = {"monkoose/parsley"}, config = _5_}, {"rust-lang/rust.vim", ft = {"rust"}, dependencies = {"mattn/webapi-vim"}, config = _6_}, {"Saecki/crates.nvim", dependencies = {"nvim-lua/plenary.nvim"}, opts = {enable_update_available_warning = false}}, {"mrcjkb/rustaceanvim", version = "^4", ft = {"rust", "toml"}}, {"qnighy/lalrpop.vim"}, {"edwinb/idris2-vim", ft = {"idris2"}}, {"vmchale/ats-vim", ft = {"ats", "dats", "sats"}}, {"bakpakin/fennel.vim", ft = {"fennel"}}, {"evanleck/vim-svelte"}} return {"Olical/aniseed", "Olical/nfnl", "nvim-lua/plenary.nvim", "norcalli/nvim.lua", "kyazdani42/nvim-web-devicons", "folke/which-key.nvim", {"ckipp01/nvim-jenkinsfile-linter", dependencies = {"nvim-lua/plenary.nvim"}}, "psliwka/vim-smoothie", {"nathanaelkane/vim-indent-guides", cmd = {"IndentGuidesToggle"}}, {"luukvbaal/stabilize.nvim", config = true}, {"stevearc/dressing.nvim", config = true}, {"tweekmonster/startuptime.vim", cmd = {"StartupTime"}}, {"moll/vim-bbye", lazy = true, cmd = {"Bdelete", "Bwipeout"}}, {"petertriho/nvim-scrollbar", event = "VeryLazy", lazy = true, config = true}, {"TimUntersberger/neogit", opts = {integrations = {diffview = true}}, cmd = {"Neogit"}}, {"folke/persistence.nvim", opts = {dir = vim.fn.expand((vim.fn.stdpath("cache") .. "/sessions/"))}}, {"https://git.sr.ht/~whynothugo/lsp_lines.nvim", config = _1_}, "jiangmiao/auto-pairs", "tpope/vim-repeat", {"preservim/nerdcommenter", event = "VeryLazy", lazy = true, priority = 1000}, {"godlygeek/tabular", cmd = {"Tabularize"}}, "tpope/vim-surround", "hauleth/sad.vim", "wellle/targets.vim", {"mg979/vim-visual-multi", lazy = true, event = "VeryLazy"}, "tommcdo/vim-exchange", {"phaazon/hop.nvim", lazy = true, event = "VeryLazy", opts = {keys = "jfkdls;amvieurow"}}, {"rcarriga/nvim-dap-ui", lazy = true, config = true, dependencies = {"mfussenegger/nvim-dap", "nvim-neotest/nvim-nio"}}, {"mfussenegger/nvim-dap", lazy = true}, {"nvim-telescope/telescope-dap.nvim", lazy = true, dependencies = {"nvim-telescope/telescope.nvim", "mfussenegger/nvim-dap"}}, {"ldelossa/gh.nvim", lazy = true, config = _2_, dependencies = {"ldelossa/litee.nvim"}}, {"pwntester/octo.nvim", lazy = true, dependencies = {"nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim", "kyazdani42/nvim-web-devicons"}, config = true}, "ruanyl/vim-gh-line", "rhysd/conflict-marker.vim", {"tpope/vim-fugitive", lazy = true, event = "VeryLazy"}, {"ray-x/lsp_signature.nvim", event = "BufEnter"}, {"weilbith/nvim-code-action-menu", cmd = "CodeActionMenu", config = _3_}, {"dnlhc/glance.nvim", lazy = true, config = true}, {"smjonas/inc-rename.nvim", opts = {input_buffer_type = "dressing"}}, {"monkoose/nvlime", ft = {"lisp"}, dependencies = {"monkoose/parsley"}}, "imsnif/kdl.vim", "tpope/vim-sleuth", "editorconfig/editorconfig-vim", "sbdchd/neoformat", {"elkowar/antifennel-nvim", config = _4_}, {"Olical/conjure", ft = {"fennel"}}, {"eraserhd/parinfer-rust", build = "cargo build --release"}, "kmonad/kmonad-vim", {"elkowar/yuck.vim", ft = {"yuck"}}, {"rhaiscript/vim-rhai", ft = {"rhai"}}, {"cespare/vim-toml", ft = {"toml"}}, {"bduggan/vim-raku", ft = {"raku"}}, {"LnL7/vim-nix", ft = {"nix"}}, {"kevinoid/vim-jsonc"}, {"pangloss/vim-javascript", ft = {"javascript"}}, {"ianks/vim-tsx", ft = {"typescript-react"}}, {"leafgarland/typescript-vim", ft = {"typescript", "typescript-react", "javascript"}}, {"HerringtonDarkholme/yats.vim"}, {"mxw/vim-jsx"}, {"purescript-contrib/purescript-vim", ft = {"purescript"}}, {"derekelkins/agda-vim", ft = {"agda"}}, {"neovimhaskell/haskell-vim", ft = {"haskell"}}, {"monkoose/nvlime", ft = {"lisp"}, dependencies = {"monkoose/parsley"}, config = _5_}, "rhaiscript/vim-rhai", {"rust-lang/rust.vim", ft = {"rust"}, dependencies = {"mattn/webapi-vim"}, config = _6_}, {"Saecki/crates.nvim", dependencies = {"nvim-lua/plenary.nvim"}, opts = {enable_update_available_warning = false}}, {"mrcjkb/rustaceanvim", version = "^4", ft = {"rust", "toml"}}, {"qnighy/lalrpop.vim"}, {"edwinb/idris2-vim", ft = {"idris2"}}, {"vmchale/ats-vim", ft = {"ats", "dats", "sats"}}, {"bakpakin/fennel.vim", ft = {"fennel"}}, {"evanleck/vim-svelte"}}

View file

@ -1,7 +1,12 @@
conversations /conversations
languages /languages
prettier /prettier
/extensions
node node
node_modules node_modules
/db
/embeddings
/copilot
.tmp* .tmp*

File diff suppressed because one or more lines are too long

View file

@ -1,28 +0,0 @@
/*!
* buildToken
* Builds OAuth token prefix (helper function)
*
* @name buildToken
* @function
* @param {GitUrl} obj The parsed Git url object.
* @return {String} token prefix
*/
/** @license URI.js v4.4.1 (c) 2011 Gary Court. License: http://github.com/garycourt/uri-js */
/** @preserve
* Counter block mode compatible with Dr Brian Gladman fileenc.c
* derived from CryptoJS.mode.CTR
* Jan Hruby jhruby.web@gmail.com
*/
/** @preserve
(c) 2012 by Cédric Mesnil. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1 +0,0 @@
../../../dots-of-war/zed/.config/zed/embeddings/stable

View file

@ -1,57 +0,0 @@
{
"extensions": {
"toml": {
"manifest": {
"id": "toml",
"name": "TOML",
"version": "0.1.0",
"schema_version": 1,
"description": "TOML support.",
"repository": "https://github.com/zed-industries/zed",
"authors": [
"Max Brunsfeld <max@zed.dev>",
"Ammar Arif <evergreenkary@gmail.com>"
],
"lib": {
"kind": "Rust",
"version": "0.0.6"
},
"themes": [],
"languages": [
"languages/toml"
],
"grammars": {
"toml": {
"repository": "https://github.com/tree-sitter/tree-sitter-toml",
"rev": "342d9be207c2dba869b9967124c679b5e6fd0ebe",
"path": null
}
},
"language_servers": {
"taplo": {
"language": "TOML",
"languages": [],
"language_ids": {},
"code_action_kinds": null
}
}
},
"dev": false
}
},
"themes": {},
"languages": {
"TOML": {
"extension": "toml",
"path": "languages/toml",
"matcher": {
"path_suffixes": [
"Cargo.lock",
"toml"
],
"first_line_pattern": null
},
"grammar": "toml"
}
}
}

View file

@ -1,23 +0,0 @@
id = "toml"
name = "TOML"
version = "0.1.0"
schema_version = 1
description = "TOML support."
repository = "https://github.com/zed-industries/zed"
authors = ["Max Brunsfeld <max@zed.dev>", "Ammar Arif <evergreenkary@gmail.com>"]
themes = []
languages = ["languages/toml"]
[lib]
kind = "Rust"
version = "0.0.6"
[grammars.toml]
repository = "https://github.com/tree-sitter/tree-sitter-toml"
rev = "342d9be207c2dba869b9967124c679b5e6fd0ebe"
[language_servers.taplo]
language = "TOML"
languages = []
[language_servers.taplo.language_ids]

View file

@ -1,6 +0,0 @@
{
"extensions": {},
"grammars": {},
"languages": {},
"themes": {}
}

View file

@ -46,5 +46,26 @@
"JSON": { "JSON": {
"format_on_save": "off" "format_on_save": "off"
} }
},
"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": {
// Temporary workaround around round rust-analzyer wrongly inserting `|` twice
"excludeChars": "|<"
}
}
}
} }
} }

View file

@ -1,6 +1,3 @@
data = {
}
device = { device = {
thinkix = function() thinkix = function()
return SYSTEM.hostname == "thinkix" return SYSTEM.hostname == "thinkix"

43
yolk.rhai Normal file
View file

@ -0,0 +1,43 @@
const themes = #{
gruv: "a",
nord: "b",
};
export const device = #{
thinkix: SYSTEM.hostname == "thinkix",
desktop: SYSTEM.hostname == "fedora.fritz.box",
laptop: SYSTEM.hostname == "thinkix" || SYSTEM.hostname == "frissnix",
gruv: if LOCAL { themes.gruv } else { themes.nord }
};
export let eggs = #{};
eggs["alacritty"] = #{ enabled: true, targets: "~" };
eggs["eww"] = #{ enabled: true, targets: "~" };
eggs["eww-bar"] = #{ enabled: true, targets: "~" };
eggs["foot"] = #{ enabled: true, targets: "~", templates: [".config/foot/foot.ini"] };
eggs["git"] = #{ enabled: true, targets: "~", templates: [".gitconfig"] };
eggs["niri"] = #{ enabled: true, targets: "~", templates: [".config/niri/*"] };
eggs["nvim"] = #{ enabled: true, targets: "~" };
eggs["other-dotfiles-stuff"] = #{ enabled: true, targets: "~" };
eggs["profile"] = #{ enabled: true, targets: "~" };
eggs["starship"] = #{ enabled: true, targets: "~" };
eggs["sway"] = #{ enabled: true, targets: "~" };
eggs["tmux"] = #{ enabled: true, targets: "~" };
eggs["zed"] = #{ enabled: true, targets: "~" };
eggs["zsh"] = #{ enabled: true, targets: "~" };
eggs["rofi"] = #{ enabled: true, targets: "~" };
eggs["gtk"] = #{ enabled: true, targets: "~" };
eggs["powershell"] = #{ enabled: false, targets: "~" };
eggs["scripts"] = #{ enabled: true, targets: "~" };
eggs["sioyek"] = #{ enabled: false, targets: "~" };
eggs["waybar"] = #{ enabled: false, targets: "~" };
eggs["zathura"] = #{ enabled: false, targets: "~" };
eggs["eww-laptop"] = #{ enabled: false, targets: "~" };
eggs["hyprland"] = #{ enabled: false, targets: "~" };
eggs["hyprlock"] = #{ enabled: false, targets: "~" };
eggs["kakoune"] = #{ enabled: false, targets: "~" };
eggs["kanata"] = #{ enabled: false, targets: "~" };
eggs["karabiner"] = #{ enabled: false, targets: "~" };