diff --git a/hosts/stardust/home.nix b/hosts/stardust/home.nix index ddff214..188b856 100644 --- a/hosts/stardust/home.nix +++ b/hosts/stardust/home.nix @@ -15,6 +15,7 @@ # programs browser = "brave"; editor = "vscodium"; + ranger.enable = true; yazi.enable = true; git.enable = true; art.enable = true; diff --git a/hosts/zenith/home.nix b/hosts/zenith/home.nix index 60e6c63..3c75937 100644 --- a/hosts/zenith/home.nix +++ b/hosts/zenith/home.nix @@ -13,8 +13,7 @@ # programs browser = "brave"; - editor = "zed"; - emacs.enable = true; + editor = "emacs"; vscodium.enable = true; yazi.enable = true; git.enable = true; diff --git a/modules/user/zed/default.nix b/modules/user/zed/default.nix index 56e8908..409115b 100644 --- a/modules/user/zed/default.nix +++ b/modules/user/zed/default.nix @@ -15,157 +15,6 @@ in { ]; stylix.targets.zed.enable = true; programs.zed-editor.enable = true; - programs.zed-editor.userSettings = { - cursor_blink = false; - session = { - restore_unsaved_buffers = false; - }; - restore_on_startup = "none"; - toolbar = { - code_actions = true; - agent_review = false; - breadcrumbs = true; - }; - minimap = { - max_width_columns = 80; - thumb = "always"; - show = "always"; - }; - search = { - regex = false; - }; - use_smartcase_search = true; - close_on_file_delete = true; - file_finder = { - modal_max_width = "large"; - }; - gutter = { - min_line_number_digits = 4; - }; - show_whitespaces = "trailing"; - tab_bar = { - show = false; - show_nav_history_buttons = false; - }; - use_system_prompts = false; - use_system_path_prompts = false; - auto_update = false; - telemetry = { - diagnostics = false; - metrics = false; - }; - tab_size = 2; - disable_ai = true; - agent = { - button = false; - model_parameters = []; - }; - git_panel = { - button = false; - }; - project_panel = { - starts_open = false; - }; - active_pane_modifiers = { - border_size = 0.0; - inactive_opacity = 1.0; - }; - bottom_dock_layout = "contained"; - title_bar = { - show_menus = false; - show_branch_icon = true; - }; - preview_tabs = { - enable_preview_from_file_finder = false; - }; - tabs = { - file_icons = true; - git_status = true; - show_close_button = "always"; - activate_on_close = "left_neighbour"; - }; - prettier = { - allowed = false; - }; - vim_mode = true; - base_keymap = "Emacs"; - icon_theme = "Zed (Default)"; - buffer_font_family = "FiraCode Nerd Font"; - buffer_font_size = 24.0; - ui_font_family = "Fira Sans"; - ui_font_size = 16.0; - }; - programs.zed-editor.userKeymaps = [ - { - context = ""; - bindings = { - "alt-x" = "command_palette::Toggle"; - }; - } - { - context = "VimControl || (!Editor && !menu && !Terminal)"; - bindings = { - "ctrl-x ctrl-s" = "workspace::Save"; - "ctrl-x ctrl-shift-s" = "workspace::SaveAll"; - "space w v" = "pane::SplitVertical"; - "space w V" = "pane::SplitVertical"; - "space w h" = "pane::SplitHorizontal"; - "space w H" = "pane::SplitHorizontal"; - "space p f" = "file_finder::Toggle"; - "space p p" = "projects::OpenRecent"; - "space g g" = [ - "task::Spawn" - { - "task_name" = "gitu"; - } - ]; - "space o d" = [ - "task::Spawn" - { - "task_name" = "yazi"; - } - ]; - "ctrl-h" = "workspace::ActivatePaneLeft"; - "ctrl-l" = "workspace::ActivatePaneRight"; - "ctrl-j" = "workspace::ActivatePaneDown"; - "ctrl-k" = "workspace::ActivatePaneUp"; - "space w d" = "pane::CloseActiveItem"; - "space b p" = "panel::PreviousPanelTab"; - "space b n" = "panel::NextPanelTab"; - "alt-z" = "terminal_panel::Toggle"; - }; - } - { - context = "Terminal"; - bindings = { - "alt-z" = "terminal_panel::Toggle"; - }; - } - { - "context" = "Editor && vim_mode == insert"; - "bindings" = {}; - } - ]; - programs.zed-editor.userTasks = [ - { - label = "gitu"; - command = "gitu || {git init && gitu}"; - reveal = "always"; - reveal_target = "center"; - allow_concurrent_runs = false; - use_new_terminal = false; - hide = "on_success"; - } - { - label = "yazi"; - command = "yazi"; - reveal = "always"; - reveal_target = "center"; - allow_concurrent_runs = false; - use_new_terminal = false; - hide = "on_success"; - } - ]; programs.zed-editor.extensions = [ "nix" "gdscript"