diff --git a/homes/odyssey.nix b/homes/odyssey.nix index be5c06e..0d9cf61 100644 --- a/homes/odyssey.nix +++ b/homes/odyssey.nix @@ -1,8 +1,4 @@ -{ - config, - ... -}: -{ +{ config, lib, pkgs, pkgs-unstable, ... }: { home = { username = "millironx"; homeDirectory = "/home/millironx"; @@ -16,9 +12,7 @@ }; }; services = { - gpg-agent = { - sshKeys = [ "F72C07DBA3DC0903C3ABB55E8B460803FEC22640" ]; - }; + gpg-agent = { sshKeys = [ "F72C07DBA3DC0903C3ABB55E8B460803FEC22640" ]; }; }; virtualisation.quadlet = { containers = { @@ -29,13 +23,9 @@ autoUpdate = "registry"; addHosts = [ "ollama.millironx.local:host-gateway" ]; publishPorts = [ "3001:3001" ]; - volumes = [ - "${config.xdg.dataHome}/anythingllm:/app/server/storage:Z" - "${config.xdg.dataHome}/anythingllm/.env:/app/server/.env:Z" - ]; - environments = { - STORAGE_DIR = "/app/server/storage"; - }; + volumes = + [ "${config.xdg.dataHome}/anythingllm:/app/server/storage:Z" ]; + environments = { STORAGE_DIR = "/app/server/storage"; }; }; }; diff --git a/programs/zed.nix b/programs/zed.nix index c3488e9..d2dba9e 100644 --- a/programs/zed.nix +++ b/programs/zed.nix @@ -7,8 +7,8 @@ "clean-vscode-icons" "caddyfile" "clojure" - "cspell" "dockerfile" + "earthfile" "git-firefly" "html" "julia" @@ -23,20 +23,15 @@ userSettings = { agent = { use_modifier_to_send = true; - sidebar_side = "right"; default_model = { provider = "zed.dev"; - model = "claude-sonnet-4-6"; - enable_thinking = true; - effort = "medium"; + model = "claude-sonnet-4-5"; }; - default_profile = "ask"; + default_profile = "minimal"; }; buffer_font_family = "FiraCode Nerd Font"; buffer_font_size = 11; - features = { - edit_prediction_provider = "zed"; - }; + features = { edit_prediction_provider = "zed"; }; git_hosting_providers = [ { provider = "forgejo"; @@ -54,58 +49,29 @@ tab_size = 2; formatter.external = { command = "${pkgs.caddy}/bin/caddy"; - arguments = [ - "fmt" - "-c" - "-" - ]; - }; - }; - Julia = { - formatter = { - external = { - command = "jlfmt"; - }; + arguments = [ "fmt" "-c" "-" ]; }; }; + Julia = { formatter = { external = { command = "jlfmt"; }; }; }; LaTeX = { formatter = { external = { - command = - let - latexindent = ( - pkgs.texlive.combine { - inherit (pkgs.texlive) scheme-minimal latexindent; - } - ); - in - "${latexindent}/bin/latexindent"; - arguments = [ - "-m" - "-tt" - "-l" - "-" - ]; + command = let + latexindent = (pkgs.texlive.combine { + inherit (pkgs.texlive) scheme-minimal latexindent; + }); + in "${latexindent}/bin/latexindent"; + arguments = [ "-m" "-tt" "-l" "-" ]; }; }; }; + Nix = { formatter.external.command = "${pkgs.nixfmt}/bin/nixfmt"; }; }; - language_models = - { - ollama = - let - serverName = if (hostname == "odyssey") then "localhost" else "odyssey"; - in - { - api_uri = "http://${serverName}:11434"; - }; - }; lsp = { - nil = { - settings.nix.flake.autoArchive = true; - }; + nil = { settings.nix.flake.autoArchive = true; }; nixd = { - settings.options.home-manager.expr = ''(builtins.getFlake (builtins.toString ~/.config/home-manager)).homeConfigurations."millironx@${hostname}".options''; + settings.options.home-manager.expr = '' + (builtins.getFlake (builtins.toString ~/.config/home-manager)).homeConfigurations."millironx@${hostname}".options''; }; texlab = { settings.texlab = { @@ -113,32 +79,18 @@ onSave = true; forwardSearchAfter = true; }; - forwardSearch = - if pkgs.stdenv.hostPlatform.isDarwin then - { - executable = "/Applications/Skim.app/Contents/SharedSupport/displayline"; - args = [ - "-r" - "-g" - "%l" - "%p" - "%f" - ]; - } - else - { - executable = "/usr/bin/okular"; - args = [ - "--unique" - "file:%p#src:%l%f" - ]; - }; + forwardSearch = if pkgs.stdenv.hostPlatform.isDarwin then { + executable = + "/Applications/Skim.app/Contents/SharedSupport/displayline"; + args = [ "-r" "-g" "%l" "%p" "%f" ]; + } else { + executable = "/usr/bin/okular"; + args = [ "--unique" "file:%p#src:%l%f" ]; + }; }; }; tinymist = { - initialization_options = { - preview.background.enabled = true; - }; + initialization_options = { preview.background.enabled = true; }; settings = { exportPdf = "onSave"; outputPath = "$root/$name"; @@ -146,15 +98,11 @@ }; }; }; - preview_tabs = { - enabled = false; - }; - ssh_connections = [ - { - host = "anderson"; - projects = [ { paths = [ "/var/docker" ]; } ]; - } - ]; + preview_tabs = { enabled = false; }; + ssh_connections = [{ + host = "anderson"; + projects = [{ paths = [ "/var/docker" ]; }]; + }]; show_edit_predictions = false; terminal = { font_family = "MesloLGS NF"; @@ -163,29 +111,21 @@ theme = "macOS Classic Dark"; icon_theme = "Clean VSCode Icon Theme"; ui_font_size = 16; - wrap_guides = [ - 80 - 92 - 120 - ]; + wrap_guides = [ 80 92 120 ]; }; userTasks = [ { label = "latexmk (project)"; command = "latexmk"; - args = [ - "-synctex=1" - "-pdf" - "-recorder" - ]; + args = [ "-synctex=1" "-pdf" "-recorder" ]; cwd = "$ZED_DIRNAME"; tags = [ "latex-build" ]; } { label = "Open Typst preview"; command = "${ - if pkgs.stdenv.hostPlatform.isDarwin then "open" else "xdg-open" - } http://127.0.0.1:23635/"; + if pkgs.stdenv.hostPlatform.isDarwin then "open" else "xdg-open" + } http://127.0.0.1:23635/"; use_new_terminal = true; allow_concurrent_runs = false; reveal = "never";