Using this on mac as well now

This commit is contained in:
Leon Kowarschick 2024-12-22 16:17:50 +01:00
parent d5792c7003
commit 4db7099ba9
Signed by: ElKowar
GPG key ID: 72C759DA738DE3A2
4 changed files with 24 additions and 27 deletions

View file

@ -1,6 +1,10 @@
; {% if !device.kenbun %}
[user] [user]
email = dev@elkowar.dev
name = elkowar name = elkowar
email = dev@elkowar.dev
[github]
user = ElKowar
; {% end %}
[include] [include]
path = ~/.gitconfig.local path = ~/.gitconfig.local
[credential] [credential]
@ -12,12 +16,6 @@
[pull] [pull]
rebase = false rebase = false
[github]
user = ElKowar
;[diff]
;external = "difft"
[delta] [delta]
syntax-theme = gruvbox syntax-theme = gruvbox
@ -27,7 +25,7 @@
line-numbers-left-style = cyan line-numbers-left-style = cyan
[init] [init]
defaultBranch = master defaultBranch = main
[filter "lfs"] [filter "lfs"]
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f

1
eggs/zed/.gitignore vendored
View file

@ -7,6 +7,7 @@ node_modules
/db /db
/embeddings /embeddings
/copilot /copilot
/prompts
.tmp* .tmp*

View file

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

View file

@ -1,15 +1,16 @@
import "foo" as stuff;
// stuff::stuff();
export const device = #{ export const device = #{
thinkix: SYSTEM.hostname == "thinkix", thinkix: SYSTEM.hostname == "thinkix",
desktop: SYSTEM.hostname == "fedora.fritz.box" ||SYSTEM.hostname == "fedora", desktop: SYSTEM.hostname == "fedora.fritz.box" ||SYSTEM.hostname == "fedora",
laptop: SYSTEM.hostname == "thinkix" || SYSTEM.hostname == "frissnix", 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) { private fn merge_into_home(enabled, templates) {
#{ enabled: enabled, targets: "~", strategy: "merge", templates: templates } #{ enabled: enabled, targets: "~", strategy: "merge", templates: templates }
} }
@ -18,28 +19,28 @@ export let eggs = #{
"alacritty": #{ targets: "~/.config/alacritty" }, "alacritty": #{ targets: "~/.config/alacritty" },
"eww": merge_into_home(device.desktop, []), "eww": merge_into_home(device.desktop, []),
"eww-bar": 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"]), "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" }, "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, []), "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" }, "zed": #{ strategy: "put", targets: "~/.config/zed" },
"zsh": merge_into_home(true, []), "zsh": merge_into_home(true, []),
"rofi": merge_into_home(true, []), "rofi": merge_into_home(device.linux, []),
"gtk": merge_into_home(true, []), "gtk": merge_into_home(device.linux, []),
"scripts": #{ targets: "~/scripts", strategy: "merge" }, "scripts": #{ enabled: device.linux, targets: "~/scripts", strategy: "merge" },
"hyprlock": merge_into_home(device.laptop, []), "hyprlock": merge_into_home(device.laptop && device.linux, []),
"kanata": merge_into_home(device.laptop, []), "kanata": merge_into_home(device.laptop && device.linux, []),
"waybar": merge_into_home(device.laptop, []), "waybar": merge_into_home(device.laptop && device.linux, []),
"karabiner": merge_into_home(device.macbook, []), "karabiner": merge_into_home(device.macbook, []),
"sioyek": merge_into_home(device.linux, []),
"powershell": merge_into_home(false, []), "powershell": merge_into_home(false, []),
"sioyek": merge_into_home(true, []),
"zathura": merge_into_home(false, []), "zathura": merge_into_home(false, []),
"eww-laptop": merge_into_home(false, []), "eww-laptop": merge_into_home(false, []),
"hyprland": merge_into_home(false, []), "hyprland": merge_into_home(false, []),