diff --git a/flake.nix b/flake.nix index dbea029..1b337b2 100644 --- a/flake.nix +++ b/flake.nix @@ -132,7 +132,6 @@ home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; home-manager.users.gunalx = import ./home/gunalx.nix; home-manager.backupFileExtension = "bac"; home-manager.extraSpecialArgs = { inherit nix-colors inputs; }; @@ -152,6 +151,14 @@ self.overlays.unstable niri.overlays.niri ]; + home-manager.users.gunalx = { + nixpkgs.config.allowUnfree = true; + nixpkgs.overlays = [ + self.overlays.custom + self.overlays.unstable + niri.overlays.niri + ]; + }; } sops-nix.nixosModules.sops @@ -175,7 +182,6 @@ home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; home-manager.users.gunalx = import ./home/gunalx.nix; home-manager.backupFileExtension = "bac"; home-manager.extraSpecialArgs = { inherit nix-colors inputs; }; @@ -195,13 +201,21 @@ self.overlays.unstable niri.overlays.niri ]; + home-manager.users.gunalx = { + nixpkgs.config.allowUnfree = true; + nixpkgs.overlays = [ + self.overlays.custom + self.overlays.unstable + niri.overlays.niri + ]; + }; } sops-nix.nixosModules.sops lanzaboote.nixosModules.lanzaboote - ]; + ]; }; # galadriel diff --git a/hosts/legolas/hardware-configuration.nix b/hosts/legolas/hardware-configuration.nix index ae18edd..b37f3f9 100644 --- a/hosts/legolas/hardware-configuration.nix +++ b/hosts/legolas/hardware-configuration.nix @@ -10,7 +10,7 @@ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; #boot.kernelPackages = pkgs.linuxPackages_zen; - boot.kernelPackages = pkgs.linuxPackages_6_19; + boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelParams = [ "mem_sleep_default=s2idle" diff --git a/modules/nix.nix b/modules/nix.nix index e6f48b2..f956c1d 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -50,34 +50,35 @@ hostName = "localhost"; system = "x86_64-linux"; maxJobs = 4; - speedFactor = 8000; + speedFactor = 2000; supportedFeatures = [ ]; mandatoryFeatures = [ ]; } { hostName = "aragon"; - #system = "x86_64-linux"; - # if the builder supports building for multiple architectures, - # replace the previous line by, e.g., systems = [ "x86_64-linux" "aarch64-linux" ]; maxJobs = 6; - speedFactor = 6001; + speedFactor = 6000; supportedFeatures = [ ]; mandatoryFeatures = [ ]; + sshUser = "root"; + sshKey = "/root/.ssh/nixos"; + protocol = "ssh"; } { hostName = "galadriel"; system = "x86_64-linux"; maxJobs = 4; - speedFactor = 4001; - #supportedFeatures = [ "cuda" ]; + speedFactor = 4000; supportedFeatures = [ ]; mandatoryFeatures = [ ]; + sshUser = "root"; + sshKey = "/root/.ssh/nixos"; + protocol = "ssh"; } - ]; distributedBuilds = true; }; diff --git a/modules/openssh.nix b/modules/openssh.nix index 29a77bc..20af68e 100644 --- a/modules/openssh.nix +++ b/modules/openssh.nix @@ -27,6 +27,17 @@ in #]; authorizedKeysCommand = "${sshLookup}"; }; + programs.ssh.extraConfig = '' + Host aragon + Port 6969 + ConnectTimeout 3 + Host galadriel + Port 6969 + ConnectTimeout 3 + Host localhost + ConnectTimeout 3 + ''; + services.endlessh-go = { enable = true; port = 22; diff --git a/modules/python-packages.nix b/modules/python-packages.nix index fa601c8..62098c5 100644 --- a/modules/python-packages.nix +++ b/modules/python-packages.nix @@ -40,8 +40,7 @@ ps: with ps; [ authlib litellm openai - langchain - langchain-community + pydantic pydantic-core docling-core diff --git a/packages/android-cli/default.nix b/packages/android-cli/default.nix index 1508d86..ef752db 100644 --- a/packages/android-cli/default.nix +++ b/packages/android-cli/default.nix @@ -17,7 +17,7 @@ let src = fetchurl { url = "https://dl.google.com/android/cli/latest/linux_x86_64/android"; - hash = "sha256-v5hgB+1OVyiWnoqpfXwicXOSBm/XRuDmnNOwFndQuM4="; + hash = "sha256-k119FKk+V4dfpknbqdx7AZUA4u1tw+MJuq+4qOPh83Q="; }; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/packages/llama-cpp-nightly/default.nix b/packages/llama-cpp-nightly/default.nix index 8535526..a7214b6 100644 --- a/packages/llama-cpp-nightly/default.nix +++ b/packages/llama-cpp-nightly/default.nix @@ -79,13 +79,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp-nightly"; - version = "8763"; + version = "8966"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-bDI7a7OMCbuZyaJX4o22fmQIyrGdzYkoIeVvxBYlnRI="; + hash = "sha256-3FuL0lyeQqwKE04QMx/0+pln2i0910L7TCDaoFjw7T8="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT diff --git a/packages/llama-swap/package.nix b/packages/llama-swap/package.nix index 52ea369..001c8bc 100644 --- a/packages/llama-swap/package.nix +++ b/packages/llama-swap/package.nix @@ -17,7 +17,7 @@ let in buildGoModule (finalAttrs: { pname = "llama-swap"; - version = "198"; + version = "208"; outputs = [ "out" @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { owner = "mostlygeek"; repo = "llama-swap"; tag = "v${finalAttrs.version}"; - hash = "sha256-7fZUKDCtj8RGca53CkLwVpvNWX6ryTbS02Uz/+uZpTs="; + hash = "sha256-E+BqqQcCLlW/DWvjwC66ClV6yuQ5x7cAMkLPJkS3x5M="; leaveDotGit = true; postFetch = '' cd "$out" diff --git a/packages/llama-swap/ui.nix b/packages/llama-swap/ui.nix index a701eac..bb4282e 100644 --- a/packages/llama-swap/ui.nix +++ b/packages/llama-swap/ui.nix @@ -13,7 +13,7 @@ buildNpmPackage (finalAttrs: { owner = "mostlygeek"; repo = "llama-swap"; tag = "v${finalAttrs.version}"; - hash = "sha256-FGrRwWgXTpH4h0MYCdMDagUskUZA+/s/dOjjkAigPQw="; + hash = "sha256-j7G2EkosqRGsQJB3XsdDZLvkubR/tQLKxX+FWykfuxk="; }; npmDepsHash = "sha256-gTDsuWPLCWsPltioziygFmSQFdLqjkZpmmVWIWoZwoc="; diff --git a/packages/s2cpp/default.nix b/packages/s2cpp/default.nix index cf922cf..537505d 100644 --- a/packages/s2cpp/default.nix +++ b/packages/s2cpp/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "s2cpp"; - version = "0-unstable-2025-04-05"; + version = "0-unstable-2026-04-12"; src = fetchFromGitHub { owner = "rodrigomatta"; repo = "s2.cpp"; - rev = "36a5fb058b740d8826f67d027bf46b3273fe4e3d"; - hash = "sha256-C8BSUWNRrZKdaKHniAbeObq9fChvFQZ5HXcvSzgNsIw="; + rev = "e48ce8e1c3ee23acbac97ce078b8faab0a2da43c"; + hash = "sha256-xlDYqimbqCBidkcmt5gIgMtYLw8gdR51qD3gFD0j7xE="; fetchSubmodules = true; };