[Altair] Adds Thunderbird email, protonmail bridge. [Nix] Fixes deprecated expressions

home-manager/features/development/vscode.nix

@@ -3,7 +3,7 @@
   programs.vscode = {
     enable = true;
 
-    extensions = with pkgs.vscode-extensions; [
+    profiles.default.extensions = with pkgs.vscode-extensions; [
       asvetliakov.vscode-neovim # Use embedded neovim editor
       enkia.tokyo-night # Color theme
       eamodio.gitlens # Show git info inline

home-manager/features/email.nix

@@ -0,0 +1,23 @@
+_: {
+  # Proton Mail is fully encrypted on the servers so it doesn't support POP3 or
+  # IMAP.  In order to connect we need to set up a bridge that will download
+  # the mail and decrypt it locally.
+  services.protonmail-bridge.enable = true;
+
+  programs.thunderbird = {
+    enable = true;
+
+    profiles.drew = {
+      isDefault = true;
+      accountsOrder = [ "proton" ];
+    };
+  };
+
+  accounts.email.accounts.proton = {
+    enable = true;
+    primary = true;
+    address = "drew@blazestar.net";
+    realName = "Drew Haven";
+    thunderbird.enable = true;
+  };
+}

home-manager/features/git.nix

@@ -2,27 +2,29 @@
 {
   programs.git = {
     enable = true;
-    aliases = {
-      "co" = "checkout";
-      "s" = "status";
-      "b" = "branch";
-      "r" = "remote";
-      "amend" = "commit -a --amend --no-edit";
-      "c" = "commit -am";
-      "l" = "log --oneline";
+    settings = {
+      alias = {
+        "co" = "checkout";
+        "s" = "status";
+        "b" = "branch";
+        "r" = "remote";
+        "amend" = "commit -a --amend --no-edit";
+        "c" = "commit -am";
+        "l" = "log --oneline";
+      };
+      extraConfig = {
+        pull = {
+          rebase = true;
+        };
+        log = {
+          date = "iso";
+        };
+        init = {
+          defaultBranch = "main";
+        };
+      };
+      # Enable the delta diff pager.
+      delta.enable = true;
     };
-    extraConfig = {
-      pull = {
-        rebase = true;
-      };
-      log = {
-        date = "iso";
-      };
-      init = {
-        defaultBranch = "main";
-      };
-    };
-    # Enable the delta diff pager.
-    delta.enable = true;
   };
 }

home-manager/features/ssh.nix

@@ -3,13 +3,13 @@
   programs.ssh = {
     enable = true;
 
-    # Automatically add keys to agent when used
-    # Other options are "no" and "confirm"
-    addKeysToAgent = "yes";
-
     matchBlocks = {
       "mcp.haven" = {
         user = "drew";
+
+        # Automatically add keys to agent when used
+        # Other options are "no" and "confirm"
+        addKeysToAgent = "yes";
       };
     };
   };