update

9 files changed, 43 insertions, 37 deletions

diff --git a/flake.lock b/flake.lock
index dd67dfa..42bf64f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -40,11 +40,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741352980,
-        "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
+        "lastModified": 1743550720,
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738453229,
-        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+        "lastModified": 1741352980,
+        "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+        "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
         "type": "github"
       },
       "original": {
@@ -99,11 +99,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741379162,
-        "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
         "type": "github"
       },
       "original": {
@@ -143,11 +143,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739595404,
-        "narHash": "sha256-0CjCfbq0yHWexOrpO06e2WU1r5JAqR6ffy1zgM3NksI=",
+        "lastModified": 1742014779,
+        "narHash": "sha256-I6fG1zrfdLFcp/imGZElig0BJO3YU0QEXLgvwWoOpJ8=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-effects",
-        "rev": "06519cec8fb32d219006da6eacd255504a9996af",
+        "rev": "524637ef84c177661690b924bf64a1ce18072a2c",
         "type": "github"
       },
       "original": {
@@ -163,11 +163,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741635347,
-        "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=",
+        "lastModified": 1743948087,
+        "narHash": "sha256-B6cIi2ScgVSROPPlTti6len+TdR0K25B9R3oKvbw3M8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551",
+        "rev": "ef3b2a6b602c3f1a80c6897d6de3ee62339a3eb7",
         "type": "github"
       },
       "original": {
@@ -189,11 +189,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1741565384,
-        "narHash": "sha256-J6i/A2XM0cctEUJH3p0jeDUg1jhzKriPjfkhvEc/THw=",
+        "lastModified": 1743898191,
+        "narHash": "sha256-JCcQDgwYV+C4igYA6DchGpKKA6eyZXLvRrxWHmQbmDk=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "7ecc342f01679cf4b275d8353bdcd192dfde4333",
+        "rev": "276567b29d8c9aca7b6a54e93a9183e44a17f19c",
         "type": "github"
       },
       "original": {
@@ -205,11 +205,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1741563807,
-        "narHash": "sha256-KfhHApWCRoqzR3X529be2qeBRa7KY8gXh8C2204J1rE=",
+        "lastModified": 1743893800,
+        "narHash": "sha256-i/X0b3b/dAqjNIB5RoryeDvMkVfdoPBwK5xn06W6Wdo=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "b90f649ca2e240c1bfb22fe91247bc90314af1e1",
+        "rev": "28e819018520a2300eaeeec6794ffcd614b25dd2",
         "type": "github"
       },
       "original": {
@@ -241,11 +241,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1741513245,
-        "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
+        "lastModified": 1743827369,
+        "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
+        "rev": "42a1c966be226125b48c384171c44c651c236c22",
         "type": "github"
       },
       "original": {
@@ -271,11 +271,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739829690,
-        "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
+        "lastModified": 1743748085,
+        "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "3d0579f5cc93436052d94b73925b48973a104204",
+        "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d",
         "type": "github"
       },
       "original": {
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%";