update

3 files changed, 8 insertions, 14 deletions

diff --git a/modules/foot.nix b/modules/foot.nix
index 107b7bb..6cd6bf8 100644
--- a/modules/foot.nix
+++ b/modules/foot.nix
@@ -7,7 +7,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [
-      ibm-plex
+      (nerdfonts.override { fonts = [ "SpaceMono" "IBMPlexMono" "Terminus" ]; })
     ];
 
     programs.foot = {
@@ -15,7 +15,7 @@ in {
       settings = {
         main = {
           pad = "10x10";
-          font = "IBM Plex Mono:size=10";
+          font = "SpaceMono Nerd Font Mono:size=10";
           line-height = 12;
         };
 
diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
index 415861a..6374d66 100644
--- a/modules/neovim/default.nix
+++ b/modules/neovim/default.nix
@@ -6,8 +6,6 @@ in {
   options.neovim.enable = lib.mkEnableOption "Enable and setup neovim";
 
   config = lib.mkIf cfg.enable {
-    xdg.configFile."nvim/lua".source = pkgs.lib.mkForce ./lua;
-
     programs.neovim = {
       enable = true;
       vimAlias = true;
@@ -36,18 +34,10 @@ in {
           tree-sitter-markdown_inline
         ]))
       ];
-
-      extraLuaConfig = ''
-        vim.g.mapleader = " "
-        vim.g.maplocalleader = "\\"
-
-        require('options')
-        require('keymaps')
-        require('plugins')
-        require('autocmds')
-      '';
     };
 
+    xdg.configFile."nvim/lua".source = ./lua;
+
     home.sessionVariables = rec {
       EDITOR = "nvim";
       GIT_EDITOR = EDITOR;
diff --git a/modules/neovim/lua/init.lua b/modules/neovim/lua/init.lua
new file mode 100644
index 0000000..2d394bf
--- /dev/null
+++ b/modules/neovim/lua/init.lua
@@ -0,0 +1,4 @@
+require("autocmds")
+require("keymaps")
+require("options")
+require("plugins")