aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rwxr-xr-xCommon/nvim/lua/basic.lua.m4 (renamed from Common/nvim/lua/basic.lua)3
-rw-r--r--Makefile.m47
3 files changed, 9 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 640f120..cca9fc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,6 +79,7 @@ system.m4
# Generated
Common/zshrc
Common/bashrc
+Common/nvim/lua/basic.lua
linux/tmux.conf
linux/qtile/config/config.py
linux/sway/config
diff --git a/Common/nvim/lua/basic.lua b/Common/nvim/lua/basic.lua.m4
index 47a7ab6..70d78cc 100755
--- a/Common/nvim/lua/basic.lua
+++ b/Common/nvim/lua/basic.lua.m4
@@ -33,3 +33,6 @@ vim.cmd [[ colorscheme bw ]]
vim.opt.background = "light"
-- No idea why, preview in fzf does at least work extremely porly without this
vim.cmd [[ let $BAT_THEME = 'gruvbox-light' ]]
+m4_ifelse(DT_DOTFILES_TYPE, `remote', `m4_dnl
+vim.opt.termguicolors = true
+')m4_dnl
diff --git a/Makefile.m4 b/Makefile.m4
index f59ffc8..884f663 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -182,7 +182,10 @@ m4_ifelse(DT_NEOVIM, `yes', `m4_dnl
git -C /tmp/neovim checkout tags/v0.10.0
(cd /tmp/neovim && sudo make install)
-$(HOME_DIR)/.config/nvim: /usr/local/bin/nvim
+Common/nvim/lua/basic.lua: Common/nvim/lua/basic.lua.m4 ${M4_COMMON_DEPS}
+ $(call M4_EXEC)
+
+$(HOME_DIR)/.config/nvim: Common/nvim/lua/basic.lua /usr/local/bin/nvim
$(call create_symlink,$(SRC_DIR)/Common/nvim,$(HOME_DIR)/.config/nvim)
')m4_dnl
@@ -221,7 +224,7 @@ m4_ifelse(DT_GREETD_TUIGREET, `yes', `greetd',) m4_dnl
m4_ifelse(DT_TLP, `yes', `tlp',) m4_dnl
m4_dnl
m4_ifelse(DT_SWAY, `yes', `sway swayidle physlock blueman network-manager-gnome wob wlogout wofi brightnessctl clipman xwayland seahorse fcitx5',) m4_dnl
-m4_ifelse(DT_NEOVIM, `yes', `cmake gettext fzf',) m4_dnl
+m4_ifelse(DT_NEOVIM, `yes', `cmake gettext',) m4_dnl
m4_ifelse(DT_ALACRITTY, `yes', `libfontconfig1-dev pkg-config',)
m4_dnl