feat: update colorscheme

.config/alacritty/alacritty.toml

@@ -1,5 +1,5 @@
 [general]
-import = ["~/.config/alacritty/carbonfox.toml"]
+import = ["~/.config/alacritty/onedarkpro_onedark.toml"]
 
 [window]
 opacity = 1

.config/alacritty/carbonfox.toml

@@ -1,79 +0,0 @@
-# Nightfox Alacritty Colors
-## name: carbonfox
-## upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/carbonfox/alacritty.toml
-
-[colors.primary]
-background = "#161616"
-foreground = "#f2f4f8"
-dim_foreground = "#b6b8bb"
-bright_foreground = "#f9fbff"
-
-[colors.cursor]
-text = "#f2f4f8"
-cursor = "#b6b8bb"
-
-[colors.vi_mode_cursor]
-text = "#f2f4f8"
-cursor = "#33b1ff"
-
-[colors.search.matches]
-foreground = "#f2f4f8"
-background = "#525253"
-
-[colors.search.focused_match]
-foreground = "#f2f4f8"
-background = "#3ddbd9"
-
-[colors.footer_bar]
-foreground = "#f2f4f8"
-background = "#353535"
-
-[colors.hints.start]
-foreground = "#f2f4f8"
-background = "#3ddbd9"
-
-[colors.hints.end]
-foreground = "#f2f4f8"
-background = "#353535"
-
-[colors.selection]
-text = "#f2f4f8"
-background = "#2a2a2a"
-
-[colors.normal]
-black = "#282828"
-red = "#ee5396"
-green = "#25be6a"
-yellow = "#08bdba"
-blue = "#78a9ff"
-magenta = "#be95ff"
-cyan = "#33b1ff"
-white = "#dfdfe0"
-
-[colors.bright]
-black = "#484848"
-red = "#f16da6"
-green = "#46c880"
-yellow = "#2dc7c4"
-blue = "#8cb6ff"
-magenta = "#c8a5ff"
-cyan = "#52bdff"
-white = "#e4e4e5"
-
-[colors.dim]
-black = "#222222"
-red = "#ca4780"
-green = "#1fa25a"
-yellow = "#07a19e"
-blue = "#6690d9"
-magenta = "#a27fd9"
-cyan = "#2b96d9"
-white = "#bebebe"
-
-[[colors.indexed_colors]]
-index = 16
-color = "#3ddbd9"
-
-[[colors.indexed_colors]]
-index = 17
-color = "#ff7eb6"

.config/alacritty/cyberdream.toml

@@ -1,36 +0,0 @@
-# cyberdream theme for alacritty
-[[colors.indexed_colors]]
-color = "0xffbd5e"
-index = 16
-
-[[colors.indexed_colors]]
-color = "0xff6e5e"
-index = 17
-
-[colors.bright]
-black = "0x3c4048"
-blue = "0x5ea1ff"
-cyan = "0x5ef1ff"
-green = "0x5eff6c"
-magenta = "0xbd5eff"
-red = "0xff6e5e"
-white = "0xffffff"
-yellow = "0xf1ff5e"
-
-[colors.normal]
-black = "0x16181a"
-blue = "0x5ea1ff"
-cyan = "0x5ef1ff"
-green = "0x5eff6c"
-magenta = "0xbd5eff"
-red = "0xff6e5e"
-white = "0xffffff"
-yellow = "0xf1ff5e"
-
-[colors.primary]
-background = "0x16181a"
-foreground = "0xffffff"
-
-[colors.selection]
-background = "0x3c4048"
-foreground = "0xffffff"

.config/alacritty/onedarkpro_onedark.toml

@@ -0,0 +1,32 @@
+# Colors - https://github.com/olimorris/onedarkpro.nvim
+[colors.primary]
+background  = "#282c34"
+foreground  = "#abb2bf"
+
+[colors.normal]
+black       = "#282c34"
+red         = "#e06c75"
+green       = "#98c379"
+yellow      = "#e5c07b"
+blue        = "#61afef"
+magenta     = "#c678dd"
+cyan        = "#56b6c2"
+white       = "#abb2bf"
+
+[colors.bright]
+black       = "#3e4451"
+red         = "#e9969d"
+green       = "#b3d39c"
+yellow      = "#edd4a6"
+blue        = "#8fc6f4"
+magenta     = "#d7a1e7"
+cyan        = "#7bc6d0"
+white       = "#c8cdd5"
+
+[colors.cursor]
+text        = "CellBackground"
+cursor      = "CellForeground" # syntax-cursor-color
+
+[colors.selection]
+text        = "CellForeground"
+background  = "#5c6370"

.config/nvim/lua/lsp/servers/html.lua

@@ -1,3 +1,4 @@
 return {
+    cmd = { vim.fn.expand('~/.local/share/nvim/mason/bin/vscode-html-language-server'), '--stdio' },
     filetypes = { "html", "templ" },
 }

.config/nvim/lua/lsp/servers/intelephense.lua

@@ -8,10 +8,9 @@ if not utils.file_exists(license_path) then
 end
 
 return {
-    root_dir = function(pattern)
-        local root = util.root_pattern("composer.json", "composer.lock")(pattern)
-        return root or vim.fn.getcwd()
-    end,
+    cmd = { vim.fn.expand('~/.local/share/nvim/mason/bin/intelephense'), '--stdio' },
+    filetypes = { 'php' },
+    root_markers = { "composer.json", "composer.lock" },
     single_file_support = false,
     init_options = {
         licenceKey = license_path,

.config/nvim/lua/plugins/colorscheme.lua

@@ -83,6 +83,7 @@ return {
     {
         "EdenEast/nightfox.nvim",
         lazy = false,
+        enabled = false,
         priority = 1000,
         opts = {
             options = {
@@ -124,5 +125,12 @@ return {
             require("nightfox").setup(opts)
             vim.cmd("colorscheme carbonfox")
         end
+    },
+    {
+        "olimorris/onedarkpro.nvim",
+        priority = 1000, -- Ensure it loads first
+        config = function()
+            vim.cmd("colorscheme onedark")
+        end,
     }
 }

.config/nvim/lua/plugins/lspconfig.lua

@@ -1,6 +1,6 @@
 return {
     "neovim/nvim-lspconfig",
-    event = { "BufReadPre", "BufNewFile" },
+    -- event = { "BufReadPre", "BufNewFile" },
     dependencies = {
         { "saghen/blink.cmp" },
         { "antosha417/nvim-lsp-file-operations",      config = true                   },
@@ -74,10 +74,7 @@ return {
             -- Merge capabilities
             server.capabilities = vim.tbl_deep_extend("force", {}, capabilities, server.capabilities or {})
 
-            -- Use vim.lsp.config to define/customize the server configuration
             vim.lsp.config(server_name, server)
-
-            -- Use vim.lsp.enable to activate the server for its filetypes
             vim.lsp.enable(server_name)
         end
     end,

.tmux.conf

@@ -57,6 +57,9 @@ bind 'V' copy-mode
 # Enable clipboard integration
 set-option -g set-clipboard on
 
+bind-key -T copy-mode-vi 'C-v' send -X rectangle-toggle
+bind-key -T copy-mode-vi Escape send -X cancel
+
 # Use xclip for copying text in copy mode and stay in copy mode
 bind-key -T copy-mode-vi y send-keys -X copy-pipe "xclip -selection clipboard -in"
 bind-key -T copy-mode y send-keys -X copy-pipe "xclip -selection clipboard -in"
@@ -75,25 +78,43 @@ bind-key -r f run-shell "tmux neww ~/.local/bin/tmux-sessionizer"
 
 bind-key -r m run-shell "~/.local/bin/tmux-music"
 
-set -g mode-style "fg=#0c0c0c,bg=#b6b8bb"
-set -g message-style "fg=#0c0c0c,bg=#b6b8bb"
-set -g message-command-style "fg=#0c0c0c,bg=#b6b8bb"
-set -g pane-border-style "fg=#b6b8bb"
-set -g pane-active-border-style "fg=#78a9ff"
+set -g mode-style "fg=#98c379,bg=#3d4350"
+
+set -g message-style "fg=#98c379,bg=#3d4350"
+set -g message-command-style "fg=#98c379,bg=#3d4350"
+
+set -g pane-border-style "fg=#3d4350"
+set -g pane-active-border-style "fg=#98c379"
+
 set -g status "on"
 set -g status-justify "left"
-set -g status-style "fg=#b6b8bb,bg=#0c0c0c"
+
+set -g status-style "fg=#98c379,bg=#22262d"
+
 set -g status-left-length "100"
 set -g status-right-length "100"
+
 set -g status-left-style NONE
 set -g status-right-style NONE
-set -g status-left "#[fg=#0c0c0c,bg=#78a9ff,bold] #S #[fg=#78a9ff,bg=#0c0c0c,nobold,nounderscore,noitalics]"
-set -g status-right "#[fg=#0c0c0c,bg=#0c0c0c,nobold,nounderscore,noitalics]#[fg=#78a9ff,bg=#0c0c0c] #{prefix_highlight} #[fg=#b6b8bb,bg=#0c0c0c,nobold,nounderscore,noitalics]#[fg=#0c0c0c,bg=#b6b8bb] %Y-%m-%d  %I:%M %p #[fg=#78a9ff,bg=#b6b8bb,nobold,nounderscore,noitalics]#[fg=#0c0c0c,bg=#78a9ff,bold] #h "
-setw -g window-status-activity-style "underscore,fg=#7b7c7e,bg=#0c0c0c"
+
+set -g status-left "#[fg=#282c34,bg=#98c379,bold] #S #[fg=#98c379,bg=#22262d,nobold,nounderscore,noitalics]"
+set -g status-right "#[fg=#22262d,bg=#22262d,nobold,nounderscore,noitalics]#[fg=#98c379,bg=#22262d] #{prefix_highlight} #[fg=#3d4350,bg=#22262d,bold,nounderscore,noitalics]#[fg=#98c379,bg=#3d4350] %Y-%m-%d  %I:%M %p #[fg=#98c379,bg=#3d4350,nobold,nounderscore,noitalics]#[fg=#282c34,bg=#98c379,bold] #h "
+if-shell '[ "$(tmux show-option -gqv "clock-mode-style")" == "24" ]' {
+  set -g status-right "#[fg=#22262d,bg=#22262d,nobold,nounderscore,noitalics]#[fg=#98c379,bg=#22262d] #{prefix_highlight} #[fg=#3d4350,bg=#22262d,bold,nounderscore,noitalics]#[fg=#98c379,bg=#3d4350] %Y-%m-%d  %H:%M #[fg=#98c379,bg=#3d4350,nobold,nounderscore,noitalics]#[fg=#282c34,bg=#98c379,bold] #h "
+}
+
+setw -g window-status-activity-style "underscore,fg=#98c379,bg=#22262d"
 setw -g window-status-separator ""
-setw -g window-status-style "NONE,fg=#7b7c7e,bg=#0c0c0c"
-setw -g window-status-format "#[fg=#0c0c0c,bg=#0c0c0c,nobold,nounderscore,noitalics]#[default] #I  #W #F #[fg=#0c0c0c,bg=#0c0c0c,nobold,nounderscore,noitalics]"
-setw -g window-status-current-format "#[fg=#0c0c0c,bg=#b6b8bb,nobold,nounderscore,noitalics]#[fg=#0c0c0c,bg=#b6b8bb,bold] #I  #W #F #[fg=#b6b8bb,bg=#0c0c0c,nobold,nounderscore,noitalics]"
+setw -g window-status-style "NONE,fg=#98c379,bg=#22262d"
+setw -g window-status-format "#[fg=#22262d,bg=#22262d,nobold,nounderscore,noitalics]#[default] #I  #W #F #[fg=#22262d,bg=#22262d,nobold,nounderscore,noitalics]"
+setw -g window-status-current-format "#[fg=#22262d,bg=#3d4350,nobold,nounderscore,noitalics]#[fg=#98c379,bg=#3d4350,bold] #I  #W #F #[fg=#3d4350,bg=#22262d,nobold,nounderscore,noitalics]"
+
+# Requires tmux-plugins/tmux-prefix-highlight
+set -g @prefix_highlight_output_prefix "#[fg=#61afef]#[bg=#22262d]#[fg=#22262d]#[bg=#61afef]"
+set -g @prefix_highlight_output_suffix ""
+
+set -g @prefix_highlight_show_copy_mode 'on'
+set -g @prefix_highlight_show_sync_mode 'on'
 
 # List of plugins
 set -g @plugin 'tmux-plugins/tpm'