aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nix/hosts/common/macos.nix5
-rw-r--r--nix/hosts/mba/default.nix13
-rw-r--r--nix/hosts/work/default.nix17
3 files changed, 13 insertions, 22 deletions
diff --git a/nix/hosts/common/macos.nix b/nix/hosts/common/macos.nix
index 18e7b07..e764129 100644
--- a/nix/hosts/common/macos.nix
+++ b/nix/hosts/common/macos.nix
@@ -14,6 +14,11 @@
remapCapsLockToControl = true;
};
+ # Touch ID for sudo auth
+ security.pam.enableSudoTouchIdAuth = true;
+
+ services.nix-daemon.enable = true;
+
system.defaults.CustomUserPreferences = {
"com.apple.desktopservices" = {
# Avoid creating .DS_Store files on network or USB volumes
diff --git a/nix/hosts/mba/default.nix b/nix/hosts/mba/default.nix
index 8beef56..0a5caac 100644
--- a/nix/hosts/mba/default.nix
+++ b/nix/hosts/mba/default.nix
@@ -1,20 +1,13 @@
{ pkgs, self, ... }: {
- services.nix-daemon.enable = true;
-
- programs.fish.enable = true;
-
- environment.shells = [ pkgs.fish ];
+ networking.hostName = "mba-fcuny";
users.users.fcuny.home = "/Users/fcuny";
users.users.fcuny.shell = pkgs.fish;
-
- # Touch ID for sudo auth
- security.pam.enableSudoTouchIdAuth = true;
+ programs.fish.enable = true;
+ environment.shells = [ pkgs.fish ];
system.stateVersion = 5;
- networking.hostName = "mba-fcuny";
-
home-manager.users.fcuny =
import "${self}/nix/profiles/home-manager/personal.nix";
}
diff --git a/nix/hosts/work/default.nix b/nix/hosts/work/default.nix
index 0d9432e..9d5f2c0 100644
--- a/nix/hosts/work/default.nix
+++ b/nix/hosts/work/default.nix
@@ -1,18 +1,11 @@
-{ pkgs, self, ... }:
-{
- services.nix-daemon.enable = true;
-
- programs.fish.enable = true;
-
- environment.shells = [ pkgs.fish ];
-
+{ pkgs, self, ... }: {
users.users.fcuny.home = "/Users/fcuny";
users.users.fcuny.shell = pkgs.fish;
-
- # Touch ID for sudo auth
- security.pam.enableSudoTouchIdAuth = true;
+ programs.fish.enable = true;
+ environment.shells = [ pkgs.fish ];
system.stateVersion = 5;
- home-manager.users.fcuny = import "${self}/nix/profiles/home-manager/work.nix";
+ home-manager.users.fcuny =
+ import "${self}/nix/profiles/home-manager/work.nix";
}