From ec4dcbd3a60eaf485acc0b893c73a2fa1538ce5e Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Mon, 16 May 2022 22:05:21 -0400
Subject: [PATCH] fix kbfs, mbsync, alacritty i3

---
 modules/graphical/i3.nix     |  2 +-
 modules/mail/himalaya.nix    |  9 +++++++--
 modules/services/keybase.nix | 11 ++++++++++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/modules/graphical/i3.nix b/modules/graphical/i3.nix
index b577185..993e596 100644
--- a/modules/graphical/i3.nix
+++ b/modules/graphical/i3.nix
@@ -115,7 +115,7 @@ in {
 
           # Launchers
           "${modifier}+Return" =
-            "exec alacritty; workspace ${ws2}; layout tabbed";
+            "exec --no-startup-id alacritty; workspace ${ws2}; layout tabbed";
           "${modifier}+space" =
             "exec --no-startup-id ${config.gui.launcherCommand}";
           "${modifier}+Shift+s" =
diff --git a/modules/mail/himalaya.nix b/modules/mail/himalaya.nix
index 6269270..302ea9d 100644
--- a/modules/mail/himalaya.nix
+++ b/modules/mail/himalaya.nix
@@ -14,11 +14,16 @@
       home.packages = with pkgs; [ age ];
 
       programs.himalaya = { enable = true; };
+      programs.mbsync = { enable = true; };
+      services.mbsync = {
+        enable = true;
+        frequency = "*:0/5";
+      };
 
       accounts.email = {
         maildirBasePath = "/home/${config.user}/mail";
         accounts = {
-          main = let
+          home = let
             address = "${config.user}@${config.mailServer}";
             serverHostname = "mail.${config.mailServer}";
           in {
@@ -55,7 +60,7 @@
             };
             maildir = { path = "main"; };
             mbsync = {
-              enable = false;
+              enable = true;
               create = "maildir";
               expunge = "none";
               remove = "none";
diff --git a/modules/services/keybase.nix b/modules/services/keybase.nix
index 4e51e2d..4f4a824 100644
--- a/modules/services/keybase.nix
+++ b/modules/services/keybase.nix
@@ -1,7 +1,16 @@
 { config, pkgs, lib, ... }: {
 
   services.keybase.enable = true;
-  services.kbfs.enable = true;
+  services.kbfs = {
+    enable = true;
+    enableRedirector = true;
+    mountPoint = "/run/user/1000/keybase/kbfs";
+  };
+  security.wrappers.keybase-redirector = {
+    setuid = true;
+    owner = "root";
+    group = "root";
+  };
 
   home-manager.users.${config.user} = {
     home.packages = [ (lib.mkIf config.gui.enable pkgs.keybase-gui) ];