diff options
| -rw-r--r-- | ghostty/config | 12 | ||||
| -rw-r--r-- | nvim/init.lua | 53 | ||||
| -rw-r--r-- | nvim/lazy-lock.json | 10 | ||||
| -rw-r--r-- | sioyek/keys_user.config | 11 | ||||
| -rw-r--r-- | sioyek/prefs_user.config | 3 | ||||
| -rw-r--r-- | tmux/tmux.conf | 5 | ||||
| -rw-r--r-- | zed/keymap.json | 12 | ||||
| -rw-r--r-- | zed/settings.json | 11 | ||||
| -rw-r--r-- | zsh/.zshrc | 3 |
9 files changed, 93 insertions, 27 deletions
diff --git a/ghostty/config b/ghostty/config index dfaddd8..efeeb09 100644 --- a/ghostty/config +++ b/ghostty/config @@ -1,12 +1,12 @@ -background=#000000 +background=#131313 font-size = 15 background-blur-radius = 20 mouse-hide-while-typing = true window-decoration = true macos-option-as-alt = true -background-opacity = 0.85 -background-blur-radius = 20 +background-opacity = 1 +background-blur-radius = 20 foreground = #FCFCFC keybind = cmd+shift+right=goto_split:right @@ -14,11 +14,6 @@ keybind = cmd+shift+left=goto_split:left keybind = cmd+shift+up=goto_split:up keybind = cmd+shift+down=goto_split:down -keybind = ctrl+shift+right=goto_split:right -keybind = ctrl+shift+left=goto_split:left -keybind = ctrl+shift+up=goto_split:up -keybind = ctrl+shift+down=goto_split:down - keybind = ctrl+shift+l=goto_split:right keybind = ctrl+shift+h=goto_split:left keybind = ctrl+shift+k=goto_split:up @@ -26,3 +21,4 @@ keybind = ctrl+shift+j=goto_split:down window-padding-balance = true split-divider-color = #444444 + diff --git a/nvim/init.lua b/nvim/init.lua index 1aca305..24e5b27 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,3 +1,7 @@ +-- disable netrw before plugins load +vim.g.loaded_netrw = 1 +vim.g.loaded_netrwPlugin = 1 + -- Plugins local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then @@ -14,14 +18,12 @@ require("lazy").setup({ 'nvim-telescope/telescope.nvim', dependencies = { 'nvim-lua/plenary.nvim', - { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' }, - { 'nvim-telescope/telescope-file-browser.nvim' }, + { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' }, }, keys = { { '<leader>ff', '<cmd>Telescope find_files<cr>' }, { '<leader>fg', '<cmd>Telescope live_grep<cr>' }, { '<leader>fb', '<cmd>Telescope buffers<cr>' }, - { '<leader>e', '<cmd>Telescope file_browser<cr>' }, }, }, { @@ -42,6 +44,51 @@ require("lazy").setup({ }, }, { + 'stevearc/oil.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + opts = { + default_file_explorer = true, + view_options = { show_hidden = true }, + keymaps = { + ['l'] = { 'actions.select', opts = {}, desc = 'Open file or directory' }, + ['h'] = { 'actions.parent', desc = 'Go to parent directory' }, + }, + }, + keys = { + { '-', '<cmd>Oil<cr>', desc = 'Open parent directory' }, + { '<leader>e', '<cmd>Oil<cr>', desc = 'Open file explorer' }, + }, + }, + { + "nvim-neorg/neorg", + lazy = false, + version = "*", + dependencies = { + "nvim-lua/plenary.nvim", + { + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + opts = {}, + }, + }, + config = function() + require("neorg").setup({ + load = { + ["core.defaults"] = {}, + ["core.concealer"] = {}, + ["core.dirman"] = { + config = { + workspaces = { + notes = "~/notes", + }, + default_workspace = "notes", + }, + }, + }, + }) + end, + }, + { "iamcco/markdown-preview.nvim", cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, build = "cd app && npm install", diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index b3fa85b..03666f4 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,6 +1,12 @@ { - "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" }, - "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, + "gitsigns.nvim": { "branch": "main", "commit": "0a80125bace82d82847d40bc2c38a22d62c6dc2d" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "nvim-dap": { "branch": "master", "commit": "a9d8cb68ee7184111dc66156c4a2ebabfbe01bc5" }, + "nvim-dap-ui": { "branch": "master", "commit": "f5b6673f374626515401c5bc51b005f784a4f252" }, + "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, + "nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" }, + "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" } diff --git a/sioyek/keys_user.config b/sioyek/keys_user.config index ff5bff6..3855c28 100644 --- a/sioyek/keys_user.config +++ b/sioyek/keys_user.config @@ -1,15 +1,18 @@ -# Vim-style scrolling +# Vim-style half-page scrolling screen_down <C-d> screen_up <C-u> -goto_beginning gg -goto_end G +prev_state <C-o> toggle_titlebar <C-w> +next_state <C-i> zoom_in J zoom_out K + +# Toggle dark mode with 'i' (for "invert") toggle_dark_mode i toggle_custom_color c reload_config r helper_window -fit_to_page_width s
\ No newline at end of file + +fit_to_page_width s diff --git a/sioyek/prefs_user.config b/sioyek/prefs_user.config index 8c623f2..410129c 100644 --- a/sioyek/prefs_user.config +++ b/sioyek/prefs_user.config @@ -20,7 +20,7 @@ wheel_zoom_on_cursor 1 # ----- Behavior ----- should_load_tutorial_when_no_other_file 0 -should_launch_new_window 1 +should_launch_new_window 1 should_use_multiple_monitors 0 should_draw_unrendered_pages 1 check_for_updates_on_startup 0 @@ -33,3 +33,4 @@ search_url_d https://duckduckgo.com/?q= middle_click_search_engine g shift_middle_click_search_engine d + diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 28a99cc..7409ac4 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -31,7 +31,6 @@ set -g pane-active-border-style "fg=#fcfcfc" unbind C-b set -g prefix C-a bind C-a send-prefix -bind d detach-client set -g status-interval 5 set -sg escape-time 10 @@ -52,3 +51,7 @@ bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-no-clear "pbcopy" # Prevent click from passing through to terminal (causes jump-to-bottom) bind -T copy-mode MouseDown1Pane select-pane bind -T copy-mode-vi MouseDown1Pane select-pane + + + + diff --git a/zed/keymap.json b/zed/keymap.json index 801a55d..ec685eb 100644 --- a/zed/keymap.json +++ b/zed/keymap.json @@ -10,27 +10,25 @@ "context": "Workspace", "bindings": { "\\ f f": "file_finder::Toggle", - "\\ f g": "workspace::NewSearch", - "\\ f b": "tab_switcher::Toggle", - "\\ f e": "project_panel::ToggleFocus", + "\\ g": "workspace::NewSearch", + "\\ b": "tab_switcher::Toggle", + "\\ e": "project_panel::ToggleFocus", + "\\ a": "agent::ToggleFocus", }, }, { "context": "Editor && vim_mode == normal", "bindings": { - "\\ d": "editor::Delete", - "g d": "editor::GoToDefinition", "g D": "editor::GoToDeclaration", "g r": "editor::FindAllReferences", "g i": "editor::GoToImplementation", - "k": "editor::Hover", + "K": "editor::Hover", "ctrl-k": "editor::ShowSignatureHelp", "\\ c a": "editor::ToggleCodeActions", "\\ r n": "editor::Rename", - "\\ f m": "editor::Format", "\\ w": "workspace::Save", diff --git a/zed/settings.json b/zed/settings.json index 8257fa9..84ddb61 100644 --- a/zed/settings.json +++ b/zed/settings.json @@ -1,4 +1,13 @@ { + "which_key": { + "delay_ms": 1000, + }, + "autosave": "on_focus_change", + "agent_servers": { + "claude-acp": { + "type": "registry", + }, + }, "show_edit_predictions": false, "icon_theme": "Zed (Default)", "vim_mode": true, @@ -9,7 +18,7 @@ "theme": { "mode": "dark", "light": "Ayu Light", - "dark": "Ayu Dark", + "dark": "macOS Classic Dark", }, "relative_line_numbers": "enabled", @@ -1,6 +1,9 @@ eval "$(/opt/homebrew/bin/brew shellenv)" alias python=python3 alias ls='ls -lah' +alias vim=nvim +alias ta='tmux attach' +alias td='tmux detach' # bun completions [ -s "/Users/yousefjan/.bun/_bun" ] && source "/Users/yousefjan/.bun/_bun" |