aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Sangdahl <[email protected]>2023-06-16 10:33:21 -0600
committerJack Sangdahl <[email protected]>2023-06-16 10:33:21 -0600
commit2ff709407ce99d972882717a7738ecde7911708a (patch)
treedc85b6a109af7112c9427fedfd1589f1173b5ac1
parent80e924489a8507775924ebad5c38ea098b36a990 (diff)
downloaddots-2ff709407ce99d972882717a7738ecde7911708a.tar.gz
dots-2ff709407ce99d972882717a7738ecde7911708a.zip
nvchad updates & bd
-rw-r--r--.config/BetterDiscord/themes/mocha.theme.css11
-rw-r--r--.config/alacritty/alacritty.yml18
-rw-r--r--.config/gtk-3.0/settings.ini2
-rw-r--r--.config/mako/config14
-rw-r--r--.config/nvchad/chadrc.lua17
-rw-r--r--.config/nvchad/configs/lspconfig.lua13
-rw-r--r--.config/nvchad/configs/null-ls.lua37
-rw-r--r--.config/nvchad/configs/overrides.lua50
-rw-r--r--.config/nvchad/plugins.lua46
-rw-r--r--.pkglist.txt1
10 files changed, 183 insertions, 26 deletions
diff --git a/.config/BetterDiscord/themes/mocha.theme.css b/.config/BetterDiscord/themes/mocha.theme.css
new file mode 100644
index 00000000..e3005488
--- /dev/null
+++ b/.config/BetterDiscord/themes/mocha.theme.css
@@ -0,0 +1,11 @@
+/**
+ * @name Catppuccin Mocha
+ * @author winston#0001
+ * @authorId 505490445468696576
+ * @version 0.2.0
+ * @description 🎮 Soothing pastel theme for Discord
+ * @website https://github.com/catppuccin/discord
+ * @invite r6Mdz5dpFc
+ * **/
+
+@import url("https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css");
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 1d78344e..49dcdd50 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -10,9 +10,8 @@ window:
y: 5
opacity: 1.0
startup_mode: Windowed
- title: Alacritty
+ title: alacritty
dynamic_title: true
- gtk_theme_variant: None
scrolling:
history: 10000
@@ -24,18 +23,6 @@ font:
family: JetBrains Mono
style: Regular
- bold:
- family: JetBrains Mono
- style: Bold
-
- italic:
- family: JetBrains Mono
- style: Italic
-
- bold_italic:
- family: JetBrains Mono
- style: Bold Italic
-
size: 12
# Colors (catppuccin)
@@ -86,6 +73,3 @@ live_config_reload: true
# Shell
shell:
program: /bin/zsh
-
-mouse:
- hide_when_typing: false
diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
index 614de72c..84657dce 100644
--- a/.config/gtk-3.0/settings.ini
+++ b/.config/gtk-3.0/settings.ini
@@ -2,4 +2,4 @@
gtk-icon-theme-name = catppuccin-icons
gtk-theme-name = catppuccin
gtk-cursor-theme-name = sunity-cursors
-gtk-font-name = mononoki Nerd Font 11
+gtk-font-name = mononoki Nerd Font
diff --git a/.config/mako/config b/.config/mako/config
index b2380433..b3b94d0d 100644
--- a/.config/mako/config
+++ b/.config/mako/config
@@ -1,11 +1,11 @@
-font=mononoki Nerd Font
-background-color=#1e1e2e
-text-color=#f5e0dc
-max-icon-size=48
-icon-location=right
+border-size=2
margin=0,30,25
+border-radius=15
padding=15,10,15
-border-size=2
+max-icon-size=48
+text-color=#f5e0dc
+icon-location=right
border-color=#eba0ac
-border-radius=15
default-timeout=10000
+font=mononoki Nerd Font
+background-color=#1e1e2e
diff --git a/.config/nvchad/chadrc.lua b/.config/nvchad/chadrc.lua
new file mode 100644
index 00000000..62bf96c3
--- /dev/null
+++ b/.config/nvchad/chadrc.lua
@@ -0,0 +1,17 @@
+---@type ChadrcConfig
+local M = {}
+
+M.ui = {
+ statusline = {
+ theme = "vscode_colored",
+ separator_style = "default",
+ },
+ tabufline = {
+ lazyload = true,
+ },
+ theme = "catppuccin",
+}
+
+M.plugins = "custom.plugins"
+
+return M
diff --git a/.config/nvchad/configs/lspconfig.lua b/.config/nvchad/configs/lspconfig.lua
new file mode 100644
index 00000000..22e17288
--- /dev/null
+++ b/.config/nvchad/configs/lspconfig.lua
@@ -0,0 +1,13 @@
+local on_attach = require("plugins.configs.lspconfig").on_attach
+local capabilities = require("plugins.configs.lspconfig").capabilities
+
+local lspconfig = require "lspconfig"
+
+local servers = { "cssls", "pylsp", "clangd" }
+
+for _, lsp in ipairs(servers) do
+ lspconfig[lsp].setup {
+ on_attach = on_attach,
+ capabilities = capabilities,
+ }
+end
diff --git a/.config/nvchad/configs/null-ls.lua b/.config/nvchad/configs/null-ls.lua
new file mode 100644
index 00000000..cd635ee2
--- /dev/null
+++ b/.config/nvchad/configs/null-ls.lua
@@ -0,0 +1,37 @@
+local present, null_ls = pcall(require, "null-ls")
+
+if not present then
+ return
+end
+
+local b = null_ls.builtins
+
+local sources = {
+ -- Lua
+ b.formatting.stylua,
+
+ -- cpp
+ b.formatting.clang_format,
+
+ -- rust
+ b.formatting.rustfmt,
+
+ -- python
+ b.formatting.black,
+
+ -- json
+ b.diagnostics.jsonlint,
+}
+
+null_ls.setup {
+ debug = true,
+ sources = sources,
+}
+
+local notify = vim.notify
+vim.notify = function(msg, ...)
+ if msg:match("warning: multiple different client offset_encodings") then
+ return
+ end
+ notify(msg, ...)
+end
diff --git a/.config/nvchad/configs/overrides.lua b/.config/nvchad/configs/overrides.lua
new file mode 100644
index 00000000..f12ff680
--- /dev/null
+++ b/.config/nvchad/configs/overrides.lua
@@ -0,0 +1,50 @@
+local M = {}
+
+M.treesitter = {
+ ensure_installed = {
+ "vim",
+ "lua",
+ "html",
+ "css",
+ "cpp",
+ "c",
+ "markdown",
+ "markdown_inline",
+ },
+ indent = {
+ enable = true,
+ },
+}
+
+M.mason = {
+ ensure_installed = {
+ -- lua stuff
+ "lua-language-server",
+ "stylua",
+
+ -- web dev stuff
+ "css-lsp",
+
+ -- c/cpp stuff
+ "clangd",
+ "clang-format",
+ },
+}
+
+-- git support in nvimtree
+M.nvimtree = {
+ git = {
+ enable = true,
+ },
+
+ renderer = {
+ highlight_git = true,
+ icons = {
+ show = {
+ git = true,
+ },
+ },
+ },
+}
+
+return M
diff --git a/.config/nvchad/plugins.lua b/.config/nvchad/plugins.lua
new file mode 100644
index 00000000..e760bc1d
--- /dev/null
+++ b/.config/nvchad/plugins.lua
@@ -0,0 +1,46 @@
+local overrides = require("custom.configs.overrides")
+
+---@type NvPluginSpec[]
+local plugins = {
+
+ {
+ "neovim/nvim-lspconfig",
+ dependencies = {
+ {
+ "jose-elias-alvarez/null-ls.nvim",
+ config = function()
+ require "custom.configs.null-ls"
+ end,
+ },
+ },
+ config = function()
+ require "plugins.configs.lspconfig"
+ require "custom.configs.lspconfig"
+ end,
+ },
+
+ {
+ "williamboman/mason.nvim",
+ opts = overrides.mason
+ },
+
+ {
+ "nvim-treesitter/nvim-treesitter",
+ opts = overrides.treesitter,
+ },
+
+ {
+ "nvim-tree/nvim-tree.lua",
+ opts = overrides.nvimtree,
+ },
+
+ {
+ "max397574/better-escape.nvim",
+ event = "InsertEnter",
+ config = function()
+ require("better_escape").setup()
+ end,
+ },
+}
+
+return plugins
diff --git a/.pkglist.txt b/.pkglist.txt
index 7437dfe5..383c6566 100644
--- a/.pkglist.txt
+++ b/.pkglist.txt
@@ -7,7 +7,6 @@ app-eselect/eselect-repository
app-laptop/laptop-mode-tools
app-laptop/tlp
app-misc/brightnessctl
-app-misc/spicetify-cli
app-mobilephone/dfu-util
app-portage/gentoolkit
app-shells/gentoo-zsh-completions