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

33
modules/home-manager/reo101-shell/default.nix
View file

@ -16,10 +16,15 @@ in
reo101.shell = {
enable = mkEnableOption "reo101 zsh setup";
username = mkOption {
description = "Username to be used in prompt";
description = "Username to be used (for prompt)";
type = types.str;
default = "${config.home.username}";
};
hostname = mkOption {
description = "Hostname to be used (for `rebuild`)";
type = types.nullOr types.str;
default = null;
};
atuin = mkOption {
description = "Integrate with atuin";
type = types.bool;
@ -36,7 +41,7 @@ in
default = true;
};
flakePath = mkOption {
description = "Flake path (used for `rebuild` command)";
description = "Flake path (for `rebuild`)";
type = types.str;
default = "${config.xdg.configHome}/rix101";
};
@ -69,7 +74,7 @@ in
];
# Atuin
home.file."${config.xdg.configHome}/config.toml" = mkIf cfg.atuin {
home.file."${config.xdg.configHome}/atuin/config.toml" = mkIf cfg.atuin {
text = import ./atuin.nix {
keyPath = "${config.xdg.dataHome}/atuin/key";
};
@ -88,7 +93,9 @@ in
programs.starship = {
enable = true;
settings = import ./starship.nix { username = cfg.username; };
settings = import ./starship.nix {
inherit (cfg) username;
};
};
# Zsh
@ -116,17 +123,25 @@ in
rebuild () {
${
let
inherit (lib.strings) hasInfix;
inherit (lib.strings)
hasInfix;
inherit (pkgs.hostPlatform)
isx86_64 isAarch64
isLinux isDarwin;
in
if hasInfix "nixos" pkgs.system then
if isx86_64 && isLinux then
"sudo --validate && sudo nixos-rebuild"
else if hasInfix "darwin" pkgs.system then
else if isDarwin then
"darwin-rebuild"
else if "aarch64-linux" == pkgs.system then
else if isAarch64 then
"nix-on-droid"
else
"home-manager"
} --flake ${cfg.flakePath} ''$''\{1:-switch''\} |& nix run nixpkgs#nix-output-monitor
} --flake ${
if cfg.hostname != null
then "${cfg.flakePath}#${cfg.hostname}"
else "${cfg.flakePath}"
} ''$''\{1:-switch''\} "''$''\{@:2''\}" |& nix run nixpkgs#nix-output-monitor
}
''
(optionalString cfg.atuin ''