diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 705c912..1cb0196 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,6 +1,6 @@ { "recommendations": [ "pinage404.nix-extension-pack", - "brettm12345.nixfmt-vscode" + "b4dm4n.nixpkgs-fmt" ] -} +} \ No newline at end of file diff --git a/flake.lock b/flake.lock index 83bd9ba..b09efdd 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1720737798, - "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", + "lastModified": 1721331912, + "narHash": "sha256-h2yaU+QEU4pHxMySHPIsRV2T/pihDHnrXBca8BY6xgc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", + "rev": "bb90787ea034c8b9035dfcfc9b4dc23898d414be", "type": "github" }, "original": { @@ -80,7 +80,8 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "systems": "systems", - "unstable": "unstable" + "unstable": "unstable", + "unstable-home-manager": "unstable-home-manager" } }, "systems": { @@ -100,19 +101,40 @@ }, "unstable": { "locked": { - "lastModified": 1721138476, - "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", + "lastModified": 1721359386, + "narHash": "sha256-FsW0f9FpL9ECgA3d6iqk+OWhAuwR4zOvtP6Ibsfgrrw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", + "rev": "20f734b3472ee06a29cb312c5da439c0089e258d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "master", "repo": "nixpkgs", "type": "github" } + }, + "unstable-home-manager": { + "inputs": { + "nixpkgs": [ + "unstable" + ] + }, + "locked": { + "lastModified": 1721135958, + "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "home-manager", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 2dfa276..b7ae54c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + unstable.url = "github:NixOS/nixpkgs/master"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; systems.url = "github:nix-systems/default"; home-manager = { @@ -9,7 +9,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; unstable-home-manager = { - url = "github:nix-community/home-manager/release-master"; + url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "unstable"; }; nix-darwin = { @@ -91,7 +91,9 @@ enableNetworking = true; enableSSH = false; hardware = { enable = true; }; - containerRuntime = "docker"; + containers = { + runtime = "docker"; + }; enablePrometheusExporters = true; }; configuration = { ... }: { @@ -140,6 +142,9 @@ enableFonts = true; hardware = { enable = false; }; enablePrometheusExporters = true; + containers = { + runtime = "docker"; + }; }; configuration = (import ./hosts/hl-bigbox1.nix { user = user; }); }; diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index abbec31..0278d72 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -3,35 +3,54 @@ imports = [ ./hl-bigbox1.hardware-configuration.nix ]; # firmware updater services.fwupd.enable = true; + virtualisation.docker.enableNvidia = true; + hardware.graphics.enable32Bit = true; + systemd.enableUnifiedCgroupHierarchy = false; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.tmp.useTmpfs = true; boot.kernelPackages = pkgs.linuxPackages_latest; - # Ollama - services.ollama = { - enable = true; - acceleration = "cuda"; - host = "0.0.0.0"; + # Containers + virtualisation.oci-containers = { + backend = "docker"; + containers = { + ollama = { + autoStart = true; + image = "ollama/ollama"; + extraOptions = [ "--gpus" "all" ]; + ports = [ "11434:11434" ]; + volumes = [ "ollama:/root/.ollama" ]; + }; + openwakeword = { + autoStart = true; + image = "rhasspy/wyoming-openwakeword"; + cmd = [ "--preload-model" "ok_nabu" ]; + ports = [ "10400:10400" ]; + }; + }; + }; + + # Wyoming Service + services.wyoming = { + # openwakeword.enable = true; + faster-whisper.servers.main-eng = { + enable = true; + device = "cpu"; + model = "medium.en"; + language = "en"; + uri = "tcp://0.0.0.0:10300"; + }; + piper.servers.pier = { + enable = true; + uri = "tcp://0.0.0.0:10200"; + voice = "en_GB-alan-medium"; + }; }; - # services.wyoming = { - # openwakeword.enable = true; - # faster-whisper.servers.main-eng = { - # enable = true; - # device = "cpu"; - # model = "medium.en"; - # language = "en"; - # uri = "tcp://0.0.0.0:10300"; - # }; - # piper.servers.pier = { - # enable = true; - # uri = "tcp://0.0.0.0:10200"; - # voice = "en_GB-alan-medium"; - # }; - # }; # Nvidia Settings services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.enable = true; + hardware.graphics.enable = true; hardware.nvidia = { modesetting.enable = true; powerManagement.enable = false; diff --git a/modules/os/containers/default.nix b/modules/os/containers/default.nix index 864250f..62feb53 100644 --- a/modules/os/containers/default.nix +++ b/modules/os/containers/default.nix @@ -1,11 +1,16 @@ -{ user, runtime ? null }: +{ user, runtime ? null, enableOnBoot ? false }: { pkgs, ... }: { virtualisation.containers.enable = true; - environment.systemPackages = with pkgs; [ dive podman-tui ]; + environment.systemPackages = with pkgs; [ dive ]; imports = (if runtime == "podman" then [ (import ./podman.nix { user = user; }) ] else if runtime == "docker" then - [ (import ./docker.nix { user = user; }) ] + [ + (import ./docker.nix { + user = user; + enableOnBoot = enableOnBoot; + }) + ] else [ ]); } diff --git a/modules/os/containers/docker.nix b/modules/os/containers/docker.nix index c97a2a6..c8bce36 100644 --- a/modules/os/containers/docker.nix +++ b/modules/os/containers/docker.nix @@ -1,9 +1,9 @@ -{ user }: +{ user, enableOnBoot ? false, ... }: { pkgs, ... }: { virtualisation.docker = { enable = true; autoPrune.enable = true; - enableOnBoot = false; + enableOnBoot = enableOnBoot; liveRestore = false; }; environment.systemPackages = with pkgs; [ docker-compose ]; diff --git a/modules/os/containers/podman.nix b/modules/os/containers/podman.nix index 9442595..30f242d 100644 --- a/modules/os/containers/podman.nix +++ b/modules/os/containers/podman.nix @@ -1,4 +1,4 @@ -{ user }: +{ user, ... }: { pkgs, ... }: { virtualisation.oci-containers.backend = "podman"; virtualisation = { @@ -10,5 +10,5 @@ autoPrune.enable = true; }; }; - environment.systemPackages = with pkgs; [ podman-compose ]; + environment.systemPackages = with pkgs; [ podman-compose podman-tui ]; } diff --git a/modules/os/default.nix b/modules/os/default.nix index 242b186..b7b034c 100644 --- a/modules/os/default.nix +++ b/modules/os/default.nix @@ -4,7 +4,7 @@ , enableFonts ? true , enableNetworking ? true , enableSSH ? true -, containerRuntime ? null +, containers ? { runtime = null; } , hardware ? { enable = false; } , enablePrometheusExporters ? false , ... @@ -14,10 +14,9 @@ (import ./core.nix { user = user; }) ./rootUser.nix (import ./user.nix { user = user; }) - (import ./containers/default.nix { + (import ./containers/default.nix ({ user = user; - runtime = containerRuntime; - }) + } // containers)) ] ++ (if enableFonts then [ ./fonts.nix ] else [ ]) ++ (if hardware.enable then [ ./hardware.nix ] else [ ]) ++ (if enableNetworking then