From 1410158222936ca5835f7d1440b2327484d2ba9f Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 13 Jul 2024 19:31:43 -0400 Subject: [PATCH] Using unstab;e --- flake.lock | 28 ++++++++++++++-------------- flake.nix | 7 +++---- hosts/fwbook.nix | 5 +++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 59bab62..462339a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,16 +7,16 @@ ] }, "locked": { - "lastModified": 1718530513, - "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", + "lastModified": 1720734513, + "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", + "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1719128254, - "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=", + "lastModified": 1720845312, + "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "50581970f37f06a4719001735828519925ef8310", + "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", "type": "github" }, "original": { @@ -43,11 +43,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719413427, - "narHash": "sha256-WS087+fEO804gWvwqEfclbLFw6xdrrtZZULSyQafMdg=", + "lastModified": 1720737798, + "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "901bc809b5d3e73a609a167385df23311d81b39c", + "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", "type": "github" }, "original": { @@ -59,16 +59,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719253556, - "narHash": "sha256-A/76RFUVxZ/7Y8+OMVL1Lc8LRhBxZ8ZE2bpMnvZ1VpY=", + "lastModified": 1720768451, + "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc07dc3bdf2956ddd64f24612ea7fc894933eb2e", + "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 52050d3..652b5a9 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { inputs = { nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; systems.url = "github:nix-systems/default"; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-darwin = { @@ -110,8 +110,7 @@ enableSSH = true; hardware = { enable = true; }; }; - configuration = - (import ./hosts/hl-bigbox1.nix { user = user; }); + configuration = (import ./hosts/hl-bigbox1.nix { user = user; }); }; }; } diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 92a9d58..ca3bf96 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -47,7 +47,8 @@ in services.ollama = { enable = true; acceleration = "rocm"; - listenAddress = "0.0.0.0:11434"; + # listenAddress = "0.0.0.0:11434"; + host = "0.0.0.0"; }; # Brother Printer hardware.sane.brscan5.enable = true; @@ -58,7 +59,7 @@ in ''; # Kernel boot.initrd.kernelModules = [ "amdgpu" "evdi" ]; - hardware.opengl.extraPackages = with pkgs; [ rocmPackages.clr.icd amdvlk ]; + hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd amdvlk ]; # Add Functions home-manager.users.${user.name}.programs.zsh.initExtra = '' source ${zshFunctions}