Add more profiles for work machine

ethan-turkeltaub-zocdoc · ethan-turkeltaub-zocdoc · commit c92cb58f9edf · 2025-05-05T09:57:51.000-04:00
diff --git a/flake.lock b/flake.lock
diff --git a/hosts/eMac/configuration.nix b/hosts/eMac/configuration.nix
@@ -29,10 +29,8 @@
     taps = [ "homebrew/services" ];
 
     casks = [
-      "arc"
       "elgato-stream-deck"
       "hazel"
-      "istat-menus"
       "notion"
       "steam"
       "tailscale"
diff --git a/hosts/eturkeltaub-mb/configuration.nix b/hosts/eturkeltaub-mb/configuration.nix
@@ -10,4 +10,6 @@
     directory = "/Users/ethan/Workspace/tilde";
     system = "aarch64-darwin";
   };
+
+  homebrew.onActivation.cleanup = "uninstall";
 }
diff --git a/modules/profiles/home/amazon-ecr-credential-helper/default.nix b/modules/profiles/home/amazon-ecr-credential-helper/default.nix
@@ -0,0 +1 @@
+{ pkgs, ... }: { home.packages = [ pkgs.amazon-ecr-credential-helper ]; }
diff --git a/modules/profiles/home/git/common.nix b/modules/profiles/home/git/common.nix
@@ -43,8 +43,7 @@
     extraConfig = let deltaCommand = lib.getExe pkgs.delta;
     in {
       core.pager = deltaCommand;
-      interactive.diffFilter =
-        "${deltaCommand} --diff-so-fancy --keep-plus-minus-markers --line-numbers";
+      interactive.diffFilter = "${deltaCommand} --color-only";
       http = { sslCAinfo = "/etc/ssl/certs/ca-certificates.crt"; };
       color = {
         status = "always";
diff --git a/modules/profiles/home/rider/default.nix b/modules/profiles/home/rider/default.nix
@@ -0,0 +1 @@
+{ pkgs, ... }: { home.packages = [ pkgs.jetbrains.rider ]; }
diff --git a/modules/profiles/system/core/nix-config.nix b/modules/profiles/system/core/nix-config.nix
@@ -12,8 +12,5 @@
     };
   };
 
-  nix = {
-    gc.automatic = true;
-    # settings.extra-experimental-features = [ "repl-flake" ];
-  };
+  nix = { gc.automatic = true; };
 }
diff --git a/modules/profiles/system/darwin/brew.nix b/modules/profiles/system/darwin/brew.nix
@@ -10,12 +10,15 @@
 
     casks = [
       "1password"
+      "arc"
       "bartender"
       "cleanshot"
       "dash"
       "docker"
       "ghostty"
+      "fantastical"
       "firefox"
+      "istat-menus"
       "iterm2"
       "jabra-direct"
       "logitune"
@@ -28,9 +31,6 @@
       "zoom"
     ];
 
-    masApps = {
-      "Amphetamine" = 937984704;
-      Fantastical = 975937182;
-    };
+    masApps = { "Amphetamine" = 937984704; };
   };
 }
diff --git a/modules/suites/home.nix b/modules/suites/home.nix
@@ -26,7 +26,13 @@ with profiles;
 
   identity = [ gnupg.default ];
 
-  work = [ git.large-repos ];
+  work = [
+    amazon-ecr-credential-helper.default
+    awscli.default
+    git.large-repos
+    mise.default
+    rider.default
+  ];
 
   minimal = [
     autojump.default
diff --git a/users/ethan.turkeltaub/home.nix b/users/ethan.turkeltaub/home.nix
@@ -1,6 +1,5 @@
-{ config, suites, profiles, secrets, ... }: {
-  imports = (with suites; base ++ development ++ identity)
-    ++ (with profiles; [ awscli.default mise.default ])
+{ config, suites, secrets, ... }: {
+  imports = (with suites; base ++ development ++ identity ++ work)
     ++ [ secrets.users."ethan.turkeltaub".home ] ++ [ ./profiles/vscode.nix ];
 
   tilde.home = {
@@ -20,6 +19,7 @@
   home = {
     username = "ethan.turkeltaub";
     homeDirectory = "/Users/ethan.turkeltaub";
+
     stateVersion = "24.05";
   };
 }
diff --git a/users/ethan.turkeltaub/profiles/vscode.nix b/users/ethan.turkeltaub/profiles/vscode.nix
@@ -1,10 +1,43 @@
-{ pkgs, ... }: {
+{ pkgs, lib, ... }: {
   programs.vscode.profiles.default = {
-    extensions = pkgs.vscode-utils.extensionsFromVscodeMarketplace [{
-      name = "csdevkit";
-      publisher = "ms-dotnettools";
-      version = "1.19.35";
-      sha256 = "chEfSSZcofWZGJcabfsfop5lnTD7aVqriBDvLCxsHWM=";
-    }];
+    userSettings = {
+      "github.copilot.enable" = lib.mkOverride 10 {
+        "*" = true;
+        "csharp" = true;
+      };
+    };
+
+    extensions = pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+      {
+        name = "vscode-dotnet-runtime";
+        publisher = "ms-dotnettools";
+        version = "2.3.3";
+        sha256 = "l+/r0C+BZr8H8qBKenVP3b4qYGR57Lol+Y1Q2XUGl24=";
+      }
+      {
+        name = "csdevkit";
+        publisher = "ms-dotnettools";
+        version = "1.19.45";
+        sha256 = "ErJ8FjStxwaaJ6f2qew/hY4GTrzC6ZG3MtPGEDmQaHU=";
+      }
+      {
+        name = "csharp";
+        publisher = "ms-dotnettools";
+        version = "2.72.34";
+        sha256 = "d77S13UzAvHF9JBoi/wzh1EDjVAQ6/KugT/zHl6Aj+U=";
+      }
+      {
+        name = "vscodeintellicode-csharp";
+        publisher = "ms-dotnettools";
+        version = "2.2.3";
+        sha256 = "E2KRzjIxLFmwArzEKittjejacrCOFFNNzphWw8v5CpE=";
+      }
+      {
+        name = "graphql";
+        publisher = "mquandalle";
+        version = "0.1.2";
+        sha256 = "0hBtHDD/yk+EpA0A/9ovAz8SUcAoTrXAtHU4Y9MiHnw=";
+      }
+    ];
   };
 }

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,6 @@`
`10`	`10`	`directory = "/Users/ethan/Workspace/tilde";`
`11`	`11`	`system = "aarch64-darwin";`
`12`	`12`	`};`
	`13`	`+`
	`14`	`+ homebrew.onActivation.cleanup = "uninstall";`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{ pkgs, ... }: { home.packages = [ pkgs.amazon-ecr-credential-helper ]; }`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,5 @@`
`12`	`12`	`};`
`13`	`13`	`};`
`14`	`14`
`15`		`- nix = {`
`16`		`- gc.automatic = true;`
`17`		`- # settings.extra-experimental-features = [ "repl-flake" ];`
`18`		`- };`
	`15`	`+ nix = { gc.automatic = true; };`
`19`	`16`	`}`