From 422081994986d68908ab42c47786c8af0cbbde0d Mon Sep 17 00:00:00 2001 From: Mel Date: Sun, 11 Oct 2026 20:57:04 +0200 Subject: Re-structure renard for new host Signed-off-by: Mel --- machines/renard/default.nix | 16 +--------------- machines/renard/devices.nix | 28 ++++++++++++++-------------- machines/renard/hardware.nix | 11 +++++++++-- machines/renard/home.nix | 2 +- 4 files changed, 25 insertions(+), 32 deletions(-) diff --git a/machines/renard/default.nix b/machines/renard/default.nix index 52b8496..aaa3be7 100644 --- a/machines/renard/default.nix +++ b/machines/renard/default.nix @@ -9,10 +9,8 @@ ../../modules/binary-cache.nix ../../modules/git.nix - ../../modules/syncthing.nix ../../services/cgit.nix - ../../services/minecraft ../../services/miniflux.nix ../../services/shiori.nix ../../services/matrix.nix @@ -45,7 +43,6 @@ "cache" "git" "mel" - "shorest" "matrix" "goat" ]; @@ -88,17 +85,6 @@ }; }; - "sho.rest" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://127.0.0.1:5000"; - }; - extraConfig = '' - access_log /var/log/nginx/shorest.access.log json_combined; - ''; - }; - "mel.gg" = { enableACME = true; forceSSL = true; @@ -127,5 +113,5 @@ }; }; - system.stateVersion = "24.05"; + system.stateVersion = "26.05"; } diff --git a/machines/renard/devices.nix b/machines/renard/devices.nix index d952488..e2bf95f 100644 --- a/machines/renard/devices.nix +++ b/machines/renard/devices.nix @@ -1,14 +1,9 @@ -{ config, pkgs, ... }: +{ ... }: { - boot.initrd = { - availableKernelModules = [ "virtio_pci" "virtio_scsi" ]; - kernelModules = [ "dm-snapshot" ]; - }; - - boot.loader.grub = { - enable = true; - device = "/dev/sda"; + boot.loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; }; zramSwap = { @@ -18,10 +13,15 @@ memoryPercent = 50; }; - systemd.network.networks."10-wan" = { - name = "ens18"; - DHCP = "ipv4"; - address = [ "2a02:c207:2042:1313::1" ]; - routes = [ { Gateway = "fe80::1"; } ]; + systemd.network = { + enable = true; + wait-online.anyInterface = true; + + networks."10-wan" = { + name = "ens3"; + DHCP = "ipv4"; + address = [ "2a0a:4cc0:c1:ab6b::1" ]; + routes = [ { Gateway = "fe80::1"; } ]; + }; }; } diff --git a/machines/renard/hardware.nix b/machines/renard/hardware.nix index f7d1d6b..18051a2 100644 --- a/machines/renard/hardware.nix +++ b/machines/renard/hardware.nix @@ -8,16 +8,23 @@ [ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/258bcc4c-22a7-4c4c-a264-568b7194dffc"; + { device = "/dev/disk/by-uuid/202f36ad-291f-46df-ae54-7b46548f180c"; fsType = "ext4"; }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/0A39-9903"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + swapDevices = [ ]; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/machines/renard/home.nix b/machines/renard/home.nix index dce0783..0e554b1 100644 --- a/machines/renard/home.nix +++ b/machines/renard/home.nix @@ -5,5 +5,5 @@ ../../modules/home/common.nix ]; - home.stateVersion = "24.05"; + home.stateVersion = "26.05"; } -- cgit v1.3.1