Compare commits

..

11 commits

Author SHA1 Message Date
38a99c972e
update vim stuff 2025-05-19 18:18:54 +02:00
6f6399259a
Merge branch 'yolk' of github-elk:elkowar/dots-of-war 2025-05-19 18:18:31 +02:00
0e1d94d909
typst setup 2025-05-19 18:17:24 +02:00
0c3c815412
Stuff 2025-05-19 18:15:14 +02:00
c6a05831db
niri config and wallpapers 2025-05-19 18:13:48 +02:00
5d4479eecd
Fix rofi structure 2025-05-19 18:13:48 +02:00
d111ecc7d2
Add overview bind to niri 2025-05-19 18:13:48 +02:00
d87ec206fc
Add readme 2025-05-19 18:13:48 +02:00
e58444da98
Some laptop changes 2025-05-11 14:26:58 +02:00
43b08d0c58
toggle-overview bind 2025-04-26 23:26:16 +02:00
4f085f9bc0
nushell 2025-04-26 23:24:48 +02:00
14 changed files with 360 additions and 67 deletions

1
eggs/gtk/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
**/bookmarks

View file

@ -1,6 +1,6 @@
// vim:set ft=kdl shiftwidth=4 commentstring=//%s: // vim:set ft=kdl shiftwidth=4 commentstring=//%s:
debug { debug {
keep-laptop-panel-on-when-lid-is-closed // keep-laptop-panel-on-when-lid-is-closed
} }
input { input {
@ -26,7 +26,7 @@ input {
accel-speed -0.1 accel-speed -0.1
} }
trackpoint { trackpoint {
accel-speed -0.1 accel-speed -0.4
} }
//warp-mouse-to-focus //warp-mouse-to-focus
focus-follows-mouse max-scroll-amount="20%" focus-follows-mouse max-scroll-amount="20%"
@ -75,8 +75,6 @@ output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" {
// {% end %} // {% end %}
layout { layout {
gaps 16 gaps 16
// center-focused-column "always" // - "never", "always" "on-overflow" // center-focused-column "always" // - "never", "always" "on-overflow"
@ -191,6 +189,7 @@ window-rule {
width 2 width 2
} }
} }
window-rule { window-rule {
match app-id=r#"^foot$"# match app-id=r#"^foot$"#
default-column-width { proportion 0.3333; } default-column-width { proportion 0.3333; }

1
eggs/nushell/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/history.txt

7
eggs/nushell/config.nu Normal file
View file

@ -0,0 +1,7 @@
$env.config = {
buffer_editor: "nvim",
show_banner : false,
}
alias cr = cargo run

74
eggs/nushell/env.nu Normal file
View file

@ -0,0 +1,74 @@
# Nushell Environment Config File
#
# version = "0.99.1"
#
source ($nu.default-config-dir | path join 'zoxide.nu')
# Use nushell functions to define your right and left prompt
$env.PROMPT_COMMAND = {|| create_left_prompt }
# FIXME: This default is not implemented in rust code as of 2023-09-08.
$env.PROMPT_COMMAND_RIGHT = {|| create_right_prompt }
# The prompt indicators are environmental variables that represent
# the state of the prompt
$env.PROMPT_INDICATOR = {|| "> " }
$env.PROMPT_INDICATOR_VI_INSERT = {|| ": " }
$env.PROMPT_INDICATOR_VI_NORMAL = {|| "> " }
$env.PROMPT_MULTILINE_INDICATOR = {|| "::: " }
# If you want previously entered commands to have a different prompt from the usual one,
# you can uncomment one or more of the following lines.
# This can be useful if you have a 2-line prompt and it's taking up a lot of space
# because every command entered takes up 2 lines instead of 1. You can then uncomment
# the line below so that previously entered commands show with a single `🚀`.
# $env.TRANSIENT_PROMPT_COMMAND = {|| "🚀 " }
# $env.TRANSIENT_PROMPT_INDICATOR = {|| "" }
# $env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = {|| "" }
# $env.TRANSIENT_PROMPT_INDICATOR_VI_NORMAL = {|| "" }
# $env.TRANSIENT_PROMPT_MULTILINE_INDICATOR = {|| "" }
# $env.TRANSIENT_PROMPT_COMMAND_RIGHT = {|| "" }
# Specifies how environment variables are:
# - converted from a string to a value on Nushell startup (from_string)
# - converted from a value back to a string when running external commands (to_string)
# Note: The conversions happen *after* config.nu is loaded
$env.ENV_CONVERSIONS = {
"PATH": {
from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
}
"Path": {
from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
}
}
# Directories to search for scripts when calling source or use
# The default for this is $nu.default-config-dir/scripts
$env.NU_LIB_DIRS = [
($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
($nu.data-dir | path join 'completions') # default home for nushell completions
]
# Directories to search for plugin binaries when calling register
# The default for this is $nu.default-config-dir/plugins
$env.NU_PLUGIN_DIRS = [
($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
]
# To add entries to PATH (on Windows you might use Path), you can use the following pattern:
# $env.PATH = ($env.PATH | split row (char esep) | prepend '/some/path')
# An alternate way to add entries to $env.PATH is to use the custom command `path add`
# which is built into the nushell stdlib:
# use std "path add"
# $env.PATH = ($env.PATH | split row (char esep))
# path add /some/path
# path add ($env.CARGO_HOME | path join "bin")
# path add ($env.HOME | path join ".local" "bin")
# $env.PATH = ($env.PATH | uniq)
mkdir ($nu.data-dir | path join "vendor/autoload")
starship init nu | save -f ($nu.data-dir | path join "vendor/autoload/starship.nu")

60
eggs/nushell/zoxide.nu Normal file
View file

@ -0,0 +1,60 @@
# Code generated by zoxide. DO NOT EDIT.
# =============================================================================
#
# Hook configuration for zoxide.
#
# Initialize hook to add new entries to the database.
if (not ($env | default false __zoxide_hooked | get __zoxide_hooked)) {
$env.__zoxide_hooked = true
$env.config = ($env | default {} config).config
$env.config = ($env.config | default {} hooks)
$env.config = ($env.config | update hooks ($env.config.hooks | default {} env_change))
$env.config = ($env.config | update hooks.env_change ($env.config.hooks.env_change | default [] PWD))
$env.config = ($env.config | update hooks.env_change.PWD ($env.config.hooks.env_change.PWD | append {|_, dir|
zoxide add -- $dir
}))
}
# =============================================================================
#
# When using zoxide with --no-cmd, alias these internal functions as desired.
#
# Jump to a directory using only keywords.
def --env __zoxide_z [...rest:string] {
let arg0 = ($rest | append '~').0
let path = if (($rest | length) <= 1) and ($arg0 == '-' or ($arg0 | path expand | path type) == dir) {
$arg0
} else {
(zoxide query --exclude $env.PWD -- ...$rest | str trim -r -c "\n")
}
cd $path
}
# Jump to a directory using interactive search.
def --env __zoxide_zi [...rest:string] {
cd $'(zoxide query --interactive -- ...$rest | str trim -r -c "\n")'
}
# =============================================================================
#
# Commands for zoxide. Disable these using --no-cmd.
#
alias z = __zoxide_z
alias zi = __zoxide_zi
# =============================================================================
#
# Add this to your env file (find it by running `$nu.env-path` in Nushell):
#
# zoxide init nushell | save -f ~/.zoxide.nu
#
# Now, add this to the end of your config file (find it by running
# `$nu.config-path` in Nushell):
#
# source ~/.zoxide.nu
#
# Note: zoxide only supports Nushell v0.89.0+.

View file

@ -1,49 +1,50 @@
{ {
"CopilotChat.nvim": { "branch": "main", "commit": "03d1aba3270169e2c06edb0043b1d232e4f43dce" }, "CopilotChat.nvim": { "branch": "main", "commit": "1b375c24602680b5fe28c3c223a822111857dc37" },
"LazyVim": { "branch": "main", "commit": "45d94b3197eaf3f35754b8ecb7adebfcebe5160d" }, "LazyVim": { "branch": "main", "commit": "eb8ddea8c9438c34e71db097eb77a44185dd1093" },
"LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
"SchemaStore.nvim": { "branch": "main", "commit": "56d8ed0fa1516242085ba5e95d7f49fad50d5754" }, "SchemaStore.nvim": { "branch": "main", "commit": "4244700eff0a9258b88f48b2b0d0339dea3338af" },
"blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" }, "blink-cmp-copilot": { "branch": "main", "commit": "5d4ed42c5d7d144012792bb6cc4ac7899a108169" },
"blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" }, "blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" },
"catppuccin": { "branch": "main", "commit": "0b2437bcc12b4021614dc41fcea9d0f136d94063" }, "catppuccin": { "branch": "main", "commit": "4965db2d6155c25db4e8417465fc2703fdf4c2b7" },
"copilot.lua": { "branch": "master", "commit": "30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9" }, "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" },
"crates.nvim": { "branch": "main", "commit": "403a0abef0e2aec12749a534dc468d6fd50c6741" }, "crates.nvim": { "branch": "main", "commit": "bd35b13e94a292ee6e32c351e05ca2202dc9f070" },
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, "dressing.nvim": { "branch": "master", "commit": "56ef6a969a4990d938c5fed40c370f65e125fc97" },
"dropbar.nvim": { "branch": "master", "commit": "485558fb7c237cde72b624b20619124a74822b3e" }, "dropbar.nvim": { "branch": "master", "commit": "f11b27344dc3675cdaeffa9e1e5cab0442abb0fa" },
"gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "gitsigns.nvim": { "branch": "main", "commit": "9b36d497495436c135659902054ee637e0ba6021" },
"grug-far.nvim": { "branch": "main", "commit": "a5d095a2ee0a04d656d1b2c3e2ad210ff3daf75c" }, "grug-far.nvim": { "branch": "main", "commit": "3a8690461afac34c0e5bacb0f7b4bc3066aab665" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
"lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" },
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"mini.ai": { "branch": "main", "commit": "6e01c0e5a15554852546fac9853960780ac52ed4" }, "mini.ai": { "branch": "main", "commit": "640418aafb5a6e830eade483cdc2d4f0cd0e3f1a" },
"mini.comment": { "branch": "main", "commit": "264b8a63edd5a9a41d5361a1d52c13131c3c51a2" }, "mini.comment": { "branch": "main", "commit": "5bd72d50d36f4c0fd531adc409715a75a2c984da" },
"mini.hipatterns": { "branch": "main", "commit": "fbf1e2195fdd65cf1bc970316c28098257728868" }, "mini.hipatterns": { "branch": "main", "commit": "fbf1e2195fdd65cf1bc970316c28098257728868" },
"mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" }, "mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" },
"mini.move": { "branch": "main", "commit": "c8b30e92dd2668dd6e56a9a23cb7d4ee38c2266d" }, "mini.move": { "branch": "main", "commit": "c8b30e92dd2668dd6e56a9a23cb7d4ee38c2266d" },
"mini.surround": { "branch": "main", "commit": "f90069c7441a5fb04c3de42eacf93e16b64dd3eb" }, "mini.surround": { "branch": "main", "commit": "ceddea5fe862f13b279d9bbe81c3327a0e66d56b" },
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "noice.nvim": { "branch": "main", "commit": "e3c68a4d2275a01268a52e2931bfccfbfb693d15" },
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
"nvim-lint": { "branch": "master", "commit": "936197073214c26a347fb933c9459c8766376b23" }, "nvim-lint": { "branch": "master", "commit": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87" },
"nvim-lsp-endhints": { "branch": "main", "commit": "a449f2f27b6b985ff216964572224ce432d94a86" }, "nvim-lsp-endhints": { "branch": "main", "commit": "a449f2f27b6b985ff216964572224ce432d94a86" },
"nvim-lspconfig": { "branch": "master", "commit": "6c17f8656f667727b27f5f598463afedb7791b18" }, "nvim-lspconfig": { "branch": "master", "commit": "00b236b795acfb79339bd6771488c155073a2889" },
"nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" }, "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" },
"nvim-scrollbar": { "branch": "main", "commit": "6994eb9f73d5fdc36ee2c8717940e8c853e51a49" }, "nvim-scrollbar": { "branch": "main", "commit": "6994eb9f73d5fdc36ee2c8717940e8c853e51a49" },
"nvim-treesitter": { "branch": "master", "commit": "6d957c22cb48a734b009a69d03c18d20042c4754" }, "nvim-treesitter": { "branch": "master", "commit": "4e701776f8824fc188a6254f57d080971ce28c92" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
"playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
"remote-nvim.nvim": { "branch": "main", "commit": "66fc20fd259401c7bb6ac5189ecb6283c2eb65d2" }, "remote-nvim.nvim": { "branch": "main", "commit": "66fc20fd259401c7bb6ac5189ecb6283c2eb65d2" },
"render-markdown.nvim": { "branch": "main", "commit": "e05a9f22f31c088ece3fa5928daf546a015b66ee" }, "render-markdown.nvim": { "branch": "main", "commit": "2a9e0ab6043bfb4996ce6a6a35594ab357e5d299" },
"rustaceanvim": { "branch": "master", "commit": "448c76451ecf3c0edabcde427b7f1c8c219be2dd" }, "rustaceanvim": { "branch": "master", "commit": "f03035fa03ccb36cd26d0792c946fbacba1d1a39" },
"snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "snacks.nvim": { "branch": "main", "commit": "b773368f8aa6e84a68e979f0e335d23de71f405a" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
"telescope.nvim": { "branch": "master", "commit": "78857db9e8d819d3cc1a9a7bdc1d39d127a36495" }, "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" },
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, "trouble.nvim": { "branch": "main", "commit": "6f380b8826fb819c752c8fd7daaee9ef96d4c689" },
"ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" },
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, "typst-preview.nvim": { "branch": "master", "commit": "dea4525d5420b7c32eebda7de15a6beb9d6574fa" },
"which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" },
"zenbones.nvim": { "branch": "main", "commit": "9ef4241c50ea24026b732512223dbc55589ce2c4" } "zenbones.nvim": { "branch": "main", "commit": "9ef4241c50ea24026b732512223dbc55589ce2c4" }
} }

View file

@ -7,6 +7,7 @@
"lazyvim.plugins.extras.editor.telescope", "lazyvim.plugins.extras.editor.telescope",
"lazyvim.plugins.extras.lang.json", "lazyvim.plugins.extras.lang.json",
"lazyvim.plugins.extras.lang.markdown", "lazyvim.plugins.extras.lang.markdown",
"lazyvim.plugins.extras.lang.nushell",
"lazyvim.plugins.extras.lang.rust", "lazyvim.plugins.extras.lang.rust",
"lazyvim.plugins.extras.lang.toml", "lazyvim.plugins.extras.lang.toml",
"lazyvim.plugins.extras.util.mini-hipatterns" "lazyvim.plugins.extras.util.mini-hipatterns"

View file

@ -0,0 +1,9 @@
return {
{
'chomosuke/typst-preview.nvim',
-- lazy = false, -- or ft = 'typst'
ft = 'typst',
version = '1.*',
opts = {}, -- lazy.nvim will implicitly calls `setup {}`
}
}

View file

@ -33,13 +33,15 @@
} }
}, },
{ {
"context": "EmptyPane || Diagnostics && !vim_mode && !VimWaiting && !menu", "context": "Welcome || EmptyPane || Diagnostics && !vim_mode && !VimWaiting && !menu",
"bindings": { "bindings": {
"space b c": "pane::CloseActiveItem", "space b c": "pane::CloseActiveItem",
"space p": "file_finder::Toggle", "space p": "file_finder::Toggle",
"space o": "pane::DeploySearch", "space o": "pane::DeploySearch",
"space h": "pane::ActivatePrevItem", "space h": "pane::ActivatePreviousItem",
"space l": "pane::ActivateNextItem" "space l": "pane::ActivateNextItem",
"space e w": "diagnostics::ToggleWarnings",
"alt-j": "workspace::ToggleBottomDock"
} }
}, },
{ {
@ -54,7 +56,7 @@
"space p": "file_finder::Toggle", "space p": "file_finder::Toggle",
"space o": "pane::DeploySearch", "space o": "pane::DeploySearch",
"space h": "pane::ActivatePrevItem", "space h": "pane::ActivatePreviousItem",
"space l": "pane::ActivateNextItem", "space l": "pane::ActivateNextItem",
"space c space": "editor::ToggleComments", "space c space": "editor::ToggleComments",
@ -69,7 +71,7 @@
"ctrl-j": "editor::AddSelectionBelow", "ctrl-j": "editor::AddSelectionBelow",
"ctrl-k": "editor::AddSelectionAbove", "ctrl-k": "editor::AddSelectionAbove",
"alt-d": "editor::SelectNext", "alt-d": "editor::SelectNext",
"alt-j": "editor::SelectAllMatches", "alt-shift-d": "editor::SelectAllMatches",
// lsp // lsp
"space m f": "editor::Format", "space m f": "editor::Format",
"space m s": "project_symbols::Toggle", "space m s": "project_symbols::Toggle",
@ -79,7 +81,7 @@
"space m r": "editor::FindAllReferences", "space m r": "editor::FindAllReferences",
"space m t": "editor::GoToTypeDefinition", "space m t": "editor::GoToTypeDefinition",
"space m e": "editor::GoToDiagnostic", "space m e": "editor::GoToDiagnostic",
"space m E": "editor::GoToPrevDiagnostic", "space m E": "editor::GoToPreviousDiagnostic",
"space m v": "editor::ToggleCodeActions", "space m v": "editor::ToggleCodeActions",
"space m o": "outline::Toggle", "space m o": "outline::Toggle",
"space m h": "editor::ShowSignatureHelp", "space m h": "editor::ShowSignatureHelp",
@ -90,7 +92,7 @@
"space v n": "editor::ToggleLineNumbers", "space v n": "editor::ToggleLineNumbers",
"space v i": "editor::ToggleInlayHints", "space v i": "editor::ToggleInlayHints",
// Git // Git
"space g b": "editor::ToggleGitBlame" "space g b": "git::Blame"
} }
}, },
{ {
@ -114,7 +116,7 @@
"ctrl-t ctrl-t": "terminal_panel::ToggleFocus", "ctrl-t ctrl-t": "terminal_panel::ToggleFocus",
"ctrl-t ctrl-n": "workspace::NewTerminal", "ctrl-t ctrl-n": "workspace::NewTerminal",
"ctrl-t ctrl-shift-n": "workspace::NewCenterTerminal", "ctrl-t ctrl-shift-n": "workspace::NewCenterTerminal",
"ctrl-t ctrl-h": "pane::ActivatePrevItem", "ctrl-t ctrl-h": "pane::ActivatePreviousItem",
"ctrl-t ctrl-l": "pane::ActivateNextItem", "ctrl-t ctrl-l": "pane::ActivateNextItem",
"ctrl-x ctrl-c": "pane::CloseActiveItem", "ctrl-x ctrl-c": "pane::CloseActiveItem",
"ctrl-t ctrl-c": "pane::CloseActiveItem", "ctrl-t ctrl-c": "pane::CloseActiveItem",
@ -128,7 +130,7 @@
"cmd-t cmd-t": "terminal_panel::ToggleFocus", "cmd-t cmd-t": "terminal_panel::ToggleFocus",
"cmd-t cmd-n": "workspace::NewTerminal", "cmd-t cmd-n": "workspace::NewTerminal",
"cmd-t cmd-shift-n": "workspace::NewCenterTerminal", "cmd-t cmd-shift-n": "workspace::NewCenterTerminal",
"cmd-t cmd-h": "pane::ActivatePrevItem", "cmd-t cmd-h": "pane::ActivatePreviousItem",
"cmd-t cmd-l": "pane::ActivateNextItem", "cmd-t cmd-l": "pane::ActivateNextItem",
"cmd-x cmd-c": "pane::CloseActiveItem" "cmd-x cmd-c": "pane::CloseActiveItem"
} }
@ -140,7 +142,7 @@
"alt-t alt-t": "terminal_panel::ToggleFocus", "alt-t alt-t": "terminal_panel::ToggleFocus",
"alt-t alt-n": "workspace::NewTerminal", "alt-t alt-n": "workspace::NewTerminal",
"alt-t alt-shift-n": "workspace::NewCenterTerminal", "alt-t alt-shift-n": "workspace::NewCenterTerminal",
"alt-t alt-h": "pane::ActivatePrevItem", "alt-t alt-h": "pane::ActivatePreviousItem",
"alt-t alt-l": "pane::ActivateNextItem", "alt-t alt-l": "pane::ActivateNextItem",
"alt-x alt-c": "pane::CloseActiveItem" "alt-x alt-c": "pane::CloseActiveItem"
} }
@ -166,14 +168,15 @@
// Panel stuff // Panel stuff
{ {
"context": "Editor && VimControl && !VimWaiting && !menu || OutlinePanel || ProjectPanel || Assistant || EmptyPane", "context": "Editor && VimControl && !VimWaiting && !menu || OutlinePanel || ProjectPanel || Assistant || EmptyPane || Welcome",
"bindings": { "bindings": {
"space v h": "workspace::ToggleLeftDock", "space v h": "workspace::ToggleLeftDock",
"space v l": "workspace::ToggleRightDock", "space v l": "workspace::ToggleRightDock",
"space v o": "outline_panel::ToggleFocus", "space v o": "outline_panel::ToggleFocus",
"space v p": "project_panel::ToggleFocus", "space v p": "project_panel::ToggleFocus",
"space v a": "assistant::ToggleFocus" "space v a": "agent::ToggleFocus",
"alt-j": "workspace::ToggleBottomDock"
} }
}, },
{ {
@ -191,7 +194,7 @@
{ {
"context": "Assistant", "context": "Assistant",
"bindings": { "bindings": {
"space h": "assistant::ToggleFocus" "space h": "agent::ToggleFocus"
} }
} }
] ]

View file

@ -21,12 +21,71 @@
// "use_autoclose": true, // "use_autoclose": true,
// "always_treat_brackets_as_autoclosed": false, // "always_treat_brackets_as_autoclosed": false,
// "unstable.ui_density": "compact", // "unstable.ui_density": "compact",
"assistant": { /* Duplicated key auto-commented: "agent": {
"always_allow_tool_actions": true,
"default_profile": "code",
"profiles": {
"code": {
"name": "Code",
"tools": {
"rename": false,
"thinking": true,
"terminal": true,
"symbol_info": true,
"read_file": true,
"open": true,
"now": true,
"list_directory": true,
"grep": true,
"find_path": true,
"fetch": true,
"edit_file": true,
"diagnostics": true,
"create_file": true,
"contents": true,
"code_symbols": true,
"code_actions": true,
"batch_tool": true
},
"enable_all_context_servers": false,
"context_servers": {}
},
"write": {
"name": "Write",
"tools": {
"open": true,
"batch_tool": true,
"code_actions": true,
"code_symbols": true,
"contents": false,
"copy_path": false,
"create_file": true,
"delete_path": false,
"diagnostics": true,
"edit_file": true,
"fetch": true,
"list_directory": true,
"move_path": false,
"now": true,
"find_path": true,
"read_file": true,
"grep": true,
"rename": false,
"symbol_info": true,
"terminal": true,
"thinking": true,
"web_search": true
},
"enable_all_context_servers": true,
"context_servers": {}
}
}
}, */
"agent": {
"default_model": { "default_model": {
"provider": "copilot_chat", "provider": "copilot_chat",
"model": "claude-3-7-sonnet" "model": "claude-3.7-sonnet"
}, },
"enable_experimental_live_diffs": true,
"version": "2" "version": "2"
}, },
"theme": "Gruvbox Dark Hard", "theme": "Gruvbox Dark Hard",
@ -38,7 +97,6 @@
// "buffer_line_height": { "custom": 1.55 }, // "buffer_line_height": { "custom": 1.55 },
// "ui_font_family": "Noto Sans", // "ui_font_family": "Noto Sans",
// "buffer_font_family": "Zed Mono", // "buffer_font_family": "Zed Mono",
// "active_pane_magnification": 1.3, // "active_pane_magnification": 1.3,
"tab_bar": { "tab_bar": {
"show_nav_history_buttons": false "show_nav_history_buttons": false
@ -66,11 +124,9 @@
"enable_preview_from_file_finder": true, "enable_preview_from_file_finder": true,
"enable_preview_from_code_navigation": true "enable_preview_from_code_navigation": true
}, },
"message_editor": { "message_editor": {
"auto_replace_emoji_shortcode": true "auto_replace_emoji_shortcode": true
}, },
"terminal": { "terminal": {
"font_family": "FiraCode Nerd Font", "font_family": "FiraCode Nerd Font",
"font_size": 14 "font_size": 14
@ -115,7 +171,6 @@
"panel.indent_guide": "#ffffff08", "panel.indent_guide": "#ffffff08",
"panel.indent_guide_active": "#ffffff11", "panel.indent_guide_active": "#ffffff11",
"panel.indent_guide_hover": "#ffffff13", "panel.indent_guide_hover": "#ffffff13",
"panel.background": "#282828", "panel.background": "#282828",
"tab_bar.background": "#282828", "tab_bar.background": "#282828",
// "border": "#3c3836", // "border": "#3c3836",

View file

@ -1,10 +1,14 @@
{ {
"git_panel": {
"status_style": "label_color"
},
"edit_predictions": { "edit_predictions": {
"disabled_globs": [], "disabled_globs": [],
"mode": "eager_preview" "mode": "eager"
}, },
"features": { "features": {
"inline_completion_provider": "zed" "edit_prediction_provider": "copilot"
// "edit_prediction_provider": "zed"
}, },
"icon_theme": "Material Icon Theme", "icon_theme": "Material Icon Theme",
"telemetry": { "telemetry": {
@ -18,23 +22,81 @@
// "always_treat_brackets_as_autoclosed": false, // "always_treat_brackets_as_autoclosed": false,
// "unstable.ui_density": "compact", // "unstable.ui_density": "compact",
"assistant": { "assistant": {
"always_allow_tool_actions": true,
"default_profile": "code",
"profiles": {
"code": {
"name": "Code",
"tools": {
"rename": false,
"thinking": true,
"terminal": true,
"symbol_info": true,
"read_file": true,
"open": true,
"now": true,
"list_directory": true,
"grep": true,
"find_path": true,
"fetch": true,
"edit_file": true,
"diagnostics": true,
"create_file": true,
"contents": true,
"code_symbols": true,
"code_actions": true,
"batch_tool": true
},
"enable_all_context_servers": false,
"context_servers": {}
},
"write": {
"name": "Write",
"tools": {
"open": true,
"batch_tool": true,
"code_actions": true,
"code_symbols": true,
"contents": false,
"copy_path": false,
"create_file": true,
"delete_path": false,
"diagnostics": true,
"edit_file": true,
"fetch": true,
"list_directory": true,
"move_path": false,
"now": true,
"find_path": true,
"read_file": true,
"grep": true,
"rename": false,
"symbol_info": true,
"terminal": true,
"thinking": true,
"web_search": true
},
"enable_all_context_servers": true,
"context_servers": {}
}
}
},
"agent": {
"default_model": { "default_model": {
"provider": "copilot_chat", "provider": "copilot_chat",
"model": "claude-3-5-sonnet" "model": "claude-3.7-sonnet"
}, },
"enable_experimental_live_diffs": true,
"version": "2" "version": "2"
}, },
"theme": "Gruvbox Dark Hard", "theme": "Gruvbox Dark Hard",
"buffer_font_size": 14.0, "buffer_font_size": 14.0,
"buffer_font_family": "Input", // "buffer_font_family": "Input",
// "buffer_font_family": "Input", // "buffer_font_family": "Input",
// "buffer_font_family": "FiraCode Nerd Font", // "buffer_font_family": "FiraCode Nerd Font",
// "buffer_font_family": "JetBrainsMono Nerd Font Mono", "buffer_font_family": "JetBrains Mono",
// "buffer_line_height": { "custom": 1.55 }, // "buffer_line_height": { "custom": 1.55 },
// "ui_font_family": "Noto Sans", // "ui_font_family": "Noto Sans",
// "buffer_font_family": "Zed Mono", // "buffer_font_family": "Zed Mono",
// "active_pane_magnification": 1.3, // "active_pane_magnification": 1.3,
"tab_bar": { "tab_bar": {
"show_nav_history_buttons": false "show_nav_history_buttons": false
@ -62,11 +124,9 @@
"enable_preview_from_file_finder": true, "enable_preview_from_file_finder": true,
"enable_preview_from_code_navigation": true "enable_preview_from_code_navigation": true
}, },
"message_editor": { "message_editor": {
"auto_replace_emoji_shortcode": true "auto_replace_emoji_shortcode": true
}, },
"terminal": { "terminal": {
"font_family": "FiraCode Nerd Font", "font_family": "FiraCode Nerd Font",
"font_size": 14 "font_size": 14
@ -83,7 +143,18 @@
}, },
"lsp": { "lsp": {
"rust-analyzer": { "rust-analyzer": {
"cargo": {
"features": "all"
},
"initialization_options": { "initialization_options": {
// "diagnostics": {
// "experimental": {
// "enable": true
// }
// },
// "cargo": {
// "features": "all"
// },
"typing": { "typing": {
// Temporary workaround around round rust-analzyer wrongly inserting `|` twice // Temporary workaround around round rust-analzyer wrongly inserting `|` twice
"excludeChars": "|<" "excludeChars": "|<"
@ -100,7 +171,6 @@
"panel.indent_guide": "#ffffff08", "panel.indent_guide": "#ffffff08",
"panel.indent_guide_active": "#ffffff11", "panel.indent_guide_active": "#ffffff11",
"panel.indent_guide_hover": "#ffffff13", "panel.indent_guide_hover": "#ffffff13",
"panel.background": "#282828", "panel.background": "#282828",
"tab_bar.background": "#282828", "tab_bar.background": "#282828",
// "border": "#3c3836", // "border": "#3c3836",

View file

@ -10,6 +10,7 @@ setopt SHARE_HISTORY
source "$ZDOTDIR/utils.zsh" source "$ZDOTDIR/utils.zsh"
if [ ! -f "$HISTFILE" ]; then if [ ! -f "$HISTFILE" ]; then
mkdir -p "$(dirname "$HISTFILE")" mkdir -p "$(dirname "$HISTFILE")"
touch "$HISTFILE" touch "$HISTFILE"
@ -157,6 +158,7 @@ export PATH="$HOME/.local/bin:$PATH"
export PATH="$HOME/.bun/bin:$PATH" export PATH="$HOME/.bun/bin:$PATH"
export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
if [ -s "$NVM_DIR/nvm.sh" ]; then if [ -s "$NVM_DIR/nvm.sh" ]; then
. "$NVM_DIR/nvm.sh" . "$NVM_DIR/nvm.sh"
@ -181,3 +183,12 @@ if [ -f '~/Downloads/google-cloud-sdk/completion.zsh.inc' ]; then . '~/Downloads
[[ -f '/Applications/Tailscale.app/Contents/MacOS/Tailscale' ]] && alias tailscale="/Applications/Tailscale.app/Contents/MacOS/Tailscale" [[ -f '/Applications/Tailscale.app/Contents/MacOS/Tailscale' ]] && alias tailscale="/Applications/Tailscale.app/Contents/MacOS/Tailscale"
command -v jless >/dev/null && alias yless="jless --yaml" command -v jless >/dev/null && alias yless="jless --yaml"
## SWITCH TO NU SHELL
# if [ "$(hostname)" = "crabbix" ]; then
# if command -v nu; then
# exec nu
# fi
# fi

View file

@ -44,6 +44,7 @@ export let eggs = #{
"profile": #{ enabled: device.linux, strategy: "merge", targets: "~" }, "profile": #{ enabled: device.linux, strategy: "merge", targets: "~" },
"starship": merge_into_home(true, []), "starship": merge_into_home(true, []),
"bat": #{ enabled: device.linux || device.macbook, strategy: "put", targets: "~/.config/bat", templates: ["config"]}, "bat": #{ enabled: device.linux || device.macbook, strategy: "put", targets: "~/.config/bat", templates: ["config"]},
"nushell": #{ enabled: device.linux, strategy: "put", targets: "~/.config/nushell" },
"sway": merge_into_home(device.desktop && device.linux, []), "sway": merge_into_home(device.desktop && device.linux, []),
"zed": #{ enabled: !device.windows, strategy: "put", targets: "~/.config/zed" }, "zed": #{ enabled: !device.windows, strategy: "put", targets: "~/.config/zed" },