diff --git a/.gitattributes b/.gitattributes index 08a5adc..e69de29 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +0,0 @@ -* filter=yolk \ No newline at end of file diff --git a/eggs/zed/settings.json b/eggs/zed/settings.json index 0dae023..f2541f0 100644 --- a/eggs/zed/settings.json +++ b/eggs/zed/settings.json @@ -8,7 +8,7 @@ "assistant": { "default_model": { "provider": "copilot_chat", - "model": "gpt-4o" + "model": "claude-3-5-sonnet" }, "version": "2" }, diff --git a/eggs/zsh/.config/zsh/abbreviations b/eggs/zsh/.config/zsh/abbreviations index 2d20703..a3c1ed0 100644 --- a/eggs/zsh/.config/zsh/abbreviations +++ b/eggs/zsh/.config/zsh/abbreviations @@ -4,10 +4,13 @@ abbr cnix="cd ~/.config/nixpkgs && nvim && cd -" abbr cxmonad="cd ~/.xmonad && nvim lib/Config.hs && cd -" abbr ra="ranger" abbr cr="cargo run -- " -abbr g="git " +abbr g="git" abbr ga.="git add ." abbr gaa="git add --all" abbr gc="git commit" -abbr gr="git rebase " +abbr gr="git rebase" +abbr gpf="git push --force-with-lease" +abbr gp="git push" +abbr gpu="git pull" abbr gs="git ss " abbr nvc="nvim ~/.config/" diff --git a/yolk.rhai b/yolk.rhai index 898c9e7..7d3d9dd 100644 --- a/yolk.rhai +++ b/yolk.rhai @@ -24,6 +24,7 @@ export let eggs = #{ "git": merge_into_home(true, [".gitconfig"]), "niri": #{ enabled: device.linux, targets: "~/.config/niri", templates: ["**/*.kdl"], main_file: "config.kdl" }, "nvim": #{ strategy: "put", targets: "~/.config/nvim", main_file: "init.lua" }, + "nvim-old": #{ enabled: false }, "profile": #{ enabled: device.linux, strategy: "merge", targets: "~" }, "starship": merge_into_home(true, []), "bat": #{ enabled: device.linux || device.macbook, strategy: "put", targets: "~/.config/bat", templates: ["config"]},