Compare commits

..

No commits in common. "afe1aa4e5e02f1320b470cf9cc4dae6dcd624356" and "55b34bcf92fcd015a21d33f9750b0a9a581e74b2" have entirely different histories.

6 changed files with 36 additions and 45 deletions

View file

@ -1,31 +1,33 @@
; {% if !device.kenbun %}
[user] [user]
name = elkowar
email = dev@elkowar.dev email = dev@elkowar.dev
[github] name = elkowar
user = ElKowar
; {% end %}
[include] [include]
path = ~/.gitconfig.local path = ~/.gitconfig.local
[credential] [credential]
helper = store helper = store
[core] [core]
autocrlf = input autocrlf = input
; {% if io::command_available("delta") %} ; {# if io::command_available("deltar") #}
;<yolk> pager = delta ;<yolk> pager = delta
;<yolk> [delta]
;<yolk> syntax-theme = gruvbox
;<yolk> features = side-by-side line-numbers decorations navigate
;<yolk> [delta "line-numbers"]
;<yolk> line-numbers-left-style = cyan
;{% end %}
[pull] [pull]
rebase = false rebase = false
[github]
user = ElKowar
;[diff]
;external = "difft"
[delta]
syntax-theme = gruvbox
features = side-by-side line-numbers decorations navigate
[delta "line-numbers"]
line-numbers-left-style = cyan
[init] [init]
defaultBranch = main defaultBranch = master
[filter "lfs"] [filter "lfs"]
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f

View file

@ -104,10 +104,6 @@ layout {
//<yolk> spawn-at-startup "waybar" //<yolk> spawn-at-startup "waybar"
// {% end %} // {% end %}
// {% if device.desktop %}
//<yolk> spawn-at-startup "rm" "/home/elk/.config/google-chrome/SingletonLock"
// {% end %}
spawn-at-startup "bash" "-c" "eww -c ~/.config/eww-bar open-many bar_1 niri_scroller" spawn-at-startup "bash" "-c" "eww -c ~/.config/eww-bar open-many bar_1 niri_scroller"
spawn-at-startup "xwayland-satellite" spawn-at-startup "xwayland-satellite"
spawn-at-startup "bash" "-c" "1password --silent" spawn-at-startup "bash" "-c" "1password --silent"

1
eggs/zed/.gitignore vendored
View file

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

View file

@ -10,14 +10,6 @@ setopt SHARE_HISTORY
source "$ZDOTDIR/utils.zsh" source "$ZDOTDIR/utils.zsh"
# pnpm
export PNPM_HOME="$HOME/.local/share/pnpm"
case ":$PATH:" in
*":$PNPM_HOME:"*) ;;
*) export PATH="$PNPM_HOME:$PATH" ;;
esac
# pnpm end
### Added by Zinit's installer ### Added by Zinit's installer
if [[ ! -f $HOME/.local/share/zinit/zinit.git/zinit.zsh ]]; then if [[ ! -f $HOME/.local/share/zinit/zinit.git/zinit.zsh ]]; then

3
foo.rhai Normal file
View file

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

View file

@ -1,16 +1,15 @@
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 }
} }
@ -19,28 +18,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": #{ enabled: device.linux, targets: "~/.config/foot", templates: ["foot.ini"] }, "foot": #{ targets: "~/.config/foot", templates: ["foot.ini"] },
"git": merge_into_home(true, [".gitconfig"]), "git": merge_into_home(true, [".gitconfig"]),
"niri": #{ enabled: device.linux, targets: "~/.config/niri", templates: ["**/*.kdl"] }, "niri": #{ 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": #{ enabled: device.linux, strategy: "merge", targets: "~" }, "profile": #{ strategy: "merge", targets: "~" },
"starship": merge_into_home(true, []), "starship": merge_into_home(true, []),
"sway": merge_into_home(device.desktop && device.linux, []), "sway": merge_into_home(device.desktop, []),
"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(device.linux, []), "rofi": merge_into_home(true, []),
"gtk": merge_into_home(device.linux, []), "gtk": merge_into_home(true, []),
"scripts": #{ enabled: device.linux, targets: "~/scripts", strategy: "merge" }, "scripts": #{ targets: "~/scripts", strategy: "merge" },
"hyprlock": merge_into_home(device.laptop && device.linux, []), "hyprlock": merge_into_home(device.laptop, []),
"kanata": merge_into_home(device.laptop && device.linux, []), "kanata": merge_into_home(device.laptop, []),
"waybar": merge_into_home(device.laptop && device.linux, []), "waybar": merge_into_home(device.laptop, []),
"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(false, []),
"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, []),