From 44fbfc95f779e5d6bbdaaf250ada4dfcdae5cb2a Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Sat, 18 Jan 2025 23:39:25 -0600
Subject: Cleanup zsh configs + add zplug

Just a couple plugins for syntax highlighting and history searching,
removing a bunch of old unused files, and changing to just accept the
standard of using dotfiles in the home directory.
---
 Makefile | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index e27af0a..898fe9e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,26 @@
 VIM := $(shell command -v vim 2>/dev/null)
 NVIM := $(shell command -v nvim 2>/dev/null)
-ZCONFS := zsh/.zshenv
+ZCONFS := zsh/zshenv zsh/zshrc
+SCONFS := sh/profile
 DCONFS := doas.conf
 
 all:
 
-install: install-zshconfigs vimplug-vim vimplug-nvim
+install: install-zshconfigs install-shconfigs vimplug-vim vimplug-nvim
 
 install-zshconfigs: $(ZCONFS)
 	@echo "Installing zsh conf files..."
-	@echo "Setting ZSHDOTDIR globally..."
-	@$(shell sudo installers/set_zshdirs.sh)
 	@echo ".zshenv..."
-	@ln -sf `pwd`/zsh/.zshenv ~/.zshenv
+	@ln -sf `pwd`/zsh/zshenv ~/.zshenv
+	@echo ".zshrc..."
+	@ln -sf `pwd`/zsh/zshrc ~/.zshrc
 	@echo "Done."
 
+install-shconfigs: $(SCONFS)
+	@echo "Installing sh conf files..."
+	@echo ".profile..."
+	@ln -sf `pwd`/sh/profile ~/.profile
+
 vimplug-vim: installers/vimplug_vim.sh
 ifdef VIM
 	@echo "Installing vim-plug for vim..."
-- 
cgit v1.2.3


From 4a401026461cbf4249925d373d961eb042011ed8 Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Wed, 30 Apr 2025 23:42:26 -0500
Subject: Using lazy nvim not vimplug

---
 Makefile                   | 10 ----------
 installers/vimplug_nvim.sh |  4 ----
 2 files changed, 14 deletions(-)
 delete mode 100755 installers/vimplug_nvim.sh

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 898fe9e..d850e2a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 VIM := $(shell command -v vim 2>/dev/null)
-NVIM := $(shell command -v nvim 2>/dev/null)
 ZCONFS := zsh/zshenv zsh/zshrc
 SCONFS := sh/profile
 DCONFS := doas.conf
@@ -30,15 +29,6 @@ else
 	@echo "vim not installed."
 endif
 
-vimplug-nvim: installers/vimplug_nvim.sh
-ifdef NVIM
-	@echo "Installing vim-plug for nvim..."
-	@$(shell installers/vimplug_nvim.sh)
-	@echo "Done."
-else
-	@echo "nvim not installed."
-endif
-
 doas-conf: $(DCONFS)
 	@echo "Installing doas config files..."
 	@echo "doas.conf..."
diff --git a/installers/vimplug_nvim.sh b/installers/vimplug_nvim.sh
deleted file mode 100755
index feddd03..0000000
--- a/installers/vimplug_nvim.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
-       https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-- 
cgit v1.2.3


From 05866ead2b7ee7adeb0dc208a59724a171fbbd44 Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Mon, 30 Jun 2025 00:38:52 -0500
Subject: Remove vimplug-nvim from Makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d850e2a..28bc66e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ DCONFS := doas.conf
 
 all:
 
-install: install-zshconfigs install-shconfigs vimplug-vim vimplug-nvim
+install: install-zshconfigs install-shconfigs vimplug-vim
 
 install-zshconfigs: $(ZCONFS)
 	@echo "Installing zsh conf files..."
-- 
cgit v1.2.3