diff --git a/flake.lock b/flake.lock index b7ad26e..247f398 100644 --- a/flake.lock +++ b/flake.lock @@ -35,6 +35,21 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1762463231, + "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1761114652, @@ -55,6 +70,7 @@ "inputs": { "home-manager": "home-manager", "impermanence": "impermanence", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index faaf5ff..6b94fab 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable/"; + nixos-hardware.url = "github:NixOS/nixos-hardware/"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; impermanence.url = "github:nix-community/impermanence"; diff --git a/hosts/nullstar/configuration.nix b/hosts/nullstar/configuration.nix index cad931b..ea9d895 100644 --- a/hosts/nullstar/configuration.nix +++ b/hosts/nullstar/configuration.nix @@ -2,12 +2,13 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, inputs, ... }: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + (inputs.nixos-hardware.nixosModules.framework-16-7040-amd) ]; # Bootloader. @@ -17,6 +18,8 @@ # Use latest kernel. boot.kernelPackages = pkgs.linuxPackages_latest; + systemd.services.home-manager-xory.enable = false; + environment.persistence."/persistent" = { enable = true; hideMounts = true; @@ -24,6 +27,7 @@ "/var/log" "/var/lib/bluetooth" "/var/lib/nixos" + "/var/lib/ollama-models" "/etc/NetworkManager/system-connections" ]; files = [ @@ -31,6 +35,8 @@ ]; }; + services.fwupd.enable = true; + networking.hostName = "nullstar"; # Define your hostname. # Enable networking @@ -157,7 +163,8 @@ hardware.keyboard.qmk.enable = true; services.ollama.enable = true; - services.ollama.acceleration = "cuda"; + services.ollama.acceleration = "rocm"; + services.ollama.models = "/var/lib/ollama-models"; # Enable automatic login for the user. services.displayManager.autoLogin.enable = true; @@ -190,6 +197,8 @@ programs.virt-manager.enable = true; virtualisation.libvirtd.enable = true; + virtualisation.libvirtd.qemu.swtpm.enable = true; + virtualisation.libvirtd.qemu.vhostUserPackages = [ pkgs.virtiofsd ]; virtualisation.spiceUSBRedirection.enable = true; virtualisation.docker.enable = true; diff --git a/hosts/nullstar/home.nix b/hosts/nullstar/home.nix index 4ed32d6..43625b6 100644 --- a/hosts/nullstar/home.nix +++ b/hosts/nullstar/home.nix @@ -89,6 +89,7 @@ programs.waybar.enable = true; programs.wofi.enable = true; services.dunst.enable = true; + services.hyprpolkitagent.enable = true; home.stateVersion = "25.05"; diff --git a/hosts/voidspear/configuration.nix b/hosts/voidspear/configuration.nix index 52f62e7..f6d3d8e 100644 --- a/hosts/voidspear/configuration.nix +++ b/hosts/voidspear/configuration.nix @@ -2,12 +2,13 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, inputs, ... }: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + (inputs.nixos-hardware.nixosModules.framework-16-7040-amd) ]; # Bootloader.