From 5b095c7dfa236e15e8bbcfb3a96069b44abd5344 Mon Sep 17 00:00:00 2001
From: Michael <michaeljohannpeter@gmail.com>
Date: Wed, 7 Feb 2024 19:56:57 +0100
Subject: [PATCH] fix: user_config handling #73

---
 Dockerfile          |  4 ++--
 lua/config/init.lua | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8bc78c3d..ab30743e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,9 +5,9 @@ FROM ${ARCH}allaman/nvim-full:latest
 RUN mkdir -p .config/nvim \
   && mkdir -p .local/share/nvim/mason/packages \
   ## Create empty user config file
-  && echo "return {}" > $HOME/.nvim_config.lua \
+  && echo "return {}" > .nvim_config.lua \
   ## Add mason tools dir to path
-  && echo "PATH=$PATH:$HOME/.local/share/nvim/mason/bin" >> $HOME/.bashrc
+  && echo "PATH=$PATH:~/.local/share/nvim/mason/bin" >> ~/.bashrc
 
 COPY --chown=nvim:nvim . .config/nvim
 # Install plugins and tools with Mason and go.nvim
diff --git a/lua/config/init.lua b/lua/config/init.lua
index 1230bb5f..b6659eb8 100644
--- a/lua/config/init.lua
+++ b/lua/config/init.lua
@@ -7,10 +7,14 @@ local function validate_config(config) end
 
 local function init()
   local user_config = utils.load_user_config()
-  validate_config(user_config)
 
-  -- Merge defaults and user config
-  vim.g.config = utils.merge_tables(require("config.defaults"), user_config)
+  if next(user_config) ~= nil then
+    validate_config(user_config)
+    -- Merge defaults and user config
+    vim.g.config = utils.merge_tables(require("config.defaults"), user_config)
+  else
+    vim.g.config = require("config.defaults")
+  end
 
   -- configure vim.opt
   for k, v in pairs(vim.g.config.options) do