From d8c1af4bb18c7586f1f7cf4224944fd820a4da94 Mon Sep 17 00:00:00 2001
From: edwark43 <97860398+edwark43@users.noreply.github.com>
Date: Fri, 19 Jan 2024 03:40:32 +0000
Subject: [PATCH] Fixed things and added NvChad as nvim config

---
 config/alacritty/alacritty.toml              |  4 +-
 config/nvim/init.lua                         |  7 ---
 config/nvim/lua/config/core/colorscheme.lua  | 11 -----
 config/nvim/lua/config/plugins-setup.lua     | 51 --------------------
 config/nvim/lua/config/plugins/colorizer.lua | 12 -----
 config/nvim/lua/config/plugins/lualine.lua   | 36 --------------
 config/nvim/lua/config/plugins/nvim-tree.lua | 40 ---------------
 misc/bin/openapp                             | 17 +++----
 setup.sh                                     |  9 +++-
 9 files changed, 18 insertions(+), 169 deletions(-)
 delete mode 100644 config/nvim/init.lua
 delete mode 100644 config/nvim/lua/config/core/colorscheme.lua
 delete mode 100644 config/nvim/lua/config/plugins-setup.lua
 delete mode 100644 config/nvim/lua/config/plugins/colorizer.lua
 delete mode 100644 config/nvim/lua/config/plugins/lualine.lua
 delete mode 100644 config/nvim/lua/config/plugins/nvim-tree.lua

diff --git a/config/alacritty/alacritty.toml b/config/alacritty/alacritty.toml
index 338d026..6469782 100644
--- a/config/alacritty/alacritty.toml
+++ b/config/alacritty/alacritty.toml
@@ -22,8 +22,8 @@ command = { program = "paplay", args = ["/usr/share/sounds/freedesktop/stereo/di
 save_to_clipboard = false
 
 [cursor]
-style = { Block, Off }
-vi_mode_style = { Block, On }
+style = { shape = Block, blinking = Off }
+vi_mode_style = { shape = Block, blinking = On }
 blink_interval = 1000
 blink_timeout = 0
 unfocused_hollow = false
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
deleted file mode 100644
index f7444a4..0000000
--- a/config/nvim/init.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-require("config.plugins-setup")
-require("config.core.options")
-require("config.core.keymaps")
-require("config.core.colorscheme")
-require("config.plugins.nvim-tree")
-require("config.plugins.lualine")
-require("config.plugins.colorizer")
\ No newline at end of file
diff --git a/config/nvim/lua/config/core/colorscheme.lua b/config/nvim/lua/config/core/colorscheme.lua
deleted file mode 100644
index 0f34d08..0000000
--- a/config/nvim/lua/config/core/colorscheme.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-local status, _ = pcall(vim.cmd, "colorscheme onedark")
-if not status then
-  print("Colorscheme not found!") -- print error if colorscheme not installed
-  return
-end
-
-require('onedark').setup {
-    style = 'darker',
-    transparent = true
-}
-require('onedark').load()
\ No newline at end of file
diff --git a/config/nvim/lua/config/plugins-setup.lua b/config/nvim/lua/config/plugins-setup.lua
deleted file mode 100644
index 6e867ec..0000000
--- a/config/nvim/lua/config/plugins-setup.lua
+++ /dev/null
@@ -1,51 +0,0 @@
--- auto install packer if not installed
-local ensure_packer = function()
-    local fn = vim.fn
-    local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
-    if fn.empty(fn.glob(install_path)) > 0 then
-      fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path })
-      vim.cmd([[packadd packer.nvim]])
-      return true
-    end
-    return false
-  end
-  local packer_bootstrap = ensure_packer() -- true if packer was just installed
-  
-  -- autocommand that reloads neovim and installs/updates/removes plugins
-  -- when file is saved
-  vim.cmd([[ 
-    augroup packer_user_config
-      autocmd!
-      autocmd BufWritePost plugins-setup.lua source <afile> | PackerSync
-    augroup end
-  ]])
-  
-  -- import packer safely
-  local status, packer = pcall(require, "packer")
-  if not status then
-    return
-  end
-  
-  -- add list of plugins to install
-  return packer.startup(function(use)
-    -- packer can manage itself
-  use("wbthomason/packer.nvim")
-  
-  use("navarasu/onedark.nvim")
-  
-  -- file explorer
-  use("nvim-tree/nvim-tree.lua")
-  
-  -- vs-code like icons
-  use("nvim-tree/nvim-web-devicons")
-  
-  -- statusline
-  use("nvim-lualine/lualine.nvim")
-  
-  -- Colorizer
-  use("norcalli/nvim-colorizer.lua")
-  
-   if packer_bootstrap then
-      require("packer").sync()
-    end
-  end)
diff --git a/config/nvim/lua/config/plugins/colorizer.lua b/config/nvim/lua/config/plugins/colorizer.lua
deleted file mode 100644
index dff5def..0000000
--- a/config/nvim/lua/config/plugins/colorizer.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-require'colorizer'.setup(
-  {'*';},
-  {
-    RGB      = true;         -- #RGB hex codes
-      RRGGBB   = true;         -- #RRGGBB hex codes
-      names    = true;         -- "Name" codes like Blue
-      RRGGBBAA = true;         -- #RRGGBBAA hex codes
-      rgb_fn   = true;         -- CSS rgb() and rgba() functions
-      hsl_fn   = true;         -- CSS hsl() and hsla() functions
-      css      = true;         -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB
-      css_fn   = true;         -- Enable all CSS *functions*: rgb_fn, hsl_fn
-  })
\ No newline at end of file
diff --git a/config/nvim/lua/config/plugins/lualine.lua b/config/nvim/lua/config/plugins/lualine.lua
deleted file mode 100644
index 7206fa3..0000000
--- a/config/nvim/lua/config/plugins/lualine.lua
+++ /dev/null
@@ -1,36 +0,0 @@
--- import lualine plugin safely
-local status, lualine = pcall(require, "lualine")
-if not status then
-  return
-end
-
--- get lualine nightfly theme
-local lualine_onedark = require("lualine.themes.onedark")
-
--- new colors for theme
-local new_colors = {
-  blue = "#65D1FF",
-  green = "#3EFFDC",
-  violet = "#FF61EF",
-  yellow = "#FFDA7B",
-  black = "#000000",
-}
-
--- change nightlfy theme colors
-lualine_onedark.normal.a.bg = new_colors.blue
-lualine_onedark.insert.a.bg = new_colors.green
-lualine_onedark.visual.a.bg = new_colors.violet
-lualine_onedark.command = {
-  a = {
-    gui = "bold",
-    bg = new_colors.yellow,
-    fg = new_colors.black, -- black
-  },
-}
-
--- configure lualine with modified theme
-lualine.setup({
-  options = {
-    theme = lualine_onedark,
-  },
-})
\ No newline at end of file
diff --git a/config/nvim/lua/config/plugins/nvim-tree.lua b/config/nvim/lua/config/plugins/nvim-tree.lua
deleted file mode 100644
index 0bf5d2c..0000000
--- a/config/nvim/lua/config/plugins/nvim-tree.lua
+++ /dev/null
@@ -1,40 +0,0 @@
--- import nvim-tree plugin safely
-local setup, nvimtree = pcall(require, "nvim-tree")
-if not setup then
-  return
-end
-
--- recommended settings from nvim-tree documentation
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
-
--- change color for arrows in tree to light blue
-vim.cmd([[ highlight NvimTreeIndentMarker guifg=#3FC5FF ]])
-
--- configure nvim-tree
-nvimtree.setup({
-  -- change folder arrow icons
-  renderer = {
-    icons = {
-      glyphs = {
-        folder = {
-          arrow_closed = "", -- arrow when folder is closed
-          arrow_open = "", -- arrow when folder is open
-        },
-      },
-    },
-  },
-  -- disable window_picker for
-  -- explorer to work well with
-  -- window splits
-  actions = {
-    open_file = {
-      window_picker = {
-        enable = false,
-      },
-    },
-  },
-  -- 	git = {
-  -- 		ignore = false,
-  -- 	},
-})
\ No newline at end of file
diff --git a/misc/bin/openapp b/misc/bin/openapp
index 0363b7f..3969b14 100755
--- a/misc/bin/openapp
+++ b/misc/bin/openapp
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 # Originally created by	- https://github.com/gh0stzk
 
-term="alacritty"
 lines="window.dimensions.lines"
 columns="window.dimensions.columns"
 
@@ -10,28 +9,28 @@ case "$1" in
 		rofi -show drun -theme $HOME/.config/rofi/launcher.rasi
 		;; 
 	--terminal)
-		term
+		alacritty
 		;;
 	--floating)
-		term --class floaterm,term -o lines=22 columns=90
+		alacritty --class floaterm,alacritty -o lines=22 columns=90
 		;;
 	--update)
-		term --hold --class floaterm,term -o lines=22 columns=90 -e updates --update-system
+		alacritty --hold --class floaterm,alacritty -o lines=22 columns=90 -e updates --update-system
 		;;
 	--checkupdates)
-		term --hold --class updating,term -o lines=22 columns=47 -e updates --print-updates
+		alacritty --hold --class updating,alacritty -o lines=22 columns=47 -e updates --print-updates
 		;;
 	--ranger)
-		term --class term -e ranger
+		alacritty --class alacritty -e ranger
 		;;
 	--nvim)
-		term -e nvim
+		alacritty -e nvim
 		;;
 	--music)
-		term --class floaterm,term -o lines=18 columns=67 -e ncmpcpp
+		alacritty --class floaterm,alacritty -o lines=18 columns=67 -e ncmpcpp
 		;;
 	--fetch)
-		term --hold --class floaterm,term -o lines=21 columns=90 -e neofetch
+		alacritty --hold --class floaterm,alacritty -o lines=21 columns=90 -e neofetch
 		;;
 	--browser)
 		brave
diff --git a/setup.sh b/setup.sh
index 0ba8ee8..5463c79 100644
--- a/setup.sh
+++ b/setup.sh
@@ -86,7 +86,7 @@ clear
 
 ########## ---------- Backup files ---------- ##########
 
-prinf '%s%sBackup files%s\n\n' "${CNC}" "${CRE}" "${CNC}"
+printf '%s%sBackup files%s\n\n' "${CNC}" "${CRE}" "${CNC}"
 printf "Backup files will be stored in %s%s%s/.ricebackup%s \n\n" "${BLD}" "${CRE}" "$HOME" "${CNC}"
 sleep 10
 
@@ -201,6 +201,13 @@ printf "%s%sFile copied succesfully!!%s\n" "${BLD}" "${CGR}" "${CNC}"
 sleep 3
 clear
 
+########## ---------- Installing NvChad ---------- ##########
+
+printf '%s%sInstalling NvChad.%s\n\n' "${CNC}" "${CRE}" "${CNC}"
+git clone https://github.com/NvChad/NvChad "$HOME"/.config/nvim --depth 1
+sleep 2
+clear
+
 ########## ---------- Installing Yay & other aur packages ---------- ##########
 
 printf '%s%sInstalling Yay, Tdrop, xqp, and Brave.%s\n\n' "${CNC}" "${CRE}" "${CNC}"