feat(glittershark): Get everything working on Darwin r/1917

Update everything in home-manager to properly work on darwin (including
adding dobharchu as a top-level attribute from
//users/glittershark/home) and also fix font faces and sizes in emacs
config

Change-Id: Ica889dd212876030d5c2a916a71d8b614e6964f1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2147
Reviewed-by: glittershark <grfn@gws.fyi>
Tested-by: BuildkiteCI

6 files changed, 37 insertions, 29 deletions

diff --git a/users/glittershark/system/home/default.nix b/users/glittershark/system/home/default.nix
index 1e5ed98255b1..d19397192e4d 100644
--- a/users/glittershark/system/home/default.nix
+++ b/users/glittershark/system/home/default.nix
@@ -21,5 +21,9 @@ rec {
 
   chupacabraHome = chupacabra.activation-script;
 
+  dobharchu = home ./machines/dobharchu.nix;
+
+  dobharchuHome = dobharchu.activation-script;
+
   meta.targets = [ "chupacabraHome" ];
 }
diff --git a/users/glittershark/system/home/modules/common.nix b/users/glittershark/system/home/modules/common.nix
index 14ac4a8b0e7c..69494cea4236 100644
--- a/users/glittershark/system/home/modules/common.nix
+++ b/users/glittershark/system/home/modules/common.nix
@@ -38,8 +38,6 @@
     gnupg
     keybase
     openssl
-    yubikey-manager
-    yubikey-manager-qt
 
     # Nix things
     nixfmt
@@ -78,4 +76,12 @@
       };
     };
   };
+
+  services.lorri.enable = true;
+
+  programs.direnv = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+  };
 }
diff --git a/users/glittershark/system/home/modules/development.nix b/users/glittershark/system/home/modules/development.nix
index 1fe9381be58d..3056f8547a0d 100644
--- a/users/glittershark/system/home/modules/development.nix
+++ b/users/glittershark/system/home/modules/development.nix
@@ -21,7 +21,7 @@ let
     };
 
     vendorSha256 = "1a5fx6mrv30cl46kswicd8lf5i5shn1fykchvbnbhdpgxhbz6qi4";
-    deleteVendor = true;
+    deleteVendor = pkgs.stdenv.isLinux;
   };
 
 in
@@ -52,8 +52,6 @@ with lib;
 
     gdb
     lldb
-    valgrind
-    rr
     hyperfine
 
     clj2nix
@@ -63,7 +61,10 @@ with lib;
     pg-dump-upsert
 
     config.lib.depot.third_party.clang-tools
-  ]; # ++ optional (stdenv.isLinux) julia;
+  ] ++ optionals (stdenv.isLinux) [
+    valgrind
+    rr
+  ];
 
   programs.git = {
     enable = true;
diff --git a/users/glittershark/system/home/modules/games.nix b/users/glittershark/system/home/modules/games.nix
index e508d7b3b995..b3e07a83e61e 100644
--- a/users/glittershark/system/home/modules/games.nix
+++ b/users/glittershark/system/home/modules/games.nix
@@ -47,12 +47,12 @@ in mkMerge [
   {
     home.packages = [
       crawl
-      multimc
     ];
   }
   (mkIf stdenv.isLinux {
     home.packages = [
       df
+      multimc
     ];
   })
 ]
diff --git a/users/glittershark/system/home/platforms/darwin.nix b/users/glittershark/system/home/platforms/darwin.nix
index d6b33ba5625c..cf0375e94162 100644
--- a/users/glittershark/system/home/platforms/darwin.nix
+++ b/users/glittershark/system/home/platforms/darwin.nix
@@ -3,22 +3,24 @@
 with lib;
 
 {
-  home.packages = with pkgs; [
-    coreutils
-    gnupg
-    pinentry_mac
-  ];
+  config = {
+    home.packages = with pkgs; [
+      coreutils
+      gnupg
+      pinentry_mac
+    ];
 
-  home.activation.linkApplications = lib.hm.dag.entryAfter ["writeBoundary"] ''
-    $DRY_RUN_CMD ln -sf $VERBOSE_ARG \
-      ~/.nix-profile/Applications/* ~/Applications/
-  '';
+    home.activation.linkApplications = lib.hm.dag.entryAfter ["writeBoundary"] ''
+      $DRY_RUN_CMD ln -sf $VERBOSE_ARG \
+        ~/.nix-profile/Applications/* ~/Applications/
+    '';
 
-  programs.zsh.initExtra = ''
-    export NIX_PATH=$HOME/.nix-defexpr/channels:$NIX_PATH
+    programs.zsh.initExtra = ''
+      export NIX_PATH=$HOME/.nix-defexpr/channels:$NIX_PATH
 
-    if [[ "$TERM" == "alacritty" ]]; then
-      export TERM="xterm-256color"
-    fi
-  '';
+      if [[ "$TERM" == "alacritty" ]]; then
+        export TERM="xterm-256color"
+      fi
+    '';
+  };
 }
diff --git a/users/glittershark/system/home/platforms/linux.nix b/users/glittershark/system/home/platforms/linux.nix
index fd9bcf192433..b1e8cd19400f 100644
--- a/users/glittershark/system/home/platforms/linux.nix
+++ b/users/glittershark/system/home/platforms/linux.nix
@@ -59,6 +59,8 @@ in
     gnupg
     keybase
     openssl
+    yubikey-manager
+    yubikey-manager-qt
 
     # Spotify...etc
     spotify
@@ -83,13 +85,6 @@ in
     ];
   };
 
-  # programs.tarsnap = {
-  #   enable = true;
-  #   keyfile = "/home/grfn/.private/tarsnap.key";
-  #   printStats = true;
-  #   humanizeNumbers = true;
-  # };
-
   programs.zsh.initExtra = ''
     [[ ! $IN_NIX_SHELL ]] && alsi -l
   '';