diff --git a/eggs/foot/.config/foot/foot.ini b/eggs/foot/.config/foot/foot.ini index 8fe4d2d..6bca6fc 100644 --- a/eggs/foot/.config/foot/foot.ini +++ b/eggs/foot/.config/foot/foot.ini @@ -1,5 +1,6 @@ # -*- conf -*- + # shell=$SHELL (if set, otherwise user's default shell from /etc/passwd) # term=foot (or xterm-256color if built with -Dterminfo=disabled) # login-shell=no @@ -8,6 +9,7 @@ # title=foot # locked-title=no + # font=APL386 Unicode:size=8 font=Fira Code Nerd Font:size=12 # font-bold= @@ -73,7 +75,7 @@ hide-when-typing=yes #background=1d2021 background=282828 foreground=ebdbb2 -#regular0=282828 +#regular0=282828 regular0=665c54 regular1=cc241d regular2=98971a diff --git a/eggs/foot/yolk_templates b/eggs/foot/yolk_templates index 5adbc9f..1c9ef25 100644 --- a/eggs/foot/yolk_templates +++ b/eggs/foot/yolk_templates @@ -1,8 +1 @@ -.config/foot/foot.ini -.config/foot/foot.ini -.config/foot/foot.ini -.config/foot/foot.ini -.config/foot/foot.ini -.config/foot/foot.ini -.config/foot/foot.ini .config/foot/foot.ini \ No newline at end of file diff --git a/eggs/git/yolk_templates b/eggs/git/yolk_templates index 2a99653..e717d37 100644 --- a/eggs/git/yolk_templates +++ b/eggs/git/yolk_templates @@ -1,2 +1 @@ -.gitconfig .gitconfig \ No newline at end of file diff --git a/eggs/niri/.config/niri/config.kdl b/eggs/niri/.config/niri/config.kdl index 107f423..1684f77 100644 --- a/eggs/niri/.config/niri/config.kdl +++ b/eggs/niri/.config/niri/config.kdl @@ -34,6 +34,11 @@ input { cursor { xcursor-size 32 // {< rnum(if device.laptop() then 12 else 32) >} xcursor-theme "phinger-cursors-light" +<<<<<<< HEAD +======= + xcursor-size 12 + hide-when-typing +>>>>>>> 6440e12 (stuff) } environment { diff --git a/eggs/zed/.config/zed/keymap.json b/eggs/zed/.config/zed/keymap.json index f241ec7..b9265cb 100644 --- a/eggs/zed/.config/zed/keymap.json +++ b/eggs/zed/.config/zed/keymap.json @@ -108,6 +108,7 @@ "ctrl-t ctrl-h": "pane::ActivatePrevItem", "ctrl-t ctrl-l": "pane::ActivateNextItem", "ctrl-x ctrl-c": "pane::CloseActiveItem", + "ctrl-t ctrl-c": "pane::CloseActiveItem", "alt-j": "workspace::ToggleBottomDock" } diff --git a/eggs/zed/.config/zed/settings.json b/eggs/zed/.config/zed/settings.json index b4c67e8..b3a4f11 100644 --- a/eggs/zed/.config/zed/settings.json +++ b/eggs/zed/.config/zed/settings.json @@ -1,6 +1,6 @@ { "auto_signature_help": false, - "use_autoclose": true, + // "use_autoclose": true, // "always_treat_brackets_as_autoclosed": false, // "unstable.ui_density": "compact", "assistant": { @@ -12,7 +12,8 @@ }, "theme": "Gruvbox Dark Hard", "buffer_font_size": 14, - "buffer_font_family": "FiraCode Nerd Font", + "buffer_font_family": "Input", + // "buffer_font_family": "FiraCode Nerd Font", //"buffer_font_family": "JetBrainsMono Nerd Font Mono", // "buffer_line_height": { "custom": 1.55 }, // "ui_font_family": "Noto Sans", diff --git a/eggs/zed/.config/zed/tasks.json b/eggs/zed/.config/zed/tasks.json index e177d29..e039947 100644 --- a/eggs/zed/.config/zed/tasks.json +++ b/eggs/zed/.config/zed/tasks.json @@ -15,5 +15,21 @@ //"cwd": "/path/to/working/directory", "use_new_terminal": false, "allow_concurrent_runs": false + }, + { + "label": "search:project", + "command": "QUERY=${ZED_SELECTED_TEXT:-}; FILE=$(rg --column --hidden --line-number --no-heading --color=always --smart-case --colors match:fg:green --colors path:fg:white --colors path:style:nobold --glob '!**/.git/' '--glob' '!**/node_modules' \"$QUERY\" . | fzf --ansi --delimiter : --preview 'bat --style=numbers,changes,header --color=always --highlight-line {2} {1}' --preview-window 'up:60%:+{2}+3/3' --layout=reverse --query \"$QUERY\" --print-query | tail -1); if [ -n \"$FILE\" ]; then LINE=$(echo $FILE | cut -d':' -f2); COL=$(echo $FILE | cut -d':' -f3); FILE=$(echo $FILE | cut -d':' -f1); zed $FILE:$LINE:$COL; fi", + "env": {}, + "cwd": "${ZED_WORKTREE_ROOT}", + "allow_concurrent_runs": false, + "use_new_terminal": false, + "reveal": "always", + "hide": "on_success", + "shell": { + "with_arguments": { + "program": "/bin/bash", + "args": ["--login"] + } + } } ]