diff --git a/configurations/home-manager/leyla/firefox.nix b/configurations/home-manager/leyla/firefox.nix index 4f8c624..2781fe4 100644 --- a/configurations/home-manager/leyla/firefox.nix +++ b/configurations/home-manager/leyla/firefox.nix @@ -123,7 +123,7 @@ "browser.bookmarks.addedImportButton" = true; "browser.newtabpage.activity-stream.feeds.section.topstories" = false; - # Usage Experience + # Usage Experiance "browser.startup.homepage" = "about:home"; "browser.download.useDownloadDir" = false; "browser.uiCustomization.state" = builtins.toJSON { diff --git a/configurations/home-manager/leyla/vscode/default.nix b/configurations/home-manager/leyla/vscode/default.nix index 1108f2f..e123149 100644 --- a/configurations/home-manager/leyla/vscode/default.nix +++ b/configurations/home-manager/leyla/vscode/default.nix @@ -65,58 +65,58 @@ in { # builtins.elemAt osConfig.services.ollama.loadModels 0; }) ]; - - extensions = ( - with open-vsx; - [ - # vs code feel extensions - ms-vscode.atom-keybindings - akamud.vscode-theme-onedark - streetsidesoftware.code-spell-checker - streetsidesoftware.code-spell-checker-german - streetsidesoftware.code-spell-checker-italian - jeanp413.open-remote-ssh - - # html extensions - formulahendry.auto-rename-tag - ms-vscode.live-server - - # js extensions - dsznajder.es7-react-js-snippets - dbaeumer.vscode-eslint - standard.vscode-standard - firsttris.vscode-jest-runner - stylelint.vscode-stylelint - tauri-apps.tauri-vscode - - # go extensions - golang.go - - # astro blog extensions - astro-build.astro-vscode - unifiedjs.vscode-mdx - - # misc extensions - tamasfe.even-better-toml - ] - ++ (lib.lists.optionals nix-development-enabled [ - # nix extensions - pinage404.nix-extension-pack - jnoortheen.nix-ide - kamadorueda.alejandra - ]) - ++ ( - with vscode-marketplace; - [ - # js extensions - karyfoundation.nearley - ] - ++ (lib.lists.optionals ai-tooling-enabled [ - continue.continue - ]) - ) - ); }; + + extensions = ( + with open-vsx; + [ + # vs code feel extensions + ms-vscode.atom-keybindings + akamud.vscode-theme-onedark + streetsidesoftware.code-spell-checker + streetsidesoftware.code-spell-checker-german + streetsidesoftware.code-spell-checker-italian + jeanp413.open-remote-ssh + + # html extensions + formulahendry.auto-rename-tag + ms-vscode.live-server + + # js extensions + dsznajder.es7-react-js-snippets + dbaeumer.vscode-eslint + standard.vscode-standard + firsttris.vscode-jest-runner + stylelint.vscode-stylelint + tauri-apps.tauri-vscode + + # go extensions + golang.go + + # astro blog extensions + astro-build.astro-vscode + unifiedjs.vscode-mdx + + # misc extensions + tamasfe.even-better-toml + ] + ++ (lib.lists.optionals nix-development-enabled [ + # nix extensions + pinage404.nix-extension-pack + jnoortheen.nix-ide + kamadorueda.alejandra + ]) + ++ ( + with vscode-marketplace; + [ + # js extensions + karyfoundation.nearley + ] + ++ (lib.lists.optionals ai-tooling-enabled [ + continue.continue + ]) + ) + ); }; }; } diff --git a/configurations/home-manager/leyla/vscode/user-words.nix b/configurations/home-manager/leyla/vscode/user-words.nix index b581118..4444c30 100644 --- a/configurations/home-manager/leyla/vscode/user-words.nix +++ b/configurations/home-manager/leyla/vscode/user-words.nix @@ -1,6 +1,4 @@ [ "leyla" "webdav" - "ollama" - "optimise" ] diff --git a/configurations/nixos/defiant/configuration.nix b/configurations/nixos/defiant/configuration.nix index 59ad2c9..8e1eab8 100644 --- a/configurations/nixos/defiant/configuration.nix +++ b/configurations/nixos/defiant/configuration.nix @@ -201,28 +201,13 @@ }; ollama = { - enable = true; - exposePort = true; + enable = false; loadModels = [ - # conversation models - "llama3.1:8b" + "deepseek-coder:6.7b" "deepseek-r1:8b" "deepseek-r1:32b" "deepseek-r1:70b" - - # auto complete models - "qwen2.5-coder:1.5b-base" - "qwen2.5-coder:7b" - "deepseek-coder:6.7b" - "deepseek-coder:33b" - - # agent models - "qwen3:8b" - "qwen3:32b" - - # embedding models - "nomic-embed-text:latest" ]; }; tailscale = { diff --git a/configurations/nixos/twilight/configuration.nix b/configurations/nixos/twilight/configuration.nix index 12d9151..f851b08 100644 --- a/configurations/nixos/twilight/configuration.nix +++ b/configurations/nixos/twilight/configuration.nix @@ -30,65 +30,8 @@ graphicsAcceleration.enable = true; directAccess.enable = true; }; - ai = { - enable = true; - # TODO: benchmark twilight against defiant and prune this list of models that are faster on defiant - models = { - # conversation models - "lamma3.1:8b" = { - model = "lamma3.1:8b"; - # TODO: figure out what should be in this array - # roles = [""]; - }; - "deepseek-r1:8b" = { - model = "deepseek-r1:8b"; - # TODO: figure out what should be in this array - # roles = [""]; - }; - "deepseek-r1:32b" = { - model = "deepseek-r1:32b"; - # TODO: figure out what should be in this array - # roles = [""]; - }; - - # auto complete models - "qwen2.5-coder:1.5b-base" = { - model = "qwen2.5-coder:1.5b-base"; - # TODO: figure out what should be in this array - # roles = [""]; - }; - "qwen2.5-coder:7b" = { - model = "qwen2.5-coder:7b"; - # TODO: figure out what should be in this array - # roles = [""]; - }; - "deepseek-coder:6.7b" = { - model = "deepseek-coder:6.7b"; - # TODO: figure out what should be in this array - # roles = [""]; - }; - "deepseek-coder:33b" = { - model = "deepseek-coder:33b"; - # TODO: figure out what should be in this array - # roles = [""]; - }; - - # agent models - "qwen3:32b" = { - model = "qwen3:32b"; - # TODO: figure out what should be in this array - # roles = [""]; - }; - - # embedding models - "nomic-embed-text:latest" = { - model = "nomic-embed-text:latest"; - # TODO: figure out what should be in this array - # roles = [""]; - }; - }; - }; }; + services = { ollama = { enable = true; diff --git a/modules/nixos-modules/continue.nix b/modules/nixos-modules/continue.nix deleted file mode 100644 index 73ff4db..0000000 --- a/modules/nixos-modules/continue.nix +++ /dev/null @@ -1,44 +0,0 @@ -{lib, ...}: { - options.host = { - ai = { - enable = lib.mkEnableOption "should we use AI on this machine"; - models = lib.mkOption { - type = lib.types.attrsOf (lib.types.submodule ({name, ...}: { - option = { - name = lib.mkOption { - type = lib.types.str; - default = name; - }; - model = { - type = lib.types.str; - }; - provider = { - type = lib.types.str; - default = "ollama"; - }; - apiBase = { - type = lib.types.str; - default = null; - }; - roles = { - type = lib.types.listOf lib.types.enumOf [ - "chat" - "autocomplete" - "embed" - "rerank" - "edit" - "apply" - "summarize" - ]; - }; - }; - })); - }; - }; - }; - - config = { - # TODO: configure ollama to download any modules listed in options.host.ai.models.{name}.model if options.host.ai.models.{name}.apiBase is null - # TODO: if we have any models that have a non null options.host.ai.models.{name}.apiBase then set services.ollama.enable to a lib.mkAfter true - }; -} diff --git a/modules/nixos-modules/default.nix b/modules/nixos-modules/default.nix index 67c75ce..fdbdc7e 100644 --- a/modules/nixos-modules/default.nix +++ b/modules/nixos-modules/default.nix @@ -12,7 +12,6 @@ ./impermanence.nix ./disko.nix ./ollama.nix - ./continue.nix ./tailscale.nix ./server ]; diff --git a/modules/nixos-modules/ollama.nix b/modules/nixos-modules/ollama.nix index 6b1d5bb..5cdc041 100644 --- a/modules/nixos-modules/ollama.nix +++ b/modules/nixos-modules/ollama.nix @@ -3,10 +3,6 @@ lib, ... }: { - options = { - services.ollama.exposePort = lib.mkEnableOption "should we expose ollama on tailscale"; - }; - config = lib.mkMerge [ { services.ollama = { @@ -26,15 +22,6 @@ } ]; }; - networking.firewall.interfaces.${config.services.tailscale.interfaceName} = let - ports = [ - config.services.ollama.port - ]; - in - lib.mkIf config.services.ollama.exposePort { - allowedTCPPorts = ports; - allowedUDPPorts = ports; - }; })) ]; }