From 62600f1851c531d0ef55eef19c91f65d3b92f750 Mon Sep 17 00:00:00 2001 From: elkowar Date: Sun, 15 Dec 2024 23:05:35 +0100 Subject: [PATCH] Update to latest yolk --- eggs.rhai | 1 + eggs/git/.gitconfig | 2 +- eggs/niri/.config/niri/config.kdl | 42 +++++++++++++--------------- eggs/zed/.config/zed/settings.json | 21 ++++++++++++++ yolk.luau | 3 -- yolk.rhai | 44 ++++++++++++++++++++++++++++++ 6 files changed, 86 insertions(+), 27 deletions(-) create mode 100644 eggs.rhai create mode 100644 yolk.rhai diff --git a/eggs.rhai b/eggs.rhai new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/eggs.rhai @@ -0,0 +1 @@ + diff --git a/eggs/git/.gitconfig b/eggs/git/.gitconfig index bd107d3..df1f52d 100644 --- a/eggs/git/.gitconfig +++ b/eggs/git/.gitconfig @@ -8,7 +8,7 @@ [core] autocrlf = input - ; {# if command_available("delta") #} + ; {# if io::command_available("delta") #} ; pager = delta [pull] diff --git a/eggs/niri/.config/niri/config.kdl b/eggs/niri/.config/niri/config.kdl index f1e985e..59e9148 100644 --- a/eggs/niri/.config/niri/config.kdl +++ b/eggs/niri/.config/niri/config.kdl @@ -31,7 +31,7 @@ input { } 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" hide-when-typing } @@ -41,14 +41,24 @@ environment { // GDK_BACKEND "x11" } -// {% if device.thinkix() %} -// output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" { - // mode "3440x1440@60" +output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" { + mode "3440x1440@60" + scale 1 + transform "normal" + // {% if device.desktop %} + // position x=2560 y=0 + // {% else %} + position x=0 y=0 + // {% end %} +} + // {% if device.desktop %} + // output "HDMI-A-1" { + // mode "2560x1440" // scale 1 - // transform "normal" // position x=0 y=0 -// } + // } +// {% elif device.thinkix %} // output "HDMI-A-1" { // mode "1920x1080" // scale 1 @@ -62,25 +72,11 @@ environment { // transform "normal" // position x=0 y=1440 // } - -// {% elif device.desktop() %} -// output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" { - // mode "3440x1440@99.982" - // scale 1 - // transform "normal" - // variable-refresh-rate on-demand=true - // position x=2560 y=0 -// } - -// output "HDMI-A-1" { - // mode "2560x1440" - // scale 1 - // position x=0 y=0 -// } // {% end %} + layout { gaps 16 // center-focused-column "always" // - "never", "always" "on-overflow" @@ -94,7 +90,7 @@ layout { default-column-width { proportion 0.33333; } focus-ring { - width 2 // {< rnum(if device.laptop() then 1 else 2)>} + width 2 // {< rnum(if device.laptop {1} else {2})>} active-color "#8ec07c" inactive-color "#1d2021" } @@ -102,7 +98,7 @@ layout { } -// {% if device.laptop() %} +// {% if device.laptop %} // 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'" // spawn-at-startup "waybar" // {% end %} diff --git a/eggs/zed/.config/zed/settings.json b/eggs/zed/.config/zed/settings.json index b3a4f11..96e8671 100644 --- a/eggs/zed/.config/zed/settings.json +++ b/eggs/zed/.config/zed/settings.json @@ -46,5 +46,26 @@ "JSON": { "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": "|<" + } + } + } } } diff --git a/yolk.luau b/yolk.luau index e80e7ea..6d4747f 100644 --- a/yolk.luau +++ b/yolk.luau @@ -1,6 +1,3 @@ -data = { -} - device = { thinkix = function() return SYSTEM.hostname == "thinkix" diff --git a/yolk.rhai b/yolk.rhai new file mode 100644 index 0000000..3cac94a --- /dev/null +++ b/yolk.rhai @@ -0,0 +1,44 @@ + +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: "~" };