From c72b612a61841ec3dd727aa50cec2e084e89a3f5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 27 Sep 2022 11:32:25 +0200 Subject: machines/sternenseemann/ludwig: resurrect This is the old racker machine, but needs to be re-installed (hence the updated stateVersion) and is renamed more consistently. This has not much set up yet, trying to get binary cache up for the first install. cc @aszlig, LMK if this is an unreasonable burden on the builders. --- machines/default.nix | 4 +- machines/sternenseemann/ludwig.nix | 77 ++++++++++++++++++++++++++++++++++++++ machines/sternenseemann/racker.nix | 74 ------------------------------------ 3 files changed, 79 insertions(+), 76 deletions(-) create mode 100644 machines/sternenseemann/ludwig.nix delete mode 100644 machines/sternenseemann/racker.nix diff --git a/machines/default.nix b/machines/default.nix index 034330a9..cb9db428 100644 --- a/machines/default.nix +++ b/machines/default.nix @@ -15,7 +15,7 @@ with import ../lib; sigrun = callMachine devhell/sigrun.nix {}; hildr = callMachine devhell/hildr.nix {}; gunnr = callMachine devhell/gunnr.nix {}; - herja = callMachine devhell/herja.nix {}; + herja = callMachine devhell/herja.nix {}; }; profpatsch = { shiki = callMachine ./profpatsch/shiki.nix {}; @@ -25,7 +25,7 @@ with import ../lib; # mikiya = callMachine ./profpatsch/mikiya.nix {}; }; sternenseemann = { - # racker = callMachine ./sternenseemann/racker.nix {}; + ludwig = callMachine ./sternenseemann/ludwig.nix {}; wolfgang = callMachine ./sternenseemann/wolfgang.nix {}; }; misc = { diff --git a/machines/sternenseemann/ludwig.nix b/machines/sternenseemann/ludwig.nix new file mode 100644 index 00000000..78b553e2 --- /dev/null +++ b/machines/sternenseemann/ludwig.nix @@ -0,0 +1,77 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ./base.nix + ./base-laptop.nix + ./fonts.nix + ./user-lukas.nix + ]; + + config = { + hardware.bluetooth.enable = false; + + nixpkgs.localSystem = { + system = "i686-linux"; + config = "i686-unknown-linux-gnu"; + }; + + system.stateVersion = "22.05"; + + boot = { + loader.grub = { + enable = true; + version = 2; + device = "/dev/sda"; + }; + + initrd.availableKernelModules = [ + "uhci_hcd" + "ehci_pci" + "ata_piix" + "usb_storage" + "floppy" + "sd_mod" + "sr_mod" + "usblp" + "pcspkr" + "btusb" + ]; + + initrd.luks.devices = { + crypted-main.device = "/dev/disk/by-uuid/84dc044f-3137-435f-a7ee-67112e56cfaa"; + crypted-swap.device = "/dev/disk/by-uuid/f84ab2a9-2687-4674-a870-d037bbd84640"; + }; + }; + + fileSystems = { + "/" = { + device = "/dev/mapper/crypted-main"; + fsType = "ext4"; + }; + + "/boot" = { + device = "/dev/disk/by-label/boot"; + fsType = "ext4"; + }; + }; + + swapDevices = [ + { device = "/dev/mapper/crypted-swap"; } + ]; + + hardware.enableRedistributableFirmware = true; + + networking = { + hostName = "ludwig"; + enableIntel2200BGFirmware = true; + }; + + nix.settings = { + max-jobs = 2; + cores = 2; + }; + + vuizvui.profiles.tvl.enable = true; + }; +} diff --git a/machines/sternenseemann/racker.nix b/machines/sternenseemann/racker.nix deleted file mode 100644 index bcd643cc..00000000 --- a/machines/sternenseemann/racker.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ./base.nix - ./base-laptop.nix - ./fonts.nix - ./user-lukas.nix - ]; - - config = { - hardware.bluetooth.enable = false; - - nixpkgs.localSystem = { - system = "i686-linux"; - config = "i686-unknown-linux-gnu"; - }; - - system.stateVersion = "21.05"; - - boot = { - loader.grub = { - enable = true; - version = 2; - device = "/dev/sda"; - }; - - initrd.availableKernelModules = [ - "uhci_hcd" - "ehci_pci" - "ata_piix" - "usb_storage" - "floppy" - "sd_mod" - "sr_mod" - "usblp" - "pcspkr" - "btusb" - ]; - - initrd.luks.devices = { - crypted-main.device = "/dev/disk/by-uuid/84dc044f-3137-435f-a7ee-67112e56cfaa"; - crypted-swap.device = "/dev/disk/by-uuid/f84ab2a9-2687-4674-a870-d037bbd84640"; - }; - }; - - fileSystems = { - "/" = { - device = "/dev/mapper/crypted-main"; - fsType = "ext4"; - }; - - "/boot" = { - device = "/dev/disk/by-label/boot"; - fsType = "ext4"; - }; - }; - - swapDevices = [ - { device = "/dev/mapper/crypted-swap"; } - ]; - - hardware.enableRedistributableFirmware = true; - - networking = { - hostName = "racker"; - enableIntel2200BGFirmware = true; - }; - - nix.settings.max-jobs = 2; - - vuizvui.profiles.tvl.enable = true; - }; -} -- cgit 1.4.1