staging: 2024-11-14

.github/workflows/build.yml

@@ -0,0 +1,34 @@
+name: Exhaustive Flake Test
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - staging
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.2.2
+
+      - name: Free Disk Space
+        uses: jlumbroso/free-disk-space@v1.3.1
+        with:
+          tool-cache: true
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v30
+        with:
+          extra_nix_config: |
+            allow-import-from-derivation = false
+            eval-cache = false
+
+      - name: Run Flake Check
+        run: nix flake check
+
+      - name: Build NixOS Configurations
+        run: |
+          nix build '.#nixosConfigurations.LAPTOP-3DT4F02.config.system.build.toplevel'
+          nix build '.#nixosConfigurations.DESKTOP-3DT4F02.config.system.build.toplevel'
+          nix build '.#nixosConfigurations.ISO-3DT4F02.config.system.build.isoImage'

hosts/laptop/configuration.nix

@@ -3,7 +3,9 @@
 }:
 {
   imports = [
+    ./hardware
     ./mounts.nix
+    ./time-sync.nix
   ];
 
   config = {

hosts/laptop/hardware/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./power-savings.nix
+  ];
+}

hosts/laptop/hardware/power-savings.nix

@@ -0,0 +1,32 @@
+{
+  ...
+}:
+{
+  config = {
+    boot.blacklistedKernelModules = [
+      "btusb"
+      "bluetooth"
+      "snd_hda_codec_hdmi"
+    ];
+
+    boot.kernelParams = [
+      "pcie_aspm.policy=powersupersave"
+    ];
+
+    powerManagement.enable = true;
+    powerManagement.scsiLinkPolicy = "med_power_with_dipm";
+
+    # TODO: /sys/devices/system/cpu/cpu*/power/energy_perf_bias -> 8/15
+
+    boot.kernel.sysctl = {
+      "kernel.nmi_watchdog" = 0;
+    };
+
+    services.tlp.enable = false;
+
+    services = {
+      auto-cpufreq.enable = true;
+      thermald.enable = true;
+    };
+  };
+}

hosts/laptop/time-sync.nix

@@ -0,0 +1,12 @@
+{
+  config,
+  ...
+}:
+{
+  config = {
+    services.chrony.enable = true;
+    my.persist.directories = [
+      config.services.chrony.directory
+    ];
+  };
+}

modules/nixos/programs/nix/module.nix

@@ -19,8 +19,7 @@ in {
 
       # Wrap the official nix binary with a snippet to allow
       # rapid repl access to `pkgs.*` and `lib.*` attributes.
-      #nix.package = pkgs.callPackage ./package.nix { nix = pkgs.lix; };
-      nix.package = pkgs.lix;
+      nix.package = pkgs.callPackage ./package.nix { nix = pkgs.lix; };
     }
     {
       # Throttle the nix-daemon so it doesn't consume

modules/nixos/programs/nix/package.nix

@@ -1,42 +1,20 @@
 {
-  lib,
-  runCommandLocal,
-  writeShellScriptBin,
+  callPackage,
+  buildEnv,
 
   nix,
 }:
 let
-  nix-wrapped = writeShellScriptBin "nix" ''
-    declare -a args
-
-    if [ "$1" = "repl" ]; then
-      # https://wiki.nixos.org/wiki/Flakes#Getting_Instant_System_Flakes_Repl
-      args+=(repl --expr "builtins // { inherit (import <nixpkgs> { config.allowUnfree = true; }) pkgs lib; }")
-      shift 1
-    fi
+  wrapper = callPackage ./wrapper { inherit nix; };
+in buildEnv {
+  inherit (nix) name;
 
-    # https://discourse.nixos.org/t/how-do-nix-legacy-commands-work-when-they-are-just-symbolic-links-to-nix/52797
-    cmd=(
-      "$(basename $0)"
-      "''${args[@]}"
-      "$@"
-    )
-
-    PATH="${nix}/bin:$PATH" exec "''${cmd[@]}"
-  '';
-in runCommandLocal "wrap-nix" {
-  pname = lib.getName nix;
-  version = lib.getVersion nix;
-
-  outputs = nix.outputs;
+  paths = [
+    wrapper
+    nix
+  ];
 
+  ignoreCollisions = true;
+  extraOutputsToInstall = nix.meta.outputsToInstall;
   meta.mainProgram = "nix";
-} ''
-  install -Dm755 -t $out/bin ${lib.getExe nix-wrapped}
-
-  ${lib.concatStringsSep "\n" (map (output: ''
-    mkdir -p ${placeholder output}
-    cp --update=none -rt ${placeholder output} ${nix.${output}}/*
-  ''
-  ) nix.outputs)}
-''
+}

modules/nixos/programs/nix/wrapper/default.nix

@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenvNoCC,
+
+  nix,
+}:
+stdenvNoCC.mkDerivation {
+  inherit (nix) name;
+
+  src = with lib.fileset; toSource {
+    root = ./.;
+    fileset = unions [
+      ./nix.sh
+    ];
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 nix.sh $out/bin/nix
+
+    runHook postInstall
+  '';
+
+  postInstall = ''
+    substituteInPlace $out/bin/nix \
+      --subst-var-by nix ${lib.getExe nix}
+  '';
+
+  meta = with lib; {
+    description = "Very bare-bones wrapper around the Nix CLI";
+
+    license = licenses.free;
+    maintainers = with maintainers; [ frontear ];
+    platforms = platforms.linux;
+
+    mainProgram = "nix";
+  };
+}

modules/nixos/programs/nix/wrapper/nix.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+origArgs=("$@")
+newArgs=()
+
+for i in "${!origArgs[@]}"; do
+  newArgs+=("${origArgs[$i]}")
+
+  if [ $i -eq 0 ]; then
+    case "${origArgs[0]}" in
+      repl)
+        newArgs+=("--expr" "builtins // { inherit (import <nixpkgs> { config.allowUnfree = true; }) pkgs lib; }")
+        ;;
+    esac
+  fi
+done
+
+# The official Nix binary resolves nix-legacy binary calls through
+# disambiguating $0. This means we must set it directly here in the
+# exec call in order to help it out.
+exec -a "$0" "@nix@" "${newArgs[@]}"

users/frontear/home/neovim/default.nix

@@ -58,6 +58,8 @@
           basedpyright
           clang-tools
           nixd
+          rust-analyzer
+          zls
         ];
 
         plugins = with pkgs.vimPlugins; [
@@ -103,6 +105,14 @@
           lspconfig.nixd.setup({
             capabilities = capabilities,
           })
+
+          lspconfig.rust_analyzer.setup({
+            capabilities = capabilities,
+          })
+
+          lspconfig.zls.setup({
+            capabilities = capabilities,
+          })
         '';
       }
       {

users/frontear/home/sway/config.nix

@@ -64,8 +64,8 @@ bindsym --locked {
   XF86AudioLowerVolume exec wpctl set-volume @DEFAULT_SINK@ 5%-
   XF86AudioRaiseVolume exec wpctl set-volume @DEFAULT_SINK@ 5%+ --limit 1.0
 
-  XF86MonBrightnessUp exec light -A 10
-  XF86MonBrightnessDown exec light -U 10
+  XF86MonBrightnessUp exec xbacklight -inc 10
+  XF86MonBrightnessDown exec xbacklight -dec 10
 }
 
 bindsym --no-repeat {

users/frontear/nixos/desktop.nix

@@ -10,7 +10,7 @@
       config.programs.ydotool.group
     ];
 
-    programs.light.enable = true;
+    hardware.acpilight.enable = true;
     programs.ydotool.enable = true;
   };
 }