From 531b638bdc7516626fd948150621958e1d7abe64 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Fri, 8 Sep 2023 20:15:02 +0000
Subject: [PATCH] Reduce vim startup time, use nerd font fira code

---
 home/files/alacritty.yml    |  2 +-
 home/kitty.nix              |  2 +-
 sets/base.nix               |  5 ++---
 sets/fonts.nix              |  3 ++-
 sets/nvim.nix               | 17 ++++++-----------
 system/mistmane/default.nix |  2 +-
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/home/files/alacritty.yml b/home/files/alacritty.yml
index d9c0207..38721a3 100644
--- a/home/files/alacritty.yml
+++ b/home/files/alacritty.yml
@@ -3,7 +3,7 @@ scrolling:
 
 font:
   normal:
-    family: Fira Code
+    family: FiraCode Nerd Font
   size: 8
 
 shell:
diff --git a/home/kitty.nix b/home/kitty.nix
index 0cc0b29..d8d49c6 100644
--- a/home/kitty.nix
+++ b/home/kitty.nix
@@ -5,7 +5,7 @@
     enable = true;
     font = {
       package = pkgs.fira-code;
-      name = "Fira Code";
+      name = "FiraCode Nerd Font";
       size = 9;
     };
     settings = {
diff --git a/sets/base.nix b/sets/base.nix
index 372e2f4..6c7f86e 100644
--- a/sets/base.nix
+++ b/sets/base.nix
@@ -1,9 +1,8 @@
 { config, pkgs, lib, inputs, ... }:
 
 {
-  systemd.tmpfiles.rules =
-    lib.mapAttrsToList (key: value: "L+ /etc/channels/${key} - - - - ${value.outPath}")
-    inputs;
+  systemd.tmpfiles.rules = lib.mapAttrsToList
+    (key: value: "L+ /etc/channels/${key} - - - - ${value.outPath}") inputs;
 
   nix = {
     nixPath =
diff --git a/sets/fonts.nix b/sets/fonts.nix
index 0b1ba38..c085865 100644
--- a/sets/fonts.nix
+++ b/sets/fonts.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   fonts = {
@@ -12,6 +12,7 @@
       # Mono fonts
       dejavu_fonts
       fira-code
+      fira-code-nerdfont
       iosevka
       source-code-pro
       source-sans-pro
diff --git a/sets/nvim.nix b/sets/nvim.nix
index 3405354..b541094 100644
--- a/sets/nvim.nix
+++ b/sets/nvim.nix
@@ -18,15 +18,7 @@
       nix.enable = true;
       fugitive.enable = true;
       gitgutter.enable = true;
-      airline = {
-        enable = true;
-        powerline = true;
-        theme = "dark";
-      };
-    };
-    globals = {
-      "airline#extensions#tabline#enabled" = 1;
-      "airline#extensions#tabline#formatter" = "unique_tail_improved";
+      lualine.enable = true;
     };
     extraPlugins = with pkgs.vimPlugins; [
       vim-fetch
@@ -34,7 +26,6 @@
       vim-flatbuffers
       vim-nftables
       vim-protobuf
-      vim-sensible
       vim-toml
     ];
     options = {
@@ -48,7 +39,11 @@
     };
 
     # LSP
-    plugins.rust-tools.enable = true;
+    plugins.rust-tools = {
+      enable = true;
+      server.standalone = false;
+    };
+    plugins.clangd-extensions.enable = true;
     plugins.lsp = {
       enable = true;
       servers = {
diff --git a/system/mistmane/default.nix b/system/mistmane/default.nix
index 660291d..09bbd67 100644
--- a/system/mistmane/default.nix
+++ b/system/mistmane/default.nix
@@ -16,7 +16,7 @@
       enable = true;
       settings.main = {
         shell = "/run/current-system/sw/bin/fish";
-        font = "Fira Code:size=6";
+        font = "FiraCode Nerd Font:size=6";
       };
     };
     wayland.windowManager.sway.config = {