update

8 files changed, 16 insertions, 10 deletions

diff --git a/modules/foot.nix b/modules/foot.nix
index e427c3a..1b00758 100644
--- a/modules/foot.nix
+++ b/modules/foot.nix
@@ -15,7 +15,8 @@ in
       };
       settings = {
         main = {
-          font="ComicShannsMono Nerd Font Mono:size=12";
+          # font="ComicShannsMono Nerd Font Mono:size=12";
+          font="BerkeleyMonoPatched Nerd Font:size=12";
           title="term";
           resize-by-cells="no";
           pad="0x0 center";
diff --git a/modules/global.nix b/modules/global.nix
index f815b23..7df75e5 100644
--- a/modules/global.nix
+++ b/modules/global.nix
@@ -56,6 +56,7 @@ in
 
     programs = {
       home-manager.enable = true;
+      direnv.enable = true;
     };
 
     dconf = {
diff --git a/modules/gpg/default.nix b/modules/gpg/default.nix
index 6f23ad9..be38513 100644
--- a/modules/gpg/default.nix
+++ b/modules/gpg/default.nix
@@ -12,6 +12,7 @@ in
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
 #      pinentry-qt
+       pinentry-dmenu
     ];
 #    home.packages = with pkgs; [
 #    pinentry-bemenu
@@ -26,7 +27,8 @@ in
       # enableNushellIntegration = true;
       enableSshSupport = true;
       noAllowExternalCache = true;
-      pinentryPackage = pkgs.pinentry-qt;
+      # pinentryPackage = pkgs.pinentry-qt;
+      pinentryPackage = pkgs.pinentry-dmenu;
       #sshKeys = [ "36663E191B00E51513F90FA5CF2BCE8461C297CD" ];
     };
 
@@ -34,7 +36,7 @@ in
       text = ''
         asterisk= "";
         prompt = "";
-        font = "ComicShannsMono Nerd Font Mono:size=13";
+        font = "BerkeleyMonoPatched Nerd Font:size=13";
         prompt_fg = "#cacaca";
         prompt_bg = "#0d0d0d";
         normal_fg = "#4c4c4c";
diff --git a/modules/i3status.nix b/modules/i3status.nix
index d796943..f7b534b 100644
--- a/modules/i3status.nix
+++ b/modules/i3status.nix
@@ -31,7 +31,7 @@ in
         "volume master" = {
           position = 1;
           settings = {
-            format = " %volume";
+            format = "  %volume";
             format_muted = "";
             device = "default";
 #            mixer = "Master";
@@ -42,7 +42,7 @@ in
           enable = cfg.wireless;
           position = 3;
           settings = {
-            format_up = "%quality";
+            format_up = " %quality";
             format_down = "󰖪";
           };
         };
diff --git a/modules/mako.nix b/modules/mako.nix
index b1d9e40..3e0c4ac 100644
--- a/modules/mako.nix
+++ b/modules/mako.nix
@@ -15,7 +15,7 @@ in
       borderColor = "#a39ec4ff";
       borderSize = 1;
       defaultTimeout = 20000;
-      font = "ComicShannsMono Nerd Font Mono 10";
+      font = "BerkeleyMonoPatched Nerd Font 10";
     };
   };
 }
diff --git a/modules/neovide.nix b/modules/neovide.nix
index b7694e4..fe297d7 100644
--- a/modules/neovide.nix
+++ b/modules/neovide.nix
@@ -14,10 +14,11 @@ in
       package = if cfg.wrapWithNixGL then config.lib.nixGL.wrap pkgs.neovide else pkgs.neovide;
       settings = {
         title-hidden = true;
+        box-drawing.mode = "native";
         font = {
-          normal = ["ComicShannsMono Nerd Font"];
+          normal = ["BerkeleyMonoPatched Nerd Font"];
           features = {
-            "ComicShannsMono Nerd Font" = ["+ss01" "+ss07" "+ss11" "-calt" "+ss09" "+ss02" "+ss14"];
+            "BerkeleyMonoPatched Nerd Font" = ["+ss01" "+ss07" "+ss11" "-calt" "+ss09" "+ss02" "+ss14"];
           };
           size = 11.0;
         };
diff --git a/modules/sway/default.nix b/modules/sway/default.nix
index b2d029e..3fe2c9f 100644
--- a/modules/sway/default.nix
+++ b/modules/sway/default.nix
@@ -116,7 +116,7 @@ in
           mode = "hide";
           hiddenState = "hide";
           fonts = {
-            names = [ "ComicShannsMono Nerd Font Mono" ];
+            names = [ "BerkeleyMonoPatched Nerd Font" ];
             size = "10.0";
           };
           extraConfig = ''
diff --git a/modules/tofi.nix b/modules/tofi.nix
index 424a921..ad1b7e8 100644
--- a/modules/tofi.nix
+++ b/modules/tofi.nix
@@ -13,7 +13,8 @@ in
     programs.tofi = {
       enable = true;
       settings = {
-        font = "ComicShannsMono Nerd Font Mono 10";
+        # font = "ComicShannsMono Nerd Font Mono 10";
+        font = "BerkeleyMonoPatched Nerd Font 10";
         "font-size" = 15;
 
         width = "60%";