aboutsummaryrefslogtreecommitdiff
path: root/machines
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--machines/mba-personal.nix8
-rw-r--r--machines/mbp-work.nix41
2 files changed, 46 insertions, 3 deletions
diff --git a/machines/mba-personal.nix b/machines/mba-personal.nix
index 5b0487c..6029181 100644
--- a/machines/mba-personal.nix
+++ b/machines/mba-personal.nix
@@ -23,7 +23,13 @@
home.homeDirectory = "/Users/${adminUser.name}";
imports = [
../home/profiles/darwin.nix
- ../home/profiles/personal.nix
+ ../home/programs/backups/restic.nix
+ ../home/programs/media/mpv.nix
+ ../home/programs/media/videos.nix
+ ../home/programs/media/yt-dlp.nix
+ ../home/programs/messengers/matrix.nix
+ ../home/programs/security/age.nix
+ ../home/programs/security/yubikey.nix
];
inherit (adminUser) userinfo;
};
diff --git a/machines/mbp-work.nix b/machines/mbp-work.nix
index b0541ac..a47d0a8 100644
--- a/machines/mbp-work.nix
+++ b/machines/mbp-work.nix
@@ -1,4 +1,9 @@
-{ adminUser, pkgs, ... }:
+{
+ adminUser,
+ pkgs,
+ lib,
+ ...
+}:
{
imports = [
../profiles/darwin.nix
@@ -16,7 +21,39 @@
home.homeDirectory = "/Users/${adminUser.name}";
imports = [
../home/profiles/mac.nix
- ../home/profiles/work.nix
+ ../programs/dev/k8s.nix
+ ../programs/dev/k9s.nix
+ ../programs/dev/kubie.nix
+ ../programs/security/hashi.nix
+ ../programs/security/sapi.nix
+ ];
+ home.packages = with pkgs; [
+ awscli2
+ boundary # for secure remote access
+ grpcurl
+ tfswitch
+ vault
+ ];
+ programs.onepassword.sshKeys = lib.mkAfter [
+ {
+ account = "roblox.1password.com";
+ vault = "Private";
+ }
];
+ programs.ssh.matchBlocks."github.rbx.com" = {
+ hostname = "github.rbx.com";
+ user = "git";
+ forwardAgent = false;
+ extraOptions = {
+ preferredAuthentications = "publickey";
+ controlMaster = "no";
+ controlPath = "none";
+ };
+ };
+ programs.git.extraConfig.url = {
+ "ssh://git@github.rbx.com/" = {
+ insteadOf = "https://github.rbx.com/";
+ };
+ };
};
}