noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2025-05-31 11:15:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zellij to trigger nix rebuild of hm and nixos or darwin

Browse Source
This commit is contained in:
Noah Masur 2025-05-14 15:04:49 -04:00
parent f2e09c9adc
commit 23f46e51e6
No known key found for this signature in database
11 changed files with 64 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hosts/aarch64-darwin/lookingglass/default.nix
View File

@ -21,6 +21,7 @@ rec {
nmasur.settings = {
username = nmasur.settings.username;
fullName = nmasur.settings.fullName;
host = "lookingglass";
};
nmasur.profiles = {
common.enable = true;

1
hosts/aarch64-linux/flame/default.nix
View File

@ -23,6 +23,7 @@ rec {
nmasur.settings = {
username = nmasur.settings.username;
fullName = nmasur.settings.fullName;
host = networking.hostName;
};
nmasur.profiles = {
common.enable = true;

1
hosts/x86_64-linux/arrow/default.nix
View File

@ -19,6 +19,7 @@ rec {
nmasur.settings = {
username = nmasur.settings.username;
fullName = nmasur.settings.fullName;
host = networking.hostName;
};
nmasur.profiles = {
common.enable = true;

1
hosts/x86_64-linux/hydra/default.nix
View File

@ -19,6 +19,7 @@ rec {
nmasur.settings = {
username = nmasur.settings.username;
fullName = nmasur.settings.fullName;
host = networking.hostName;
};
nmasur.profiles = {
common.enable = true;

1
hosts/x86_64-linux/staff/default.nix
View File

@ -23,6 +23,7 @@ rec {
nmasur.settings = {
username = nmasur.settings.username;
fullName = nmasur.settings.fullName;
host = networking.hostName;
};
nmasur.profiles = {
common.enable = true;

1
hosts/x86_64-linux/swan/default.nix
View File

@ -21,6 +21,7 @@ rec {
nmasur.settings = {
username = nmasur.settings.username;
fullName = nmasur.settings.fullName;
host = networking.hostName;
};
nmasur.profiles = {
common.enable = true;

1
hosts/x86_64-linux/tempest/default.nix
View File

@ -23,6 +23,7 @@ rec {
nmasur.settings = {
username = nmasur.settings.username;
fullName = nmasur.settings.fullName;
host = networking.hostName;
};
nmasur.profiles = {
common.enable = true;

6
platforms/home-manager/modules/nmasur/presets/programs/nixpkgs-darwin.nix
View File

@ -21,6 +21,12 @@ in
config = lib.mkIf (cfg.enable) {
# These are useful for triggering from zellij (rather than running directly in the shell)
nmasur.presets.programs.nixpkgs.commands.rebuildNixos = pkgs.writeShellScriptBin "rebuild-darwin" ''
git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
darwin-rebuild switch --flake "${config.nmasur.presets.programs.dotfiles.path}#${config.nmasur.settings.host}"
'';
programs.fish = {
shellAbbrs = lib.mkIf config.nmasur.presets.programs.dotfiles.enable {
nr = {

26
platforms/home-manager/modules/nmasur/presets/programs/nixpkgs.nix
View File

@ -11,10 +11,34 @@ in
{
options.nmasur.presets.programs.nixpkgs.enable = lib.mkEnableOption "Nixpkgs presets";
options.nmasur.presets.programs.nixpkgs = {
enable = lib.mkEnableOption "Nixpkgs presets";
commands = {
# These are useful for triggering from zellij (rather than running directly in the shell)
rebuildHome = lib.mkOption {
type = lib.types.package;
default = pkgs.writeShellScriptBin "rebuild-home" ''
git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
${lib.getExe pkgs.home-manager} switch --flake "${config.nmasur.presets.programs.dotfiles.path}#${config.nmasur.settings.host}"
'';
};
rebuildNixos = lib.mkOption {
type = lib.types.package;
default = pkgs.writeShellScriptBin "rebuild-nixos" ''
git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
doas nixos-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path}
'';
};
};
};
config = lib.mkIf cfg.enable {
home.packages = [
cfg.commands.rebuildHome
cfg.commands.rebuildNixos
];
programs.fish = {
shellAbbrs = {
n = "nix";

26
platforms/home-manager/modules/nmasur/presets/programs/zellij.nix
View File

@ -121,14 +121,32 @@ in
close_on_exit = true;
};
};
"bind \"Alt Shift h\"" = {
Run = {
_args = [
(lib.getExe config.nmasur.presets.programs.nixpkgs.commands.rebuildHome)
];
# close_on_exit = false;
};
};
"bind \"Alt Shift r\"" = {
Run = {
_args = [
(lib.getExe config.nmasur.presets.programs.nixpkgs.commands.rebuildNixos)
];
# close_on_exit = false;
};
};
"bind \"Alt Shift w\"" = {
Run = {
_args = [
"${pkgs.fish}/bin/fish"
"-c"
"gh-run"
(lib.getExe pkgs.gh)
"run"
"watch"
];
close_on_exit = true;
# direction = "Right";
# close_on_exit = false;
# start_suspended = true;
};
};
"bind \"Super Shift ]\"" = {

4
platforms/home-manager/modules/nmasur/settings.nix
View File

@ -10,6 +10,10 @@
type = lib.types.str;
description = "Human readable name of the user";
};
host = lib.mkOption {
type = lib.types.str;
description = "Name of the host of this deployment";
};
hostnames = lib.mkOption {
type = lib.types.attrsOf lib.types.str;
description = "Map of service names to FQDNs";