Merge branch 'feat/t510-updates'

flake.nix

@@ -100,6 +100,7 @@
         glass = libx.mkHost { systemType = "workstation"; hostname = "glass"; username = "tcarrio"; desktop = "kde6"; };
         kuroi = libx.mkHost { systemType = "workstation"; hostname = "kuroi"; username = "tcarrio"; desktop = "pantheon"; };
         t510 = libx.mkHost { systemType = "workstation"; hostname = "t510"; username = "tcarrio"; desktop = "i3"; };
+        t510-headless = libx.mkHost { systemType = "workstation"; hostname = "t510-headless"; username = "tcarrio"; };
 
         # Servers
         # Can be executed locally:

install.sh

@@ -1,40 +1,55 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #set -euo pipefail
 
 TARGET_HOST="${1:-}"
 TARGET_USER="${2:-tcarrio}"
 TARGET_TYPE="${3:-}"
+TARGET_NIXOS_CONFIG_NAME="${4:-$TARGET_HOST}"
+
+function usage() {
+  echo """
+install.sh <host> <user> <system-type> [nixos-config-name]
+
+example: install.sh t510 tcarrio workstation t510-headless
+"""
+}
 
 if [ "$(id -u)" -eq 0 ]; then
   echo "ERROR! $(basename "$0") should be run as a regular user"
   exit 1
 fi
 
-if [ ! -d "$HOME/0xc/nix-config/.git" ]; then
-  git clone https://github.com/tcarrio/nix-config.git "$HOME/0xc/nix-config"
+if [ ! -d "$HOME/0xc/nixcfg/.git" ]; then
+  git clone https://github.com/tcarrio/nixcfg.git "$HOME/0xc/nixcfg"
 fi
 
-pushd "$HOME/0xc/nix-config"
+pushd "$HOME/0xc/nixcfg"
 
 if [[ -z "$TARGET_HOST" ]]; then
   echo "ERROR! $(basename "$0") requires a hostname as the first argument"
   echo "       The following hosts are available"
   ls -1 nixos/*/default.nix | cut -d'/' -f2 | grep -v iso
+  echo ""
+  usage
   exit 1
 fi
 
 if [[ -z "$TARGET_USER" ]]; then
   echo "ERROR! $(basename "$0") requires a username as the second argument"
   echo "       The following users are available"
   ls -1 nixos/mixins/users/ | grep -v -E "nixos|root"
+  echo ""
+  usage
   exit 1
 fi
 
 if [[ -z "$TARGET_TYPE" ]]; then
   echo "ERROR! $(basename "$0") requires a type as the third argument"
   echo "       The following types are available"
   ls -1 nixos/ | grep -v -E "nixos|root|mixins"
+  echo ""
+  usage
   exit 1
 fi
 
@@ -67,20 +82,22 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
     --mode zap_create_mount \
     "$TARGET_HOST_ROOT/disks.nix"
 
-  sudo nixos-install --no-root-password --flake ".#$TARGET_HOST"
+  MAX_CONCURRENCY=$(($(nproc) - 1))
+
+  sudo nixos-install -j $MAX_CONCURRENCY --cores $MAX_CONCURRENCY --no-root-password --flake ".#$TARGET_NIXOS_CONFIG_NAME"
 
   if [[ "$TARGET_USER" == "root" ]]; then
     TARGET_USER_HOME="/mnt/root"
   else
     TARGET_USER_HOME="/mnt/home/$TARGET_USER"
   fi
 
-  # Rsync nix-config to the target install and set the remote origin to SSH.
+  # Rsync nixcfg to the target install and set the remote origin to SSH.
   sudo mkdir -p "$TARGET_USER_HOME"
   sudo chown $(whoami):root -R "$TARGET_USER_HOME"
   rsync -a --delete "$HOME/0xc/" "$TARGET_USER_HOME/0xc/"
-  pushd "$TARGET_USER_HOME/0xc/nix-config"
-  git remote set-url origin [email protected]:tcarrio/nix-config.git
+  pushd "$TARGET_USER_HOME/0xc/nixcfg"
+  git remote set-url origin [email protected]:tcarrio/nixcfg.git
   popd
 
   # If there is a keyfile for a data disk, put copy it to the root partition and
@@ -89,4 +106,4 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
     sudo cp /tmp/data.keyfile /mnt/etc/data.keyfile
     sudo chmod 0400 /mnt/etc/data.keyfile
   fi
-fi
+fi

nixos/default.nix

@@ -7,6 +7,7 @@
     ./mixins/services/firewall.nix
     ./mixins/services/fwupd.nix
     ./mixins/services/kmscon.nix
+    ./mixins/services/networkmanager.nix
     ./mixins/services/openssh.nix
     ./mixins/services/smartmon.nix
     ./mixins/users/root

nixos/workstation/t510-headless/default.nix

@@ -0,0 +1,11 @@
+# Device:      Lenovo ThinkPad T510
+# CPU:         Intel i5 M 520
+# RAM:         8GB DDR2
+# SATA:        500GB SSD
+
+_: {
+  imports = [
+    (import ./disks.nix { })
+    ../../iso/iso-console
+  ];
+}

nixos/workstation/t510/disks.nix → nixos/workstation/t510-headless/disks.nix

@@ -2,7 +2,7 @@
   disko.devices = {
     disk = {
       sda = {
-        device = builtins.elemAt disks 0;
+        device = "/dev/disk/by-id/ata-Samsung_SSD_850_PRO_512GB_S250NXAH211618D";
         type = "disk";
         content = {
           type = "gpt";

nixos/workstation/t510/default.nix

@@ -1,11 +1,11 @@
 # Device:      Lenovo ThinkPad T510
 # CPU:         Intel i5 M 520
 # RAM:         8GB DDR2
-# SATA:        120GB SSD
+# SATA:        500GB SSD
 
 { inputs, lib, pkgs, ... }: {
   imports = [
-    (import ./disks.nix { })
+    (import ../t510-headless/disks.nix { })
 
     inputs.nixos-hardware.nixosModules.common-cpu-intel
     inputs.nixos-hardware.nixosModules.common-pc
@@ -74,3 +74,4 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }
+