aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjakobst1n <jakob@jakobstendahl.no>2024-10-29 11:36:16 +0100
committerjakobst1n <jakob@jakobstendahl.no>2024-10-29 11:36:16 +0100
commit1f98fb513aa1ca8c3fa26b67d55f205d238a63bf (patch)
tree64ee94c3accf401ee19130f4bc21d4a0c1a9e477
parente5f1f0473b7873094d52970cb10e1cb661e4cd5a (diff)
downloaddotfiles-1f98fb513aa1ca8c3fa26b67d55f205d238a63bf.tar.gz
dotfiles-1f98fb513aa1ca8c3fa26b67d55f205d238a63bf.zip
Fix some broken points
-rw-r--r--Makefile.m47
-rwxr-xr-xconfigure17
2 files changed, 22 insertions, 2 deletions
diff --git a/Makefile.m4 b/Makefile.m4
index 3cec7aa..f59ffc8 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -26,7 +26,7 @@ define create_dotfile_symlink
$(call create_symlink,${SRC_DIR}/$(1),${HOME_DIR}/$(2))
endef
-all: system.m4 install_packages m4_dnl
+all: system.m4 install_packages $(HOME_DIR)/.config m4_dnl
m4_ifelse(DT_VIM, `yes', `$(HOME_DIR)/.vimrc') m4_dnl
m4_ifelse(DT_ROFI, `yes', `$(HOME_DIR)/.config/rofi') m4_dnl
m4_ifelse(DT_DEADD, `yes', `$(HOME_DIR)/.config/deadd') m4_dnl
@@ -62,6 +62,9 @@ $(M4_SYSFILE): $(CONFIG_FILE)
Makefile: Makefile.m4 $(M4_SYSFILE)
$(call M4_EXEC)
+$(HOME_DIR)/.config:
+ mkdir $(HOME_DIR)/.config
+
m4_ifelse(DT_VIM, `yes', `m4_dnl
$(HOME_DIR)/.vimrc: Common/vimrc
$(call create_dotfile_symlink,Common/vimrc,.vimrc)
@@ -218,7 +221,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',) m4_dnl
+m4_ifelse(DT_NEOVIM, `yes', `cmake gettext fzf',) m4_dnl
m4_ifelse(DT_ALACRITTY, `yes', `libfontconfig1-dev pkg-config',)
m4_dnl
diff --git a/configure b/configure
index edad8d2..13e1fa4 100755
--- a/configure
+++ b/configure
@@ -8,6 +8,23 @@ function generate_makefile {
make Makefile
}
+if ! command -v dialog; then
+ echo '"dialog" not found, please install before continuing"
+ exit 1
+fi
+if ! command -v m4; then
+ echo 'm4" not found, please install before continuing"
+ exit 1
+fi
+if ! command -v make; then
+ echo 'make" not found, please install before continuing"
+ exit 1
+fi
+if ! command -v awk; then
+ echo 'awk" not found, please install before continuing"
+ exit 1
+fi
+
if [ -f "${CONFIG_FILE}" ]; then
dialog \
--keep-tite \