update colors

This commit is contained in:
arielherself 2024-12-11 23:27:25 +08:00
parent b5945b86b0
commit 3268c73310
Signed by: arielherself
SSH Key Fingerprint: SHA256:AK3cyo9tFsp7Mox7K0sYphleC8hReXhnRKxwuDT5LBc
3 changed files with 51 additions and 14 deletions

View File

@ -70,6 +70,9 @@ in {
}; };
recursive = true; recursive = true;
}; };
"tmux-powerline" = {
source = ../tmux-powerline;
};
"contour/contour.yml" = { "contour/contour.yml" = {
source = ../contour.yml; source = ../contour.yml;
recursive = true; recursive = true;
@ -205,7 +208,7 @@ in {
pkgs.jdt-language-server pkgs.jdt-language-server
# Python # Python
(pkgs.python312.withPackages (ps: with ps; [ (pkgs.python313.withPackages (ps: with ps; [
])) ]))
pkgs.pyright pkgs.pyright
# pkgs.pipx # pkgs.pipx
@ -337,6 +340,22 @@ in {
initExtraFirst = '' initExtraFirst = ''
ZSH_TMUX_AUTOSTART=true ZSH_TMUX_AUTOSTART=true
ZSH_TMUX_AUTOCONNECT=false ZSH_TMUX_AUTOCONNECT=false
typeset -A ZSH_HIGHLIGHT_STYLES
ZSH_HIGHLIGHT_STYLES[unknown-token]=fg=#c9a9a6
ZSH_HIGHLIGHT_STYLES[command]=fg=#f36c8d
ZSH_HIGHLIGHT_STYLES[precommand]=fg=#f36c8d
ZSH_HIGHLIGHT_STYLES[function]=fg=#f36c8d
ZSH_HIGHLIGHT_STYLES[suffix-alias]=fg=#f36c8d
ZSH_HIGHLIGHT_STYLES[global-alias]=fg=#f36c8d
ZSH_HIGHLIGHT_STYLES[alias]=fg=#f36c8d
ZSH_HIGHLIGHT_STYLES[builtin]=fg=#f36c8d
ZSH_HIGHLIGHT_STYLES[reserved-word]=fg=#f36c8d
ZSH_HIGHLIGHT_STYLES[hashed-command]=fg=#f36c8d
ZSH_HIGHLIGHT_STYLES[autodirectory]=fg=#f36c8d,underline
ZSH_HIGHLIGHT_STYLES[path]=fg=#f3cfc6
ZSH_HIGHLIGHT_STYLES[single-hyphen-option]=fg=#858585
ZSH_HIGHLIGHT_STYLES[double-hyphen-option]=fg=#858585
''; '';
initExtra = '' initExtra = ''
me() { mkdir -p "$1" && cd "$1" } me() { mkdir -p "$1" && cd "$1" }
@ -387,6 +406,7 @@ in {
set -g default-command "${pkgs.zsh}/bin/zsh" set -g default-command "${pkgs.zsh}/bin/zsh"
setw -g mode-keys vi setw -g mode-keys vi
set-option -g status-position top set-option -g status-position top
set -g status-bg default
set -sg escape-time 0 set -sg escape-time 0
set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tpm'
# This plugin seems to break terminfo when default shell of a terminal emulator is set to zsh. # This plugin seems to break terminfo when default shell of a terminal emulator is set to zsh.

View File

@ -43,7 +43,7 @@ vim.diagnostic.config({
focusable = false, focusable = false,
}, },
}) })
vim.cmd([[au CursorHold * lua vim.diagnostic.open_float(0,{scope = "cursor"})]]) -- vim.cmd([[au CursorHold * lua vim.diagnostic.open_float(0,{scope = "cursor"})]])
vim.g.mapleader = " "; vim.g.mapleader = " ";
vim.filetype.add({ vim.filetype.add({
extension = { extension = {
@ -236,7 +236,7 @@ local plugins = {
{ 'nvim-treesitter/nvim-treesitter-context' }, { 'nvim-treesitter/nvim-treesitter-context' },
{ 'nvim-treesitter/nvim-treesitter-refactor' }, { 'nvim-treesitter/nvim-treesitter-refactor' },
{ 'nvim-treesitter/nvim-treesitter-textobjects' }, { 'nvim-treesitter/nvim-treesitter-textobjects' },
{ 'mg979/vim-visual-multi' }, -- { 'mg979/vim-visual-multi' },
{ 'sindrets/diffview.nvim' }, { 'sindrets/diffview.nvim' },
{ {
'sitiom/nvim-numbertoggle' -- Automatically switch between relative and absolute line number 'sitiom/nvim-numbertoggle' -- Automatically switch between relative and absolute line number
@ -493,6 +493,23 @@ local plugins = {
-- }, -- },
{ 'kosayoda/nvim-lightbulb' }, { 'kosayoda/nvim-lightbulb' },
{ 'mfussenegger/nvim-jdtls' }, -- Java LS { 'mfussenegger/nvim-jdtls' }, -- Java LS
{
"smoka7/multicursors.nvim", -- multiple cursors
event = "VeryLazy",
dependencies = {
'nvimtools/hydra.nvim',
},
opts = {},
cmd = { 'MCstart', 'MCvisual', 'MCclear', 'MCpattern', 'MCvisualPattern', 'MCunderCursor' },
keys = {
{
mode = { 'v', 'n' },
'<Leader>v',
'<cmd>MCstart<cr>',
desc = 'Create a selection for selected text or word under the cursor',
},
},
}
} }
require("lazy").setup(plugins, {}) require("lazy").setup(plugins, {})
@ -763,7 +780,7 @@ vim.keymap.set('i', '<C-x>', '<ESC>ddi')
vim.keymap.set('i', '<Home>', '<ESC>^i') vim.keymap.set('i', '<Home>', '<ESC>^i')
vim.keymap.set('i', '<C-a>', '<ESC>ggVG') vim.keymap.set('i', '<C-a>', '<ESC>ggVG')
vim.keymap.set('n', '<C-a>', 'ggVG') vim.keymap.set('n', '<C-a>', 'ggVG')
vim.keymap.set('n', '<leader>`', '<Cmd>split<CR><Cmd>terminal bash<CR>i') vim.keymap.set('n', '<leader>`', '<Cmd>split<CR><Cmd>terminal zsh<CR>i')
vim.keymap.set('n', '<leader>n', '<Cmd>tabnew<CR>') vim.keymap.set('n', '<leader>n', '<Cmd>tabnew<CR>')
vim.keymap.set('n', '<leader><tab>', '<Cmd>tabnext<CR>') vim.keymap.set('n', '<leader><tab>', '<Cmd>tabnext<CR>')
vim.keymap.set('t', '<ESC>', '<C-\\><C-n>', {noremap=true}) vim.keymap.set('t', '<ESC>', '<C-\\><C-n>', {noremap=true})

View File

@ -102,15 +102,15 @@ fi
# shellcheck disable=SC1143,SC2128 # shellcheck disable=SC1143,SC2128
if [ -z "$TMUX_POWERLINE_LEFT_STATUS_SEGMENTS" ]; then if [ -z "$TMUX_POWERLINE_LEFT_STATUS_SEGMENTS" ]; then
TMUX_POWERLINE_LEFT_STATUS_SEGMENTS=( TMUX_POWERLINE_LEFT_STATUS_SEGMENTS=(
"tmux_session_info 148 234" "tmux_session_info #fb6f92 #ffffff"
"hostname 33 0" "hostname #fe8faa #ffffff"
#"mode_indicator 165 0" #"mode_indicator 165 0"
#"ifstat 30 255" #"ifstat 30 255"
#"ifstat_sys 30 255" #"ifstat_sys 30 255"
"lan_ip 24 255" "lan_ip #ffb3c7 #000000"
#"vpn 24 255 ${TMUX_POWERLINE_SEPARATOR_RIGHT_THIN}" #"vpn 24 255 ${TMUX_POWERLINE_SEPARATOR_RIGHT_THIN}"
# "wan_ip 24 255" # "wan_ip 24 255"
"vcs_branch 29 88" "vcs_branch #ffc2d2 #000000"
#"vcs_compare 60 255" #"vcs_compare 60 255"
#"vcs_staged 64 255" #"vcs_staged 64 255"
#"vcs_modified 9 255" #"vcs_modified 9 255"
@ -122,21 +122,21 @@ fi
if [ -z "$TMUX_POWERLINE_RIGHT_STATUS_SEGMENTS" ]; then if [ -z "$TMUX_POWERLINE_RIGHT_STATUS_SEGMENTS" ]; then
TMUX_POWERLINE_RIGHT_STATUS_SEGMENTS=( TMUX_POWERLINE_RIGHT_STATUS_SEGMENTS=(
#"earthquake 3 0" #"earthquake 3 0"
"pwd 89 211" "pwd #ffd7d7 #000000"
#"macos_notification_count 29 255" #"macos_notification_count 29 255"
#"mailcount 9 255" #"mailcount 9 255"
"now_playing 234 37" "now_playing #f3b6b6 #000000"
# "cpu 240 136" # "cpu 240 136"
# "load 237 167" # "load 237 167"
#"tmux_mem_cpu_load 234 136" #"tmux_mem_cpu_load 234 136"
"battery 137 127" "battery #e0a2a2 #000000"
#"air ${TMUX_POWERLINE_SEG_AIR_COLOR} 255" #"air ${TMUX_POWERLINE_SEG_AIR_COLOR} 255"
# "weather 37 255" # "weather 37 255"
#"rainbarf 0 ${TMUX_POWERLINE_DEFAULT_FOREGROUND_COLOR}" #"rainbarf 0 ${TMUX_POWERLINE_DEFAULT_FOREGROUND_COLOR}"
#"xkb_layout 125 117" #"xkb_layout 125 117"
"date_day 235 136" "date_day #c38888 #ffffff"
"date 235 136 ${TMUX_POWERLINE_SEPARATOR_LEFT_THIN}" "date #a56c6c #ffffff" # ${TMUX_POWERLINE_SEPARATOR_LEFT_THIN}"
# "time 235 136 ${TMUX_POWERLINE_SEPARATOR_LEFT_THIN}" "time #915858 #ffffff" # ${TMUX_POWERLINE_SEPARATOR_LEFT_THIN}"
#"utc_time 235 136 ${TMUX_POWERLINE_SEPARATOR_LEFT_THIN}" #"utc_time 235 136 ${TMUX_POWERLINE_SEPARATOR_LEFT_THIN}"
) )
fi fi