diff --git a/flake.lock b/flake.lock index 2b2c0c23..91773710 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1721074762, - "narHash": "sha256-RhqFBMLh6G5vAo7Jz9mdsworI50E4FAAg7rPho4CNfY=", + "lastModified": 1718921313, + "narHash": "sha256-TFJah1RW5qnYW7kajjAFPAS5j/0q0R3vz9zPjrRA0Mc=", "owner": "Aylur", "repo": "ags", - "rev": "8194f0c9546a150525a2022c17aed51df1464b80", + "rev": "646d5ad073ff7f8b1d50cfbd40f5b8a250fcd59d", "type": "github" }, "original": { @@ -346,11 +346,11 @@ ] }, "locked": { - "lastModified": 1721135958, - "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", + "lastModified": 1720734513, + "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", + "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "type": "github" }, "original": { @@ -451,11 +451,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1721150952, - "narHash": "sha256-LRuNRlV1JelXkufntUbaVDpI+CEOgHAnI+MTToOT9Hk=", + "lastModified": 1721059467, + "narHash": "sha256-0Yx4eXowxw5TATf92DZu2qKbBYXPxYh849h9tL/TQR0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4830e090c333af770f3edf2aa4d5a2b183f6455e", + "rev": "be45415f0f321f030f8c76723fd15d4b0f3a02fb", "type": "github" }, "original": { @@ -499,11 +499,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1721080040, - "narHash": "sha256-USDsS90/88RJibP3gEcH1AaVt+JpnX4XCUD9bAJP5I4=", + "lastModified": 1721016451, + "narHash": "sha256-Cypl9ORr5UjtBsbjXMTJRepTe362yNVrPrntUvHiTaw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2c1f10bfbb3f617ea8e8669ac13f3f56ceb2ea2", + "rev": "a14c5d651cee9ed70f9cd9e83f323f1e531002db", "type": "github" }, "original": { diff --git a/hosts/lilith-pc/default.nix b/hosts/lilith-pc/default.nix index 5d8a67f4..cf48e93e 100644 --- a/hosts/lilith-pc/default.nix +++ b/hosts/lilith-pc/default.nix @@ -4,8 +4,6 @@ extraConfig = { config.gaming.enable = true; - config.ollama.enable = true; - config.hyprlandOverrides = { settings = { input = { diff --git a/system/env.nix b/system/env.nix index c630d856..957336d9 100644 --- a/system/env.nix +++ b/system/env.nix @@ -2,7 +2,7 @@ environment.variables = { EDITOR = "hx"; VISUAL = "hx"; - FLAKE = "${conf.home}/nixos"; + FLAKE = conf.home + /nixos; ELECTRON_OZONE_PLATFORM_HINT = "auto"; }; } diff --git a/system/full.nix b/system/full.nix index ff59c43a..633bd9f5 100644 --- a/system/full.nix +++ b/system/full.nix @@ -1,4 +1,4 @@ -{lib, config, conf, ...}: { +{lib, config, ...}: { imports = [ ./audio.nix ./env.nix @@ -18,8 +18,5 @@ ./syncthing.nix ./wayland.nix ./zsh.nix - - - ./ollama.nix ]; } diff --git a/system/ollama.nix b/system/ollama.nix deleted file mode 100644 index 52f29ae2..00000000 --- a/system/ollama.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ options, lib, ...}: { - options = lib.mkIf options.ollama.enable { - services.ollama = { - enable = true; - acceleration = "rocm"; - }; - }; -} diff --git a/system/options.nix b/system/options.nix index c9d3d518..88ce587b 100644 --- a/system/options.nix +++ b/system/options.nix @@ -1,7 +1,6 @@ {lib, ...}: { options.gaming.enable = lib.mkEnableOption "Enable gaming"; - - options.ollama.enable = lib.mkEnableOption "Install Ollama for local LLMs"; + config.gaming.enable = lib.mkDefault false; options.hyprlandOverrides = lib.mkOption { # type = lib.types.attributeSet;