Some Linux fixes (#72)

flake.nix

@@ -70,6 +70,7 @@
               dotnet = pkgs.dotnet-sdk_8;
               mbsync = import ./mbsync.nix {inherit pkgs;};
               secretsPath = "/home/patrick/.secrets/";
+              machinename = "capybara";
             };
           in [
             ./home-manager/capybara-config.nix
@@ -95,6 +96,7 @@
               dotnet = pkgs.dotnet-sdk_8;
               mbsync = import ./mbsync.nix {inherit pkgs;};
               secretsPath = "/home/patrick/.secrets/";
+              machinename = "earthworm";
             };
           in [
             ./home-manager/earthworm-config.nix
@@ -124,6 +126,7 @@
             whisper = whisper.packages.${system};
             mbsync = import ./mbsync.nix {inherit pkgs;};
             secretsPath = "/Users/patrick/.secrets/";
+            machinename = "darwin";
           };
         in [
           ./darwin-configuration.nix

home-manager/home.nix

@@ -1,5 +1,6 @@
 {
   nixpkgs,
+  machinename,
   username,
   mbsync,
   dotnet,
@@ -58,7 +59,12 @@
     extraConfig = {
       commit.gpgsign = true;
       gpg.program = "${nixpkgs.gnupg}/bin/gpg";
-      user.signingkey = "7C97D679CF3BC4F9";
+      user.signingkey =
+        if machinename == "darwin" || machinename == "earthworm"
+        then "7C97D679CF3BC4F9"
+        else if machinename == "capybara"
+        then "AE90453E879DBCFA"
+        else throw "unrecognised machine name!";
       core = {
         autocrlf = "input";
       };
@@ -254,7 +260,8 @@
     extraLuaConfig = builtins.readFile ./nvim/build-utils.lua + "\n" + (builtins.replaceStrings ["_CURL_"] ["${nixpkgs.curl}/bin/curl"] (builtins.readFile ./nvim/dotnet.lua)) + "\n" + builtins.readFile ./nvim/init.lua + "\n" + builtins.readFile ./nvim/python.lua;
   };
 
-  home.packages = [
+  home.packages =
+    [
       nixpkgs.jq
       nixpkgs.difftastic
       nixpkgs.syncthing
@@ -304,7 +311,12 @@
       nixpkgs.clang-tools
       nixpkgs.deno
       nixpkgs.yazi
-  ];
+    ]
+    ++ (
+      if nixpkgs.stdenv.isLinux
+      then [nixpkgs.protonmail-bridge nixpkgs.pinentry]
+      else []
+    );
 
   home.file.".ideavimrc".source = ./ideavimrc;
   home.file.".config/yt-dlp/config".source = ./youtube-dl.conf;

home-manager/modules/mail.nix

@@ -149,7 +149,10 @@ in {
       port = 1025; # 8126; if using hydroxide
       tls = {enable = false;};
     };
-    userName = address;
+    userName =
+      if pkgs.stdenv.isLinux
+      then builtins.head (pkgs.lib.strings.splitString "@" address)
+      else address;
   };
 
   programs.mbsync = {