steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

fixup all kinds of bugs

Browse source
This commit is contained in:
steveej 2022-01-09 21:50:41 +01:00
parent 02bb843015
commit acc37c64f9
10 changed files with 45 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Justfile
View file

@ -20,6 +20,7 @@ _get_nix_path versionsPath:
_device recipe dir +moreargs="":
#!/usr/bin/env bash
set -ex
unset NIX_PATH
source $(just -v _get_nix_path {{invocation_directory()}}/{{dir}}/versions.nix)
$(set -x; nix-build --no-link --show-trace $(dirname {{dir}})/default.nix -A recipes.{{recipe}} --argstr dir {{dir}} {{moreargs}})

6
nix/default.nix
View file

@ -10,14 +10,14 @@ let
inherit name;
inherit (channelVersion) url ref rev;
};
nixPath = builtins.foldl' (path: elemName:
nixPath = builtins.concatStringsSep ":" (builtins.map (elemName:
let
elem = builtins.getAttr elemName channelVersions;
elemPath = (mkChannelSource elemName);
suffix = if builtins.hasAttr "suffix" elem then elem.suffix else "";
in
path + ":" + builtins.concatStringsSep "=" [ elemName elemPath ] + suffix
) "" (builtins.attrNames channelVersions);
builtins.concatStringsSep "=" [ elemName elemPath ] + suffix
) (builtins.attrNames channelVersions));
pkgs = import (mkChannelSource "nixpkgs") {};
in

10
nix/home-manager/programs/neovim.nix
View file

@ -3,22 +3,14 @@
}:
let
unstablepkgs = import <channels-nixos-unstable> {};
in {
home.sessionVariables = {
EDITOR = "nvim";
};
nixpkgs.config = {
pidgin = {
openssl = true;
gnutls = true;
};
};
programs.neovim = {
enable = true;
enable = false;
extraPython3Packages = (ps: with ps; [ ]);

1
nix/os/devices/disk.nix
View file

@ -53,6 +53,7 @@ in rec {
sudo -E $SHELL <<EOF
# 'having $system set breaks nixos-install'
unset system
echo $NIX_PATH
nixos-install --max-jobs 5 --cores 4 --no-root-passwd --root ${mntRootVol}/nixos
EOF
'';

18
nix/os/devices/steveej-rmvbl-sdep0/versions.nix
View file

@ -1,8 +1,8 @@
let
nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-21.05";
rev = "5de44c15758465f8ddf84d541ba300b48e56eda4";
ref = "nixos-21.11";
rev = "00acdb2aa817048fbe1f91ece18fe7de09762531";
};
in
@ -12,19 +12,25 @@ in
suffix = "/nixos";
};
"channels-nixos-stable" = nixpkgs;
# "channels-nixos-21.05" = {
# url = "https://github.com/NixOS/nixpkgs/";
# ref = "nixos-21.05";
# rev = "88579effa7e88c25087faf6de6388d0cd1738dc0";
# };
"channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable";
rev = "fbfb79400a08bf754e32b4d4fc3f7d8f8055cf94";
rev = "ff377a78794d412a35245e05428c8f95fef3951f";
};
"nixpkgs-master" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
rev = "7e529086a7ce588380178733a42ff2a293ac080c";
rev = "a85f163c46f4315df772946796a6527069789bc7";
};
"home-manager-module" = {
url = "https://github.com/nix-community/home-manager";
ref = "release-21.05";
rev = "148d85ee8303444fb0116943787aa0b1b25f94df";
ref = "release-21.11";
rev = "697cc8c68ed6a606296efbbe9614c32537078756";
};
}

3
nix/scripts/pre-eval-fixed.sh
View file

@ -3,6 +3,7 @@ set -xe
INFILE="${1:?Please set arg1 to INFILE}"
OUTFILE="${2:?Please set arg2 to OUTFILE}"
# sha256-1fm94N2Y9ptXVN6ni0nJyPRK+nsvoeliqBcFyjlaTH4=
hash=$(nix-build ${INFILE} --arg pkgs 'import <channels-nixos-stable> {}' --arg config 'null' 2>&1 | rg -o 'got.*(sha256-.{44})' -r '$1')
# sha256:0zjcb8wwl18pm1ifk89gggx4mx68r54qp9yyaibrpxlqvphbvyfm
hash=$(nix-build ${INFILE} --arg pkgs 'import <channels-nixos-stable> {}' --arg config 'null' 2>&1 | rg -o 'got.*(sha256[:-].+)$' -r '$1')
sed -E "s/0{52}/${hash}/" ${INFILE} > ${OUTFILE}

18
nix/variables/versions.nix
View file

@ -1,8 +1,8 @@
let
nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.09";
rev = "51aaa3fa1b69559456f9bd4968bd5b179a784f67";
ref = "nixos-21.11";
rev = "00acdb2aa817048fbe1f91ece18fe7de09762531";
};
in
@ -12,19 +12,25 @@ in
suffix = "/nixos";
};
"channels-nixos-stable" = nixpkgs;
# "channels-nixos-21.05" = {
# url = "https://github.com/NixOS/nixpkgs/";
# ref = "nixos-21.05";
# rev = "88579effa7e88c25087faf6de6388d0cd1738dc0";
# };
"channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable";
rev = "24c9b05ac53e422f1af81a156f1fd58499eb27fb";
rev = "ff377a78794d412a35245e05428c8f95fef3951f";
};
"nixpkgs-master" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
rev = "3312e1c3ba80506c435876f016d7b3888f297c4e";
rev = "2ac65dd85b7fbe81b88e3c2a80d351aba4c4a9d8";
};
"home-manager-module" = {
url = "https://github.com/nix-community/home-manager";
ref = "release-20.09";
rev = "7339784e07217ed0232e08d1ea33b610c94657d8";
ref = "release-21.11";
rev = "697cc8c68ed6a606296efbbe9614c32537078756";
};
}

14
nix/variables/versions.tmpl.nix
View file

@ -1,8 +1,8 @@
let
nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-21.05";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>";
ref = "nixos-21.11";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.11 | awk '{ print $1 }' | tr -d '\n' -%>";
};
in
@ -12,6 +12,12 @@ in
suffix = "/nixos";
};
"channels-nixos-stable" = nixpkgs;
# "channels-nixos-21.05" = {
# url = "https://github.com/NixOS/nixpkgs/";
# ref = "nixos-21.05";
# rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>";
# };
"channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable";
@ -24,7 +30,7 @@ in
};
"home-manager-module" = {
url = "https://github.com/nix-community/home-manager";
ref = "release-21.05";
rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-21.05 | awk '{ print $1 }' | tr -d '\n' -%>";
ref = "release-21.11";
rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-21.11 | awk '{ print $1 }' | tr -d '\n' -%>";
};
}

1
shell.nix
View file

@ -15,6 +15,7 @@ stdenv.mkDerivation {
vcsh
gnupg
git
nixUnstable
vncdo
tesseract