Compare commits

...

3 Commits

Author SHA1 Message Date
339fa4f166 add neovim config for vscode 2025-10-07 21:17:02 +01:00
97c24b2ccd add ghostty themes 2025-09-25 22:33:44 +01:00
1951f2c0ac add zed config 2025-09-25 22:28:48 +01:00
7 changed files with 163 additions and 4 deletions

View File

@@ -2,6 +2,6 @@ shell-integration = zsh
font-family = SF Mono
font-size = 14
font-thicken = true
theme = dark:catppuccin-macchiato,light:catppuccin-latte
theme = dark:catppuccin-mocha.conf,light:catppuccin-latte.conf
window-padding-x = 16

View File

@@ -0,0 +1,22 @@
palette = 0=#5c5f77
palette = 1=#d20f39
palette = 2=#40a02b
palette = 3=#df8e1d
palette = 4=#1e66f5
palette = 5=#ea76cb
palette = 6=#179299
palette = 7=#acb0be
palette = 8=#6c6f85
palette = 9=#d20f39
palette = 10=#40a02b
palette = 11=#df8e1d
palette = 12=#1e66f5
palette = 13=#ea76cb
palette = 14=#179299
palette = 15=#bcc0cc
background = eff1f5
foreground = 4c4f69
cursor-color = dc8a78
cursor-text = eff1f5
selection-background = d8dae1
selection-foreground = 4c4f69

View File

@@ -0,0 +1,22 @@
palette = 0=#45475a
palette = 1=#f38ba8
palette = 2=#a6e3a1
palette = 3=#f9e2af
palette = 4=#89b4fa
palette = 5=#f5c2e7
palette = 6=#94e2d5
palette = 7=#a6adc8
palette = 8=#585b70
palette = 9=#f38ba8
palette = 10=#a6e3a1
palette = 11=#f9e2af
palette = 12=#89b4fa
palette = 13=#f5c2e7
palette = 14=#94e2d5
palette = 15=#bac2de
background = 1e1e2e
foreground = cdd6f4
cursor-color = f5e0dc
cursor-text = 11111b
selection-background = 353749
selection-foreground = cdd6f4

View File

@@ -21,6 +21,10 @@ if [ ! -d "$HOME/.config/nvim" ]; then
ln -s "$HOME/dotfiles/nvim" "$HOME/.config/nvim" || :
fi
if [ ! -d "$HOME/.config/zed/settings.json" ]; then
ln -s "$HOME/dotfiles/zed/settings.json" "$HOME/.config/zed/settings.json" || :
fi
# install starship config
ln -s "$HOME/dotfiles/starship.toml" "$HOME/.config/starship.toml" || :

View File

@@ -11,7 +11,11 @@ function init_lazy_nvim()
})
end
vim.opt.rtp:prepend(lazypath)
require("lazy").setup(PLUGINS, opts)
require("lazy").setup(PLUGINS, {
defaults = {
cond = vim.g.vscode,
},
})
end
function define_keymaps()
@@ -69,6 +73,27 @@ function define_keymaps()
vim.keymap.set("n", "<space>u", builtin.lsp_references, {})
end
function define_vscode_keymaps()
local vscode = require("vscode")
local function action(command)
return function()
vscode.action(command)
end
end
vim.api.nvim_set_keymap("n", "J", "10j", { noremap = true, silent = true })
vim.keymap.set("n", "<space>e", action("editor.action.showHover"))
vim.keymap.set("n", "<space>d", action("editor.action.revealDefinition"))
vim.keymap.set("n", "<space>F", action("workbench.action.quickOpen"))
vim.keymap.set("n", "<space>f", action("workbench.view.explorer"))
vim.keymap.set("n", "<space>r", action("editor.action.rename"))
vim.keymap.set("n", "<space>g", action("workbench.action.findInFiles"))
vim.keymap.set("n", "[d", action("editor.action.marker.prevInFiles"))
vim.keymap.set("n", "]d", action("editor.action.marker.nextInFiles"))
vim.keymap.set("n", "<Esc>", action("workbench.action.closeSidebar"))
end
function setup_plugins()
require("nvim-treesitter.configs").setup({
-- A list of parser names, or "all" (the five listed parsers should always be installed)
@@ -598,6 +623,7 @@ PLUGINS = {
"windwp/nvim-autopairs",
event = "InsertEnter",
config = true,
cond = vim.g.vscode,
},
{ "windwp/nvim-ts-autotag" },
{
@@ -610,7 +636,12 @@ PLUGINS = {
init_lazy_nvim()
setup_plugins()
define_keymaps()
config_vim()
if vim.g.vscode then
define_vscode_keymaps()
else
define_keymaps()
end
vim.cmd("source ~/dotfiles/nvim/macmap.vim")

View File

@@ -3,7 +3,7 @@
query=$(defaults read -g AppleInterfaceStyle | xargs)
if [ "$query" = "Dark" ]; then
sketchybar --bar color=0xff313244 \
sketchybar --bar color=0x00000000 \
--set '/.*/' icon.color=0xffffffff label.color=0xffffffff
else
sketchybar --bar color=0x00000000 \

80
zed/settings.json Normal file
View File

@@ -0,0 +1,80 @@
// Zed settings
//
// For information on how to configure Zed, see the Zed
// documentation: https://zed.dev/docs/configuring-zed
//
// To see all of Zed's default settings without changing your
// custom settings, run `zed: open default settings` from the
// command palette (cmd-shift-p / ctrl-shift-p)
{
"ssh_connections": [
{
"host": "0199809d-3add-7188-ad6d-345995ee7324.gitpod.environment",
"port_forwards": [{ "local_port": 5173, "remote_port": 5173 }],
"projects": [
{
"paths": ["/workspace/gitpod-next"]
}
]
},
{
"host": "01995d42-f1cc-70e4-bf46-f223126298f7.gitpod.environment",
"port_forwards": [{ "local_port": 5173, "remote_port": 5173 }],
"projects": [
{
"paths": ["/workspace/gitpod-next/./"]
}
]
}
],
"vim_mode": true,
"icon_theme": {
"mode": "system",
"light": "Zed (Default)",
"dark": "Zed (Default)"
},
"base_keymap": "VSCode",
"buffer_font_family": "SF Mono",
"buffer_line_height": "standard",
"ui_font_size": 15,
"ui_font_family": "SF Mono",
"relative_line_numbers": true,
"buffer_font_size": 15,
"theme": {
"mode": "system",
"light": "Catppuccin Latte",
"dark": "Ayu Dark"
},
"tabs": {
"file_icons": true
},
"centered_layout": {
"left_padding": 0.3,
"right_padding": 0.3
},
"soft_wrap": "editor_width",
"profiles": {
"zen": {
"tab_bar": {
"show_nav_history_buttons": false
},
"toolbar": {
"breadcrumbs": false,
"quick_actions": false
},
"gutter": {
"breakpoints": false,
"runnables": false,
"min_line_number_digits": 0
},
"scrollbar": {
"show": "never",
"cursors": false
},
"centered_layout": {
"left_padding": 0.3,
"right_padding": 0.3
}
}
}
}