diff --git a/home/apps/zed.nix b/home/apps/zed.nix index da9626c7..cd9e9741 100644 --- a/home/apps/zed.nix +++ b/home/apps/zed.nix @@ -3,25 +3,58 @@ lib, ... }: { - home.packages = with pkgs; [nixd nil sleek]; + home.packages = with pkgs; [ + nixd + nil + sleek + ]; + programs.television.enable = true; programs.zed-editor = { enable = true; - extensions = ["catppuccin" "toml" "json" "yaml" "markdown" "python" "javascript" "typescript"]; + extensions = [ + "catppuccin" + "toml" + "json" + "yaml" + "markdown" + "python" + "javascript" + "typescript" + ]; userKeymaps = [ { context = "Workspace"; bindings = { "ctrl-\\" = "workspace::ToggleBottomDock"; + "ctrl-shift-r" = "workspace::ToggleRightDock"; "ctrl-k" = "editor::GoToDefinition"; + "ctrl-n" = null; + "ctrl-p" = null; + "space f f" = [ + "task::Spawn" + { + task_name = "file_finder"; + reveal_target = "center"; + } + ]; + "space g g" = [ + "task::Spawn" + { + task_name = "live_grep"; + reveal_target = "center"; + } + ]; }; } { context = "Editor"; use_key_equivalents = true; bindings = { + "ctrl-shift-r" = "workspace::ToggleRightDock"; "ctrl-k" = "editor::GoToDefinition"; "ctrl-t" = "pane::GoBack"; "ctrl-l" = "editor::AcceptEditPrediction"; + "ctrl-\\" = "workspace::ToggleBottomDock"; }; } { @@ -37,11 +70,12 @@ edit_prediction_provider = "copilot"; }; agent = { - default_profile = "ask"; + default_profile = "write"; default_model = { provider = "copilot_chat"; - model = "o4-mini"; + model = "claude-sonnet-4"; }; + always_allow_tool_actions = true; }; vim_mode = true; relative_line_numbers = true; @@ -83,6 +117,33 @@ }; theme = "Catppuccin Mocha"; }; - extraPackages = with pkgs; [nixd nil sleek]; + userTasks = [ + { + label = "file_finder"; + command = "${lib.getExe pkgs.zed-editor} \"$(tv files)\""; + hide = "always"; + allow_concurrent_runs = true; + use_new_terminal = true; + } + { + label = "live_grep"; + command = "tv text | read -alz res; and ${lib.getExe pkgs.zed-editor} $res"; + hide = "always"; + allow_concurrent_runs = false; + use_new_terminal = false; + shell = { + with_arguments = { + program = "fish"; + args = ["--no-config"]; + }; + }; + } + ]; + extraPackages = with pkgs; [ + nixd + nil + sleek + television + ]; }; } diff --git a/home/apps/zen.nix b/home/apps/zen.nix index b93cf548..d48cb95d 100644 --- a/home/apps/zen.nix +++ b/home/apps/zen.nix @@ -20,6 +20,7 @@ i-dont-care-about-cookies keepa sponsorblock + floccus ]; }; nativeMessagingHosts = [pkgs.tridactyl-native]; diff --git a/nixos/mirai/services/gitea.nix b/nixos/mirai/services/gitea.nix index 58441e1c..ba6e80fb 100644 --- a/nixos/mirai/services/gitea.nix +++ b/nixos/mirai/services/gitea.nix @@ -2,12 +2,11 @@ lib, config, ... -}: -{ +}: { virtualisation.docker.enable = true; sops = { # secrets."gitea/registration".owner = config.systemd.services.gitea-actions-mirai.serviceConfig.User; - secrets."gitea/registration" = { }; + secrets."gitea/registration" = {}; templates = { "GITEA_REGISTRATION_TOKEN.env".content = '' TOKEN=${config.sops.placeholder."gitea/registration"} @@ -72,9 +71,6 @@ { domain = "git.darksailor.dev"; policy = "one_factor"; - resources = [ - "/user/settings" - ]; } ]; };