mirror of
https://github.com/nmasur/dotfiles
synced 2025-04-23 19:12:23 +00:00
Compare commits
6 Commits
ef03bb112d
...
185258ad8a
Author | SHA1 | Date | |
---|---|---|---|
|
185258ad8a | ||
|
b69a9a2de7 | ||
|
f16859893d | ||
|
b668c991c8 | ||
|
405b1ce60f | ||
|
e6f5649999 |
@ -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}";
|
||||||
|
@ -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 = {
|
||||||
|
@ -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
|
||||||
|
@ -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'})
|
||||||
|
@ -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 = {
|
||||||
|
@ -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";
|
||||||
|
@ -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 = "";
|
||||||
};
|
# };
|
||||||
};
|
# };
|
||||||
|
# }
|
||||||
}
|
}
|
||||||
|
@ -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 {
|
||||||
|
@ -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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user