diff --git a/flake.lock b/flake.lock index 87d8d17..ea82eb6 100644 --- a/flake.lock +++ b/flake.lock @@ -18,27 +18,6 @@ "type": "github" } }, - "nixfiles-private": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1745002185, - "narHash": "sha256-bdWS7dY1yUe+RfW9a3ySrorYq1S+pWJm4AE2J0yp3+I=", - "ref": "refs/tags/0.0.1", - "rev": "a0e92bad8feeb269f985a2d8112723bf5926528c", - "revCount": 2, - "type": "git", - "url": "ssh://forgejo@git.werkraum-karlsruhe.org/WRK/nixfiles-private" - }, - "original": { - "ref": "refs/tags/0.0.1", - "type": "git", - "url": "ssh://forgejo@git.werkraum-karlsruhe.org/WRK/nixfiles-private" - } - }, "nixos-hardware": { "locked": { "lastModified": 1743420942, @@ -57,15 +36,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744533305, - "narHash": "sha256-56qCMHw9q2hkyh6qlbrTKTN102OfZPkXVI4YGLa5Wgc=", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/24.11/nixos-24.11.716947.26d499fc9f1d/nixexprs.tar.xz" + "lastModified": 1743501102, + "narHash": "sha256-7PCBQ4aGVF8OrzMkzqtYSKyoQuU2jtpPi4lmABpe5X4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "02f2af8c8a8c3b2c05028936a1e84daefa1171d4", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-24.11/nixexprs.tar.xz" + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { @@ -86,7 +68,6 @@ "root": { "inputs": { "flake-parts": "flake-parts", - "nixfiles-private": "nixfiles-private", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index e2651bc..71ed062 100644 --- a/flake.nix +++ b/flake.nix @@ -1,12 +1,8 @@ { inputs = { - nixpkgs.url = "https://channels.nixos.org/nixos-24.11/nixexprs.tar.xz"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; flake-parts.url = "github:hercules-ci/flake-parts"; - nixfiles-private = { - url = "git+ssh://forgejo@git.werkraum-karlsruhe.org/WRK/nixfiles-private?ref=refs/tags/0.0.1"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } { diff --git a/hosts/backstage/boot.nix b/hosts/backstage/boot.nix index abd9a3b..65c9f7e 100644 --- a/hosts/backstage/boot.nix +++ b/hosts/backstage/boot.nix @@ -24,7 +24,8 @@ }; systemd = { enable = true; - network = config.systemd.network; + network.enable = true; + network.networks.enp1s0 = config.systemd.network.networks.enp1s0; targets.initrd.wants = [ "systemd-networkd-wait-online@enp1s0.service" ]; @@ -37,9 +38,15 @@ device = "/dev/disk/by-uuid/7f3ccd2d-8022-491e-baa1-675805919fd7"; }; }; - kernelModules = [ "kvm-intel" ]; + kernelModules = [ "kvm-intel" "vfio" "vfio_pci" "vfio_iommu_type1" "vfio_virqfd" ]; kernelParams = [ "zfs.zfs_arc_max=1024000000" + "intel_iommu=on" + "intel_iommu=igfx_off" + "pci=assign-busses" ]; +# extraModprobeConfig = '' +# options ixgbe max_vfs=4 allow_unsupported_sfp=1 debug=2 +# ''; }; } diff --git a/hosts/backstage/configuration.nix b/hosts/backstage/configuration.nix index 79cbafa..0c1d306 100644 --- a/hosts/backstage/configuration.nix +++ b/hosts/backstage/configuration.nix @@ -1,10 +1,9 @@ -{ inputs, config, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: { imports = [ ../../services/sshd - inputs.nixfiles-private.nixosModules.hosts.backstage ]; # Set your time zone. @@ -24,11 +23,30 @@ tmux htop pciutils - lshw ethtool - usbutils ]; + users.users.root = { + openssh.authorizedKeys.keys = [ + ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCnjrKWYc0bcIsTkdpyC+yAsxSeY9M1WxVDNm3I/R3BYqyvfFuzJMQyh5APhM52yKGMN9UOuJPNPz0C4P6EY3iC3ZqUHFJ6ILrZZxdLZBVxdy2F19Xv6XcZkZxLpRKWapVFECF5z/Bi0rg1uzNRyrHjfZWcHfHIvlqxUYiitvvTbbSMQKqEV8wlnshSzBoYzaKtV1+crwlgz6wCnXq8HIupEeWfUc9kc+zunpYnuHnU5Z3HhzQGBuIiPoVritDjOo7qYREftV4qQ15xFWdezsMZlR15edwZeyNdAEx044QgaGddC8uEMoi5cp4APIqH1cEkIvSU6Y+esdgZ4CHU6M5G5ub5PTT2TaKoUMLLFtpW6QImjVApixFTHWR7tUhqInplWWLqvviS4MoI1ppxgcDUg/bgPdeDBsoRkbESr2uT8ResNi9DlPlN2rlUjlb28awzHm7agFhwfPQZ1afnFSUh0tTFz1WeR7xIGhxR1xXc8sapJhgLnYYWpR2NaJzbYYdk7CWW/3rgEsJem7Kvll6HevnFgRP/uVhEyGZl9hw+tECzvwB/LEmQ/4raDMxqOB9XO9kusJX/jTnQIObrFubfKn3ToXlYbQxZX9+QobANvQ8huILz1bBeH8aKjf9RXu+j4VNyoCKhzU/v0MIdRCsgVWgjuYXMGRo0MFMFyMqQiw=='' + ]; + }; + + # Define a user account. Don't forget to set a password with ‘passwd’. + # users.users.alice = { + # isNormalUser = true; + # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + # packages = with pkgs; [ + # tree + # ]; + # }; + + # List services that you want to enable: + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Copy the NixOS configuration file and link it from the resulting system # (/run/current-system/configuration.nix). This is useful in case you # accidentally delete configuration.nix. diff --git a/hosts/backstage/network.nix b/hosts/backstage/network.nix index a2e3dca..110b076 100644 --- a/hosts/backstage/network.nix +++ b/hosts/backstage/network.nix @@ -9,11 +9,43 @@ systemd.network = { enable = true; + links = { + "enp1s0" = { + enable = true; + matchConfig = { + Type = "ether"; + MACAddress = "9c:6b:00:8d:d0:8f"; + }; + linkConfig = { + Name = "enp1s0"; + NamePolicy = ""; + }; + }; + "enp2s0f0" = { + enable = true; + matchConfig = { + Type = "ether"; + MACAddress = "90:e2:ba:2e:ea:70"; + }; + linkConfig.MTUBytes = "9710"; + }; + "enp2s0f1" = { + enable = true; + matchConfig = { + Type = "ether"; + MACAddress = "90:e2:ba:2e:ea:71"; + }; + linkConfig.MTUBytes = "9710"; + }; + }; networks = { "enp1s0" = { matchConfig.Name = "enp1s0"; DHCP = "yes"; }; }; + netdevs = { + + }; }; } diff --git a/hosts/backstage/radvd.nix b/hosts/backstage/radvd.nix new file mode 100644 index 0000000..d6b4407 --- /dev/null +++ b/hosts/backstage/radvd.nix @@ -0,0 +1,7 @@ +{config, pkgs, ...}: +{ +# services.radvd.enable = true; +# services.radvd.config = '' +# interface br-infra +# ''; +}