diff --git a/common/home.nix b/common/home.nix
index 1733d87c..474141da 100644
--- a/common/home.nix
+++ b/common/home.nix
@@ -90,6 +90,7 @@ in {
       cachix
       fzf
       (nerdfonts.override {fonts = ["Hasklig"];})
+      monaspace
       pfetch-rs
       hotedit
       (pkgs.wrapMpv
@@ -275,8 +276,8 @@ in {
         base_url = "https://pass.uttarayan.me";
         pinentry =
           if device.isMac
-          # then pkgs.pinentry_mac
-          then pkgs.pinentry-curses
+          then pkgs.pinentry_mac
+          # then pkgs.pinentry-curses
           else pkgs.pinentry-gnome3;
       };
     };
diff --git a/common/kitty.nix b/common/kitty.nix
index f2d5dd96..472aed41 100644
--- a/common/kitty.nix
+++ b/common/kitty.nix
@@ -6,7 +6,8 @@
   programs.kitty = {
     enable = device.hasGui;
     font = {
-      name = "Hasklug Nerd Font Mono";
+      # name = "Hasklug Nerd Font Mono";
+      name = "Monaspace Krypton Var Medium";
       size = 13;
     };
     settings = {
diff --git a/common/wezterm.nix b/common/wezterm.nix
index cd75209a..344d6576 100644
--- a/common/wezterm.nix
+++ b/common/wezterm.nix
@@ -14,6 +14,7 @@
         return {
             term = "wezterm",
             font = wezterm.font_with_fallback({
+                 "Monaspace Krypton",
                  "Hasklug Nerd Font Mono",
                  "Symbols Nerd Font Mono"
             }),
@@ -24,7 +25,7 @@
             window_background_opacity = 0.8,
             cursor_blink_rate = 8,
             default_cursor_style = "BlinkingBlock",
-            default_prog = { "${pkgs.fish.outPath}/bin/fish", "-l" },
+            default_prog = { "${pkgs.fish}/bin/fish", "-l" },
             window_padding = {
                 left = 2,
                 right = 0,
diff --git a/flake.lock b/flake.lock
index c308ba41..4b0b9990 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1239,7 +1239,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-vI2Aw+fUWRppZuFnPyD0nvhKB4IdaX00AoXJAgsydjM=",
+        "narHash": "sha256-Z+jHiHfkHgc42uzQpNO1XYh9RNYzzZYNda35WJx5ib0=",
         "path": "./neovim",
         "type": "path"
       },
diff --git a/linux/foot.nix b/linux/foot.nix
index 9710534a..9494fd58 100644
--- a/linux/foot.nix
+++ b/linux/foot.nix
@@ -9,7 +9,8 @@
     settings = {
       main = {
         shell = "${pkgs.fish.outPath}/bin/fish";
-        font = "Hasklug Nerd Font Mono:size=13";
+        # font = "Hasklug Nerd Font Mono:size=13";
+        font = "Monaspace Krypton:size=13";
         initial-window-size-pixels = "1440x800";
       };
       colors = {
diff --git a/neovim/nvim.nix b/neovim/nvim.nix
index 5eb5e227..fb2c701b 100644
--- a/neovim/nvim.nix
+++ b/neovim/nvim.nix
@@ -485,7 +485,8 @@ in rec {
                 }
             }
         else
-            vim.o.guifont = "Hasklug Nerd Font Mono:h13"
+            vim.o.guifont = "Monaspace Krypton:h13"
+            -- vim.o.guifont = "Hasklug Nerd Font Mono:h13"
             vim.g.neovide_cursor_vfx_mode = "railgun"
         end
 
@@ -558,8 +559,7 @@ in rec {
                 command = function(meta)
                     local db = os.getenv("DATABASE_PATH")
                     if db == nil then
-                        local filename = vim.api.nvim_buf_get_name(meta.current_bufnr)
-                        return { '${pkgs.sqlite}/bin/sqlite3', ':memory:', filename}
+                        return { '${pkgs.sqlite}/bin/sqlite3', ':memory:' }
                     else
                         return { '${pkgs.sqlite}/bin/sqlite3', db }
                     end
@@ -569,7 +569,7 @@ in rec {
             },
             -- How the repl window will be displayed
             -- See below for more information
-            repl_open_cmd = require('iron.view').right(40),
+            repl_open_cmd = require('iron.view').right(60),
           },
           -- Iron doesn't set keymaps by default anymore.
           -- You can set them here or manually add keymaps to the functions in iron.core
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index e4d4e87d..6a0e222c 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -219,6 +219,7 @@
       gnumake
       python3
       (nerdfonts.override {fonts = ["FiraCode" "Hasklig"];})
+      monaspace
     ];
     sessionVariables = {
       WLR_NO_HARDWARE_CURSORS = "1";