From 610fada91d2777db63aaa071c421421a407a1b60 Mon Sep 17 00:00:00 2001 From: 2ndbeam <2ndbeam@disroot.org> Date: Mon, 18 Aug 2025 16:20:18 +0300 Subject: [PATCH] changed colors --- alacritty/alacritty.toml | 62 ++++++++++++++++++++-------------------- nvim/init.lua | 19 ++++++------ river/init.lua | 8 +++--- waybar/config.jsonc | 4 +-- waybar/style.css | 19 +++++++----- 5 files changed, 60 insertions(+), 52 deletions(-) diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml index 68ca71f..d7737de 100644 --- a/alacritty/alacritty.toml +++ b/alacritty/alacritty.toml @@ -2,50 +2,50 @@ import = [] live_config_reload = true [window] -opacity = 0.7 +opacity = 0.5 [font] -normal = { family = "Source Code Pro", style = "Regular" } -size = 11 +normal = { family = "FantasqueSansM Nerd Font", style = "Regular" } +size = 13 [colors] draw_bold_text_with_bright_colors = true [colors.primary] -foreground = "#ffffff" -dim_foreground = "#f0dada" -bright_foreground = "#ffffff" -background = "#2c3746" +foreground = "#d3c6aa" +dim_foreground = "#d3c6aa" +bright_foreground = "#dfddc8" +background = "#3a464c" [colors.normal] -black = "#176ef1" -red = "#fd3762" -green = "#2aacaa" -yellow = "#f7c067" -blue = "#f77067" -magenta = "#cb75f7" -cyan = "#5cc6d1" -white = "#9cacad" +black = "#3a464c" +red = "#e67e80" +green = "#a7c080" +yellow = "#dbcc7f" +blue = "#7fbbb3" +magenta = "#d699b6" +cyan = "#83c092" +white = "#d3c6aa" [colors.bright] -black = "#1874ff" -red = "#ff4772" -green = "#2ebdbb" -yellow = "#ffc66a" -blue = "#ff7c77" -magenta = "#ce79ff" -cyan = "#60ccd8" -white = "#aabcbd" +black = "#5c6a72" +red = "#f8fff2" +green = "#8da101" +yellow = "#dfa000" +blue = "#3a94c5" +magenta = "#df69ba" +cyan = "#35a77c" +white = "#dfddc8" [colors.dim] -black = "#156bdc" -red = "#f22c57" -green = "#28a09c" -yellow = "#ddab5c" -blue = "#df635d" -magenta = "#af69dd" -cyan = "#4fb0b3" -white = "#879596" +black = "#3a464c" +red = "#e67e80" +green = "#a7c080" +yellow = "#dbcc7f" +blue = "#7fbbb3" +magenta = "#d699b6" +cyan = "#83c092" +white = "#d3c6aa" [cursor.style] shape = "Underline" diff --git a/nvim/init.lua b/nvim/init.lua index 8ff029f..317ecb1 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -8,14 +8,6 @@ vim.o.cursorline = true vim.cmd( 'syntax enable' ) vim.cmd( 'filetype plugin indent on' ) -vim.cmd( 'colorscheme slate' ) - -vim.cmd [[ - highlight Normal guibg=NONE ctermbg=NONE - highlight NonText guibg=NONE ctermbg=NONE - highlight EndOfBuffer guibg=NONE ctermbg=NONE -]] - vim.cmd [[ call plug#begin() Plug 'preservim/nerdtree' @@ -28,9 +20,20 @@ vim.cmd [[ Plug 'hrsh7th/cmp-path' Plug 'hrsh7th/cmp-cmdline' Plug 'hrsh7th/nvim-cmp' + Plug 'stevedylandev/ansi-nvim' call plug#end() ]] +vim.cmd( 'colorscheme ansi' ) +vim.opt.termguicolors = false + +vim.cmd [[ + highlight Normal guibg=NONE ctermbg=NONE + highlight NonText guibg=NONE ctermbg=NONE + highlight EndOfBuffer guibg=NONE ctermbg=NONE +]] + + local cmp = require 'cmp' cmp.setup({ diff --git a/river/init.lua b/river/init.lua index 22aa4c8..496cda8 100755 --- a/river/init.lua +++ b/river/init.lua @@ -80,11 +80,11 @@ local inputs = { local river_options = { -- Theme options ['border-width'] = 2, - ['border-color-focused'] = '0xeceff4', - ['border-color-unfocused'] = '0x81a1c1', - ['border-color-urgent'] = '0xbf616a', + ['border-color-focused'] = '0x83c092', + ['border-color-unfocused'] = '0x35a77c', + ['border-color-urgent'] = '0xf85552', ['xcursor-theme'] = { 'Vimix-cursors', 24 }, - ['background-color'] = '0x2e3440', + ['background-color'] = '0x343f44', -- Other options ['set-repeat'] = { 25, 300 }, diff --git a/waybar/config.jsonc b/waybar/config.jsonc index e917ff3..020efc2 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -59,7 +59,7 @@ "temperature", "backlight", "battery", - "river/tags", + "river/tags" ], "modules-center": [ "river/window" @@ -169,6 +169,6 @@ "car": "", "default": ["", "", ""] }, - "on-click": "pavucontrol" + "on-click": "alacritty -e 'pulsemixer'" } }] diff --git a/waybar/style.css b/waybar/style.css index b75e291..bdc7f92 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -1,13 +1,13 @@ * { /* `otf-font-awesome` is required to be installed for icons */ - font-family: FontAwesome, SourceCodePro; + font-family: FantasqueSansM Nerd Font; font-size: 13px; } window#waybar { - background-color: rgba(44, 37, 46, 0.7); + background-color: rgba(50, 70, 76, 0.5); padding-bottom: 6px; - border-bottom: 2px solid rgba(129, 161, 193, 0.5); + border-bottom: 2px solid rgba(53, 167, 124, 0.5); color: #ffffff; transition-property: background-color; transition-duration: .5s; @@ -59,12 +59,12 @@ button:hover { } #tags button.focused { - background-color: #64727D; + background-color: #3a464c; box-shadow: inset 0 -3px #ffffff; } #tags button.urgent { - background-color: #eb4d4b; + background-color: #d3c6aa; } #clock, @@ -81,7 +81,7 @@ button:hover { margin: 0 3px; padding: 0 8px; color: #ffffff; - border: 2px solid #81a1c1; + border: 2px solid #35a77c; } #cpu, @@ -100,11 +100,16 @@ button:hover { #network:hover, #pulseaudio:hover, #mpd:hover { - border: 2px solid #eceff4; + border: 2px solid #83c092; } #window { margin: 0 4px; + font-size: 12px; +} + +#mpd { + font-size: 11px; } @keyframes blink {