From d533653e97c4ec93f561f5c321fcc64dda5e32a1 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 22 Sep 2024 01:44:54 -0400 Subject: [PATCH] desktop stuff --- nix/etcnixos/common.nix | 5 +++- nix/etcnixos/flake.lock | 8 +++--- nix/etcnixos/flake.nix | 3 +-- nix/etcnixos/networking.nix | 2 ++ nix/etcnixos/system-nixos.nix | 20 +++++++++++++++ nix/home-manager/flake.lock | 14 +++++------ nix/home-manager/flake.nix | 3 +-- nix/home-manager/progs/gpt4all/gpt4all.nix | 29 ++++++++++++++++++++-- 8 files changed, 66 insertions(+), 18 deletions(-) diff --git a/nix/etcnixos/common.nix b/nix/etcnixos/common.nix index 030e787..799f352 100644 --- a/nix/etcnixos/common.nix +++ b/nix/etcnixos/common.nix @@ -31,7 +31,10 @@ #kernel options boot = { - kernelPackages = pkgs.linuxPackages_cachyos-lto; + # kernelPackages = pkgs.linuxPackages_cachyos-lto; + kernelPackages = pkgs.linuxPackages_6_10; + + supportedFilesystems = [ "zfs" ]; kernel.sysctl = { #for profiling diff --git a/nix/etcnixos/flake.lock b/nix/etcnixos/flake.lock index cb51acf..63ae9fd 100644 --- a/nix/etcnixos/flake.lock +++ b/nix/etcnixos/flake.lock @@ -332,16 +332,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726953717, - "narHash": "sha256-FwwoaRi8tatStzCkz7Wrdyv0XI+xKqPPc0iru1oNQCk=", + "lastModified": 1726755586, + "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b1b7d7f3c5d3f898ca9646593cdeb378a655b446", + "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "master", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/nix/etcnixos/flake.nix b/nix/etcnixos/flake.nix index b2c9c69..5a96564 100644 --- a/nix/etcnixos/flake.nix +++ b/nix/etcnixos/flake.nix @@ -2,8 +2,7 @@ description = "A simple NixOS flake"; inputs = { - # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs.url = "github:NixOS/nixpkgs/master"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; lanzaboote = { url = "github:nix-community/lanzaboote"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nix/etcnixos/networking.nix b/nix/etcnixos/networking.nix index 5e24f3f..f660e51 100644 --- a/nix/etcnixos/networking.nix +++ b/nix/etcnixos/networking.nix @@ -2,6 +2,8 @@ { hostName = "${hostname}"; + hostId = "cfe0ff46"; + networkmanager = { enable = true; insertNameservers = [ diff --git a/nix/etcnixos/system-nixos.nix b/nix/etcnixos/system-nixos.nix index 00ab1a7..2b115a9 100644 --- a/nix/etcnixos/system-nixos.nix +++ b/nix/etcnixos/system-nixos.nix @@ -99,6 +99,26 @@ localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers }; + services.ollama = { + enable = true; + acceleration = "rocm"; + environmentVariables = { + HCC_AMDGPU_TARGET = "gfx1031"; # used to be necessary, but doesn't seem to anymore + }; + rocmOverrideGfx = "10.3.1"; + }; + + services.open-webui = { + enable = true; + openFirewall = true; + port = 8082; + environment = { + # Disable authentication + WEBUI_AUTH = "False"; + PYDANTIC_SKIP_VALIDATING_CORE_SCHEMAS = "True"; + }; + }; + systemd.packages = with pkgs; [ lact ]; systemd.services.lactd.wantedBy = [ "multi-user.target" ]; diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index 6147557..c58f8df 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -201,16 +201,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726953717, - "narHash": "sha256-FwwoaRi8tatStzCkz7Wrdyv0XI+xKqPPc0iru1oNQCk=", + "lastModified": 1726755586, + "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b1b7d7f3c5d3f898ca9646593cdeb378a655b446", + "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "master", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1726885519, - "narHash": "sha256-wrXknshJMRLv91KQD5d7ovUqJ70FlDM7XeG/upSsKgM=", + "lastModified": 1726972233, + "narHash": "sha256-FlL/bNESOtDQoczRhmPfReNAmLqVg+dAX4HectPOOf0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a66e16cb21e4428224925dbf1b66238c727dda0a", + "rev": "36d73192555e569d27579f6c486fea3ab768823c", "type": "github" }, "original": { diff --git a/nix/home-manager/flake.nix b/nix/home-manager/flake.nix index 83002d1..22e3238 100644 --- a/nix/home-manager/flake.nix +++ b/nix/home-manager/flake.nix @@ -2,8 +2,7 @@ description = "My nixOS flake for home-manager"; inputs = { - # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs.url = "github:NixOS/nixpkgs/master"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/nix/home-manager/progs/gpt4all/gpt4all.nix b/nix/home-manager/progs/gpt4all/gpt4all.nix index 7557f60..bdd45e8 100644 --- a/nix/home-manager/progs/gpt4all/gpt4all.nix +++ b/nix/home-manager/progs/gpt4all/gpt4all.nix @@ -48,7 +48,7 @@ in { home.packages = with pkgs; [ (optimizeWithFlags - (gpt4all.overrideAttrs { + (gpt4all.overrideAttrs (old: { src = fetchFromGitHub { fetchSubmodules = true; owner = "nomic-ai"; @@ -61,7 +61,32 @@ in ./gpt4all-HEAD-embeddings-model.patch ./gpt4all-HEAD-disable-settings-err.patch ]; - }) + + cmakeFlags = [ + "-DKOMPUTE_OPT_BUILD_SHADERS=ON" + "-DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON" + "-DKOMPUTE_OPT_USE_BUILT_IN_FMT=OFF" + "-DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=OFF" + "-DKOMPUTE_OPT_USE_BUILT_IN_SPDLOG=OFF" + "-DLLMODEL_KOMPUTE=ON" + "-DLLMODEL_VULKAN=OFF" + "-DLLMODEL_CUDA=OFF" + "-DLLMODEL_ROCM=OFF" + ]; + + nativeBuildInputs = old.nativeBuildInputs ++ [ + glslang + ]; + + buildInputs = old.buildInputs ++ [ + vulkan-tools + kdePackages.qtshadertools + libdrm + vulkan-loader + ocl-icd + ]; + + })) # compile flags [ "-Ofast"