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

Merge branch 'staging' of 207.180.237.116:/home/steveej/src/steveej/infra into staging

Browse source
This commit is contained in:
steveej 2019-01-06 02:11:30 +01:00
commit e3ec026aa4
5 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Justfile
View file

@ -55,6 +55,7 @@ rebuild-this-device rebuildarg="dry-activate":
if type home-manager > /dev/null 2>&1; then if type home-manager > /dev/null 2>&1; then
echo Rebuilding home in $(parse_hm_rebuildarg {{rebuildarg}})-mode... echo Rebuilding home in $(parse_hm_rebuildarg {{rebuildarg}})-mode...
source $(just -v _get_nix_path {{invocation_directory()}}/nix/os/devices/$(hostname -s)/versions.nix)
if home-manager -v $(parse_hm_rebuildarg {{rebuildarg}}) > ${HOMEREBUILD_LOG} 2>&1 ; then if home-manager -v $(parse_hm_rebuildarg {{rebuildarg}}) > ${HOMEREBUILD_LOG} 2>&1 ; then
echo Home rebuild successful echo Home rebuild successful
else else

3
nix/default.nix
View file

@ -10,7 +10,8 @@
url = "https://github.com/NixOS/nixpkgs-channels/"; url = "https://github.com/NixOS/nixpkgs-channels/";
# Commit hash for nixos-unstable as of 2018-09-12 # Commit hash for nixos-unstable as of 2018-09-12
# `git ls-remote https://github.com/nixos/nixpkgs-channels nixos-unstable` # `git ls-remote https://github.com/nixos/nixpkgs-channels nixos-unstable`
rev = (builtins.getAttr channel channelVersions); ref = (builtins.getAttr channel channelVersions)."ref";
rev = (builtins.getAttr channel channelVersions)."rev";
name = "nixpkgs-channels-${channel}"; name = "nixpkgs-channels-${channel}";
}; };
nix_path = builtins.foldl' (sum: elem: sum +":" + builtins.concatStringsSep "=" elem) "" [ nix_path = builtins.foldl' (sum: elem: sum +":" + builtins.concatStringsSep "=" elem) "" [

10
nix/os/devices/steveej-laptop/versions.nix Normal file
View file

@ -0,0 +1,10 @@
{
channelsNixosStable = {
ref = "nixos-18.09";
rev = "7e88992a8c7b2de0bcb89182d8686b27bd93e46a";
};
channelsNixosUnstable = {
ref = "nixos-unstable";
rev = "44b02b52ea6a49674f124f50009299f192ed78bb";
};
}

10
nix/os/devices/steveej-t480s-work/versions.nix
View file

@ -1,4 +1,10 @@
{ {
channelsNixosStable = "7e88992a8c7b2de0bcb89182d8686b27bd93e46a"; channelsNixosStable = {
channelsNixosUnstable = "44b02b52ea6a49674f124f50009299f192ed78bb"; ref = "nixos-18.09";
rev = "7e88992a8c7b2de0bcb89182d8686b27bd93e46a";
};
channelsNixosUnstable = {
ref = "nixos-unstable";
rev = "44b02b52ea6a49674f124f50009299f192ed78bb";
};
} }

10
nix/variables/versions.nix
View file

@ -1,4 +1,10 @@
{ {
channelsNixosStable = "7e88992a8c7b2de0bcb89182d8686b27bd93e46a"; channelsNixosStable = {
channelsNixosUnstable = "44b02b52ea6a49674f124f50009299f192ed78bb"; ref = "nixos-18.09";
rev = "7e88992a8c7b2de0bcb89182d8686b27bd93e46a";
};
channelsNixosUnstable = {
ref = "nixos-unstable";
rev = "44b02b52ea6a49674f124f50009299f192ed78bb";
};
} }