Upgraded nix and disabled rocm for ollama

This commit is contained in:
ari committed 2024-06-15 15:20:12 -04:00
1 parent c0badcb2dd
commit 1b2bc9c240
3 files changed
+28 -42

No files matched your search

Generated
+14 -13
View File
@@ -7,15 +7,16 @@
]
},
"locked": {
"lastModified": 1715930644,
"narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
"lastModified": 1717527182,
"narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
"rev": "845a5c4c073f74105022533907703441e0464bc3",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.05",
"repo": "home-manager",
"type": "github"
}
@@ -27,11 +28,11 @@
]
},
"locked": {
"lastModified": 1715901937,
"narHash": "sha256-eMyvWP56ZOdraC2IOvZo0/RTDcrrsqJ0oJWDC76JTak=",
"lastModified": 1718345812,
"narHash": "sha256-FJhA+YFsOFrAYe6EaiTEfomNf7jeURaPiG5/+a3DRSc=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "ffc01182f90118119930bdfc528c1ee9a39ecef8",
"rev": "ff988d78f2f55641efacdf9a585d2937f7e32a9b",
"type": "github"
},
"original": {
@@ -42,11 +43,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1714201532,
"narHash": "sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY=",
"lastModified": 1718349360,
"narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "53db5e1070d07e750030bf65f1b9963df8f0c678",
"rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6",
"type": "github"
},
"original": {
@@ -58,16 +59,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1716062047,
"narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=",
"lastModified": 1718208800,
"narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "02923630b89aa1ab36ef8e422501a6f4fd4b2016",
"rev": "cc54fb41d13736e92229c21627ea4f22199fee6b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
+11 -27
View File
@@ -1,10 +1,10 @@
{
inputs = {
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
systems.url = "github:nix-systems/default";
home-manager = {
url = "github:nix-community/home-manager";
url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-darwin = {
@@ -14,13 +14,7 @@
};
outputs =
{ self
, nixos-hardware
, nixpkgs
, home-manager
, nix-darwin
, systems
}:
{ self, nixos-hardware, nixpkgs, home-manager, nix-darwin, systems }:
let
user = {
name = "ari";
@@ -32,9 +26,7 @@
fullName = user.fullName;
email = "${name}@sumologic.com";
homepath = "/Users/${name}";
extraGitConfigs = [
{ path = "${homepath}/.config/mysumo/gitconfig"; }
];
extraGitConfigs = [{ path = "${homepath}/.config/mysumo/gitconfig"; }];
};
homeMangerVersion = "24.05";
lib = (import modules/lib.nix {
@@ -46,9 +38,8 @@
in
{
lib = lib;
formatter = eachSystem (system:
nixpkgs.legacyPackages.${system}.nixpkgs-fmt
);
formatter =
eachSystem (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt);
# NIXOS Setups
# -------------
@@ -80,9 +71,7 @@
configuration = { ... }: {
imports = [
nixos-hardware.nixosModules.framework-13-7040-amd
(import ./hosts/fwbook.nix {
user = user;
})
(import ./hosts/fwbook.nix { user = user; })
];
};
};
@@ -98,15 +87,10 @@
enable = true;
version = homeMangerVersion;
};
desktop = {
enable = false;
};
os = {
enable = false;
};
configuration = (import ./hosts/asosnovsky-mac.nix {
user = sumoUser;
});
desktop = { enable = false; };
os = { enable = false; };
configuration =
(import ./hosts/asosnovsky-mac.nix { user = sumoUser; });
};
};
}
+3 -2
View File
@@ -51,9 +51,10 @@ in
# Ollama
services.ollama = {
enable = true;
acceleration = "rocm";
# acceleration = "rocm";
# host = "0.0.0.0";
openFirewall = true;
# openFirewall = true;
listenAddress = "0.0.0.0:11434";
};
# Display Managers
services.xserver.videoDrivers = [ "displaylink" "modesetting" ];