From 3ccc7e784a0ed5b19910ab856f6d9774a6f27956 Mon Sep 17 00:00:00 2001 From: Kleidi Bujari Date: Sat, 23 Nov 2024 16:36:43 -0500 Subject: Initial scaffolding and layout Set up the modules of the flake. At this time, the flake is split into modules and machines. Considering that additional top-level sections -- such as packages and shells -- will also be added, it might make sense to keep all nix related things in one top-level directory, alongside the flake.nix file. This is all under the assumption that later amendments to the project will introduce other tech, such as terraform. --- machines/flake-module.nix | 29 +++++++++++++++++++++++++++++ machines/iridium/default.nix | 1 + machines/iso/default.nix | 32 ++++++++++++++++++++++++++++++++ machines/t1/default.nix | 1 + machines/t480/default.nix | 38 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 101 insertions(+) create mode 100644 machines/flake-module.nix create mode 100644 machines/iridium/default.nix create mode 100644 machines/iso/default.nix create mode 100644 machines/t1/default.nix create mode 100644 machines/t480/default.nix (limited to 'machines') diff --git a/machines/flake-module.nix b/machines/flake-module.nix new file mode 100644 index 0000000..d06bfc2 --- /dev/null +++ b/machines/flake-module.nix @@ -0,0 +1,29 @@ +{ lib, self, ... }: +let + inherit (lib) nixosSystem; + inherit (self.nixosModules) xnet xlib; +in +{ + flake.nixosConfigurations = { + t480 = nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit xlib; }; + modules = [ ./t480 xnet ]; + }; + + iso = nixosSystem { + system = "x86_64-linux"; + modules = [ ./iso ]; + }; + + # t1 = nixosSystem { + # system = "x86_64-linux"; + # modules = [ ./t1 ]; + # }; + # + # iridium = nixosSystem { + # system = "x86_64-linux"; + # modules = [ ./iridium ]; + # }; + }; +} diff --git a/machines/iridium/default.nix b/machines/iridium/default.nix new file mode 100644 index 0000000..c915eb0 --- /dev/null +++ b/machines/iridium/default.nix @@ -0,0 +1 @@ +{ ... }: { } diff --git a/machines/iso/default.nix b/machines/iso/default.nix new file mode 100644 index 0000000..d7d5861 --- /dev/null +++ b/machines/iso/default.nix @@ -0,0 +1,32 @@ +{ modulesPath, pkgs, ... }: { + imports = [ + (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") + (modulesPath + "/installer/cd-dvd/channel.nix") + ]; + + nix.settings = { + experimental-features = [ "nix-command" "flakes" ]; + }; + + environment.systemPackages = with pkgs; [ + bash + git + gum + jq + (writeShellScriptBin "xinstall" '' + set -euo pipefail + + FLAKE="github:kbujari/depot/scaffolding" + + TARGET=$( + nix flake show "$FLAKE" --json 2>/dev/null \ + | jq -r '.["nixosConfigurations"] | keys[] | select(. != "iso")' \ + | gum choose + ) + + gum confirm --default=false "This will erase the selected disk, confirm:" + + echo selected "$FLAKE"#"$TARGET" + '') + ]; +} diff --git a/machines/t1/default.nix b/machines/t1/default.nix new file mode 100644 index 0000000..c915eb0 --- /dev/null +++ b/machines/t1/default.nix @@ -0,0 +1 @@ +{ ... }: { } diff --git a/machines/t480/default.nix b/machines/t480/default.nix new file mode 100644 index 0000000..d17899e --- /dev/null +++ b/machines/t480/default.nix @@ -0,0 +1,38 @@ +{ ... }: { + system.stateVersion = "24.05"; + + xnet = { + desktop.enable = true; + disk = { + enable = true; + device = "nvme0n1"; + extraDatasets = { + "persist/usr" = { + type = "zfs_fs"; + mountpoint = "/home/k6"; + options.mountpoint = "legacy"; + }; + }; + }; + }; + + networking = { + hostName = "t480"; + useDHCP = false; + dhcpcd.enable = false; + nameservers = [ "9.9.9.9" ]; + networkmanager = { + enable = true; + dns = "none"; + wifi = { + powersave = true; + backend = "iwd"; + }; + }; + }; + + systemd.tmpfiles.rules = [ + "d /persist/data/NetworkManager 0750 - - -" + "L+ /var/lib/NetworkManager - - - - /persist/data/NetworkManager" + ]; +} -- cgit v1.3.1