Compare commits

...

6 Commits

Author SHA1 Message Date
Noah Masur
185258ad8a
keep hostname as lookingglass 2024-12-16 14:23:13 -05:00
Noah Masur
b69a9a2de7
use nerd-fonts subpackage 2024-12-16 14:20:54 -05:00
Noah Masur
f16859893d
add terminal options for darwin 2024-12-16 14:19:06 -05:00
Noah Masur
b668c991c8
move glacierbucket option away from global 2024-12-16 14:16:34 -05:00
Noah Masur
405b1ce60f
adjust lookingglass computer name 2024-12-16 14:08:29 -05:00
Noah Masur
e6f5649999
offline rebuild in new abbr 2024-12-16 13:43:57 -05:00
9 changed files with 48 additions and 21 deletions

View File

@ -247,7 +247,6 @@
mail.imapHost = "imap.purelymail.com"; mail.imapHost = "imap.purelymail.com";
mail.smtpHost = "smtp.purelymail.com"; mail.smtpHost = "smtp.purelymail.com";
dotfilesRepo = "https://github.com/nmasur/dotfiles"; dotfilesRepo = "https://github.com/nmasur/dotfiles";
backup.s3.glacierBucket = "noahmasur-archive";
hostnames = { hostnames = {
audiobooks = "read.${baseName}"; audiobooks = "read.${baseName}";
files = "files.${baseName}"; files = "files.${baseName}";

View File

@ -27,6 +27,7 @@ inputs.darwin.lib.darwinSystem {
{ {
nixpkgs.overlays = [ inputs.firefox-darwin.overlay ] ++ overlays; nixpkgs.overlays = [ inputs.firefox-darwin.overlay ] ++ overlays;
networking.hostName = "lookingglass"; networking.hostName = "lookingglass";
networking.computerName = "NYCM-NMASUR1";
identityFile = "/Users/Noah.Masur/.ssh/id_ed25519"; identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
gui.enable = true; gui.enable = true;
theme = { theme = {

View File

@ -134,6 +134,7 @@ inputs.nixpkgs.lib.nixosSystem rec {
endpoint = "s3.us-west-002.backblazeb2.com"; endpoint = "s3.us-west-002.backblazeb2.com";
bucket = "noahmasur-backup"; bucket = "noahmasur-backup";
accessKeyId = "0026b0e73b2e2c80000000005"; accessKeyId = "0026b0e73b2e2c80000000005";
glacierBucket = "noahmasur-archive";
}; };
# Disable passwords, only use SSH key # Disable passwords, only use SSH key

View File

@ -115,7 +115,7 @@
left = 10, left = 10,
right = 10, right = 10,
top = 10, top = 10,
bottom = 10, bottom = 12,
} }
config.font = wezterm.font('${font}', { weight = 'Bold'}) config.font = wezterm.font('${font}', { weight = 'Bold'})

View File

@ -19,8 +19,12 @@
nr = { nr = {
function = "rebuild-nixos"; function = "rebuild-nixos";
}; };
nro = "rebuild-nixos offline"; nro = {
hm = "rebuild-home"; function = "rebuild-nixos-offline";
};
hm = {
function = "rebuild-home";
};
}; };
functions = { functions = {
nix-shell-run = { nix-shell-run = {
@ -44,11 +48,14 @@
}; };
rebuild-nixos = { rebuild-nixos = {
body = '' body = ''
if test "$argv[1]" = "offline"
set option "--option substitute false "
end
git -C ${config.dotfilesPath} add --intent-to-add --all git -C ${config.dotfilesPath} add --intent-to-add --all
echo "doas nixos-rebuild switch $option--flake ${config.dotfilesPath}#${config.networking.hostName}" echo "doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName}"
'';
};
rebuild-nixos-offline = {
body = ''
git -C ${config.dotfilesPath} add --intent-to-add --all
echo "doas nixos-rebuild switch --option substitute false --flake ${config.dotfilesPath}#${config.networking.hostName}"
''; '';
}; };
rebuild-home = { rebuild-home = {

View File

@ -8,7 +8,7 @@
home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin { home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
home.packages = with pkgs; [ (nerdfonts.override { fonts = [ "VictorMono" ]; }) ]; home.packages = with pkgs; [ nerd-fonts.victor-mono ];
programs.alacritty.settings = { programs.alacritty.settings = {
font.normal.family = "VictorMono"; font.normal.family = "VictorMono";

View File

@ -6,11 +6,12 @@
}: }:
{ {
config = lib.mkIf pkgs.stdenv.isDarwin { # config = lib.mkIf pkgs.stdenv.isDarwin {
networking = { # networking = {
computerName = config.networking.hostName; # computerName = config.networking.hostName;
# Adjust if necessary # # Adjust if necessary
# hostName = ""; # # hostName = "";
}; # };
}; # };
# }
} }

View File

@ -13,16 +13,21 @@
nr = { nr = {
function = lib.mkForce "rebuild-darwin"; function = lib.mkForce "rebuild-darwin";
}; };
nro = lib.mkForce "rebuild-darwin offline"; nro = {
function = lib.mkForce "rebuild-darwin-offline";
};
}; };
functions = { functions = {
rebuild-darwin = { rebuild-darwin = {
body = '' body = ''
if test "$argv[1]" = "offline"
set option "--option substitute false"
end
git -C ${config.dotfilesPath} add --intent-to-add --all git -C ${config.dotfilesPath} add --intent-to-add --all
echo "darwin-rebuild switch $option--flake ${config.dotfilesPath}#lookingglass" echo "darwin-rebuild switch --flake ${config.dotfilesPath}#lookingglass"
'';
};
rebuild-darwin-offline = {
body = ''
git -C ${config.dotfilesPath} add --intent-to-add --all
echo "darwin-rebuild switch --option substitute false --flake ${config.dotfilesPath}#lookingglass"
''; '';
}; };
rebuild-home = lib.mkForce { rebuild-home = lib.mkForce {

View File

@ -6,6 +6,19 @@
}: }:
{ {
options = {
terminal = lib.mkOption {
type = lib.types.nullOr lib.types.str;
description = "Path to executable for terminal emulator program.";
default = null;
};
terminalLaunchCommand = lib.mkOption {
type = lib.types.nullOr lib.types.str;
description = "Command for using the terminal to launch a new window with a program.";
default = null;
};
};
config = lib.mkIf pkgs.stdenv.isDarwin { config = lib.mkIf pkgs.stdenv.isDarwin {
services.nix-daemon.enable = true; services.nix-daemon.enable = true;