From 370948543d62b23c6edebb5eb5d268a8887fd74e Mon Sep 17 00:00:00 2001
From: Michael Thomson <michael@michaelthomson.dev>
Date: Tue, 26 Nov 2024 15:43:48 -0500
Subject: [PATCH] updated

---
 hosts/macbook/home.nix                  | 11 +++++++++--
 modules/home-manager/bitwarden.nix      | 15 +++++++++++++++
 modules/home-manager/email/default.nix  |  2 +-
 modules/home-manager/git/default.nix    |  3 +++
 modules/home-manager/nix-index.nix      | 12 ++++++++++++
 modules/home-manager/nixvim/default.nix | 20 +++++++++++++-------
 6 files changed, 53 insertions(+), 10 deletions(-)
 create mode 100644 modules/home-manager/bitwarden.nix
 create mode 100644 modules/home-manager/nix-index.nix

diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix
index e887785..1ddccb6 100644
--- a/hosts/macbook/home.nix
+++ b/hosts/macbook/home.nix
@@ -13,13 +13,14 @@
     ../../modules/home-manager/password-store
     ../../modules/home-manager/taskwarrior
     ../../modules/home-manager/kubernetes.nix
+    ../../modules/home-manager/nix-index.nix
+    ../../modules/home-manager/bitwarden.nix
   ];
   home.username = "mthomson";
   home.homeDirectory = "/Users/mthomson";
   home.stateVersion = "23.11";
 
   home.sessionVariables = {
-    EDITOR = "nvim";
     ZK_NOTEBOOK_DIR = "\${HOME}/zk";
   };
 
@@ -43,10 +44,16 @@
     lazygit = {
       enable = true;
     };
+    man = {
+      enable = true;
+    };
+    tealdeer = {
+      enable = true;
+      settings.updates.auto_update = true;
+    };
   };
 
   home.packages = with pkgs; [
-    tldr
   ];
 
   programs.home-manager.enable = true;
diff --git a/modules/home-manager/bitwarden.nix b/modules/home-manager/bitwarden.nix
new file mode 100644
index 0000000..536fc03
--- /dev/null
+++ b/modules/home-manager/bitwarden.nix
@@ -0,0 +1,15 @@
+{
+  pkgs,
+  ...
+}: {
+  programs = {
+    rbw = {
+      enable = true;
+      settings = {
+        email = "michael@michaelthomson.dev";
+        base_url = "https://vaultwarden.michaelthomson.dev";
+        pinentry = pkgs.pinentry-tty;
+      };
+    };
+  };
+}
diff --git a/modules/home-manager/email/default.nix b/modules/home-manager/email/default.nix
index 3461d0e..1e618a7 100644
--- a/modules/home-manager/email/default.nix
+++ b/modules/home-manager/email/default.nix
@@ -69,7 +69,7 @@
         address = "michael@michaelthomson.dev";
         realName = "Michael Thomson";
         userName = "michael@michaelthomson.dev";
-        passwordCommand = "pass email/michael@michaelthomson.dev";
+        passwordCommand = "rbw get --folder email michael@michaelthomson.dev";
         aerc = {
           enable = true;
         };
diff --git a/modules/home-manager/git/default.nix b/modules/home-manager/git/default.nix
index 0763102..17dd875 100644
--- a/modules/home-manager/git/default.nix
+++ b/modules/home-manager/git/default.nix
@@ -7,6 +7,9 @@
     enable = true;
     userName = "Michael Thomson";
     userEmail = "michael@michaelthomson.dev";
+    diff-so-fancy = {
+      enable = true;
+    };
     includes = [
       {
         condition = "gitdir:~/dev/work/";
diff --git a/modules/home-manager/nix-index.nix b/modules/home-manager/nix-index.nix
new file mode 100644
index 0000000..5790803
--- /dev/null
+++ b/modules/home-manager/nix-index.nix
@@ -0,0 +1,12 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  programs = {
+    nix-index = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+  };
+}
diff --git a/modules/home-manager/nixvim/default.nix b/modules/home-manager/nixvim/default.nix
index 842f732..043a992 100644
--- a/modules/home-manager/nixvim/default.nix
+++ b/modules/home-manager/nixvim/default.nix
@@ -16,6 +16,7 @@ config,
   programs.nixvim = {
     enable = true;
     defaultEditor = true;
+    vimdiffAlias = true;
 
     colorschemes = {
       kanagawa = {
@@ -36,10 +37,6 @@ config,
       laststatus = 3;
       swapfile = false;
 
-      clipboard = {
-        register = "unnamedplus";
-      };
-
       breakindent = true;
       undofile = true;
       ignorecase = true;
@@ -427,16 +424,19 @@ config,
           nixd = {
             enable = true;
             settings = {
+              nixpkgs = {
+                expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).inputs.nixpkgs { }";
+              };
               formatting = {
                 command = ["alejandra"];
               };
               options = {
+                nixos = {
+                  expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).nixosConfigurations.desktop.options";
+                };
                 nix-darwin = {
                   expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).darwinConfigurations.macbook.options";
                 };
-                home-manager = {
-                  expr = "(import <home-manager/modules> { configuration = ~/.config/home-manager/home.nix; pkgs = import <nixpkgs> {}; }).options";
-                };
               };
             };
           };
@@ -459,6 +459,9 @@ config,
             enable = true;
             tslsIntegration = true;
           };
+          gopls = {
+            enable = true;
+          };
         };
         keymaps = {
           diagnostic = {
@@ -481,6 +484,9 @@ config,
           jest = {
             enable = true;
           };
+          go = {
+            enable = true;
+          };
         };
       };
     };