From 4131d726d514baacd7947e1d3aba2c95b72b0c84 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 26 Nov 2024 08:53:05 +0100 Subject: [PATCH] feat: enable direnv tool and disable ollama service Enable direnv under the tools configuration with a commented-out git tool. Disable the ollama service, changing its enable flag from true to false. --- homes/x86_64-linux/harald@x1/default.nix | 1 - modules/nixos/tools/git/default.nix | 3 --- systems/x86_64-linux/x1/default.nix | 6 +++++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/homes/x86_64-linux/harald@x1/default.nix b/homes/x86_64-linux/harald@x1/default.nix index d2ed44e..4fd150c 100644 --- a/homes/x86_64-linux/harald@x1/default.nix +++ b/homes/x86_64-linux/harald@x1/default.nix @@ -17,7 +17,6 @@ }; tools = { git.enable = true; - direnv.enable = true; }; }; diff --git a/modules/nixos/tools/git/default.nix b/modules/nixos/tools/git/default.nix index 0eebdd5..e67fc65 100644 --- a/modules/nixos/tools/git/default.nix +++ b/modules/nixos/tools/git/default.nix @@ -46,9 +46,6 @@ in core = { whitespace = "trailing-space,space-before-tab"; }; - safe = { - directory = "${user.home}/git"; - }; "credential \"https://github.com\"" = { helper = "!gh auth git-credential"; }; diff --git a/systems/x86_64-linux/x1/default.nix b/systems/x86_64-linux/x1/default.nix index 9c753d7..419f97b 100644 --- a/systems/x86_64-linux/x1/default.nix +++ b/systems/x86_64-linux/x1/default.nix @@ -12,6 +12,10 @@ with lib.metacfg; podman.enable = true; secureboot.enable = true; homeprinter.enable = true; + tools = { + direnv.enable = true; + #git.enable = true; + }; user.extraGroups = [ "docker" "dialout" @@ -69,7 +73,7 @@ with lib.metacfg; ]; services.ollama = { - enable = true; + enable = false; acceleration = "rocm"; environmentVariables = { HSA_OVERRIDE_GFX_VERSION = "10.1.0";