new font

8 files changed, 34 insertions, 8 deletions

diff --git a/assets/BerkeleyMonoPatchedNerdFont-Regular.ttf b/assets/BerkeleyMonoPatchedNerdFont-Regular.ttf
new file mode 100644
index 0000000..32a0fd9
--- /dev/null
+++ b/assets/BerkeleyMonoPatchedNerdFont-Regular.ttf
diff --git a/assets/BerkeleyMonoPatchedNerdFontPropo-Regular.ttf b/assets/BerkeleyMonoPatchedNerdFontPropo-Regular.ttf
new file mode 100644
index 0000000..50b78ed
--- /dev/null
+++ b/assets/BerkeleyMonoPatchedNerdFontPropo-Regular.ttf
diff --git a/assets/berkeley-mono.tar.gz b/assets/berkeley-mono.tar.gz
new file mode 100644
index 0000000..d7005c5
--- /dev/null
+++ b/assets/berkeley-mono.tar.gz
diff --git a/modules/global.nix b/modules/global.nix
index b257b29..0247896 100644
--- a/modules/global.nix
+++ b/modules/global.nix
@@ -1,6 +1,7 @@
 { config, lib, pkgs, inputs, ...}:
 let
   cfg = config.modules.global;
+  berkeley-mono = pkgs.callPackage ../packages/berkeley-mono.nix { inherit pkgs; };
 in
 {
   imports = [ ./default.nix ];
@@ -95,6 +96,7 @@ in
         ripgrep
         lean4
         dmenu
+        berkeley-mono
       ] ++ (lib.optional cfg.notNixOS nixgl.auto.nixGLDefault)
         ++ (lib.optionals cfg.wayland 
         [
diff --git a/modules/neovim/nvim/lua/config/keybinds.lua b/modules/neovim/nvim/lua/config/keybinds.lua
index 3c7ad20..5481d37 100644
--- a/modules/neovim/nvim/lua/config/keybinds.lua
+++ b/modules/neovim/nvim/lua/config/keybinds.lua
@@ -48,11 +48,6 @@ nmap('<leader>?', '<cmd>FzfLua live_grep_native<CR>', { silent = true })
 
 nmap('<leader>to', '<cmd>te<CR>', { silent = true; desc = "Open a terminal buffer in the current window." })
 
-vim.keymap.set('t', '<Esc>', '<C-\\><C-n>', { silent = true })
-vim.keymap.set('t', '<C-\\><C-n>', function()
-  vim.keymap.set('t', '<Esc>', '<Esc>', { buffer = true})
-  vim.keymap.set('t', '<C-\\><C-n>', '<C-\\><C-n>', { buffer = true})
-end, { silent = true })
 
 
 
diff --git a/modules/neovim/nvim/lua/config/statusline.lua b/modules/neovim/nvim/lua/config/statusline.lua
index 82725c1..0003383 100644
--- a/modules/neovim/nvim/lua/config/statusline.lua
+++ b/modules/neovim/nvim/lua/config/statusline.lua
@@ -1,6 +1,7 @@
 local modes = {
   ["n"] = "",
   ["no"] = "",
+  ["nt"] = "",
   ["v"] = "VISUAL",
   ["V"] = "VISUAL-LINE",
   [""] = "VISUAL-BLOCK",
@@ -38,7 +39,11 @@ M.statusline = function()
 end
 
 M.termStatus = function()
-  return " TERM » %{b:term_title}%=%p%% « %l, %c "
+  return table.concat {
+    " ",
+    mode(),
+    "%{b:term_title}%=%p%% « %l, %c "
+  }
 end
 
 M.setup = function(config)
diff --git a/modules/sway/default.nix b/modules/sway/default.nix
index c1a8653..466208e 100644
--- a/modules/sway/default.nix
+++ b/modules/sway/default.nix
@@ -114,8 +114,8 @@ in
 
         bars = [{
           statusCommand = "i3status";
-          mode = "hide";
-          hiddenState = "hide";
+          # mode = "hide";
+          # hiddenState = "hide";
           fonts = {
             names = [ "BerkeleyMonoPatched Nerd Font Propo" ];
             size = "10.0";
diff --git a/packages/berkeley-mono.nix b/packages/berkeley-mono.nix
new file mode 100644
index 0000000..291b80f
--- /dev/null
+++ b/packages/berkeley-mono.nix
@@ -0,0 +1,24 @@
+{ pkgs }:
+
+pkgs.stdenv.mkDerivation {
+  pname = "berkeley-mono";
+  version = "1.0";
+
+  src = ../assets/berkeley-mono.tar.gz;
+
+  unpackPhase = ''
+    runHook preUnpack
+
+    tar -xzf $src
+
+    runHook postUnpack
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    
+    install -Dm644 BerkeleyMonoPatchedNerdFont-Regular.ttf BerkeleyMonoPatchedNerdFontPropo-Regular.ttf -t $out/share/fonts/truetype
+
+    runHook postInstall
+  '';
+}