From 4db7099ba9130abb87ecbab9452b25bc973fea27 Mon Sep 17 00:00:00 2001 From: Leon Kowarschick Date: Sun, 22 Dec 2024 16:17:50 +0100 Subject: [PATCH] Using this on mac as well now --- eggs/git/.gitconfig | 14 ++++++-------- eggs/zed/.gitignore | 1 + foo.rhai | 3 --- yolk.rhai | 33 +++++++++++++++++---------------- 4 files changed, 24 insertions(+), 27 deletions(-) delete mode 100644 foo.rhai diff --git a/eggs/git/.gitconfig b/eggs/git/.gitconfig index a453114..651f756 100644 --- a/eggs/git/.gitconfig +++ b/eggs/git/.gitconfig @@ -1,6 +1,10 @@ +; {% if !device.kenbun %} [user] - email = dev@elkowar.dev name = elkowar + email = dev@elkowar.dev +[github] + user = ElKowar +; {% end %} [include] path = ~/.gitconfig.local [credential] @@ -12,12 +16,6 @@ [pull] rebase = false -[github] - user = ElKowar - -;[diff] -;external = "difft" - [delta] syntax-theme = gruvbox @@ -27,7 +25,7 @@ line-numbers-left-style = cyan [init] - defaultBranch = master + defaultBranch = main [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f diff --git a/eggs/zed/.gitignore b/eggs/zed/.gitignore index 61c03ee..1f64387 100644 --- a/eggs/zed/.gitignore +++ b/eggs/zed/.gitignore @@ -7,6 +7,7 @@ node_modules /db /embeddings /copilot +/prompts .tmp* diff --git a/foo.rhai b/foo.rhai deleted file mode 100644 index e2c8c8e..0000000 --- a/foo.rhai +++ /dev/null @@ -1,3 +0,0 @@ -fn stuff() { - // re "hi" -} diff --git a/yolk.rhai b/yolk.rhai index 2fecedf..053a55c 100644 --- a/yolk.rhai +++ b/yolk.rhai @@ -1,15 +1,16 @@ -import "foo" as stuff; - -// stuff::stuff(); - export const device = #{ thinkix: SYSTEM.hostname == "thinkix", desktop: SYSTEM.hostname == "fedora.fritz.box" ||SYSTEM.hostname == "fedora", laptop: SYSTEM.hostname == "thinkix" || SYSTEM.hostname == "frissnix", - macbook: false, + + linux: SYSTEM.platform == "Linux", + + macbook: "Matthiass-MacBook-Pro" in SYSTEM.hostname, + kenbun: "Matthiass-MacBook-Pro" in SYSTEM.hostname, }; + private fn merge_into_home(enabled, templates) { #{ enabled: enabled, targets: "~", strategy: "merge", templates: templates } } @@ -18,28 +19,28 @@ 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": #{ enabled: device.linux, targets: "~/.config/foot", templates: ["foot.ini"] }, "git": merge_into_home(true, [".gitconfig"]), - "niri": #{ targets: "~/.config/niri", templates: ["**/*.kdl"] }, + "niri": #{ enabled: device.linux, targets: "~/.config/niri", templates: ["**/*.kdl"] }, "nvim": #{ strategy: "put", targets: "~/.config/nvim", main_file: "fnl/main.fnl" }, - "profile": #{ strategy: "merge", targets: "~" }, + "profile": #{ enabled: device.linux, strategy: "merge", targets: "~" }, "starship": merge_into_home(true, []), - "sway": merge_into_home(device.desktop, []), + "sway": merge_into_home(device.desktop && device.linux, []), "zed": #{ strategy: "put", targets: "~/.config/zed" }, "zsh": merge_into_home(true, []), - "rofi": merge_into_home(true, []), - "gtk": merge_into_home(true, []), - "scripts": #{ targets: "~/scripts", strategy: "merge" }, + "rofi": merge_into_home(device.linux, []), + "gtk": merge_into_home(device.linux, []), + "scripts": #{ enabled: device.linux, targets: "~/scripts", strategy: "merge" }, - "hyprlock": merge_into_home(device.laptop, []), - "kanata": merge_into_home(device.laptop, []), - "waybar": merge_into_home(device.laptop, []), + "hyprlock": merge_into_home(device.laptop && device.linux, []), + "kanata": merge_into_home(device.laptop && device.linux, []), + "waybar": merge_into_home(device.laptop && device.linux, []), "karabiner": merge_into_home(device.macbook, []), + "sioyek": merge_into_home(device.linux, []), "powershell": merge_into_home(false, []), - "sioyek": merge_into_home(true, []), "zathura": merge_into_home(false, []), "eww-laptop": merge_into_home(false, []), "hyprland": merge_into_home(false, []),