fix: fix nvim installer

pablobfonseca · Mar 3, 2024 · 17eec51 · 17eec51
1 parent be6b847
commit 17eec51
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 26 deletions.
diff --git a/cmd/install.go b/cmd/install.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/pablobfonseca/dotfiles/cmd/emacs"
 	"github.com/pablobfonseca/dotfiles/cmd/homebrew"
-	"github.com/pablobfonseca/dotfiles/cmd/vim"
+	"github.com/pablobfonseca/dotfiles/cmd/nvim"
 	"github.com/pablobfonseca/dotfiles/cmd/zsh"
 	"github.com/pablobfonseca/dotfiles/src/config"
 	"github.com/pablobfonseca/dotfiles/src/utils"
@@ -15,7 +15,7 @@ import (
 var installCmd = &cobra.Command{
 	Use:     "install",
 	Short:   "Install the dotfiles",
-	Example: "dotfiles install vim",
+	Example: "dotfiles install nvim",
 	Long:    "Install the dotfiles. You can install all the dotfiles or just some of them.",
 	Run: func(cmd *cobra.Command, args []string) {
 		p := mpb.New()
@@ -39,7 +39,7 @@ var installCmd = &cobra.Command{
 func init() {
 	rootCmd.AddCommand(installCmd)
 
-	installCmd.AddCommand(vim.InstallVimCmd)
+	installCmd.AddCommand(nvim.InstallNvimCmd)
 	installCmd.AddCommand(emacs.InstallEmacsCmd)
 	installCmd.AddCommand(zsh.InstallZshCmd)
 	installCmd.AddCommand(homebrew.InstallHomebrewCmd)

diff --git a/cmd/vim/install.go → cmd/nvim/install.go b/cmd/vim/install.go → cmd/nvim/install.go
@@ -1,4 +1,4 @@
-package vim
+package nvim
 
 import (
 	"os"
@@ -10,11 +10,9 @@ import (
 	"github.com/vbauerster/mpb/v7"
 )
 
-const NVCHAD_REPO = "/~https://github.com/NvChad/NvChad"
-
-var InstallVimCmd = &cobra.Command{
-	Use:   "vim",
-	Short: "Install vim files",
+var InstallNvimCmd = &cobra.Command{
+	Use:   "nvim",
+	Short: "Install nvim files",
 	Run: func(cmd *cobra.Command, args []string) {
 		p := mpb.New()
 
@@ -23,11 +21,11 @@ var InstallVimCmd = &cobra.Command{
 		if utils.CommandExists("nvim") {
 			utils.SkipMessage("nvim already installed")
 		} else {
-			installNvimBar := utils.NewBar("Installing nvim", 1, p)
-			if err := utils.ExecuteCommand(verbose, "brew", "install", "neovim"); err != nil {
+			InstallNvimBar := utils.NewBar("Installing nvim", 1, p)
+			if err := utils.ExecuteCommand(verbose, "brew", "install", "nvim"); err != nil {
 				utils.ErrorMessage("Error installing nvim", err)
 			}
-			installNvimBar.Increment()
+			InstallNvimBar.Increment()
 		}
 
 		utils.CloneRepoIfNotExists(verbose)
@@ -36,20 +34,16 @@ var InstallVimCmd = &cobra.Command{
 			utils.SkipMessage("nvim files already exists")
 			return
 		}
-		installNvChadBar := utils.NewBar("Installing NvChad", 1, p)
-
-		if err := utils.ExecuteCommand(verbose, "git", "clone", "--depth", "1", NVCHAD_REPO, config.NvimConfigDir()); err != nil {
-			utils.ErrorMessage("Error cloning the repository", err)
-		}
-		installNvChadBar.Increment()
 
 		symlinkBar := utils.NewBar("Symlinking files", 1, p)
 
-		src := path.Join(config.DotfilesConfigDir(), "nvim", "custom")
-		dest := path.Join(config.NvimConfigDir(), "lua", "custom")
+		src := path.Join(config.DotfilesConfigDir(), "nvim")
+		dest := path.Join(config.NvimConfigDir())
 		if err := os.Symlink(src, dest); err != nil {
 			utils.ErrorMessage("Error creating symlink", err)
 		}
 		symlinkBar.Increment()
+
+		utils.SuccessMessage("nvim files synced")
 	},
 }
diff --git a/cmd/vim/uninstall.go → cmd/nvim/uninstall.go b/cmd/vim/uninstall.go → cmd/nvim/uninstall.go
@@ -1,4 +1,4 @@
-package vim
+package nvim
 
 import (
 	"github.com/pablobfonseca/dotfiles/src/config"
@@ -7,9 +7,9 @@ import (
 	"github.com/vbauerster/mpb/v7"
 )
 
-var UninstallVimCmd = &cobra.Command{
-	Use:   "vim",
-	Short: "Uninstall vim files",
+var UnInstallNvimCmd = &cobra.Command{
+	Use:   "nvim",
+	Short: "Uninstall nvim files",
 	Run: func(cmd *cobra.Command, args []string) {
 		p := mpb.New()
 

diff --git a/cmd/uninstall.go b/cmd/uninstall.go
@@ -5,7 +5,7 @@ import (
 	"github.com/vbauerster/mpb/v7"
 
 	"github.com/pablobfonseca/dotfiles/cmd/emacs"
-	"github.com/pablobfonseca/dotfiles/cmd/vim"
+	"github.com/pablobfonseca/dotfiles/cmd/nvim"
 	"github.com/pablobfonseca/dotfiles/src/config"
 	"github.com/pablobfonseca/dotfiles/src/utils"
 )
@@ -35,6 +35,6 @@ func init() {
 
 	uninstallCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "Verbose output")
 
-	uninstallCmd.AddCommand(vim.UninstallVimCmd)
+	uninstallCmd.AddCommand(nvim.UnInstallNvimCmd)
 	uninstallCmd.AddCommand(emacs.UninstallEmacsCmd)
 }