diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index 4ef30d8..dc1235c 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -49,29 +49,29 @@ scrollback_lines 10000 # color15 #a9b1d6 -# Gruvbox Dark Theme -foreground #ebdbb2 -background #1d2021 -selection_foreground #1d2021 -selection_background #ebdbb2 -url_color #458588 +# Custom Color Theme +foreground #f4decd +background #0f0f0f +selection_foreground #0f0f0f +selection_background #f4decd +url_color #71b4d6 -color0 #282828 -color1 #cc241d -color2 #98971a -color3 #d79921 -color4 #458588 -color5 #b16286 -color6 #689d6a -color7 #a89984 -color8 #928374 -color9 #fb4934 -color10 #b8bb26 -color11 #fabd2f -color12 #83a598 -color13 #d3869b -color14 #8ec07c -color15 #ebdbb2 +color0 #1e1f1e +color1 #f16e65 +color2 #7ec97e +color3 #ef934d +color4 #71b4d6 +color5 #e28dc6 +color6 #7ec9a3 +color7 #d9cdb5 +color8 #3b403c +color9 #ef968f +color10 #a4daa4 +color11 #f4b585 +color12 #b0d4e8 +color13 #ebadd6 +color14 #abd4bf +color15 #f4decd # Hide mouse while typing hide_mouse_when_typing yes diff --git a/config/qtile/config.py b/config/qtile/config.py index 83d8650..8bc27a1 100644 --- a/config/qtile/config.py +++ b/config/qtile/config.py @@ -148,16 +148,16 @@ for i in groups: # ] colors = [ - ["#282828", "#282828"], # bg - ["#ebdbb2", "#ebdbb2"], # fg - ["#3c3836", "#3c3836"], # bg1 / subtle contrast - ["#fb4934", "#fb4934"], # red - ["#b8bb26", "#b8bb26"], # green - ["#fabd2f", "#fabd2f"], # yellow - ["#83a598", "#83a598"], # blue - ["#d3869b", "#d3869b"], # purple - ["#8ec07c", "#8ec07c"], # aqua - ["#504945", "#504945"], # gray + ["#0f0f0f", "#0f0f0f"], # bg + ["#f4decd", "#f4decd"], # fg + ["#1e1f1e", "#1e1f1e"], # bg1 / subtle contrast + ["#ef968f", "#ef968f"], # red (bright) + ["#a4daa4", "#a4daa4"], # green (bright) + ["#f4b585", "#f4b585"], # yellow (bright) + ["#b0d4e8", "#b0d4e8"], # blue (bright) + ["#ebadd6", "#ebadd6"], # purple (bright magenta) + ["#abd4bf", "#abd4bf"], # aqua (bright cyan) + ["#3b403c", "#3b403c"], # gray (bright black) ] diff --git a/config/rofi/dwm-config.rasi b/config/rofi/dwm-config.rasi index e2ae40c..5a4ca91 100644 --- a/config/rofi/dwm-config.rasi +++ b/config/rofi/dwm-config.rasi @@ -19,10 +19,10 @@ configuration { @theme "/dev/null" * { - bg: #232933; - fg: #d8dee9; - selected: #2d3543; - accent: #4d6a8e; + bg: #0f0f0f; + fg: #f4decd; + selected: #1e1f1e; + accent: #b0d4e8; background-color: @bg; color: @fg; diff --git a/config/rofi/gruvbox.rasi b/config/rofi/gruvbox.rasi index a213f46..a2399d7 100644 --- a/config/rofi/gruvbox.rasi +++ b/config/rofi/gruvbox.rasi @@ -1,17 +1,17 @@ /* - * Gruvbox Dark colorscheme (converted from Tokyonight) + * Custom Color Scheme */ // define colors etc. * { - bg: #282828; - hv: #d3869b; - primary: #504945; // Gruvbox gray - ug: #3c3836; + bg: #0f0f0f; + hv: #ebadd6; + primary: #3b403c; // bright black + ug: #1e1f1e; font: "Lilex Nerd Font 14"; background-color: @bg; border: 0px; - kl: #83a598; + kl: #b0d4e8; black: #000000; transparent: rgba(46,52,64,0); diff --git a/config/rofi/tokyonight.rasi b/config/rofi/tokyonight.rasi index 1cc6014..d936355 100644 --- a/config/rofi/tokyonight.rasi +++ b/config/rofi/tokyonight.rasi @@ -1,20 +1,19 @@ /* - * Tokyonight colorscheme (big icons) for rofi - * User: w8ste + * Custom colorscheme for rofi */ // define colors etc. * { - bg: #24283b; - hv: #9274ca; - primary: #444b6a; // TokyoNight bright black - ug: #0B2447; + bg: #0f0f0f; + hv: #ebadd6; + primary: #3b403c; // bright black + ug: #1e1f1e; font: "Lilex Nerd Font 16"; background-color: @bg; //dark: @bg; border: 0px; - kl: #7aa2f7; + kl: #b0d4e8; black: #000000; transparent: rgba(46,52,64,0); diff --git a/modules/nixos/nvf.nix b/modules/nixos/nvf.nix index e68b8c6..d109f60 100644 --- a/modules/nixos/nvf.nix +++ b/modules/nixos/nvf.nix @@ -49,13 +49,114 @@ yazi-nvim.enable = true; # Terminal file manager integration }; - # Tokyo Night color theme + # Custom color theme theme = { - enable = true; - name = "gruvbox"; - style = "dark"; + enable = false; }; + # Custom colorscheme via extraConfigLuaPre + extraConfigLuaPre = '' + -- Custom colorscheme based on new1.md + vim.cmd([[ + hi clear + if exists("syntax_on") + syntax reset + endif + set background=dark + let g:colors_name = "custom" + + " Base colors + hi Normal guifg=#f4decd guibg=#0f0f0f + hi Visual guifg=#0f0f0f guibg=#f4decd + hi Cursor guifg=#0f0f0f guibg=#f4decd + hi CursorLine guibg=#1e1f1e + hi CursorColumn guibg=#1e1f1e + hi LineNr guifg=#3b403c guibg=#0f0f0f + hi CursorLineNr guifg=#f4decd guibg=#1e1f1e gui=bold + + " Syntax highlighting + hi Comment guifg=#3b403c gui=italic + hi Constant guifg=#ebadd6 + hi String guifg=#a4daa4 + hi Character guifg=#a4daa4 + hi Number guifg=#ebadd6 + hi Boolean guifg=#ebadd6 + hi Float guifg=#ebadd6 + hi Identifier guifg=#b0d4e8 + hi Function guifg=#b0d4e8 + hi Statement guifg=#ef968f gui=bold + hi Conditional guifg=#ef968f + hi Repeat guifg=#ef968f + hi Label guifg=#f4b585 + hi Operator guifg=#f4decd + hi Keyword guifg=#ef968f + hi Exception guifg=#ef968f + hi PreProc guifg=#abd4bf + hi Include guifg=#abd4bf + hi Define guifg=#ebadd6 + hi Macro guifg=#ebadd6 + hi PreCondit guifg=#abd4bf + hi Type guifg=#f4b585 gui=bold + hi StorageClass guifg=#f4b585 + hi Structure guifg=#f4b585 + hi Typedef guifg=#f4b585 + hi Special guifg=#abd4bf + hi SpecialChar guifg=#ebadd6 + hi Tag guifg=#abd4bf + hi Delimiter guifg=#f4decd + hi SpecialComment guifg=#3b403c gui=italic + hi Debug guifg=#ef968f + hi Underlined guifg=#b0d4e8 gui=underline + hi Ignore guifg=#3b403c + hi Error guifg=#ef968f guibg=#1e1f1e + hi Todo guifg=#ebadd6 guibg=#1e1f1e gui=bold + + " UI elements + hi Pmenu guifg=#f4decd guibg=#1e1f1e + hi PmenuSel guifg=#0f0f0f guibg=#b0d4e8 + hi PmenuSbar guibg=#3b403c + hi PmenuThumb guibg=#f4decd + hi StatusLine guifg=#f4decd guibg=#1e1f1e gui=bold + hi StatusLineNC guifg=#3b403c guibg=#1e1f1e + hi TabLine guifg=#3b403c guibg=#1e1f1e + hi TabLineFill guibg=#1e1f1e + hi TabLineSel guifg=#f4decd guibg=#0f0f0f gui=bold + hi VertSplit guifg=#3b403c guibg=#0f0f0f + hi Folded guifg=#3b403c guibg=#1e1f1e + hi FoldColumn guifg=#3b403c guibg=#0f0f0f + hi SignColumn guibg=#0f0f0f + hi Search guifg=#0f0f0f guibg=#f4b585 + hi IncSearch guifg=#0f0f0f guibg=#ef968f + hi MatchParen guifg=#0f0f0f guibg=#ebadd6 gui=bold + hi NonText guifg=#3b403c + hi SpecialKey guifg=#3b403c + hi Title guifg=#b0d4e8 gui=bold + hi Directory guifg=#abd4bf + hi ErrorMsg guifg=#ef968f guibg=#0f0f0f + hi WarningMsg guifg=#f4b585 + hi MoreMsg guifg=#a4daa4 + hi Question guifg=#a4daa4 + hi WildMenu guifg=#0f0f0f guibg=#b0d4e8 + + " Diff colors + hi DiffAdd guifg=#a4daa4 guibg=#1e1f1e + hi DiffChange guifg=#f4b585 guibg=#1e1f1e + hi DiffDelete guifg=#ef968f guibg=#1e1f1e + hi DiffText guifg=#b0d4e8 guibg=#3b403c gui=bold + + " Git signs + hi GitSignsAdd guifg=#a4daa4 + hi GitSignsChange guifg=#f4b585 + hi GitSignsDelete guifg=#ef968f + + " Diagnostics + hi DiagnosticError guifg=#ef968f + hi DiagnosticWarn guifg=#f4b585 + hi DiagnosticInfo guifg=#b0d4e8 + hi DiagnosticHint guifg=#abd4bf + ]]) + ''; + # Editor options options = { shiftwidth = 4; # Indent with 4 spaces diff --git a/new1.md b/new1.md new file mode 100644 index 0000000..092f5d4 --- /dev/null +++ b/new1.md @@ -0,0 +1,37 @@ +# colors + +## initial + +background= #0f0f0f foreground= #f4decd + +## black + +black = #1e1f1e bright-black = #3b403c + +## red + +red= #f16e65 bright-red = #ef968f + +## green + +green= #7ec97e bright-green = #a4daa4 + +## yellow + +yellow= #ef934d bright-yellow = #f4b585 + +## blue + +blue= #71b4d6 bright-yellow = #b0d4e8 + +## magenta + +magenta = #e28dc6 bright-magenta = #ebadd6 + +## cyan + +regular6 = #7ec9a3 bright6 = #abd4bf + +## white + +regular7 = #d9cdb5 bright7 = #f4decd