From 29ea6b9408446f0c033726fd7bb07449ab37d1ee Mon Sep 17 00:00:00 2001
From: Griffin Smith <grfn@gws.fyi>
Date: Wed, 25 Nov 2020 09:59:11 -0500
Subject: feat(glittershark): Get everything working on Darwin

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
---
 users/glittershark/system/home/modules/common.nix      | 10 ++++++++--
 users/glittershark/system/home/modules/development.nix |  9 +++++----
 users/glittershark/system/home/modules/games.nix       |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'users/glittershark/system/home/modules')

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
     ];
   })
 ]
-- 
cgit 1.4.1