diff options
| author | William Carroll <wpcarro@gmail.com> | 2020-08-17T09·08+0100 |
|---|---|---|
| committer | William Carroll <wpcarro@gmail.com> | 2020-08-20T10·26+0100 |
| commit | 59f74814111045b6d74d2a8f5b4f4bfbd1cacd85 (patch) | |
| tree | d87397c2b1f32bdc1d3df0ab4d4f62d1cf065426 /nixos | |
| parent | 7833632a7961038e8898ef287fd2dedf8fa7f33b (diff) | |
Revise previous opinions about absolute paths GT <bracket-notation>
Unforeseen problem: `buildkite-agent` runs its builds in a separate directory, so if I want the `nix-build` command to build the newly checked out code, I need to set <briefcase> to the CWD.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/socrates/default.nix | 2 | ||||
| -rw-r--r-- | nixos/socrates/hardware.nix | 2 | ||||
| -rw-r--r-- | nixos/socrates/rebuild.nix | 11 |
3 files changed, 2 insertions, 13 deletions
diff --git a/nixos/socrates/default.nix b/nixos/socrates/default.nix index d98cdb993300..ebb62036bd8f 100644 --- a/nixos/socrates/default.nix +++ b/nixos/socrates/default.nix @@ -1,5 +1,5 @@ let - briefcase = import /home/wpcarro/briefcase {}; + briefcase = import <briefcase> {}; pkgs = briefcase.third_party.pkgs; trimNewline = x: pkgs.lib.removeSuffix "\n" x; readSecret = x: trimNewline (builtins.readFile ("/etc/secrets/" + x)); diff --git a/nixos/socrates/hardware.nix b/nixos/socrates/hardware.nix index d13ffd7e401d..dde14eb1e627 100644 --- a/nixos/socrates/hardware.nix +++ b/nixos/socrates/hardware.nix @@ -5,7 +5,7 @@ { imports = - [ /home/wpcarro/nixpkgs/nixos/modules/installer/scan/not-detected.nix + [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ]; boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; diff --git a/nixos/socrates/rebuild.nix b/nixos/socrates/rebuild.nix deleted file mode 100644 index 1ab4f5133d0b..000000000000 --- a/nixos/socrates/rebuild.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: - -pkgs.writeShellScriptBin "rebuild" '' - set -ue - sudo nixos-rebuild \ - -I nixos-config=/home/wpcarro/briefcase/nixos/socrates/configuration.nix \ - -I nixpkgs=/home/wpcarro/nixpkgs \ - -I depot=/home/wpcarro/depot \ - -I briefcase=/home/wpcarro/briefcase \ - switch -'' |