From c0e551eb8bee2421f355a165bb67da3a533c9649 Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Wed, 19 Feb 2025 22:44:05 +0100 Subject: [PATCH 1/5] wenche: init new host --- flake.nix | 1 + hosts/wenche/configuration.nix | 31 +++++++++++++++++++++++++ hosts/wenche/hardware-configuration.nix | 24 +++++++++++++++++++ values.nix | 4 ++++ 4 files changed, 60 insertions(+) create mode 100644 hosts/wenche/configuration.nix create mode 100644 hosts/wenche/hardware-configuration.nix diff --git a/flake.nix b/flake.nix index 069c2fc..fcf04a6 100644 --- a/flake.nix +++ b/flake.nix @@ -116,6 +116,7 @@ ildkule = stableNixosConfig "ildkule" { }; #ildkule-unstable = unstableNixosConfig "ildkule" { }; shark = stableNixosConfig "shark" { }; + wenche = stableNixosConfig "wenche" { }; ustetind = stableNixosConfig "ustetind" { modules = [ diff --git a/hosts/wenche/configuration.nix b/hosts/wenche/configuration.nix new file mode 100644 index 0000000..2791a19 --- /dev/null +++ b/hosts/wenche/configuration.nix @@ -0,0 +1,31 @@ +{ config, fp, pkgs, values, ... }: +{ + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + (fp /base) + (fp /misc/metrics-exporters.nix) + + (fp /misc/builder.nix) + ]; + + sops.defaultSopsFile = fp /secrets/wenche/wenche.yaml; + sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; + sops.age.keyFile = "/var/lib/sops-nix/key.txt"; + sops.age.generateKey = true; + + boot.loader.grub.device = "/dev/sda"; + + networking.hostName = "wenche"; # Define your hostname. + + systemd.network.networks."30-ens18" = values.defaultNetworkConfig // { + matchConfig.Name = "ens18"; + address = with values.hosts.wenche; [ (ipv4 + "/25") (ipv6 + "/64") ]; + }; + + # List packages installed in system profile + environment.systemPackages = with pkgs; [ + ]; + + system.stateVersion = "24.11"; # Did you read the comment? +} diff --git a/hosts/wenche/hardware-configuration.nix b/hosts/wenche/hardware-configuration.nix new file mode 100644 index 0000000..42840be --- /dev/null +++ b/hosts/wenche/hardware-configuration.nix @@ -0,0 +1,24 @@ +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/profiles/qemu-guest.nix") + ]; + + boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/4e8ecdd2-d453-4fff-b952-f06da00f3b85"; + fsType = "ext4"; + }; + + swapDevices = [ ]; + + networking.useDHCP = lib.mkDefault false; + # networking.interfaces.ens18.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} diff --git a/values.nix b/values.nix index cd8e26d..4e91599 100644 --- a/values.nix +++ b/values.nix @@ -64,6 +64,10 @@ in rec { ipv4 = pvv-ipv4 234; ipv6 = pvv-ipv6 234; }; + wenche = { + ipv4 = pvv-ipv4 240; + ipv6 = pvv-ipv6 240; + }; }; defaultNetworkConfig = { From bdaa765dbbf2239b8f0093000e410243403d9e84 Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Wed, 19 Feb 2025 23:28:42 +0100 Subject: [PATCH 2/5] wenche: start adding NVIDIA support --- flake.nix | 5 +++++ hosts/wenche/configuration.nix | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index fcf04a6..2c549e4 100644 --- a/flake.nix +++ b/flake.nix @@ -71,6 +71,11 @@ pkgs = import nixpkgs { inherit system; + config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) + [ + "nvidia-x11" + "nvidia-settings" + ]; overlays = [ # Global overlays go here ] ++ config.overlays or [ ]; diff --git a/hosts/wenche/configuration.nix b/hosts/wenche/configuration.nix index 2791a19..79eade7 100644 --- a/hosts/wenche/configuration.nix +++ b/hosts/wenche/configuration.nix @@ -1,4 +1,4 @@ -{ config, fp, pkgs, values, ... }: +{ config, fp, pkgs, values, lib, ... }: { imports = [ # Include the results of the hardware scan. @@ -23,6 +23,14 @@ address = with values.hosts.wenche; [ (ipv4 + "/25") (ipv6 + "/64") ]; }; + hardware.graphics.enable = true; + services.xserver.videoDrivers = [ "nvidia" ]; + hardware.nvidia = { + modesetting.enable = true; + open = true; + package = config.boot.kernelPackages.nvidiaPackages.production; + }; + # List packages installed in system profile environment.systemPackages = with pkgs; [ ]; From 4f28815018ce9b6a557a2b6b8beb3d1e3f29eeef Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Sat, 22 Feb 2025 19:44:23 +0100 Subject: [PATCH 3/5] wenche: Fix nvidia driver. flake: add shells/cuda. --- flake.nix | 9 +++++++++ hosts/wenche/configuration.nix | 2 +- hosts/wenche/hardware-configuration.nix | 2 +- shells/cuda.nix | 25 +++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 shells/cuda.nix diff --git a/flake.nix b/flake.nix index 2c549e4..0fd9091 100644 --- a/flake.nix +++ b/flake.nix @@ -160,6 +160,15 @@ devShells = forAllSystems (system: { default = nixpkgs.legacyPackages.${system}.callPackage ./shell.nix { }; + cuda = let + cuda-pkgs = import nixpkgs { + inherit system; + config = { + allowUnfree = true; + cudaSupport = true; + }; + }; + in cuda-pkgs.callPackage ./shells/cuda.nix { }; }); packages = { diff --git a/hosts/wenche/configuration.nix b/hosts/wenche/configuration.nix index 79eade7..fab9926 100644 --- a/hosts/wenche/configuration.nix +++ b/hosts/wenche/configuration.nix @@ -27,7 +27,7 @@ services.xserver.videoDrivers = [ "nvidia" ]; hardware.nvidia = { modesetting.enable = true; - open = true; + open = false; package = config.boot.kernelPackages.nvidiaPackages.production; }; diff --git a/hosts/wenche/hardware-configuration.nix b/hosts/wenche/hardware-configuration.nix index 42840be..4c6a6e2 100644 --- a/hosts/wenche/hardware-configuration.nix +++ b/hosts/wenche/hardware-configuration.nix @@ -7,7 +7,7 @@ boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; + boot.kernelModules = [ "nvidia" ]; boot.extraModulePackages = [ ]; fileSystems."/" = diff --git a/shells/cuda.nix b/shells/cuda.nix new file mode 100644 index 0000000..b0af009 --- /dev/null +++ b/shells/cuda.nix @@ -0,0 +1,25 @@ +# nix develop .#cuda +# Copied from https://nixos.wiki/wiki/CUDA +{ pkgs }: + +pkgs.mkShell { + name = "cuda-env-shell"; + buildInputs = with pkgs; [ + git gitRepo gnupg autoconf curl + procps gnumake util-linux m4 gperf unzip + cudatoolkit linuxPackages.nvidia_x11 + libGLU libGL + xorg.libXi xorg.libXmu freeglut + xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr zlib + ncurses5 stdenv.cc binutils + + # Other applications, like + hashcat + ]; + shellHook = '' + export CUDA_PATH=${pkgs.cudatoolkit} + # export LD_LIBRARY_PATH=${pkgs.linuxPackages.nvidia_x11}/lib:${pkgs.ncurses5}/lib + export EXTRA_LDFLAGS="-L/lib -L${pkgs.linuxPackages.nvidia_x11}/lib" + export EXTRA_CCFLAGS="-I/usr/include" + ''; +} From c83005983e5f0e842cf90eccaddebdd1671d3f71 Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Sat, 15 Mar 2025 23:37:53 +0100 Subject: [PATCH 4/5] shells/cuda: Reformat, replace shellhook with env attr --- shells/cuda.nix | 58 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/shells/cuda.nix b/shells/cuda.nix index b0af009..ae99b63 100644 --- a/shells/cuda.nix +++ b/shells/cuda.nix @@ -1,25 +1,45 @@ # nix develop .#cuda # Copied from https://nixos.wiki/wiki/CUDA -{ pkgs }: +{ pkgs }: pkgs.mkShell { - name = "cuda-env-shell"; - buildInputs = with pkgs; [ - git gitRepo gnupg autoconf curl - procps gnumake util-linux m4 gperf unzip - cudatoolkit linuxPackages.nvidia_x11 - libGLU libGL - xorg.libXi xorg.libXmu freeglut - xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr zlib - ncurses5 stdenv.cc binutils + name = "cuda-env-shell"; + buildInputs = with pkgs; [ + autoconf + binutils + curl + freeglut + git + gitRepo + gnumake + gnupg + gperf + libGL + libGLU + m4 + ncurses5 + procps + stdenv.cc + unzip + util-linux + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXmu + xorg.libXrandr + xorg.libXv + zlib - # Other applications, like - hashcat - ]; - shellHook = '' - export CUDA_PATH=${pkgs.cudatoolkit} - # export LD_LIBRARY_PATH=${pkgs.linuxPackages.nvidia_x11}/lib:${pkgs.ncurses5}/lib - export EXTRA_LDFLAGS="-L/lib -L${pkgs.linuxPackages.nvidia_x11}/lib" - export EXTRA_CCFLAGS="-I/usr/include" - ''; + cudatoolkit + linuxPackages.nvidia_x11 + + # Other applications, like + hashcat + ]; + + env = { + CUDA_PATH = pkgs.cudatoolkit; + EXTRA_LDFLAGS = "-L/lib -L${pkgs.linuxPackages.nvidia_x11}/lib"; + EXTRA_CCFLAGS = "-I/usr/include"; + }; } From cd40bd61781bd69beba59f51f33d8f1760f5e3c4 Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Sat, 29 Mar 2025 19:34:42 +0100 Subject: [PATCH 5/5] Wenche: add swapfile --- hosts/wenche/hardware-configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/wenche/hardware-configuration.nix b/hosts/wenche/hardware-configuration.nix index 4c6a6e2..51d8a1b 100644 --- a/hosts/wenche/hardware-configuration.nix +++ b/hosts/wenche/hardware-configuration.nix @@ -15,7 +15,10 @@ fsType = "ext4"; }; - swapDevices = [ ]; + swapDevices = [ { + device = "/var/lib/swapfile"; + size = 16*1024; + } ]; networking.useDHCP = lib.mkDefault false; # networking.interfaces.ens18.useDHCP = lib.mkDefault true;