mirror of
https://github.com/elkowar/dots-of-war.git
synced 2024-12-25 13:42:23 +00:00
Compare commits
3 commits
55b34bcf92
...
afe1aa4e5e
Author | SHA1 | Date | |
---|---|---|---|
afe1aa4e5e | |||
4db7099ba9 | |||
d5792c7003 |
6 changed files with 45 additions and 36 deletions
|
@ -1,33 +1,31 @@
|
||||||
|
; {% 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]
|
||||||
helper = store
|
helper = store
|
||||||
[core]
|
[core]
|
||||||
autocrlf = input
|
autocrlf = input
|
||||||
; {# if io::command_available("deltar") #}
|
; {% if io::command_available("delta") %}
|
||||||
;<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 = 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
|
||||||
|
|
|
@ -104,6 +104,10 @@ 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
1
eggs/zed/.gitignore
vendored
|
@ -7,6 +7,7 @@ node_modules
|
||||||
/db
|
/db
|
||||||
/embeddings
|
/embeddings
|
||||||
/copilot
|
/copilot
|
||||||
|
/prompts
|
||||||
|
|
||||||
|
|
||||||
.tmp*
|
.tmp*
|
||||||
|
|
|
@ -10,6 +10,14 @@ 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
|
||||||
|
@ -98,7 +106,7 @@ alias dots="git -C $HOME/dots-of-war"
|
||||||
# load prompt
|
# load prompt
|
||||||
if command -v starship >/dev/null; then
|
if command -v starship >/dev/null; then
|
||||||
eval "$(starship init zsh)"
|
eval "$(starship init zsh)"
|
||||||
else
|
else
|
||||||
source "$ZDOTDIR/prompt.zsh"
|
source "$ZDOTDIR/prompt.zsh"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
3
foo.rhai
3
foo.rhai
|
@ -1,3 +0,0 @@
|
||||||
fn stuff() {
|
|
||||||
// re "hi"
|
|
||||||
}
|
|
33
yolk.rhai
33
yolk.rhai
|
@ -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(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, []),
|
||||||
|
|
Loading…
Reference in a new issue