This commit is contained in:
The-Repo-Club 2023-08-20 19:00:55 +01:00
parent 16cd720a85
commit 3e5fb84c4e
No known key found for this signature in database
GPG Key ID: E30EC2FBFB05C44F
6 changed files with 142 additions and 125 deletions

View File

@ -359,15 +359,15 @@ one, an error is signaled."
:init (global-flycheck-mode)) :init (global-flycheck-mode))
(set-face-attribute 'default nil (set-face-attribute 'default nil
:font "JetBrains Mono" :font "Hack Nerd Font Mono"
:height 110 :height 110
:weight 'medium) :weight 'medium)
(set-face-attribute 'variable-pitch nil (set-face-attribute 'variable-pitch nil
:font "Ubuntu" :font "Hack Nerd Font Mono"
:height 120 :height 120
:weight 'medium) :weight 'medium)
(set-face-attribute 'fixed-pitch nil (set-face-attribute 'fixed-pitch nil
:font "JetBrains Mono" :font "Hack Nerd Font Mono"
:height 110 :height 110
:weight 'medium) :weight 'medium)
;; Makes commented text and keywords italics. ;; 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. ;; 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 ;; 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. ;; 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. ;; Uncomment the following line if line spacing needs adjusting.
(setq-default line-spacing 0.12) (setq-default line-spacing 0.12)

View File

@ -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]] - [[#buffer-move][BUFFER-MOVE]]
- [[#company][COMPANY]] - [[#company][COMPANY]]
- [[#dashboard][DASHBOARD]] - [[#dashboard][DASHBOARD]]
@ -474,15 +460,15 @@ Defining the various fonts that Emacs will use.
** Setting the Font Face ** Setting the Font Face
#+begin_src emacs-lisp #+begin_src emacs-lisp
(set-face-attribute 'default nil (set-face-attribute 'default nil
:font "JetBrains Mono" :font "Hack Nerd Font Mono"
:height 110 :height 110
:weight 'medium) :weight 'medium)
(set-face-attribute 'variable-pitch nil (set-face-attribute 'variable-pitch nil
:font "Ubuntu" :font "Hack Nerd Font Mono"
:height 120 :height 120
:weight 'medium) :weight 'medium)
(set-face-attribute 'fixed-pitch nil (set-face-attribute 'fixed-pitch nil
:font "JetBrains Mono" :font "Hack Nerd Font Mono"
:height 110 :height 110
:weight 'medium) :weight 'medium)
;; Makes commented text and keywords italics. ;; 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. ;; 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 ;; 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. ;; 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. ;; Uncomment the following line if line spacing needs adjusting.
(setq-default line-spacing 0.12) (setq-default line-spacing 0.12)

View File

@ -1,2 +1,2 @@
LastUsed=1692553003 LastUsed=1692554805
Message='Fully Updated' Message='Fully Updated'

View File

@ -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") local status_ok, lsp_installer = pcall(require, "mason-lspconfig")
if not status_ok then if not status_ok then
return return

View File

@ -1,136 +1,140 @@
local fn = vim.fn local fn = vim.fn
-- Install packer -- Install packer
local install_path = vim.fn.stdpath 'data' .. local install_path = vim.fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
'/site/pack/packer/start/packer.nvim'
local is_bootstrap = false local is_bootstrap = false
if vim.fn.empty(vim.fn.glob(install_path)) > 0 then if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
is_bootstrap = true is_bootstrap = true
vim.fn.execute('!git clone https://github.com/wbthomason/packer.nvim ' .. vim.fn.execute("!git clone https://github.com/wbthomason/packer.nvim " .. install_path)
install_path) vim.cmd([[packadd packer.nvim]])
vim.cmd [[packadd packer.nvim]]
end end
-- Autocommand that reloads neovim whenever you save the plugins.lua file -- Autocommand that reloads neovim whenever you save the plugins.lua file
vim.api.nvim_create_autocmd("BufWritePost", { vim.api.nvim_create_autocmd("BufWritePost", {
group = vim.api.nvim_create_augroup("packer_user_config", {clear = true}), group = vim.api.nvim_create_augroup("packer_user_config", { clear = true }),
pattern = "plugins.lua", pattern = "plugins.lua",
callback = function() callback = function()
vim.cmd("source <afile>") vim.cmd("source <afile>")
require("packer").sync() require("packer").sync()
end end,
}) })
-- Use a protected call so we don't error out on first use -- Use a protected call so we don't error out on first use
local status_ok, packer = pcall(require, "packer") 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 -- Have packer use a popup window
packer.init({ packer.init({
display = { display = {
open_fn = function() open_fn = function()
return require("packer.util").float({border = "rounded"}) return require("packer.util").float({ border = "rounded" })
end end,
} },
}) })
-- Install your plugins here -- Install your plugins here
return packer.startup(function(use) return packer.startup(function(use)
-- My plugins here -- My plugins here
use({"wbthomason/packer.nvim"}) -- Have packer manage itself use({ "wbthomason/packer.nvim" }) -- Have packer manage itself
use({"windwp/nvim-autopairs"}) -- Autopairs, integrates with both cmp and treesitter use({ "windwp/nvim-autopairs" }) -- Autopairs, integrates with both cmp and treesitter
use({"numToStr/Comment.nvim"}) use({ "numToStr/Comment.nvim" })
use({"JoosepAlviste/nvim-ts-context-commentstring"}) use({ "JoosepAlviste/nvim-ts-context-commentstring" })
use({"kyazdani42/nvim-web-devicons"}) use({ "kyazdani42/nvim-web-devicons" })
use({"kyazdani42/nvim-tree.lua"}) use({ "kyazdani42/nvim-tree.lua" })
use({"akinsho/bufferline.nvim"}) use({ "akinsho/bufferline.nvim" })
use({"moll/vim-bbye"}) use({ "moll/vim-bbye" })
use({"nvim-lualine/lualine.nvim"}) use({ "nvim-lualine/lualine.nvim" })
use({"akinsho/toggleterm.nvim"}) use({ "akinsho/toggleterm.nvim" })
use({"ahmedkhalf/project.nvim"}) use({ "ahmedkhalf/project.nvim" })
use({"lewis6991/impatient.nvim"}) use({ "lewis6991/impatient.nvim" })
use({"lukas-reineke/indent-blankline.nvim"}) use({ "lukas-reineke/indent-blankline.nvim" })
use({"goolord/alpha-nvim"}) use({ "goolord/alpha-nvim" })
use({"folke/which-key.nvim"}) use({ "folke/which-key.nvim" })
-- Colorschemes -- Colorschemes
use({"folke/tokyonight.nvim"}) use({ "folke/tokyonight.nvim" })
use({"Minimal-Mistakes/minimalmistakes-nvim"}) use({ "Minimal-Mistakes/minimalmistakes-nvim" })
-- CMP plugins -- CMP plugins
use { -- Autocompletion use({ -- Autocompletion
'hrsh7th/nvim-cmp', "hrsh7th/nvim-cmp",
requires = { requires = {
'hrsh7th/cmp-buffer', -- buffer completions "hrsh7th/cmp-buffer", -- buffer completions
'hrsh7th/cmp-cmdline', -- cmdline completions "hrsh7th/cmp-cmdline", -- cmdline completions
'hrsh7th/cmp-path', -- path completions "hrsh7th/cmp-path", -- path completions
'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-nvim-lua', 'L3MON4D3/LuaSnip', -- snippet engine "hrsh7th/cmp-nvim-lsp",
'rafamadriz/friendly-snippets', -- a bunch of snippets to use "hrsh7th/cmp-nvim-lua",
'saadparwaiz1/cmp_luasnip' "L3MON4D3/LuaSnip", -- snippet engine
} "rafamadriz/friendly-snippets", -- a bunch of snippets to use
} "saadparwaiz1/cmp_luasnip",
},
})
-- LSP -- LSP
use({ -- LSP Configuration & Plugins use({ -- LSP Configuration & Plugins
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
requires = { requires = {
-- Automatically install LSPs to stdpath for neovim -- Automatically install LSPs to stdpath for neovim
--'williamboman/mason.nvim', 'williamboman/mason-lspconfig.nvim', 'williamboman/mason.nvim', 'williamboman/mason-lspconfig.nvim',
-- Useful status updates for LSP -- Useful status updates for LSP
--'j-hui/fidget.nvim' 'j-hui/fidget.nvim', tag = 'legacy'
} },
}) -- enable LSP }) -- enable LSP
use {'j-hui/fidget.nvim', tag = 'legacy'} use {'j-hui/fidget.nvim', tag = 'legacy'}
use({"jose-elias-alvarez/null-ls.nvim"}) -- for formatters and linters use({ "jose-elias-alvarez/null-ls.nvim" }) -- for formatters and linters
-- Telescope Fuzzy Finder (files, lsp, etc) -- Telescope Fuzzy Finder (files, lsp, etc)
use({"nvim-telescope/telescope.nvim", requires = {'nvim-lua/plenary.nvim'}}) 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 -- Fuzzy Finder Algorithm which requires local dependencies to be built. Only load if `make` is available
use { use({
'nvim-telescope/telescope-fzf-native.nvim', "nvim-telescope/telescope-fzf-native.nvim",
run = 'make', run = "make",
cond = vim.fn.executable 'make' == 1 cond = vim.fn.executable("make") == 1,
} })
-- Treesitter -- Treesitter
use { -- Highlight, edit, and navigate code use({ -- Highlight, edit, and navigate code
'nvim-treesitter/nvim-treesitter', "nvim-treesitter/nvim-treesitter",
run = function() run = function()
pcall(require('nvim-treesitter.install').update {with_sync = true}) pcall(require("nvim-treesitter.install").update({ with_sync = true }))
end end,
} })
use { -- Additional text objects via treesitter use({ -- Additional text objects via treesitter
'nvim-treesitter/nvim-treesitter-textobjects', "nvim-treesitter/nvim-treesitter-textobjects",
after = 'nvim-treesitter' after = "nvim-treesitter",
} })
-- Git -- Git
use({"tpope/vim-fugitive"}) use({ "tpope/vim-fugitive" })
use({"tpope/vim-rhubarb"}) use({ "tpope/vim-rhubarb" })
use({"lewis6991/gitsigns.nvim"}) use({ "lewis6991/gitsigns.nvim" })
-- Custom -- Custom
use({"wesleimp/stylua.nvim"}) use({ "wesleimp/stylua.nvim" })
use({"cappyzawa/trim.nvim"}) use({ "cappyzawa/trim.nvim" })
use({"ap/vim-css-color"}) use({ "ap/vim-css-color" })
use({"airblade/vim-gitgutter"}) use({ "airblade/vim-gitgutter" })
use({"ctrlpvim/ctrlp.vim"}) use({ "ctrlpvim/ctrlp.vim" })
use({"lyuts/vim-rtags"}) use({ "lyuts/vim-rtags" })
use({"wakatime/vim-wakatime"}) use({ "wakatime/vim-wakatime" })
use({"mboughaba/i3config.vim"}) use({ "mboughaba/i3config.vim" })
use({"The-Repo-Club/header.nvim"}) use({ "The-Repo-Club/header.nvim" })
use({"The-Repo-Club/Vim_Keys"}) use({ "The-Repo-Club/Vim_Keys" })
use({"Thyrum/vim-stabs"}) use({ "Thyrum/vim-stabs" })
use({"mbbill/undotree"}) use({ "mbbill/undotree" })
use({"tpope/vim-sleuth"}) -- Detect tabstop and shiftwidth automatically use({ "tpope/vim-sleuth" }) -- Detect tabstop and shiftwidth automatically
-- When we are bootstrapping a configuration, it doesn't -- When we are bootstrapping a configuration, it doesn't
-- make sense to execute the rest of the init.lua. -- make sense to execute the rest of the init.lua.
-- You'll need to restart nvim, and then it will work. -- You'll need to restart nvim, and then it will work.
if is_bootstrap then require("packer").sync() end if is_bootstrap then
require("packer").sync()
end
end) end)

View File

@ -174,6 +174,16 @@ _G.packer_plugins = {
path = "/home/repo/.local/share/nvim/site/pack/packer/start/lualine.nvim", path = "/home/repo/.local/share/nvim/site/pack/packer/start/lualine.nvim",
url = "https://github.com/nvim-lualine/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"] = { ["minimalmistakes-nvim"] = {
loaded = true, loaded = true,
path = "/home/repo/.local/share/nvim/site/pack/packer/start/minimalmistakes-nvim", path = "/home/repo/.local/share/nvim/site/pack/packer/start/minimalmistakes-nvim",