diff options
| author | jakobst1n <jakob@jakobstendahl.no> | 2024-10-20 12:04:46 +0200 |
|---|---|---|
| committer | jakobst1n <jakob@jakobstendahl.no> | 2024-10-20 12:04:46 +0200 |
| commit | e5f1f0473b7873094d52970cb10e1cb661e4cd5a (patch) | |
| tree | b4cf5b81b159447e1992cfea2e190573c8f7f340 | |
| parent | fbac12e907db6be58f4372f42e31f0214186be06 (diff) | |
| download | dotfiles-e5f1f0473b7873094d52970cb10e1cb661e4cd5a.tar.gz dotfiles-e5f1f0473b7873094d52970cb10e1cb661e4cd5a.zip | |
Fix a few bugs
| -rw-r--r-- | Makefile.m4 | 12 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | linux/alacritty/alacritty.toml | 4 |
3 files changed, 14 insertions, 8 deletions
diff --git a/Makefile.m4 b/Makefile.m4 index e3aa34b..3cec7aa 100644 --- a/Makefile.m4 +++ b/Makefile.m4 @@ -176,10 +176,10 @@ $(HOME_DIR)/.config/qtile/config.py: linux/qtile/config/config.py m4_ifelse(DT_NEOVIM, `yes', `m4_dnl /usr/local/bin/nvim: git clone https://github.com/neovim/neovim /tmp/neovim - git -C /tmp/neovim checkout tags/v0.9.0 + git -C /tmp/neovim checkout tags/v0.10.0 (cd /tmp/neovim && sudo make install) -$(HOME_DIR)/.config/nvim/: /usr/local/bin/nvim +$(HOME_DIR)/.config/nvim: /usr/local/bin/nvim $(call create_symlink,$(SRC_DIR)/Common/nvim,$(HOME_DIR)/.config/nvim) ')m4_dnl @@ -218,6 +218,8 @@ 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_ALACRITTY, `yes', `libfontconfig1-dev pkg-config',) m4_dnl @@ -301,8 +303,12 @@ m4_ifelse(DT_ALACRITTY, `yes', `alacritty',) install_cargo_packages: DT_HOME_DIRECTORY/.cargo/bin/cargo @missing_packages=""; \ for pkg in $(CARGO_DEPENDENCIES); do \ - if [ "$($$CARGO install --list | grep -sw "$$pkg" | wc -l)" = "0" ]; then \ + echo "$(cargo install --list | grep -sw "$$pkg" | wc -l)"; \ + echo "$(cargo install --list)"; \ + if [ "$(cargo install --list | grep -sw "$$pkg" | wc -l)" = "0" ]; then \ missing_packages="$$missing_packages $$pkg"; \ + else \ + echo "not missing $$pkg"; \ fi; \ done; \ if [ -n "$$missing_packages" ]; then \ @@ -14,7 +14,7 @@ if [ -f "${CONFIG_FILE}" ]; then --backtitle "Dotfile configuration" \ --title "Overwrite settings?" \ --defaultno \ - --yesno "A system.m4 file already exists, do you want to make that file over again? If you press No, the Makefile will be processed again based on the current system.m4 file." 0 0 + --yesno "A config file already exists, do you want to make that file over again? If you press No, the Makefile will be processed again based on the current config file." 0 0 if [ "$?" -eq 1 ]; then generate_makefile exit 0 @@ -152,8 +152,8 @@ GIT_VALUES=$(dialog \ --title "Configure" \ --form "Git settings" \ 0 50 0 \ - "Username:" 1 1 "$GIT_AUTHOR_NAME" 1 10 255 0 \ - "Email:" 2 1 "$GIT_AUTHOR_EMAIL" 2 10 255 0 \ + "Username:" 1 1 "${GIT_AUTHOR_NAME:-}" 1 10 255 0 \ + "Email:" 2 1 "${GIT_AUTHOR_EMAIL:-}" 2 10 255 0 \ 3>&1 1>&2 2>&3 3>&-) GIT_VALUES=($GIT_VALUES) if [ "$?" -eq 1 ]; then exit 0; fi diff --git a/linux/alacritty/alacritty.toml b/linux/alacritty/alacritty.toml index 3bec804..39b0972 100644 --- a/linux/alacritty/alacritty.toml +++ b/linux/alacritty/alacritty.toml @@ -7,8 +7,8 @@ TERM = "alacritty" [font] size = 7 -[font.normal] -family = "RobotoMono Nerd Font Mono" +# [font.normal] +# family = "RobotoMono Nerd Font Mono" [[keyboard.bindings]] action = "Paste" |