From 3e5fb84c4eb6a2e7548a5540e89c74b08d62c789 Mon Sep 17 00:00:00 2001 From: The-Repo-Club Date: Sun, 20 Aug 2023 19:00:55 +0100 Subject: [PATCH] Nvim --- emacs/.config/emacs/config.el | 8 +- emacs/.config/emacs/config.org | 22 +- .../flexiflow/flexiflow_bar/bar_updates.ini | 2 +- nvim/.config/nvim/lua/user/lsp/configs.lua | 17 ++ nvim/.config/nvim/lua/user/plugins.lua | 208 +++++++++--------- nvim/.config/nvim/plugin/packer_compiled.lua | 10 + 6 files changed, 142 insertions(+), 125 deletions(-) diff --git a/emacs/.config/emacs/config.el b/emacs/.config/emacs/config.el index f20b5feb7..2b1e3a092 100644 --- a/emacs/.config/emacs/config.el +++ b/emacs/.config/emacs/config.el @@ -359,15 +359,15 @@ one, an error is signaled." :init (global-flycheck-mode)) (set-face-attribute 'default nil - :font "JetBrains Mono" + :font "Hack Nerd Font Mono" :height 110 :weight 'medium) (set-face-attribute 'variable-pitch nil - :font "Ubuntu" + :font "Hack Nerd Font Mono" :height 120 :weight 'medium) (set-face-attribute 'fixed-pitch nil - :font "JetBrains Mono" + :font "Hack Nerd Font Mono" :height 110 :weight 'medium) ;; Makes commented text and keywords italics. @@ -381,7 +381,7 @@ one, an error is signaled." ;; This sets the default font on all graphical frames created after restarting Emacs. ;; Does the same thing as 'set-face-attribute default' above, but emacsclient fonts ;; are not right unless I also add this method of setting the default font. -(add-to-list 'default-frame-alist '(font . "JetBrains Mono-11")) +(add-to-list 'default-frame-alist '(font . "Hack Nerd Font Mono-11")) ;; Uncomment the following line if line spacing needs adjusting. (setq-default line-spacing 0.12) diff --git a/emacs/.config/emacs/config.org b/emacs/.config/emacs/config.org index 99bfe783b..82f9b0fc6 100644 --- a/emacs/.config/emacs/config.org +++ b/emacs/.config/emacs/config.org @@ -1,18 +1,4 @@ -#+TITLE: Repo's GNU Emacs Config -#+AUTHOR: Wayne Wesley (The-Repo-Club) -#+DESCRIPTION: Repo's Personal Emacs config. -#+STARTUP: showeverything -#+OPTIONS: toc:2 -* TABLE OF CONTENTS :toc: -- [[#important-programs-to-load-first][IMPORTANT PROGRAMS TO LOAD FIRST]] - - [[#elpaca-package-manager][Elpaca Package Manager]] - - [[#load-evil-mode][Load Evil Mode]] - - [[#general-keybindings][General Keybindings]] -- [[#app-launchers][APP LAUNCHERS]] - - [[#counsel-linux-app][Counsel-Linux-App]] - - [[#app-launcher][App-Launcher]] -- [[#all-the-icons][ALL THE ICONS]] - [[#buffer-move][BUFFER-MOVE]] - [[#company][COMPANY]] - [[#dashboard][DASHBOARD]] @@ -474,15 +460,15 @@ Defining the various fonts that Emacs will use. ** Setting the Font Face #+begin_src emacs-lisp (set-face-attribute 'default nil - :font "JetBrains Mono" + :font "Hack Nerd Font Mono" :height 110 :weight 'medium) (set-face-attribute 'variable-pitch nil - :font "Ubuntu" + :font "Hack Nerd Font Mono" :height 120 :weight 'medium) (set-face-attribute 'fixed-pitch nil - :font "JetBrains Mono" + :font "Hack Nerd Font Mono" :height 110 :weight 'medium) ;; Makes commented text and keywords italics. @@ -496,7 +482,7 @@ Defining the various fonts that Emacs will use. ;; This sets the default font on all graphical frames created after restarting Emacs. ;; Does the same thing as 'set-face-attribute default' above, but emacsclient fonts ;; are not right unless I also add this method of setting the default font. -(add-to-list 'default-frame-alist '(font . "JetBrains Mono-11")) +(add-to-list 'default-frame-alist '(font . "Hack Nerd Font Mono-11")) ;; Uncomment the following line if line spacing needs adjusting. (setq-default line-spacing 0.12) diff --git a/flexiflow/.config/flexiflow/flexiflow_bar/bar_updates.ini b/flexiflow/.config/flexiflow/flexiflow_bar/bar_updates.ini index beae6867c..83e9b1be1 100644 --- a/flexiflow/.config/flexiflow/flexiflow_bar/bar_updates.ini +++ b/flexiflow/.config/flexiflow/flexiflow_bar/bar_updates.ini @@ -1,2 +1,2 @@ -LastUsed=1692553003 +LastUsed=1692554805 Message='Fully Updated' diff --git a/nvim/.config/nvim/lua/user/lsp/configs.lua b/nvim/.config/nvim/lua/user/lsp/configs.lua index 10924d92d..61e2ec98f 100644 --- a/nvim/.config/nvim/lua/user/lsp/configs.lua +++ b/nvim/.config/nvim/lua/user/lsp/configs.lua @@ -1,3 +1,20 @@ +local status_ok, mason = pcall(require, "mason") + +if not status_ok then + vim.notify("Problem with mason") + return +end + +mason.setup({ + ui = { + icons = { + package_installed = "✓", + package_pending = "➜", + package_uninstalled = "✗" + } + } +}) + local status_ok, lsp_installer = pcall(require, "mason-lspconfig") if not status_ok then return diff --git a/nvim/.config/nvim/lua/user/plugins.lua b/nvim/.config/nvim/lua/user/plugins.lua index 378bbf130..4f97032fa 100644 --- a/nvim/.config/nvim/lua/user/plugins.lua +++ b/nvim/.config/nvim/lua/user/plugins.lua @@ -1,136 +1,140 @@ local fn = vim.fn -- Install packer -local install_path = vim.fn.stdpath 'data' .. - '/site/pack/packer/start/packer.nvim' +local install_path = vim.fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" local is_bootstrap = false if vim.fn.empty(vim.fn.glob(install_path)) > 0 then - is_bootstrap = true - vim.fn.execute('!git clone https://github.com/wbthomason/packer.nvim ' .. - install_path) - vim.cmd [[packadd packer.nvim]] + is_bootstrap = true + vim.fn.execute("!git clone https://github.com/wbthomason/packer.nvim " .. install_path) + vim.cmd([[packadd packer.nvim]]) end -- Autocommand that reloads neovim whenever you save the plugins.lua file vim.api.nvim_create_autocmd("BufWritePost", { - group = vim.api.nvim_create_augroup("packer_user_config", {clear = true}), - pattern = "plugins.lua", - callback = function() - vim.cmd("source ") - require("packer").sync() - end + group = vim.api.nvim_create_augroup("packer_user_config", { clear = true }), + pattern = "plugins.lua", + callback = function() + vim.cmd("source ") + require("packer").sync() + end, }) -- Use a protected call so we don't error out on first use local status_ok, packer = pcall(require, "packer") -if not status_ok then return end +if not status_ok then + return +end -- Have packer use a popup window packer.init({ - display = { - open_fn = function() - return require("packer.util").float({border = "rounded"}) - end - } + display = { + open_fn = function() + return require("packer.util").float({ border = "rounded" }) + end, + }, }) -- Install your plugins here return packer.startup(function(use) - -- My plugins here + -- My plugins here - use({"wbthomason/packer.nvim"}) -- Have packer manage itself - use({"windwp/nvim-autopairs"}) -- Autopairs, integrates with both cmp and treesitter - use({"numToStr/Comment.nvim"}) - use({"JoosepAlviste/nvim-ts-context-commentstring"}) - use({"kyazdani42/nvim-web-devicons"}) - use({"kyazdani42/nvim-tree.lua"}) - use({"akinsho/bufferline.nvim"}) - use({"moll/vim-bbye"}) - use({"nvim-lualine/lualine.nvim"}) - use({"akinsho/toggleterm.nvim"}) - use({"ahmedkhalf/project.nvim"}) - use({"lewis6991/impatient.nvim"}) - use({"lukas-reineke/indent-blankline.nvim"}) - use({"goolord/alpha-nvim"}) - use({"folke/which-key.nvim"}) + use({ "wbthomason/packer.nvim" }) -- Have packer manage itself + use({ "windwp/nvim-autopairs" }) -- Autopairs, integrates with both cmp and treesitter + use({ "numToStr/Comment.nvim" }) + use({ "JoosepAlviste/nvim-ts-context-commentstring" }) + use({ "kyazdani42/nvim-web-devicons" }) + use({ "kyazdani42/nvim-tree.lua" }) + use({ "akinsho/bufferline.nvim" }) + use({ "moll/vim-bbye" }) + use({ "nvim-lualine/lualine.nvim" }) + use({ "akinsho/toggleterm.nvim" }) + use({ "ahmedkhalf/project.nvim" }) + use({ "lewis6991/impatient.nvim" }) + use({ "lukas-reineke/indent-blankline.nvim" }) + use({ "goolord/alpha-nvim" }) + use({ "folke/which-key.nvim" }) - -- Colorschemes - use({"folke/tokyonight.nvim"}) - use({"Minimal-Mistakes/minimalmistakes-nvim"}) + -- Colorschemes + use({ "folke/tokyonight.nvim" }) + use({ "Minimal-Mistakes/minimalmistakes-nvim" }) - -- CMP plugins - use { -- Autocompletion - 'hrsh7th/nvim-cmp', - requires = { - 'hrsh7th/cmp-buffer', -- buffer completions - 'hrsh7th/cmp-cmdline', -- cmdline completions - 'hrsh7th/cmp-path', -- path completions - 'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-nvim-lua', 'L3MON4D3/LuaSnip', -- snippet engine - 'rafamadriz/friendly-snippets', -- a bunch of snippets to use - 'saadparwaiz1/cmp_luasnip' - } - } + -- CMP plugins + use({ -- Autocompletion + "hrsh7th/nvim-cmp", + requires = { + "hrsh7th/cmp-buffer", -- buffer completions + "hrsh7th/cmp-cmdline", -- cmdline completions + "hrsh7th/cmp-path", -- path completions + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-nvim-lua", + "L3MON4D3/LuaSnip", -- snippet engine + "rafamadriz/friendly-snippets", -- a bunch of snippets to use + "saadparwaiz1/cmp_luasnip", + }, + }) - -- LSP - use({ -- LSP Configuration & Plugins - "neovim/nvim-lspconfig", - requires = { - -- Automatically install LSPs to stdpath for neovim - --'williamboman/mason.nvim', 'williamboman/mason-lspconfig.nvim', + -- LSP + use({ -- LSP Configuration & Plugins + "neovim/nvim-lspconfig", + requires = { + -- Automatically install LSPs to stdpath for neovim + 'williamboman/mason.nvim', 'williamboman/mason-lspconfig.nvim', - -- Useful status updates for LSP - --'j-hui/fidget.nvim' - } - }) -- enable LSP - use {'j-hui/fidget.nvim', tag = 'legacy'} - use({"jose-elias-alvarez/null-ls.nvim"}) -- for formatters and linters + -- Useful status updates for LSP + 'j-hui/fidget.nvim', tag = 'legacy' + }, + }) -- enable LSP + use {'j-hui/fidget.nvim', tag = 'legacy'} + use({ "jose-elias-alvarez/null-ls.nvim" }) -- for formatters and linters - -- Telescope Fuzzy Finder (files, lsp, etc) - use({"nvim-telescope/telescope.nvim", requires = {'nvim-lua/plenary.nvim'}}) + -- Telescope Fuzzy Finder (files, lsp, etc) + use({ "nvim-telescope/telescope.nvim", requires = { "nvim-lua/plenary.nvim" } }) - -- Fuzzy Finder Algorithm which requires local dependencies to be built. Only load if `make` is available - use { - 'nvim-telescope/telescope-fzf-native.nvim', - run = 'make', - cond = vim.fn.executable 'make' == 1 - } + -- Fuzzy Finder Algorithm which requires local dependencies to be built. Only load if `make` is available + use({ + "nvim-telescope/telescope-fzf-native.nvim", + run = "make", + cond = vim.fn.executable("make") == 1, + }) - -- Treesitter - use { -- Highlight, edit, and navigate code - 'nvim-treesitter/nvim-treesitter', - run = function() - pcall(require('nvim-treesitter.install').update {with_sync = true}) - end - } + -- Treesitter + use({ -- Highlight, edit, and navigate code + "nvim-treesitter/nvim-treesitter", + run = function() + pcall(require("nvim-treesitter.install").update({ with_sync = true })) + end, + }) - use { -- Additional text objects via treesitter - 'nvim-treesitter/nvim-treesitter-textobjects', - after = 'nvim-treesitter' - } + use({ -- Additional text objects via treesitter + "nvim-treesitter/nvim-treesitter-textobjects", + after = "nvim-treesitter", + }) - -- Git - use({"tpope/vim-fugitive"}) - use({"tpope/vim-rhubarb"}) - use({"lewis6991/gitsigns.nvim"}) + -- Git + use({ "tpope/vim-fugitive" }) + use({ "tpope/vim-rhubarb" }) + use({ "lewis6991/gitsigns.nvim" }) - -- Custom - use({"wesleimp/stylua.nvim"}) - use({"cappyzawa/trim.nvim"}) - use({"ap/vim-css-color"}) - use({"airblade/vim-gitgutter"}) - use({"ctrlpvim/ctrlp.vim"}) - use({"lyuts/vim-rtags"}) - use({"wakatime/vim-wakatime"}) - use({"mboughaba/i3config.vim"}) - use({"The-Repo-Club/header.nvim"}) - use({"The-Repo-Club/Vim_Keys"}) - use({"Thyrum/vim-stabs"}) - use({"mbbill/undotree"}) - use({"tpope/vim-sleuth"}) -- Detect tabstop and shiftwidth automatically + -- Custom + use({ "wesleimp/stylua.nvim" }) + use({ "cappyzawa/trim.nvim" }) + use({ "ap/vim-css-color" }) + use({ "airblade/vim-gitgutter" }) + use({ "ctrlpvim/ctrlp.vim" }) + use({ "lyuts/vim-rtags" }) + use({ "wakatime/vim-wakatime" }) + use({ "mboughaba/i3config.vim" }) + use({ "The-Repo-Club/header.nvim" }) + use({ "The-Repo-Club/Vim_Keys" }) + use({ "Thyrum/vim-stabs" }) + use({ "mbbill/undotree" }) + use({ "tpope/vim-sleuth" }) -- Detect tabstop and shiftwidth automatically - -- When we are bootstrapping a configuration, it doesn't - -- make sense to execute the rest of the init.lua. + -- When we are bootstrapping a configuration, it doesn't + -- make sense to execute the rest of the init.lua. - -- You'll need to restart nvim, and then it will work. - if is_bootstrap then require("packer").sync() end + -- You'll need to restart nvim, and then it will work. + if is_bootstrap then + require("packer").sync() + end end) diff --git a/nvim/.config/nvim/plugin/packer_compiled.lua b/nvim/.config/nvim/plugin/packer_compiled.lua index a698b2a1f..d1bd4f25e 100644 --- a/nvim/.config/nvim/plugin/packer_compiled.lua +++ b/nvim/.config/nvim/plugin/packer_compiled.lua @@ -174,6 +174,16 @@ _G.packer_plugins = { path = "/home/repo/.local/share/nvim/site/pack/packer/start/lualine.nvim", url = "https://github.com/nvim-lualine/lualine.nvim" }, + ["mason-lspconfig.nvim"] = { + loaded = true, + path = "/home/repo/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", + url = "https://github.com/williamboman/mason-lspconfig.nvim" + }, + ["mason.nvim"] = { + loaded = true, + path = "/home/repo/.local/share/nvim/site/pack/packer/start/mason.nvim", + url = "https://github.com/williamboman/mason.nvim" + }, ["minimalmistakes-nvim"] = { loaded = true, path = "/home/repo/.local/share/nvim/site/pack/packer/start/minimalmistakes-nvim",