neovim/default.nix

@@ -143,6 +143,8 @@
 
       extraConfig = ''
         lua << EOF
+            vim.o.guifont = "DejaVu Sans Mono:h10"
+
             ${builtins.readFile ./keymaps.lua }
             ${builtins.readFile ./options.lua }
             ${builtins.readFile ./commands.lua }
@@ -160,10 +162,8 @@
             ${builtins.readFile ./nvim-cmp.lua }
             ${builtins.readFile ./telescope.lua }
 
-            do
-              local vim_theme = "${theme}";
-              ${builtins.readFile ./themes.lua }
-            end
+            ${builtins.readFile ./themes.lua }
+            vim.opt.background = '${theme}'
 
             ${builtins.readFile ./project-nvim.lua }
             ${builtins.readFile ./dap.lua }

neovim/themes.lua

@@ -1,2 +1 @@
 vim.cmd("colorscheme solarized")
-vim.opt.background = vim_theme