diff options
| -rw-r--r-- | machines/mba-personal.nix | 15 | ||||
| -rw-r--r-- | machines/mbp-work.nix | 11 | ||||
| -rw-r--r-- | profiles/darwin.nix | 12 |
3 files changed, 13 insertions, 25 deletions
diff --git a/machines/mba-personal.nix b/machines/mba-personal.nix index d606a42..0804043 100644 --- a/machines/mba-personal.nix +++ b/machines/mba-personal.nix @@ -1,8 +1,6 @@ { pkgs, ... }: { - age.secrets = { - ssh-remote-builder.file = ../secrets/ssh-remote-builder.age; - }; + age.secrets.ssh-remote-builder.file = ../secrets/ssh-remote-builder.age; imports = [ ../profiles/darwin.nix @@ -20,17 +18,6 @@ shell = pkgs.fish; }; - environment.shells = [ pkgs.fish ]; - - programs.fish.enable = true; - programs.fish.shellInit = '' - # Nix - if test -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish' - source '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish' - end - # End Nix - ''; - home-manager.users.fcuny = { home.stateVersion = "23.05"; home.username = "fcuny"; diff --git a/machines/mbp-work.nix b/machines/mbp-work.nix index fc4340d..8050987 100644 --- a/machines/mbp-work.nix +++ b/machines/mbp-work.nix @@ -10,17 +10,6 @@ shell = pkgs.fish; }; - environment.shells = [ pkgs.fish ]; - - programs.fish.enable = true; - programs.fish.shellInit = '' - # Nix - if test -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish' - source '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish' - end - # End Nix - ''; - home-manager.users.fcuny = { home.stateVersion = "23.05"; home.username = "fcuny"; diff --git a/profiles/darwin.nix b/profiles/darwin.nix index 8b260f5..dadc7b9 100644 --- a/profiles/darwin.nix +++ b/profiles/darwin.nix @@ -1,6 +1,7 @@ { lib, pkgs, ... }: { fonts.packages = with pkgs; [ + dejavu_fonts source-code-pro ]; @@ -42,6 +43,17 @@ system.primaryUser = "fcuny"; + environment.shells = [ pkgs.fish ]; + + programs.fish.enable = true; + programs.fish.shellInit = '' + # Nix + if test -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish' + source '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish' + end + # End Nix + ''; + nix = { extraOptions = '' tarball-ttl = 900 |