From 9562435aa4e8d74169a497e0c3a815926f4bd20b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 1 Oct 2023 12:04:00 +0000 Subject: sys: remove obsolete systems RIP. --- sys/default.nix | 2 -- sys/eve.nix | 47 -------------------------------- sys/x220.nix | 84 --------------------------------------------------------- 3 files changed, 133 deletions(-) delete mode 100644 sys/eve.nix delete mode 100644 sys/x220.nix (limited to 'sys') diff --git a/sys/default.nix b/sys/default.nix index 1c5eb5c8377a..b0e647ca29a0 100644 --- a/sys/default.nix +++ b/sys/default.nix @@ -6,7 +6,5 @@ in { atuin = buildSystem ./atuin.nix; - eve = buildSystem ./eve.nix; mbp = buildSystem ./mbp.nix; - x220 = buildSystem ./x220.nix; } diff --git a/sys/eve.nix b/sys/eve.nix deleted file mode 100644 index 2c0cb44d5a4a..000000000000 --- a/sys/eve.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../modules/workstation/physical - ../modules/workstation/hardware/pixelbook - ]; - - hardware.enableRedistributableFirmware = true; - - boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; - boot.zfs.enableUnstable = true; - - boot.initrd.availableKernelModules = [ "nvme" "usb_storage" "sdhci_pci" ]; - boot.kernelModules = [ "kvm-intel" ]; - - boot.loader.systemd-boot.enable = true; - - fileSystems."/" = { fsType = "zfs"; device = "rpool/local/root"; }; - fileSystems."/tmp" = { fsType = "zfs"; device = "rpool/local/tmp"; }; - fileSystems."/nix" = { fsType = "zfs"; device = "rpool/local/nix"; }; - fileSystems."/home" = { fsType = "zfs"; device = "rpool/data/home"; }; - fileSystems."/state" = { fsType = "zfs"; device = "rpool/data/state"; }; - fileSystems."/boot" = { - fsType = "vfat"; - device = "/dev/disk/by-path/pci-0000:02:00.0-nvme-1-part2"; - }; - - # TODO: do this with ZFS - boot.tmp.cleanOnBoot = true; - - networking.hostName = "eve"; - networking.hostId = "c00b7876"; - - nix.settings.max-jobs = 4; - - console.font = "${pkgs.terminus_font}/share/consolefonts/ter-u32n.psf.gz"; - console.earlySetup = true; - programs.sway.extraConfig = '' - output eDP-1 scale 2 - ''; - - users.users.qyliss.hashedPassword = "$5$rounds=2000000$FPrRi1TT.rCn$8MhcwE7JL8yTKI.fSRe4ZgJP3eumStDCNl5Pb.IN9i5"; - users.users.qyliss.home = "/home"; - - system.stateVersion = "20.03"; -} diff --git a/sys/x220.nix b/sys/x220.nix deleted file mode 100644 index cc079dae5ca9..000000000000 --- a/sys/x220.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ pkgs, ... }: - -{ - imports = [ - ../modules/nixos-hardware/lenovo/thinkpad/x220 - ../modules/persistence - ../modules/workstation/audio - ../modules/workstation/hardware/bluetooth - ../modules/workstation/physical - ]; - - hardware.enableRedistributableFirmware = true; - - boot.initrd.availableKernelModules = - [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" "i915" ]; - - boot.kernelModules = [ "kvm-intel" ]; - - boot.loader.grub.enable = true; - boot.loader.grub.device = "nodev"; - - boot.swraid.enable = false; - - boot.initrd.postDeviceCommands = '' - mkdir /mnt - mount /dev/mapper/root /mnt - btrfs subvolume delete /mnt/boot - btrfs subvolume create /mnt/boot - umount /mnt - ''; - - boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/c28ed0c0-4fa9-4d8a-a771-5fddac61adda"; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/c068093d-512b-43d3-a4c3-cab52a190bfd"; - fsType = "btrfs"; - options = [ "subvol=boot" ]; - }; - - fileSystems."/home" = { - device = "/dev/disk/by-uuid/c068093d-512b-43d3-a4c3-cab52a190bfd"; - fsType = "btrfs"; - options = [ "subvol=persist/safe/home" ]; - }; - - fileSystems."/nix" = { - device = "/dev/disk/by-uuid/c068093d-512b-43d3-a4c3-cab52a190bfd"; - fsType = "btrfs"; - options = [ "subvol=persist/local/nix" ]; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/6F69-3310"; - fsType = "vfat"; - }; - - fileSystems."/persist" = { - device = "/dev/disk/by-uuid/c068093d-512b-43d3-a4c3-cab52a190bfd"; - fsType = "btrfs"; - options = [ "subvol=persist" ]; - neededForBoot = true; - }; - - fileSystems."/srv" = { - device = "/dev/disk/by-uuid/c068093d-512b-43d3-a4c3-cab52a190bfd"; - fsType = "btrfs"; - options = [ "subvol=persist/safe/srv" ]; - }; - - fileSystems."/var/lib/machines" = { - device = "/dev/disk/by-uuid/c068093d-512b-43d3-a4c3-cab52a190bfd"; - fsType = "btrfs"; - options = [ "subvol=persist/safe/var/lib/machines" ]; - }; - - networking.hostName = "x220"; - - system.stateVersion = "22.05"; - - users.users.qyliss.hashedPassword = "$y$j9T$Q5bSnSDsY.PkqBX9AA3Gp0$cMl0jK1Cug/7vu8n4ShmQouZTbyPMkUO3NMBVpWn353"; - - hardware.opengl.enable = true; - hardware.opengl.extraPackages = with pkgs; [ libGL ]; -} -- cgit 1.4.1