Compare commits

...

3 commits

Author SHA1 Message Date
afe1aa4e5e
Clean up gitconfig 2024-12-22 16:29:42 +01:00
4db7099ba9
Using this on mac as well now 2024-12-22 16:17:50 +01:00
d5792c7003
Stuff 2024-12-22 15:54:53 +01:00
6 changed files with 45 additions and 36 deletions

View file

@ -1,33 +1,31 @@
; {% if !device.kenbun %}
[user]
email = dev@elkowar.dev
name = elkowar
email = dev@elkowar.dev
[github]
user = ElKowar
; {% end %}
[include]
path = ~/.gitconfig.local
[credential]
helper = store
[core]
autocrlf = input
; {# if io::command_available("deltar") #}
; {% if io::command_available("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]
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]
defaultBranch = master
defaultBranch = main
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f

View file

@ -104,6 +104,10 @@ layout {
//<yolk> spawn-at-startup "waybar"
// {% 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 "xwayland-satellite"
spawn-at-startup "bash" "-c" "1password --silent"

1
eggs/zed/.gitignore vendored
View file

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

View file

@ -10,6 +10,14 @@ setopt SHARE_HISTORY
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
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
if command -v starship >/dev/null; then
eval "$(starship init zsh)"
else
else
source "$ZDOTDIR/prompt.zsh"
fi

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 = #{
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(false, []),
"zathura": merge_into_home(false, []),
"eww-laptop": merge_into_home(false, []),
"hyprland": merge_into_home(false, []),