++++++
This commit is contained in:
4
system-modules/auto-mount.nix
Normal file
4
system-modules/auto-mount.nix
Normal file
@@ -0,0 +1,4 @@
|
||||
{ ... }:
|
||||
{
|
||||
services.udisks2.enable = true;
|
||||
}
|
||||
@@ -4,12 +4,9 @@
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
environment.systemPackages = if host == "NxNORTH" then with pkgs; [
|
||||
environment.systemPackages = with pkgs; [
|
||||
ntfs3g
|
||||
btrfs-progs
|
||||
] else if host == "NxXPS" then with pkgs; [
|
||||
ntfs3g
|
||||
] else [];
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||
# boot.initrd.kernelModules = [ ];
|
||||
@@ -19,7 +16,7 @@
|
||||
fileSystems = if host != "NxACE" then {
|
||||
"/" = { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; };
|
||||
"/boot" = { device = "/dev/disk/by-label/EFI"; fsType = "vfat"; };
|
||||
"/home/${user}/shared" = { device = "/dev/disk/by-label/shared"; fsType = if host == "NxXPS" then "ntfs" else "btrfs"; };
|
||||
"/home/${user}/shared" = { device = "/dev/disk/by-label/shared"; fsType = "ntfs"; };
|
||||
} else {
|
||||
"/" = { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; };
|
||||
"/boot" = { device = "/dev/disk/by-label/EFI"; fsType = "vfat"; };
|
||||
|
||||
@@ -1,12 +1,22 @@
|
||||
{ pkgs, pkgs-unstable, lib, host, nvidia, ... }:
|
||||
let p = pkgs-unstable; in
|
||||
{
|
||||
environment.systemPackages = with p; [
|
||||
ollama
|
||||
];
|
||||
{ pkgs, pkgs-unstable, pkgs-latest, lib, host, nvidia, ... }:
|
||||
let
|
||||
p = pkgs-latest.ollama;
|
||||
# p = pkgs-unstable.ollama.overrideAttrs (oldAttrs: rec {
|
||||
# inherit (oldAttrs) pname;
|
||||
# version = "0.3.0";
|
||||
# src = pkgs.fetchFromGitHub {
|
||||
# owner = "ollama";
|
||||
# repo = "ollama";
|
||||
# rev = "v${version}";
|
||||
# hash = "sha256-69CpRAggx6a1NJq+CA9QliXuUbDgC1ERRuA3y17KVAM=";
|
||||
# fetchSubmodules = true;
|
||||
# };
|
||||
# });
|
||||
in {
|
||||
environment.systemPackages = [ p ];
|
||||
|
||||
services.ollama = {
|
||||
package = p.ollama;
|
||||
package = p;
|
||||
enable = true;
|
||||
acceleration = lib.mkIf nvidia.enable "cuda";
|
||||
listenAddress = if host == "NxACE" then "0.0.0.0:11434" else "127.0.0.1:11434";
|
||||
|
||||
Reference in New Issue
Block a user