clean up theme

brightpuddle · Apr 14, 2023 · ea02110 · ea02110
1 parent 0b9599b
commit ea02110
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 47 deletions.
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
@@ -124,6 +124,9 @@ key_bindings:
     mods: Command
     chars: "vi ~/.config/alacritty/alacritty.yml\r"
 
+# Copyright (c) 2016-present Sven Greb <[email protected]>
+# This source code is licensed under the MIT license found in the license file.
+
 colors:
   primary:
     background: "#2e3440"
@@ -142,9 +145,9 @@ colors:
     matches:
       foreground: CellBackground
       background: "#88c0d0"
-  footer_bar:
-    background: "#434c5e"
-    foreground: "#d8dee9"
+    footer_bar:
+      background: "#434c5e"
+      foreground: "#d8dee9"
   normal:
     black: "#3b4252"
     red: "#bf616a"

diff --git a/.config/bat/config b/.config/bat/config
@@ -2,5 +2,6 @@
 #--italic-text=always
 #--paging=never
 --pager="less --RAW-CONTROL-CHARS --quit-if-one-screen --mouse -X"
+--theme="Nord"
 #--map-syntax "*.ino:C++"
 #--map-syntax ".ignore:Git Ignore"
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
@@ -87,9 +87,12 @@ vim.diagnostic.config({
 
 -- Plugins that use settings for config
 g.better_escape_shortcut = "jk"
+
+-- Nord colorscheme settings
 g.nord_contrast = true
-g.nord_borders = false
+g.nord_borders = true
 g.nord_enable_sidebar_background = true
+g.nord_italic = false
 
 local packerSyncGrp = vim.api.nvim_create_augroup("PackerSyncGrp", {})
 vim.api.nvim_clear_autocmds({ group = packerSyncGrp })

diff --git a/.config/nvim/lua/config/color.lua b/.config/nvim/lua/config/color.lua
@@ -25,21 +25,31 @@
 -- #B48EAD
 
 return function()
-	vim.cmd("colorscheme nord")
+	vim.cmd.colorscheme("nord")
+	-- require("catppuccin").setup({
+	-- 	custom_highlights = function(c)
+	-- 		return {
+	-- 		  ["@"]
+	-- 		}
+	-- 	end,
+	-- })
+
 	-- General visibility
+	vim.api.nvim_set_hl(0, "Comment", { fg = "#616e88", italic = 1 })
 	vim.api.nvim_set_hl(0, "Keyword", { fg = "#B48EAD" })
 	vim.api.nvim_set_hl(0, "Number", { fg = "#D08770" })
 	vim.api.nvim_set_hl(0, "Float", { link = "Number" })
 	vim.api.nvim_set_hl(0, "Boolean", { link = "Number" })
-	-- Limited cursorline
-	vim.api.nvim_set_hl(0, "CursorLine", {})
-	vim.api.nvim_set_hl(0, "CursorLineNr", { bg = "#3B4252", fg = "#5E81AC" })
+
+	-- Cursorline
+	vim.api.nvim_set_hl(0, "CursorLine", { bg = "#282E39", fg = "#282E39" })
+	vim.api.nvim_set_hl(0, "CursorLineNr", { bg = "#282E39", fg = "#282E39" })
+
 	-- SymbolBrowser
 	vim.api.nvim_set_hl(0, "FocusedSymbol", { fg = "#D08770", bold = 1 })
+
 	-- Neotree
 	vim.api.nvim_set_hl(0, "NeoTreeCursorLine", { bg = "#3B4252" })
-	-- Transparent background
-	-- vim.api.nvim_set_hl(0, "Normal", { bg = "NONE", fg = "NONE" })
 	vim.api.nvim_set_hl(0, "NeoTreeNormal", { bg = "#282E39" })
 	vim.api.nvim_set_hl(0, "NeoTreeWinSeparator", { fg = "#2E3440", bg = "#2E3440" })
 end
diff --git a/.config/nvim/lua/config/lsp.lua b/.config/nvim/lua/config/lsp.lua
@@ -85,11 +85,14 @@ return function()
 	})
 
 	local null_ls = require("null-ls")
-	local formatting = null_ls.builtins.formatting
+	-- local actions = null_ls.builtins.code_actions
 	local diagnostics = null_ls.builtins.diagnostics
+	local formatting = null_ls.builtins.formatting
 	null_ls.setup({
 		on_attach = on_attach({ format = true }),
 		sources = {
+			-- Code Actions
+
 			-- Diagnostics
 			diagnostics.ansiblelint,
 			diagnostics.curlylint,
@@ -99,8 +102,6 @@ return function()
 			diagnostics.npm_groovy_lint,
 			diagnostics.revive,
 
-			-- Code Actions
-
 			-- Formatting
 			formatting.black,
 			formatting.csharpier,

diff --git a/.config/nvim/plugin/10-main.lua b/.config/nvim/plugin/10-main.lua
@@ -31,10 +31,6 @@ require("packer").startup({
 		-- Debugging
 		use({ "rcarriga/nvim-dap-ui", opt = true, requires = { "mfussenegger/nvim-dap" } })
 
-		-- TODO
-		-- Easier whichkey setup (need to test without first)
-		-- https://github.com/AckslD/nvim-whichkey-setup.lua
-
 		-- TODO
 		-- Tmux and neovim splits
 		-- https://github.com/declancm/windex.nvim
@@ -50,13 +46,13 @@ require("packer").startup({
 			"folke/which-key.nvim",
 			config = require("config.whichkey"),
 		})
+		-- TODO
+		-- Easier whichkey setup (need to test without first)
+		-- https://github.com/AckslD/nvim-whichkey-setup.lua
 
 		-- indent guides
 		use({ "lukas-reineke/indent-blankline.nvim", ft = { "python" } })
 
-		-- faster filetypes
-		use({ "nathom/filetype.nvim", config = require("config.filetype") })
-
 		-- base64 encode/decode
 		use({ "taybart/b64.nvim" })
 
@@ -97,8 +93,8 @@ require("packer").startup({
 		})
 
 		-- colorscheme
-		use({ "arcticicestudio/nord-vim", config = require("config.color") })
-		-- use({ "shaunsingh/nord.nvim", config = require("config.color") })
+		use({ "nordtheme/vim", as = "nord", config = require("config.color") })
+		-- use({ "catppuccin/nvim", as = "catppuccin", config = require("config.color") })
 
 		-- "tab" line with buffers
 		use({
@@ -111,17 +107,15 @@ require("packer").startup({
 
 		-- syntax highlighting, etc
 		use({ "nvim-treesitter/nvim-treesitter", config = require("config.treesitter") })
-
-		-- treesitter syntax tree
-		-- use({ "nvim-treesitter/playground" })
+		use({ "nvim-treesitter/playground" })
 
 		-- status bar
 		use({ "kyazdani42/nvim-web-devicons" })
 		use({
 			"freddiehaddad/feline.nvim",
 			requires = { "kyazdani42/nvim-web-devicons" },
 			config = require("config.feline"),
-			after = { "nord-vim" },
+			after = "nord",
 		})
 
 		-- quickfix/problem viewer
@@ -172,12 +166,6 @@ require("packer").startup({
 			cmd = "Neotree",
 			config = require("config.neotree"),
 		})
-		-- use({
-		-- 	"kyazdani42/nvim-tree.lua",
-		-- 	requires = { "kyazdani42/nvim-web-devicons" },
-		-- 	cmd = "NvimTreeToggle",
-		-- 	config = require("config.nvimtree"),
-		-- })
 
 		-- fzf/CtrlP
 		use({

diff --git a/.config/spicetify/Backup/login.spa b/.config/spicetify/Backup/login.spa
diff --git a/.config/spicetify/Backup/xpui.spa b/.config/spicetify/Backup/xpui.spa
diff --git a/.config/spicetify/config-xpui.ini b/.config/spicetify/config-xpui.ini
@@ -1,7 +1,7 @@
 [AdditionalOptions]
 home_config           = 1
 experimental_features = 1
-extensions            = 
+extensions            = catppuccin-macchiato.js
 custom_apps           = marketplace
 sidebar_config        = 1
 
@@ -10,11 +10,11 @@ sidebar_config        = 1
 [Setting]
 inject_css              = 1
 replace_colors          = 1
-overwrite_assets        = 0
+overwrite_assets        = 1
 spotify_path            = /Applications/Spotify.app/Contents/Resources
 prefs_path              = /Users/nathan/Library/Application Support/Spotify/prefs
-color_scheme            = nord
-current_theme           = marketplace
+color_scheme            = mauve
+current_theme           = catppuccin-macchiato
 spotify_launch_flags    = 
 check_spicetify_upgrade = 0
 
@@ -27,5 +27,5 @@ remove_rtl_rule       = 1
 
 ; DO NOT CHANGE!
 [Backup]
-version = 1.2.4.912.g949d5fd0
-with    = 2.16.1
+version = 
+with    = 
diff --git a/.config/tmux/status.conf b/.config/tmux/status.conf
@@ -10,13 +10,13 @@ set -g status-justify left
 set-window-option -g window-status-separator ' '
 
 # Active tab
-set-window-option -g window-status-current-format "#[fg=brightblack bg=default]"
-set-window-option -ag window-status-current-format "#[fg=#8fbcbb bg=brightblack italics]  "
-set-window-option -ag window-status-current-format "#[default italics bg=brightblack fg=default] #I:#W "
-set-window-option -ag window-status-current-format "#[fg=brightblack bg=default]"
+set-window-option -g window-status-current-format "#[fg=#434c5e bg=default]"
+set-window-option -ag window-status-current-format "#[fg=color4 bg=#434c5e italics]  "
+set-window-option -ag window-status-current-format "#[default italics bg=#434c5e fg=default] #I:#W "
+set-window-option -ag window-status-current-format "#[fg=#434c5e bg=default]"
 
 # Inactive tab
-set-window-option -g window-status-format "#[default]    #I:#W  "
+set-window-option -g window-status-format "#[fg=default]    #I:#W  "
 
 
 # Left
@@ -27,6 +27,6 @@ set -g status-left ""
 
 # Right
 # Host
-set -g status-right "#[fg=black bg=#2e3440]"
-set -ag status-right "#[fg=#5e81ac bg=black]  #[fg=default] #H "
-set -ag status-right "#[fg=black bg=#2e3440]"
+set -g status-right "#[fg=#434c5e bg=default]"
+set -ag status-right "#[fg=color4 bg=#434c5e]  #[fg=default] #H "
+set -ag status-right "#[fg=#434c5e bg=default]"
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
@@ -1,7 +1,7 @@
 ###########################################################
 # Plugins
 ############################################################
-set -g @plugin 'tmux-plugins/tpm'
+# set -g @plugin "arcticicestudio/nord-tmux"
 set -g @plugin 'tmux-plugins/tmux-resurrect'
 set -g @plugin 'tmux-plugins/tmux-logging'
 set -g @plugin 'tmux-plugins/tmux-continuum'

diff --git a/.yabairc b/.yabairc
@@ -11,6 +11,8 @@ yabai -m config window_border on
 
 # opacity
 yabai -m config window_opacity off
+# First two digits are opacity
+yabai -m config active_window_border_color "0x70D08770"
 
 # animation
 # yabai -m config window_animation_duration 0.35