From 516957c81218e65e11031d81913e4bcc1fb08a37 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Sun, 24 Apr 2022 10:49:10 -0400
Subject: [PATCH] keybase move to system

---
 nixos/configuration.nix | 27 +++++++++++++++------------
 nixos/home.nix          |  3 ++-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 2e9d3c7..266ed7f 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -98,9 +98,9 @@
   # Install fonts
   fonts.fonts = with pkgs; [
     victor-mono # Used for Vim and Terminal
-    nerdfonts
-    font-awesome # Icons (for i3)
-    siji # More icons for Polybar
+    nerdfonts # Used for icons in Vim
+    font-awesome # Icons for i3
+    # siji # More icons for Polybar
   ];
   fonts.fontconfig.defaultFonts.monospace = [ "Victor Mono" ];
 
@@ -164,16 +164,15 @@
     home-manager
     xclip # Clipboard
     pamixer # Audio control
-    dmenu
-    xlockmore
-    feh
-    playerctl
-    polybar
+    dmenu # Launcher
+    feh # Wallpaper
+    playerctl # Media control
+    polybarFull # Polybar + PulseAudio
     ddcutil # Monitor brightness control
 
     # Mouse config
-    libratbag
-    piper
+    libratbag # Mouse adjustments
+    piper # Mouse adjustments GUI
 
     # Gaming
     steam
@@ -184,7 +183,7 @@
     dconf
   ];
 
-  environment.variables = { NIX_SKIP_KEYBASE_CHECKS = "1"; };
+  # environment.variables = { NIX_SKIP_KEYBASE_CHECKS = "1"; };
 
   # Reduce blue light at night
   services.redshift = {
@@ -202,7 +201,11 @@
   services.keybase.enable = true;
   services.kbfs = {
     enable = true;
-    mountPoint = "/keybase";
+    enableRedirector = true;
+  };
+  security.wrappers.keybase-redirector = {
+    owner = "root";
+    group = "wheel";
   };
 
   # Some programs need SUID wrappers, can be configured further or are
diff --git a/nixos/home.nix b/nixos/home.nix
index 859a1ae..34541cd 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -47,7 +47,6 @@ in {
     glow
 
     # Encryption
-    keybase
     keybase-gui
     gnupg
     pass
@@ -141,6 +140,7 @@ in {
       l = "ls";
       lh = "ls -lh";
       ll = "ls -alhF";
+      la = "ls -a";
       lf = "ls -lh | fzf";
       c = "cd";
       "-" = "cd -";
@@ -149,6 +149,7 @@ in {
       # System
       s = "sudo";
       sc = "systemctl";
+      scs = "systemctl status";
 
       # Tmux
       ta = "tmux attach-session";