From acc37c64f9948edac1cb1987df1b784bb4b5833e Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sun, 9 Jan 2022 21:50:41 +0100 Subject: [PATCH] fixup all kinds of bugs --- Justfile | 1 + nix/default.nix | 6 +++--- nix/home-manager/programs/neovim.nix | 12 ++---------- nix/home-manager/programs/vscode/default.nix | 2 +- nix/os/devices/disk.nix | 1 + .../devices/steveej-rmvbl-sdep0/versions.nix | 18 ++++++++++++------ nix/scripts/pre-eval-fixed.sh | 3 ++- nix/variables/versions.nix | 18 ++++++++++++------ nix/variables/versions.tmpl.nix | 14 ++++++++++---- shell.nix | 1 + 10 files changed, 45 insertions(+), 31 deletions(-) diff --git a/Justfile b/Justfile index aa28c8f..d07ba1f 100755 --- a/Justfile +++ b/Justfile @@ -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}}) diff --git a/nix/default.nix b/nix/default.nix index 2512b43..7a19c2d 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -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 diff --git a/nix/home-manager/programs/neovim.nix b/nix/home-manager/programs/neovim.nix index febea42..1dd0d92 100644 --- a/nix/home-manager/programs/neovim.nix +++ b/nix/home-manager/programs/neovim.nix @@ -3,22 +3,14 @@ }: let - unstablepkgs = import {}; in { home.sessionVariables = { EDITOR = "nvim"; }; - nixpkgs.config = { - pidgin = { - openssl = true; - gnutls = true; - }; - }; - programs.neovim = { - enable = true; + enable = false; extraPython3Packages = (ps: with ps; [ ]); @@ -134,6 +126,6 @@ in { # misc syntax support vim-bazel maktaba ]) - ; + ; }; } diff --git a/nix/home-manager/programs/vscode/default.nix b/nix/home-manager/programs/vscode/default.nix index 9a28bdf..9c9adaa 100644 --- a/nix/home-manager/programs/vscode/default.nix +++ b/nix/home-manager/programs/vscode/default.nix @@ -469,7 +469,7 @@ in enable = true; extensions = [] ++ packagedExtensions - # ++ marketPlaceExtensions + # ++ marketPlaceExtensions ; }; } diff --git a/nix/os/devices/disk.nix b/nix/os/devices/disk.nix index 4181f1a..3928f6a 100644 --- a/nix/os/devices/disk.nix +++ b/nix/os/devices/disk.nix @@ -53,6 +53,7 @@ in rec { sudo -E $SHELL < {}' --arg config 'null' 2>&1 | rg -o 'got.*(sha256-.{44})' -r '$1') +# sha256:0zjcb8wwl18pm1ifk89gggx4mx68r54qp9yyaibrpxlqvphbvyfm +hash=$(nix-build ${INFILE} --arg pkgs 'import {}' --arg config 'null' 2>&1 | rg -o 'got.*(sha256[:-].+)$' -r '$1') sed -E "s/0{52}/${hash}/" ${INFILE} > ${OUTFILE} diff --git a/nix/variables/versions.nix b/nix/variables/versions.nix index 4a3e8f4..3883b92 100644 --- a/nix/variables/versions.nix +++ b/nix/variables/versions.nix @@ -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"; }; } diff --git a/nix/variables/versions.tmpl.nix b/nix/variables/versions.tmpl.nix index a3a1e8f..7461f29 100644 --- a/nix/variables/versions.tmpl.nix +++ b/nix/variables/versions.tmpl.nix @@ -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' -%>"; }; } diff --git a/shell.nix b/shell.nix index 8df0295..c1e6a13 100644 --- a/shell.nix +++ b/shell.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation { vcsh gnupg git + nixUnstable vncdo tesseract