Merge branch 'main' of github.com:asosnovsky/nixos-setup
This commit is contained in:
commit
26aae5aa3d
3 files changed
+11
-9
No files matched your search
Generated
+6
-6
@@ -28,11 +28,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1720845312,
|
||||
"narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=",
|
||||
"lastModified": 1721270582,
|
||||
"narHash": "sha256-MdZmYPPExntE5rJu88IhJSy8Um4UyZCTXhOwvzbjDVI=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc",
|
||||
"rev": "a3e4a7b8ffc08c7dc1973822a77ad432e1ec3dec",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -59,11 +59,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1720823163,
|
||||
"narHash": "sha256-FZ5dnrvKkln9ESdoTR8R7GKW9rNpXNZrxGsOXsbsTpE=",
|
||||
"lastModified": 1721226092,
|
||||
"narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f12ee5f64c6a09995e71c9626d88c4efa983b488",
|
||||
"rev": "c716603a63aca44f39bef1986c13402167450e0a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
+2
-1
@@ -1,5 +1,5 @@
|
||||
{ user, dataDir ? "/mnt/Data" }:
|
||||
{ pkgs, lib, ... }:
|
||||
{ pkgs, lib, unstable, ... }:
|
||||
let
|
||||
zshFWBook = builtins.filterSource (p: t: true) ../configs/fwbook;
|
||||
zshFunctions = zshFWBook + "/functions.sh";
|
||||
@@ -48,6 +48,7 @@ in
|
||||
enable = true;
|
||||
acceleration = "rocm";
|
||||
listenAddress = "0.0.0.0:11434";
|
||||
package = unstable.ollama;
|
||||
};
|
||||
# Brother Printer
|
||||
hardware.sane.brscan5.enable = true;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ user }:
|
||||
{ pkgs, lib, config, ... }: {
|
||||
{ pkgs, lib, config, unstable, ... }: {
|
||||
imports = [ ./hl-bigbox1.hardware-configuration.nix ];
|
||||
# firmware updater
|
||||
services.fwupd.enable = true;
|
||||
@@ -13,6 +13,7 @@
|
||||
enable = true;
|
||||
acceleration = "cuda";
|
||||
listenAddress = "0.0.0.0:11434";
|
||||
package = unstable.ollama;
|
||||
};
|
||||
services.wyoming = {
|
||||
openwakeword.enable = true;
|
||||
@@ -32,7 +33,7 @@
|
||||
# Nvidia Settings
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
services.xserver.enable = true;
|
||||
#nixpkgs.config.cudaSupport = true;
|
||||
# nixpkgs.config.cudaSupport = true;
|
||||
hardware.nvidia = {
|
||||
modesetting.enable = true;
|
||||
powerManagement.enable = false;
|
||||
|
||||
Reference in new issue
Block a user