From c89798d9c0ffbb1722f131f96eab9dd99fe3cc7e Mon Sep 17 00:00:00 2001 From: rogueking Date: Fri, 3 Jul 2026 17:47:05 -0700 Subject: [PATCH] ender-ml change, update flake, added tmux config --- .gitignore | 1 + home-manager/commands/commands.nix | 9 +-- hosts/buildbox/configuration.nix | 3 + hosts/ender-ml/configuration.nix | 85 +++++++++++++---------- hosts/ender-ml/hardware-configuration.nix | 24 +++---- 5 files changed, 67 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index b154e34..43a3043 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ AGENTS.md opencode.jsonc .agents .serena +.claude skills-lock.json diff --git a/home-manager/commands/commands.nix b/home-manager/commands/commands.nix index fce5dfd..4262f59 100644 --- a/home-manager/commands/commands.nix +++ b/home-manager/commands/commands.nix @@ -76,6 +76,7 @@ yazi yt-dlp zstd + pkgs-unstable.herdr ] # Desktop-specific packages (Linux desktops and macOS) ++ lib.optionals (!(hostTypes.isServer hostname)) (with pkgs; [ @@ -178,10 +179,10 @@ ] # ender-ml specific ++ lib.optionals (hostname == "ender-ml") [ - pkgs-unstable.stable-diffusion-cpp-cuda - (pkgs-unstable.llama-cpp.override {cudaSupport = true;}) - pkgs-unstable.witr - pkgs-unstable.comfy-ui-cuda + # pkgs-unstable.stable-diffusion-cpp-cuda + # (pkgs-unstable.llama-cpp.override {cudaSupport = true;}) + # pkgs-unstable.witr + # pkgs-unstable.comfy-ui-cuda ] # acheron specific ++ lib.optionals (hostname == "acheron") [ diff --git a/hosts/buildbox/configuration.nix b/hosts/buildbox/configuration.nix index 79a1be7..f5c50f4 100644 --- a/hosts/buildbox/configuration.nix +++ b/hosts/buildbox/configuration.nix @@ -17,6 +17,9 @@ inputs.home-manager.nixosModules.default ]; + # Kernel + boot.kernelPackages = pkgs.linuxPackages_latest; + # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/hosts/ender-ml/configuration.nix b/hosts/ender-ml/configuration.nix index 5915e8e..659d7c9 100644 --- a/hosts/ender-ml/configuration.nix +++ b/hosts/ender-ml/configuration.nix @@ -19,7 +19,8 @@ #Kernel # boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen; - boot.kernelPackages = pkgs-unstable.linuxKernel.packages.linux_zen; + # boot.kernelPackages = pkgs-unstable.linuxKernel.packages.linux_zen; + boot.kernelPackages = pkgs.linuxPackages_latest; # Bootloader. boot.loader.systemd-boot.enable = true; @@ -75,6 +76,15 @@ # Enable networking networking.networkmanager.enable = true; + networking.useDHCP = false; + networking.interfaces.ens18.ipv4.addresses = [ + { + address = "192.168.8.126"; + prefixLength = 24; # Subnet Mask + } + ]; + networking.defaultGateway = "192.168.8.1"; + networking.nameservers = ["192.168.8.1" "1.1.1.1"]; # Virtualisation virtualisation.docker.enable = true; @@ -109,8 +119,8 @@ nvidiaSettings = true; # Optionally, you may need to select the appropriate driver version for your specific GPU. - #package = config.boot.kernelPackages.nvidiaPackages.latest; - package = pkgs-unstable.linuxKernel.packages.linux_zen.nvidia_x11; + package = config.boot.kernelPackages.nvidiaPackages.latest; + # package = pkgs-unstable.linuxKernel.packages.linux_zen.nvidia_x11; }; nix.settings = { @@ -172,49 +182,50 @@ openssl ]; - # Enable ollama - services.ollama = { - enable = true; - host = "0.0.0.0"; - openFirewall = true; - package = pkgs.ollama-cuda; - environmentVariables = { - CUDA_VISIBLE_DEVICES = "0,1"; - }; - }; + # # Enable ollama + # services.ollama = { + # enable = true; + # host = "0.0.0.0"; + # openFirewall = true; + # package = pkgs.ollama-cuda; + # environmentVariables = { + # CUDA_VISIBLE_DEVICES = "0,1"; + # }; + # }; - services.comfyui = { - enable = true; - enableManager = true; - port = 8188; - openFirewall = true; - listenAddress = "0.0.0.0"; - dataDir = "/home/rogueking/models/comfyui-data"; - user = "rogueking"; - group = "users"; - package = pkgs-unstable.comfy-ui-cuda; - #createUser = true; # Use existing user - # If dataDir is on a separate mount (NFS, ZFS dataset, etc.): - # requiresMounts = [ "home-myuser-comfyui\\x2ddata.mount" ]; - }; + # services.comfyui = { + # enable = true; + # enableManager = true; + # port = 8188; + # openFirewall = true; + # listenAddress = "0.0.0.0"; + # dataDir = "/home/rogueking/models/comfyui-data"; + # user = "rogueking"; + # group = "users"; + # package = pkgs-unstable.comfy-ui-cuda; + # #createUser = true; # Use existing user + # # If dataDir is on a separate mount (NFS, ZFS dataset, etc.): + # # requiresMounts = [ "home-myuser-comfyui\\x2ddata.mount" ]; + # }; # Enable llama-cpp server - services.llama-cpp = { - enable = true; - package = pkgs-unstable.llama-cpp.override {cudaSupport = true;}; - model = "/home/rogueking/models"; - host = "0.0.0.0"; - port = 8080; - # extraFlags = [ - # "n-gpu-layers 99" - # ]; - }; + # services.llama-cpp = { + # enable = true; + # package = pkgs-unstable.llama-cpp.override {cudaSupport = true;}; + # model = "/home/rogueking/models"; + # host = "0.0.0.0"; + # port = 8080; + # # extraFlags = [ + # # "n-gpu-layers 99" + # # ]; + # }; # Define a user account. Don't forget to set a password with ‘passwd’. programs.zsh.enable = true; users.users.rogueking = { isNormalUser = true; description = "rogueking"; + hashedPassword = "$y$j9T$acC7H6j3hHlc9RBftDGvd.$5irPc2XAuYCwDx3lqtcSPEUBY31SGI/ZmcP/t9SbKq0"; extraGroups = ["networkmanager" "wheel" "docker"]; shell = pkgs.zsh; packages = with pkgs; []; diff --git a/hosts/ender-ml/hardware-configuration.nix b/hosts/ender-ml/hardware-configuration.nix index f151c0e..f9b8c0d 100644 --- a/hosts/ender-ml/hardware-configuration.nix +++ b/hosts/ender-ml/hardware-configuration.nix @@ -1,21 +1,17 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ]; +{ config, lib, pkgs, modulesPath, ... }: - boot.initrd.availableKernelModules = ["uhci_hcd" "ehci_pci" "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = []; - boot.extraModulePackages = []; +{ + imports = + [ (modulesPath + "/profiles/qemu-guest.nix") + ]; + + boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; }