From 19f5811c4beb13d861c469f35991830b996baa64 Mon Sep 17 00:00:00 2001 From: Elizabeth Date: Tue, 20 May 2025 10:25:57 -0700 Subject: Fix ZDotFiles --- nvim/.config/nvim/config/lazy.lua | 35 -------------------------- nvim/.config/nvim/config/options.lua | 39 ----------------------------- nvim/.config/nvim/lua/autopairs.lua | 16 ------------ nvim/.config/nvim/lua/comment.lua | 6 ----- nvim/.config/nvim/lua/config/lazy.lua | 35 ++++++++++++++++++++++++++ nvim/.config/nvim/lua/config/options.lua | 39 +++++++++++++++++++++++++++++ nvim/.config/nvim/lua/lualine.lua | 34 ------------------------- nvim/.config/nvim/lua/plugins/comment.lua | 6 +++++ nvim/.config/nvim/lua/plugins/lualine.lua | 34 +++++++++++++++++++++++++ nvim/.config/nvim/lua/plugins/telescope.lua | 25 ++++++++++++++++++ nvim/.config/nvim/lua/plugins/theme.lua | 9 +++++++ nvim/.config/nvim/lua/plugins/whichkey.lua | 6 +++++ nvim/.config/nvim/lua/telescope.lua | 25 ------------------ nvim/.config/nvim/lua/theme.lua | 9 ------- nvim/.config/nvim/lua/whichkey.lua | 6 ----- zsh/.config/zsh/.zshrc | 38 ++++++++++++++++++++++++++++ zsh/.zshenv | 1 + zsh/.zshrc | 38 ---------------------------- 18 files changed, 193 insertions(+), 208 deletions(-) delete mode 100644 nvim/.config/nvim/config/lazy.lua delete mode 100644 nvim/.config/nvim/config/options.lua delete mode 100644 nvim/.config/nvim/lua/autopairs.lua delete mode 100644 nvim/.config/nvim/lua/comment.lua create mode 100644 nvim/.config/nvim/lua/config/lazy.lua create mode 100644 nvim/.config/nvim/lua/config/options.lua delete mode 100644 nvim/.config/nvim/lua/lualine.lua create mode 100644 nvim/.config/nvim/lua/plugins/comment.lua create mode 100644 nvim/.config/nvim/lua/plugins/lualine.lua create mode 100644 nvim/.config/nvim/lua/plugins/telescope.lua create mode 100644 nvim/.config/nvim/lua/plugins/theme.lua create mode 100644 nvim/.config/nvim/lua/plugins/whichkey.lua delete mode 100644 nvim/.config/nvim/lua/telescope.lua delete mode 100644 nvim/.config/nvim/lua/theme.lua delete mode 100644 nvim/.config/nvim/lua/whichkey.lua create mode 100644 zsh/.config/zsh/.zshrc create mode 100644 zsh/.zshenv delete mode 100644 zsh/.zshrc diff --git a/nvim/.config/nvim/config/lazy.lua b/nvim/.config/nvim/config/lazy.lua deleted file mode 100644 index f5ee74c..0000000 --- a/nvim/.config/nvim/config/lazy.lua +++ /dev/null @@ -1,35 +0,0 @@ --- Bootstrap lazy.nvim -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not (vim.uv or vim.loop).fs_stat(lazypath) then - local lazyrepo = "https://github.com/folke/lazy.nvim.git" - local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) - if vim.v.shell_error ~= 0 then - vim.api.nvim_echo({ - { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, - { "\nPress any key to exit..." }, - }, true, {}) - vim.fn.getchar() - os.exit(1) - end -end -vim.opt.rtp:prepend(lazypath) - --- Make sure to setup `mapleader` and `maplocalleader` before --- loading lazy.nvim so that mappings are correct. --- This is also a good place to setup other settings (vim.opt) -vim.g.mapleader = " " -vim.g.maplocalleader = "\\" - --- Setup lazy.nvim -require("lazy").setup({ - spec = { - -- import your plugins - { import = "plugins" }, - }, - -- Configure any other settings here. See the documentation for more details. - -- colorscheme that will be used when installing plugins. - install = { colorscheme = { "habamax" } }, - -- automatically check for plugin updates - checker = { enabled = true }, -}) diff --git a/nvim/.config/nvim/config/options.lua b/nvim/.config/nvim/config/options.lua deleted file mode 100644 index 01489f0..0000000 --- a/nvim/.config/nvim/config/options.lua +++ /dev/null @@ -1,39 +0,0 @@ -local options = { - cmdheight = 0, - - number = true, - relativenumber = true, - - clipboard = "unnamedplus", - - breakindent = true, - tabstop = 4, - softtabstop = 4, - shiftwidth = 4, - expandtab = true, - - undofile = true, - - hlsearch = false, - ignorecase = true, - smartcase = true, - - completeopt = "menuone,noselect", - - timeout = true, - timeoutlen = 500, - - foldcolumn = "0", - foldlevel = 99, - foldlevelstart = 99, - foldenable = true, - - spelllang = { "nb", "en" }, - spellcapcheck = "", -} - -vim.g.spellfile_URL = "https://ftp.nluug.nl/pub/vim/runtime/spell/" - -for k, v in pairs(options) do - vim.opt[k] = v -end diff --git a/nvim/.config/nvim/lua/autopairs.lua b/nvim/.config/nvim/lua/autopairs.lua deleted file mode 100644 index cd78d93..0000000 --- a/nvim/.config/nvim/lua/autopairs.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - "windwp/nvim-autopairs", - config = function() - require("nvim-autopairs").setup({}) - - local cmp_autopairs = require("nvim-autopairs.completion.cmp") - local cmp = require("cmp") - - cmp.event:on( - "confirm_done", - cmp_autopairs.on_confirm_done() - ) - - end, -} - diff --git a/nvim/.config/nvim/lua/comment.lua b/nvim/.config/nvim/lua/comment.lua deleted file mode 100644 index fe9adbe..0000000 --- a/nvim/.config/nvim/lua/comment.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "numToStr/Comment.nvim", - opts = {}, - lazy = false, -} - diff --git a/nvim/.config/nvim/lua/config/lazy.lua b/nvim/.config/nvim/lua/config/lazy.lua new file mode 100644 index 0000000..f5ee74c --- /dev/null +++ b/nvim/.config/nvim/lua/config/lazy.lua @@ -0,0 +1,35 @@ +-- Bootstrap lazy.nvim +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +-- Make sure to setup `mapleader` and `maplocalleader` before +-- loading lazy.nvim so that mappings are correct. +-- This is also a good place to setup other settings (vim.opt) +vim.g.mapleader = " " +vim.g.maplocalleader = "\\" + +-- Setup lazy.nvim +require("lazy").setup({ + spec = { + -- import your plugins + { import = "plugins" }, + }, + -- Configure any other settings here. See the documentation for more details. + -- colorscheme that will be used when installing plugins. + install = { colorscheme = { "habamax" } }, + -- automatically check for plugin updates + checker = { enabled = true }, +}) diff --git a/nvim/.config/nvim/lua/config/options.lua b/nvim/.config/nvim/lua/config/options.lua new file mode 100644 index 0000000..01489f0 --- /dev/null +++ b/nvim/.config/nvim/lua/config/options.lua @@ -0,0 +1,39 @@ +local options = { + cmdheight = 0, + + number = true, + relativenumber = true, + + clipboard = "unnamedplus", + + breakindent = true, + tabstop = 4, + softtabstop = 4, + shiftwidth = 4, + expandtab = true, + + undofile = true, + + hlsearch = false, + ignorecase = true, + smartcase = true, + + completeopt = "menuone,noselect", + + timeout = true, + timeoutlen = 500, + + foldcolumn = "0", + foldlevel = 99, + foldlevelstart = 99, + foldenable = true, + + spelllang = { "nb", "en" }, + spellcapcheck = "", +} + +vim.g.spellfile_URL = "https://ftp.nluug.nl/pub/vim/runtime/spell/" + +for k, v in pairs(options) do + vim.opt[k] = v +end diff --git a/nvim/.config/nvim/lua/lualine.lua b/nvim/.config/nvim/lua/lualine.lua deleted file mode 100644 index a5c341d..0000000 --- a/nvim/.config/nvim/lua/lualine.lua +++ /dev/null @@ -1,34 +0,0 @@ -return { - { - 'nvim-lualine/lualine.nvim', - event = 'VeryLazy', - opts = function() - return { - options = { - icons_enabled = true, - theme = 'gruvbox', - component_separators = { left = '', right = ''}, - section_separators = { left = '', right = ''}, - }, - sections = { - lualine_c = { - { 'filename', path = 1 }, - }, - lualine_y = { - { - require('tmux-status').tmux_windows, - cond = require('tmux-status').show, - padding = { left = 1, right = 1 }, - }, - } - }, - } - end, - }, - { - "christopher-francisco/tmux-status.nvim", --- lazy = true, - opts = {}, - }, -} - diff --git a/nvim/.config/nvim/lua/plugins/comment.lua b/nvim/.config/nvim/lua/plugins/comment.lua new file mode 100644 index 0000000..fe9adbe --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/comment.lua @@ -0,0 +1,6 @@ +return { + "numToStr/Comment.nvim", + opts = {}, + lazy = false, +} + diff --git a/nvim/.config/nvim/lua/plugins/lualine.lua b/nvim/.config/nvim/lua/plugins/lualine.lua new file mode 100644 index 0000000..a5c341d --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/lualine.lua @@ -0,0 +1,34 @@ +return { + { + 'nvim-lualine/lualine.nvim', + event = 'VeryLazy', + opts = function() + return { + options = { + icons_enabled = true, + theme = 'gruvbox', + component_separators = { left = '', right = ''}, + section_separators = { left = '', right = ''}, + }, + sections = { + lualine_c = { + { 'filename', path = 1 }, + }, + lualine_y = { + { + require('tmux-status').tmux_windows, + cond = require('tmux-status').show, + padding = { left = 1, right = 1 }, + }, + } + }, + } + end, + }, + { + "christopher-francisco/tmux-status.nvim", +-- lazy = true, + opts = {}, + }, +} + diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua new file mode 100644 index 0000000..47b0b36 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/telescope.lua @@ -0,0 +1,25 @@ +return { + "nvim-telescope/telescope.nvim", + branch = "0.1.x", + dependencies = { + "nvim-lua/plenary.nvim", + { + "nvim-telescope/telescope-fzf-native.nvim", + build = "make", + cond = function() + return vim.fn.executable "make" == 1 + end, + }, + }, + config = function () + pcall(require("telescope").load_extension, "fzf") + end, + opt = { + pickers = { + colorscheme = { + enable_preview = true + } + } + }, +} + diff --git a/nvim/.config/nvim/lua/plugins/theme.lua b/nvim/.config/nvim/lua/plugins/theme.lua new file mode 100644 index 0000000..7f53fa8 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/theme.lua @@ -0,0 +1,9 @@ +return { + "ellisonleao/gruvbox.nvim", + opts = { + transparent_mode = true, + }, + init = function() + vim.cmd("colorscheme gruvbox") + end +} diff --git a/nvim/.config/nvim/lua/plugins/whichkey.lua b/nvim/.config/nvim/lua/plugins/whichkey.lua new file mode 100644 index 0000000..1173e06 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/whichkey.lua @@ -0,0 +1,6 @@ +return { + "folke/which-key.nvim", + event = "VeryLazy", + opts = {}, +} + diff --git a/nvim/.config/nvim/lua/telescope.lua b/nvim/.config/nvim/lua/telescope.lua deleted file mode 100644 index 47b0b36..0000000 --- a/nvim/.config/nvim/lua/telescope.lua +++ /dev/null @@ -1,25 +0,0 @@ -return { - "nvim-telescope/telescope.nvim", - branch = "0.1.x", - dependencies = { - "nvim-lua/plenary.nvim", - { - "nvim-telescope/telescope-fzf-native.nvim", - build = "make", - cond = function() - return vim.fn.executable "make" == 1 - end, - }, - }, - config = function () - pcall(require("telescope").load_extension, "fzf") - end, - opt = { - pickers = { - colorscheme = { - enable_preview = true - } - } - }, -} - diff --git a/nvim/.config/nvim/lua/theme.lua b/nvim/.config/nvim/lua/theme.lua deleted file mode 100644 index 7f53fa8..0000000 --- a/nvim/.config/nvim/lua/theme.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "ellisonleao/gruvbox.nvim", - opts = { - transparent_mode = true, - }, - init = function() - vim.cmd("colorscheme gruvbox") - end -} diff --git a/nvim/.config/nvim/lua/whichkey.lua b/nvim/.config/nvim/lua/whichkey.lua deleted file mode 100644 index 1173e06..0000000 --- a/nvim/.config/nvim/lua/whichkey.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "folke/which-key.nvim", - event = "VeryLazy", - opts = {}, -} - diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc new file mode 100644 index 0000000..a2376b7 --- /dev/null +++ b/zsh/.config/zsh/.zshrc @@ -0,0 +1,38 @@ +#!/bin/zsh + +#-- -- +export XDG_CONFIG_HOME="$HOME/.config" +export ZDOTDIR=${XDG_CONFIG_HOME:-$HOME/.config}/zsh +export PATH=$PATH:$HOME/scripts:$HOME/.local/bin + +source log.sh ".zshrc" +greet.sh +#-- -- + +#-- -- +. "$ZDOTDIR/setup/misc.zsh" +#-- -- + +#-- -- +. "$ZDOTDIR/setup/aliases.zsh" +#-- -- + +#-- -- +. "$ZDOTDIR/setup/history.zsh" +#-- -- + +#-- -- +. "$ZDOTDIR/setup/git.zsh" +#-- -- + +#-- -- +. "$ZDOTDIR/setup/device.zsh" +#-- -- + +#-- -- +. "$ZDOTDIR/setup/tools.zsh" +#-- -- + +#-- -- +. "$ZDOTDIR/setup/gpg.zsh" +#-- -- diff --git a/zsh/.zshenv b/zsh/.zshenv new file mode 100644 index 0000000..bc00d69 --- /dev/null +++ b/zsh/.zshenv @@ -0,0 +1 @@ +ZDOTDIR=${XDG_CONFIG_HOME:-$HOME/.config}/zsh diff --git a/zsh/.zshrc b/zsh/.zshrc deleted file mode 100644 index a2376b7..0000000 --- a/zsh/.zshrc +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/zsh - -#-- -- -export XDG_CONFIG_HOME="$HOME/.config" -export ZDOTDIR=${XDG_CONFIG_HOME:-$HOME/.config}/zsh -export PATH=$PATH:$HOME/scripts:$HOME/.local/bin - -source log.sh ".zshrc" -greet.sh -#-- -- - -#-- -- -. "$ZDOTDIR/setup/misc.zsh" -#-- -- - -#-- -- -. "$ZDOTDIR/setup/aliases.zsh" -#-- -- - -#-- -- -. "$ZDOTDIR/setup/history.zsh" -#-- -- - -#-- -- -. "$ZDOTDIR/setup/git.zsh" -#-- -- - -#-- -- -. "$ZDOTDIR/setup/device.zsh" -#-- -- - -#-- -- -. "$ZDOTDIR/setup/tools.zsh" -#-- -- - -#-- -- -. "$ZDOTDIR/setup/gpg.zsh" -#-- -- -- cgit v1.2.3-70-g09d2