reo101/rix101
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(shell)!: accept a hostname parameter

Browse source 
Pass along device `hostname` into `home-manager` (and more) configs
Used for the `rebuild` command since `nix-on-droid` uses the `default` system instead of the `$(hostname)` one (because that requires root to change on-device)
This commit is contained in:
reo101 2023-07-26 09:43:14 +03:00
parent bc81e59950
commit 20e7547b0c
Signed by: reo101
GPG key ID: 675AA7EF13964ACB
4 changed files with 45 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

26
util/default.nix
View file

@ -3,8 +3,6 @@
let
inherit (inputs) nixpkgs;
inherit (nixpkgs) lib;
inherit (lib) mapAttrs;
inherit (lib.attrsets) filterAttrs;
in
rec {
# Boolean helpers
@ -14,7 +12,7 @@ rec {
# Directory walking helpers
recurseDir = dir:
mapAttrs
lib.mapAttrs
(file: type:
if type == "directory"
then recurseDir "${dir}/${file}"
@ -131,6 +129,7 @@ rec {
sharedModules = builtins.attrValues homeManagerModules;
extraSpecialArgs = {
inherit inputs outputs;
inherit hostname;
};
};
}
@ -163,13 +162,17 @@ rec {
useGlobalPkgs = false;
useUserPackages = true;
sharedModules = builtins.attrValues homeManagerModules;
extraSpecialArgs = { inherit inputs outputs; };
extraSpecialArgs = {
inherit inputs outputs;
inherit hostname;
};
};
}
] ++ (builtins.attrValues nixOnDroidModules);
extraSpecialArgs = {
inherit inputs outputs;
inherit hostname;
# rootPath = ./.;
};
@ -190,12 +193,18 @@ rec {
users
(user: import (root + "/home/${user}.nix"));
sharedModules = builtins.attrValues homeManagerModules;
extraSpecialArgs = { inherit inputs outputs; };
extraSpecialArgs = {
inherit inputs outputs;
inherit hostname;
};
};
}
] ++ (builtins.attrValues nixDarwinModules);
inputs = { inherit inputs outputs nixpkgs; };
inputs = {
inherit inputs outputs;
inherit nixpkgs;
};
};
mkHomeManagerHost = root: system: hostname: inputs.home-manager.lib.homeManagerConfiguration {
@ -205,7 +214,10 @@ rec {
(root + "/home.nix")
] ++ (builtins.attrValues homeManagerModules);
extraSpecialArgs = { inherit inputs outputs; };
extraSpecialArgs = {
inherit inputs outputs;
inherit hostname;
};
};
createConfigurations =

103
util/test.nix
View file

@ -1,103 +0,0 @@
# { lib, stdenv, darwin, fetchFromGitHub, rustPlatform, openssl, pkg-config, libxkbcommon }:
# # rustPlatform.buildRustPackage rec {
# rec {
# pname = "vim-fmi-cli";
# version = "0.2.0";
#
# src = fetchFromGitHub {
# owner = "AndrewRadev";
# repo = pname;
# rev = "v${version}";
# sha256 = "sha256-RAlvDiNvDVRNtex0aD8WESc4R/lskjda;sldfjmAr7FjWtgzHWa4ZSI=";
# };
# }
# {
# a = ''''\'''${a}''\''';
#
# src = fetchFromGitHub {
# owner = "g15ecb";
# repo = "promela-mode";
# rev = "53863e62cfedcd0466e1e19b1ca7b5786cb7a576";
# # hash = "sha256-pOVIOj5XnZcNVFNyjMV7Iv0X+R+W+mQfT1o5nay2Kww=";
# };
# }
# let
# a = "v${b}.${c}.${d}";
# b = "2";
# c = "3";
# d = "6";
# rev = a;
# in
# rec {
# src = fetchTest {
# inherit a b c rev;
# };
# rev = "aloda";
# alo = da;
# }
let
# kek
type = "256";
in
let
in
rec {
pname = "vim-fmi-cli";
version = "0.2.0";
sha = "RAlvDiNvDVRNtex0aD8WESc4R/mAr7FjWtgzHWa4ZSI=";
sha256 = "sha${type}-${sha}";
kek = let
in rec {};
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = pname;
rev = "v${version}";
inherit sha256;
};
}
# let
# bb = "2";
# b = bb;
# in
# let
# # ...
# in
# fetchTest {
# a = "1";
# inherit b;
# c = "3";
# rev = "456";
# }
# let
# f = "2";
# s = "3";
# t = "4";
# a = "1";
# c = "2";
# v = "${f}.${s}.${t}";
# kek = rec {
# x = "5";
# y = x;
# };
# aloda = fetchTest rec {
# c = b;
# a = "2";
# b = a;
# rev = "v${c}";
# };
# in
# fetchTest {
# inherit a c;
# m = a;
# b = "b";
# aloda = "${a}b${c}d";
# rev = "v${v}";
# }