050125

2026-04-03 12:20:45 +04:00 · 2026-01-05 10:57:27 +04:00
parent 842e1c94f2
commit cc03ff37c4
25 changed files with 373 additions and 114 deletions
--- a/.config/colorschemes/gruvbox.json
+++ b/.config/colorschemes/gruvbox.json
@@ -0,0 +1,27 @@
+{
+    "wallpaper": "none",
+    "alpha": "100",
+    "special": {
+        "background": "#0d0e0f",
+        "foreground": "#ebdbb2",
+        "cursor": "#ebdbb2"
+    },
+    "colors": {
+        "color0": "#0d0e0f",
+        "color1": "#fb4934",
+        "color2": "#b8bb26",
+        "color3": "#fabd2f",
+        "color4": "#83a598",
+        "color5": "#d3869b",
+        "color6": "#8ec07c",
+        "color7": "#a89984",
+        "color8": "#665c54",
+        "color9": "#fb4934",
+        "color10": "#b8bb26",
+        "color11": "#fabd2f",
+        "color12": "#83a598",
+        "color13": "#d3869b",
+        "color14": "#8ec07c",
+        "color15": "#fbf1c7"
+    }
+}
--- a/.config/colorschemes/telegram.tdesktop-theme
+++ b/.config/colorschemes/telegram.tdesktop-theme
@@ -0,0 +1,61 @@
+
+// Основное окно
+windowBg: #0d0e0f;
+windowFg: #ebdbb2;
+windowBgOver: #665c54;
+windowBgRipple: #0d0e0f;
+windowFgOver: #ebdbb2;
+windowSubTextFg: #a89984;
+windowBoldFg: #ebdbb2;
+windowActiveTextFg: #fabd2f;
+
+// --- ВАШИ СООБЩЕНИЯ (Исходящие) ---
+// Делаем их темными, почти как фон, но с заметной границей или чуть светлее
+msgOutBg: #0d0e0f; 
+msgOutBgSelected: #665c54;
+msgOutTxtFg: #ebdbb2;
+msgOutServiceFg: #fabd2f;
+msgOutShadow: #00000000;
+
+// Входящие сообщения
+msgInBg: #0d0e0f;
+msgInBgSelected: #665c54;
+msgInTxtFg: #ebdbb2;
+msgInShadow: #00000000;
+
+// --- МЕНЮ И ВЫПАДАЮЩИЕ СПИСКИ ---
+// Исправляем отсутствие выделения в меню
+menuBg: #0d0e0f;
+menuBgOver: #665c54;
+menuBgRipple: #0d0e0f;
+menuFg: #ebdbb2;
+menuFgOver: #fbf1c7;
+menuIconFg: #a89984;
+menuIconFgOver: #fabd2f;
+
+// Списки (выбор в настройках, контакты)
+listBgOver: #665c54;
+listFgOver: #ebdbb2;
+
+// Боковая панель (Список чатов)
+dialogsBg: #0d0e0f;
+dialogsBgOver: #665c54;
+dialogsBgActive: #665c54;
+dialogsNameFg: #ebdbb2;
+dialogsTextFg: #a89984;
+dialogsUnreadBg: #fabd2f;
+dialogsUnreadFg: #0d0e0f;
+
+// Поле ввода
+historyComposeAreaBg: #0d0e0f;
+historyComposeIconFg: #a89984;
+historyComposeIconFgOver: #fabd2f;
+
+// Скроллбар
+scrollBarBg: #0d0e0f80;
+scrollBarBgOver: #665c54;
+
+// Кнопки
+activeButtonBg: #fabd2f;
+activeButtonBgOver: #83a598;
+activeButtonFg: #0d0e0f;
--- a/.config/conky/conky.conf
+++ b/.config/conky/conky.conf
@@ -15,7 +15,7 @@ conky.config = {
    -- Виджет
    own_window = true,
    own_window_class = 'Conky',
-    own_window_type = 'desktop',
+    own_window_type = 'override',

    -- Прозрачность
    own_window_transparent = true,
@@ -36,7 +36,7 @@ conky.config = {
    draw_shades = false,
    extra_newline = false,
    minimum_height = 5,
-    minimum_width = 5,
+    minimum_width = 250,
    net_avg_samples = 2,
    no_buffers = true,
    out_to_console = false,
@@ -57,8 +57,8 @@ conky.config = {

 conky.text = [[
 ${color1}${goto 25}Date/Time${color0} $hr $color
-${color0}Day: ${time %A}${goto 160}Date: ${time %d.%m.%y}$color
-${color0}Time: ${time %H:%M:%S}${goto 160}Uptime: ${uptime_short}$color
+${color0}Day: ${time %A}${goto 155}Date: ${time %d.%m.%y}$color
+${color0}Time: ${time %H:%M:%S}${goto 155}Uptime: ${uptime_short}$color

 ${color1}${goto 25}Battery${color0} $hr $color
 ${color0}Battery \#1: $alignr \
@@ -81,10 +81,10 @@ $color
 ${color1}${goto 25}CPU${color0} $hr $color
 ${color0}Frequency (GHz): $alignr$freq_g$color
 ${color0}CPU: $alignr$cpu% ${cpugraph 15,180}
-${color0}RAM: $mem/$memmax${goto 160}SWAP: $swap/$swapmax$color
-${color0}$memperc%${goto 32}${memgraph 15,105}${goto 160}$swapperc% ${swapbar 5,85}$color
+${color0}RAM: $mem/$memmax${goto 150}SWAP: $swap/$swapmax$color
+${color0}$memperc%${goto 32}${memgraph 15,105}${goto 150}$swapperc% ${swapbar 5,85}$color
 ${color0}Active processes: $running_processes ($processes)$color

 ${color1}${goto 25}Storage${color0} $hr $color
- / $alignc${fs_used /}/${fs_size /}$alignr${fs_bar 5,120 /}
+ / $alignc${fs_used /}/${fs_size /}$alignr${fs_bar 5,110 /}
 ]]
--- a/.config/conky/icon.conf
+++ b/.config/conky/icon.conf
@@ -15,7 +15,7 @@ conky.config = {
    -- Виджет
    own_window = true,
    own_window_class = 'Conky',
-    own_window_type = 'desktop',
+    own_window_type = 'override',

    -- Прозрачность
    own_window_transparent = true,
--- a/.config/conky/weather.conf
+++ b/.config/conky/weather.conf
@@ -15,7 +15,7 @@ conky.config = {
    -- Виджет
    own_window = true,
    own_window_class = 'Conky',
-    own_window_type = 'desktop',
+    own_window_type = 'override',

    -- Прозрачность
    own_window_transparent = true,
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -11,9 +11,7 @@
  "flit.nvim": { "branch": "main", "commit": "513e38abe61237c53a9e983e45595b1d2e7d5391" },
  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
  "gitsigns.nvim": { "branch": "main", "commit": "f780609807eca1f783a36a8a31c30a48fbe150c5" },
-  "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
-  "knap": { "branch": "main", "commit": "7db44d0bb760120142cc1e8f43e44976de59c2f6" },
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
  "leap.nvim": { "branch": "main", "commit": "657da3f8aa2cb8359ce90e8bc0ed5ca0d9665383" },
  "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
  "markview.nvim": { "branch": "main", "commit": "e6b0f5aee8105adab6077509c46459812db4cffa" },
@@ -27,10 +25,11 @@
  "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
  "nvim-lspconfig": { "branch": "master", "commit": "d9879110d0422a566fa01d732556f4d5515e1738" },
  "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-treesitter": { "branch": "main", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
  "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
  "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" },
  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "pywal": { "branch": "main", "commit": "d11b673c0e3d6eb8cbee7ea8cf4a8911f6ee24b9" },
  "telescope-file-browser.nvim": { "branch": "master", "commit": "3610dc7dc91f06aa98b11dca5cc30dfa98626b7e" },
  "telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" },
  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
@@ -40,5 +39,6 @@
  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
  "vim-css-color": { "branch": "master", "commit": "14fd934cdd9ca1ac0e53511094e612eb9bace373" },
  "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
+  "vimtex": { "branch": "master", "commit": "a50f40783c1cade2e8e2994a9f4a8e038a0a57bc" },
  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
 }
--- a/.config/nvim/lua/plugins/colorscheme.lua
+++ b/.config/nvim/lua/plugins/colorscheme.lua
@@ -1,106 +1,107 @@
 return {
-	-- {
-	--   -- Загрука темы из pywal
-	--   "dylanaraps/wal.vim",
-	--   config = function()
-	--     vim.cmd([[colorscheme wal]])
-	--   end,
-	-- }
-
 	{
-		-- Отличная тема, но слишком яркий фон
-		"ellisonleao/gruvbox.nvim",
-		lazy = false,
-		priority = 1000,
+		"AlphaTechnolog/pywal.nvim",
+		name = "pywal",
 		config = function()
-			vim.o.background = "dark"
-			-- vim.cmd([[colorscheme gruvbox]])
-			require("gruvbox").setup({
-				-- Основные настройки контраста
-				contrast = "hard", -- "hard", "medium", "soft"
-
-				-- Тёмная версия
-				terminal_colors = true,
-
-				-- Настройки яркости
-				undercurl = true,
-				underline = true,
-				bold = true,
-				italic = {
-					strings = false,
-					comments = false,
-					operators = false,
-					folds = false,
-				},
-
-				-- Цветовые настройки
-				invert_selection = false,
-				invert_signs = false,
-				invert_tabline = false,
-				invert_intend_guides = false,
-
-				-- Более тёмные цвета
-				palette_overrides = {
-					dark0_hard = "#0d0e0f", -- самый тёмный фон
-					dark0 = "#1d2021", -- стандартный фон
-					dark1 = "#282828",
-					dark2 = "#32302f",
-					dark3 = "#3c3836",
-					dark4 = "#504945",
-
-					-- Более насыщенные цвета
-					bright_red = "#fb4934",
-					bright_green = "#b8bb26",
-					bright_yellow = "#fabd2f",
-					bright_blue = "#83a598",
-					bright_purple = "#d3869b",
-					bright_aqua = "#8ec07c",
-					bright_orange = "#fe8019",
-				},
-
-				-- Контрастные настройки
-				overrides = {
-					-- Пример: сделать выделение контрастнее
-					Visual = { bg = "#3c3836", fg = "#ebdbb2" },
-					Search = { bg = "#fe8019", fg = "#282828" },
-					IncSearch = { bg = "#fb4934", fg = "#282828" },
-
-					-- Контрастные границы
-					FloatBorder = { fg = "#ebdbb2" },
-
-					-- Более тёмный LineNr
-					LineNr = { fg = "#7c6f64" },
-					CursorLineNr = { fg = "#d5c4a1", bold = true },
-				},
-			})
-
-			-- Дополнительные Vim команды для увеличения контраста
-			vim.cmd([[
-      colorscheme gruvbox
-      
-      " Дополнительные настройки контраста
-      highlight Normal guibg=#0d0e0f
-      highlight NormalNC guibg=#0d0e0f
-      highlight SignColumn guibg=#0d0e0f
-      highlight EndOfBuffer guifg=#0d0e0f
-      
-      " Более контрастные комментарии
-      highlight Comment guifg=#928374
-      
-      " Контрастные номера строк
-      highlight LineNr guifg=#7c6f64 guibg=#0d0e0f
-      highlight CursorLineNr guifg=#ebdbb2 guibg=#0d0e0f
-      
-      " Контрастный скроллбар
-      highlight Pmenu guibg=#1d2021
-      highlight PmenuSel guibg=#504945
-      
-      " Более тёмные границы
-      highlight WinSeparator guifg=#504945
-    ]])
+			local pywal = require("pywal")
+			pywal.setup()
 		end,
 	},

+	-- {
+	-- 	-- Отличная тема, но слишком яркий фон
+	-- 	"ellisonleao/gruvbox.nvim",
+	-- 	lazy = false,
+	-- 	priority = 1000,
+	-- 	config = function()
+	-- 		vim.o.background = "dark"
+	-- 		-- vim.cmd([[colorscheme gruvbox]])
+	-- 		require("gruvbox").setup({
+	-- 			-- Основные настройки контраста
+	-- 			contrast = "hard", -- "hard", "medium", "soft"
+	--
+	-- 			-- Тёмная версия
+	-- 			terminal_colors = true,
+	--
+	-- 			-- Настройки яркости
+	-- 			undercurl = true,
+	-- 			underline = true,
+	-- 			bold = true,
+	-- 			italic = {
+	-- 				strings = false,
+	-- 				comments = false,
+	-- 				operators = false,
+	-- 				folds = false,
+	-- 			},
+	--
+	-- 			-- Цветовые настройки
+	-- 			invert_selection = false,
+	-- 			invert_signs = false,
+	-- 			invert_tabline = false,
+	-- 			invert_intend_guides = false,
+	--
+	-- 			-- Более тёмные цвета
+	-- 			palette_overrides = {
+	-- 				dark0_hard = "#0d0e0f", -- самый тёмный фон
+	-- 				dark0 = "#1d2021", -- стандартный фон
+	-- 				dark1 = "#282828",
+	-- 				dark2 = "#32302f",
+	-- 				dark3 = "#3c3836",
+	-- 				dark4 = "#504945",
+	--
+	-- 				-- Более насыщенные цвета
+	-- 				bright_red = "#fb4934",
+	-- 				bright_green = "#b8bb26",
+	-- 				bright_yellow = "#fabd2f",
+	-- 				bright_blue = "#83a598",
+	-- 				bright_purple = "#d3869b",
+	-- 				bright_aqua = "#8ec07c",
+	-- 				bright_orange = "#fe8019",
+	-- 			},
+	--
+	-- 			-- Контрастные настройки
+	-- 			overrides = {
+	-- 				-- Пример: сделать выделение контрастнее
+	-- 				Visual = { bg = "#3c3836", fg = "#ebdbb2" },
+	-- 				Search = { bg = "#fe8019", fg = "#282828" },
+	-- 				IncSearch = { bg = "#fb4934", fg = "#282828" },
+	--
+	-- 				-- Контрастные границы
+	-- 				FloatBorder = { fg = "#ebdbb2" },
+	--
+	-- 				-- Более тёмный LineNr
+	-- 				LineNr = { fg = "#7c6f64" },
+	-- 				CursorLineNr = { fg = "#d5c4a1", bold = true },
+	-- 			},
+	-- 		})
+	--
+	-- 		-- Дополнительные Vim команды для увеличения контраста
+	-- 		vim.cmd([[
+	--      colorscheme gruvbox
+	--
+	--      " Дополнительные настройки контраста
+	--      highlight Normal guibg=#0d0e0f
+	--      highlight NormalNC guibg=#0d0e0f
+	--      highlight SignColumn guibg=#0d0e0f
+	--      highlight EndOfBuffer guifg=#0d0e0f
+	--
+	--      " Более контрастные комментарии
+	--      highlight Comment guifg=#928374
+	--
+	--      " Контрастные номера строк
+	--      highlight LineNr guifg=#7c6f64 guibg=#0d0e0f
+	--      highlight CursorLineNr guifg=#ebdbb2 guibg=#0d0e0f
+	--
+	--      " Контрастный скроллбар
+	--      highlight Pmenu guibg=#1d2021
+	--      highlight PmenuSel guibg=#504945
+	--
+	--      " Более тёмные границы
+	--      highlight WinSeparator guifg=#504945
+	--    ]])
+	-- 	end,
+	-- },
+
 	-- {
 	-- 	"morhetz/gruvbox",
 	-- 	priority = 1000,
--- a/.gitignore
+++ b/.gitignore
@@ -11,12 +11,20 @@
 /Sync/*
 /Data/*
 /Mount/*
+!/Mount/DwarfStorage
+/Mount/DwarfStorage/*

 !*.gitkeep

 !.config
 !.scripts

+!.local
+.local/*
+!.local/share
+.local/share/*
+!.local/share/fonts
+
 !.xinitrc
 !.bashrc

--- a/.local/share/fonts/CodeNewRomanNerdFont-Bold.otf
+++ b/.local/share/fonts/CodeNewRomanNerdFont-Bold.otf
--- a/.local/share/fonts/CodeNewRomanNerdFont-Italic.otf
+++ b/.local/share/fonts/CodeNewRomanNerdFont-Italic.otf
--- a/.local/share/fonts/CodeNewRomanNerdFont-Regular.otf
+++ b/.local/share/fonts/CodeNewRomanNerdFont-Regular.otf
--- a/.local/share/fonts/CodeNewRomanNerdFontMono-Bold.otf
+++ b/.local/share/fonts/CodeNewRomanNerdFontMono-Bold.otf
--- a/.local/share/fonts/CodeNewRomanNerdFontMono-Italic.otf
+++ b/.local/share/fonts/CodeNewRomanNerdFontMono-Italic.otf
--- a/.local/share/fonts/CodeNewRomanNerdFontMono-Regular.otf
+++ b/.local/share/fonts/CodeNewRomanNerdFontMono-Regular.otf
--- a/.local/share/fonts/CodeNewRomanNerdFontPropo-Bold.otf
+++ b/.local/share/fonts/CodeNewRomanNerdFontPropo-Bold.otf
--- a/.local/share/fonts/CodeNewRomanNerdFontPropo-Italic.otf
+++ b/.local/share/fonts/CodeNewRomanNerdFontPropo-Italic.otf
--- a/.local/share/fonts/CodeNewRomanNerdFontPropo-Regular.otf
+++ b/.local/share/fonts/CodeNewRomanNerdFontPropo-Regular.otf
--- a/.scripts/create_telegram_theme.py
+++ b/.scripts/create_telegram_theme.py
@@ -0,0 +1,108 @@
+import json
+import os
+import sys
+
+
+def create_pro_dark_theme():
+    if len(sys.argv) < 2:
+        print("Использование: python3 gen_telegram.py /путь/к/colors.json")
+        return
+
+    colors_path = os.path.expanduser(sys.argv[1])
+
+    if not os.path.exists(colors_path):
+        print(f"Файл '{colors_path}' не найден.")
+        return
+
+    try:
+        with open(colors_path, "r") as f:
+            wal = json.load(f)
+
+        c = wal["colors"]
+        bg = wal["special"]["background"]
+        fg = wal["special"]["foreground"]
+
+        # Настройки для максимальной темноты
+        real_bg = bg
+        darker_bg = c["color0"]  # Самый темный из палитры
+        selection_bg = c["color8"]  # Цвет для выделения (серый)
+        accent = c["color3"]  # Основной акцент
+
+        # Генерация расширенной темы
+        theme_content = f"""
+// Основное окно
+windowBg: {real_bg};
+windowFg: {fg};
+windowBgOver: {selection_bg};
+windowBgRipple: {darker_bg};
+windowFgOver: {fg};
+windowSubTextFg: {c['color7']};
+windowBoldFg: {fg};
+windowActiveTextFg: {accent};
+
+// --- ВАШИ СООБЩЕНИЯ (Исходящие) ---
+// Делаем их темными, почти как фон, но с заметной границей или чуть светлее
+msgOutBg: {darker_bg}; 
+msgOutBgSelected: {selection_bg};
+msgOutTxtFg: {fg};
+msgOutServiceFg: {accent};
+msgOutShadow: #00000000;
+
+// Входящие сообщения
+msgInBg: {darker_bg};
+msgInBgSelected: {selection_bg};
+msgInTxtFg: {fg};
+msgInShadow: #00000000;
+
+// --- МЕНЮ И ВЫПАДАЮЩИЕ СПИСКИ ---
+// Исправляем отсутствие выделения в меню
+menuBg: {real_bg};
+menuBgOver: {selection_bg};
+menuBgRipple: {darker_bg};
+menuFg: {fg};
+menuFgOver: {c['color15']};
+menuIconFg: {c['color7']};
+menuIconFgOver: {accent};
+
+// Списки (выбор в настройках, контакты)
+listBgOver: {selection_bg};
+listFgOver: {fg};
+
+// Боковая панель (Список чатов)
+dialogsBg: {real_bg};
+dialogsBgOver: {selection_bg};
+dialogsBgActive: {selection_bg};
+dialogsNameFg: {fg};
+dialogsTextFg: {c['color7']};
+dialogsUnreadBg: {accent};
+dialogsUnreadFg: {real_bg};
+
+// Поле ввода
+historyComposeAreaBg: {real_bg};
+historyComposeIconFg: {c['color7']};
+historyComposeIconFgOver: {accent};
+
+// Скроллбар
+scrollBarBg: {darker_bg}80;
+scrollBarBgOver: {selection_bg};
+
+// Кнопки
+activeButtonBg: {accent};
+activeButtonBgOver: {c['color12']};
+activeButtonFg: {real_bg};
+"""
+
+        output_path = os.path.expanduser(
+            "~/.config/colorschemes/telegram.tdesktop-theme"
+        )
+        with open(output_path, "w") as f:
+            f.write(theme_content)
+
+        print(f"Тема обновлена: {output_path}")
+
+    except Exception as e:
+        print(f"Ошибка: {e}")
+
+
+if __name__ == "__main__":
+    create_pro_dark_theme()
--- a/.scripts/dwmblocks/cpu
+++ b/.scripts/dwmblocks/cpu
@@ -0,0 +1,11 @@
+#!/bin/env bash
+colors_path=$HOME/.cache/wal/colors.sh
+cpu_usage=$(top -bn1 | grep "Cpu(s)" | sed "s/.*, *\([0-9.]*\)%* id.*/\1/" | awk '{print 100 - $1"%"}')
+
+# cpu_usage=$(echo "$cpu_usage" | cut -c1-1)
+cpu_usage=$(printf "%.0f" "$cpu_usage")
+
+if [ -f "$colors_path" ]; then
+  source $colors_path
+  echo "^b$color1^^c$color0^  ^d^^b$color8^^c$color0^ $cpu_usage% ^d^"
+fi
--- a/.scripts/dwmblocks/date
+++ b/.scripts/dwmblocks/date
@@ -0,0 +1,6 @@
+#!/bin/env bash
+colors_path=$HOME/.cache/wal/colors.sh
+if [ -f "$colors_path" ]; then
+  source $colors_path
+  echo "^c$color0^^b$color1^$(date +" %d") ^d^^c$color0^^b$color8^$(date +" %I:%M%p") ^d^ ^d^ "
+fi
--- a/.scripts/dwmblocks/memory
+++ b/.scripts/dwmblocks/memory
@@ -0,0 +1,9 @@
+#!/bin/env bash
+colors_path=$HOME/.cache/wal/colors.sh
+
+memory_usage=$(free -h | awk '/^Mem/ { print $3 }' | sed s/i//g)
+
+if [ -f "$colors_path" ]; then
+  source $colors_path
+  echo "^b$color1^^c$color0^  ^d^^b$color8^^c$color0^ $memory_usage ^d^"
+fi
--- a/.scripts/dwmblocks/volume_mic
+++ b/.scripts/dwmblocks/volume_mic
@@ -0,0 +1,18 @@
+#!/bin/env bash
+
+colors_path=$HOME/.cache/wal/colors.sh
+
+vol=$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | awk -F "Volume: " '{print $2}')
+vol=$(echo "$vol * 100" | bc)
+vol=$(printf "%.0f" "$vol")
+
+mic=$(wpctl get-volume @DEFAULT_SOURCE@ | awk -F "Volume: " '{print $2}')
+mic=$(echo "$mic * 100" | bc)
+mic=$(printf "%.0f" "$mic")
+
+
+if [ -f "$colors_path" ]; then
+  source $colors_path
+  echo "^b$color1^^c$color0^  $vol ^d^^b$color8^^c$color0^  $mic ^d^"
+fi
+
--- a/.scripts/dwmblocks/weather
+++ b/.scripts/dwmblocks/weather
--- a/.scripts/weather.sh
+++ b/.scripts/weather.sh
@@ -0,0 +1,10 @@
+#!/bin/env bash
+colors_path=$HOME/.cache/wal/colors.sh
+
+WEATHER=$(curl --silent v2d.wttr.in/Samara | grep "Weather:")
+TEMP=$(echo $WEATHER | tr "," "\n" | grep "°C")
+
+if [ -f "$colors_path" ]; then
+	source $colors_path
+	[[ ! -z "$TEMP" ]] && echo "^b$color1^^c$color0^  ^d^^b$color8^^c$color0^$TEMP ^d^"
+fi
--- a/.xinitrc
+++ b/.xinitrc
@@ -3,7 +3,7 @@ setxkbmap -option grp:ctrl_shift_toggle us,ru
 libinput-gestures &

 wal --theme base16-gruvbox-hard
-# wal --theme ~/.config/colorschemes/vscode.json
+wal --theme ~/.config/colorschemes/gruvbox.json

 polybar -r &

@@ -15,7 +15,7 @@ brightnessctl s 50% >> /dev/null
 dunst -conf ~/.config/dunst/config.conf &

 # numen ~/.config/numen/startup.phrasess.txt &
-echo "[R]" > ~/.config/numen/current_mode
+# echo "[R]" > ~/.config/numen/current_mode

 conky -c ~/.config/conky/conky.conf &
 conky -c ~/.config/conky/weather.conf &
@@ -23,8 +23,8 @@ conky -c ~/.config/conky/icon.conf &

 # [ ! -s ~/.config/mpd/pid ] && mpd ~/.config/mpd/mpd.conf && mpc stop

-syncthing &
-syncthingtray-qt6 &
+# syncthing &
+# syncthingtray-qt6 &

 exec sxhkd -c ~/.config/sxhkd/sxhkdrc &
 exec bspwm