Compare commits

..

No commits in common. "a55a67ee66082249fc6d2f39e87b870939dbcbd5" and "d2563e16d824cba455ee5485693b7811fe01cfb7" have entirely different histories.

5 changed files with 61 additions and 85 deletions

View file

@ -3,8 +3,8 @@
# #
# Waybar # Waybar
# layerrule = blur, waybar layerrule = blur, waybar
# layerrule = ignorezero, waybar layerrule = ignorezero, waybar
# Mako # Mako
layerrule = blur, notifications layerrule = blur, notifications
@ -20,7 +20,7 @@ windowrulev2 = suppressevent maximize, class:.*
# Pavucontrol # Pavucontrol
windowrulev2 = float, class:^(org.pulseaudio.pavucontrol)$ windowrulev2 = float, class:^(org.pulseaudio.pavucontrol)$
windowrulev2 = size 696 570, class:^(org.pulseaudio.pavucontrol)$ windowrulev2 = size 696 570, class:^(org.pulseaudio.pavucontrol)$
windowrulev2 = move 711 376, class:^(org.pulseaudio.pavucontrol)$ windowrulev2 = move 1630 820, class:^(org.pulseaudio.pavucontrol)$
windowrulev2 = monitor DP-1, class:^(org.pulseaudio.pavucontrol)$ windowrulev2 = monitor DP-1, class:^(org.pulseaudio.pavucontrol)$
windowrulev2 = opacity 0.9, class:^(org.pulseaudio.pavucontrol)$ windowrulev2 = opacity 0.9, class:^(org.pulseaudio.pavucontrol)$

View file

@ -1,31 +1,31 @@
{ {
"LuaSnip": { "branch": "master", "commit": "0f7bbce41ea152a94d12aea286f2ce98e63c0f58" }, "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" },
"NvChad": { "branch": "v2.5", "commit": "8792679a08c6747ba3f5890a01561442abec6935" }, "NvChad": { "branch": "v2.5", "commit": "8792679a08c6747ba3f5890a01561442abec6935" },
"base46": { "branch": "v2.5", "commit": "40943fc668bf8f1caa4cc45f71c784cf0d3cc34f" }, "base46": { "branch": "v2.5", "commit": "fec9fa583025e69e0c4f902bd61990e8d13d1975" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"conform.nvim": { "branch": "master", "commit": "f5bd8419f8a29451e20bdb1061a54fe13d5c8de3" }, "conform.nvim": { "branch": "master", "commit": "f5bd8419f8a29451e20bdb1061a54fe13d5c8de3" },
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
"gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" },
"indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" }, "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" },
"lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"menu": { "branch": "main", "commit": "657bfc91382c0928453d9a4d0a10ec92db5de2bb" }, "menu": { "branch": "main", "commit": "ee85b2e394fde354bd24e35ff7a688d10c9212fa" },
"minty": { "branch": "main", "commit": "b454ca0229f8e22a631fd3c014ec99973fb8cad4" }, "minty": { "branch": "main", "commit": "7c2a6452922313e10ff46aea49a4bb5e50e1ac68" },
"nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
"nvim-cmp": { "branch": "main", "commit": "ed31156aa2cc14e3bc066c59357cc91536a2bc01" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
"nvim-lspconfig": { "branch": "master", "commit": "b55b9659de9ac17e05df4787bb023e4c7ef45329" }, "nvim-lspconfig": { "branch": "master", "commit": "b55b9659de9ac17e05df4787bb023e4c7ef45329" },
"nvim-tree.lua": { "branch": "master", "commit": "ca7c4c33cac2ad66ec69d45e465379716ef0cc97" }, "nvim-tree.lua": { "branch": "master", "commit": "2a268f631da85e83b7a95291be589bcddfc785d8" },
"nvim-treesitter": { "branch": "master", "commit": "68b2bdd99d889e9705f7e90ae64d990f3ff03cf3" }, "nvim-treesitter": { "branch": "master", "commit": "68b2bdd99d889e9705f7e90ae64d990f3ff03cf3" },
"nvim-web-devicons": { "branch": "master", "commit": "edbe0a65cfacbbfff6a4a1e98ddd60c28c560509" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" }, "telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" },
"tree-sitter-hyprlang": { "branch": "master", "commit": "6858695eba0e63b9e0fceef081d291eb352abce8" }, "tree-sitter-hyprlang": { "branch": "master", "commit": "6858695eba0e63b9e0fceef081d291eb352abce8" },
"ui": { "branch": "v3.0", "commit": "7905539f1e10f460811dc0db800355611f8a527a" }, "ui": { "branch": "v3.0", "commit": "87578bb7e2bc106127f013f9a1edd7a716f4f6c6" },
"vim-tmux-navigator": { "branch": "master", "commit": "a9b52e7d36114d40350099f254b5f299a35df978" }, "vim-tmux-navigator": { "branch": "master", "commit": "a9b52e7d36114d40350099f254b5f299a35df978" },
"volt": { "branch": "main", "commit": "8d35e03c70490190149a77c59155618ef4370721" }, "volt": { "branch": "main", "commit": "43f72b49037c191eb3cfe26ba7a5574b4bfce226" },
"which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" } "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
} }

View file

@ -17,7 +17,7 @@ bind -n M-: next-window
# List of plugins # List of plugins
set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'tmux-plugins/tmux-sensible'
set -g @plugin 'catppuccin/tmux' set -g @plugin 'catppuccin/tmux#sgoudham-patch-1'
set -g @plugin 'christoomey/vim-tmux-navigator' set -g @plugin 'christoomey/vim-tmux-navigator'
set -g @plugin 'tmux-plugins/tmux-yank' set -g @plugin 'tmux-plugins/tmux-yank'
set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tpm'

View file

@ -1,30 +1,30 @@
@import "mocha.css"; @import "mocha.css";
* { * {
font-family: Cantarell, "Font Awesome 6 Free", SymbolsNerdFont; font-family: JetBrainsMono, "Font Awesome 6 Free", SymbolsNerdFont;
font-weight: bold; font-weight: bold;
font-size: 14px; font-size: 14px;
min-height: 0px; min-height: 0px;
} }
window#waybar { window#waybar {
background-color: @base; background-color: transparent;
/* background: @base; */ /* background: @base; */
transition-property: background-color; transition-property: background-color;
transition-duration: .5s; transition-duration: .5s;
border-radius: 14px 14px 0px 0px; border-radius: 14px;
} }
#workspaces { #workspaces {
background-color: @mantle; background-color: @mantle;
margin: 4px 5px 4px 5px; margin: 3px 5px 3px 5px;
padding: 3px; padding: 3px;
border-radius: 14px; border-radius: 14px;
} }
#workspaces button, #workspaces button,
#workspaces button:hover, #workspaces button:hover,
#workspaces button.active { #workspaces button.active {
padding: 0px 4px; padding: 0px 3px;
margin: 2px; margin: 2px;
border-radius: 10px; border-radius: 10px;
} }
@ -45,17 +45,17 @@ window#waybar {
color: @base; color: @base;
} }
#custom-power, #custom-runner, #battery, #custom-power, #custom-runner,
#backlight, #wireplumber, #wireplumber.muted, #wireplumber, #wireplumber.muted,
#tray, #language, #clock { #tray, #language, #clock {
background: @mantle; background: @mantle;
border-radius: 14px; border-radius: 14px;
color: @text; color: @text;
margin: 4px 2.5px 4px 2.5px; margin: 3px 2.5px 3px 2.5px;
} }
#custom-power { #custom-power {
margin: 4px 2.5px 4px 2.5px; margin: 3px 2.5px 3px 2.5px;
padding: 0px 9px; padding: 0px 9px;
} }
@ -63,16 +63,11 @@ window#waybar {
padding: 0px 10px; padding: 0px 10px;
} }
#battery {
padding: 0px 10px;
}
#tray { #tray {
margin: 4px 2.5px 4px 5px;
padding: 0px 10px; padding: 0px 10px;
} }
#backlight, #wireplumber, #wireplumber.muted { #wireplumber, #wireplumber.muted {
padding: 0px 10px; padding: 0px 10px;
min-width: 55px; min-width: 55px;
} }
@ -81,11 +76,10 @@ window#waybar {
} }
#language { #language {
padding: 0px 9px 0px 8px; padding: 0px 7px 0px 7px;
} }
#clock { #clock {
padding: 0px 10px; padding: 0px 10px;
margin: 4px 5px 4px 2.5px; margin: 3px 5px 3px 2.5px;
font-size: 15px;
} }

View file

@ -1,75 +1,57 @@
{ {
"position": "bottom", "position": "bottom",
"height": 36, "height": 31,
"width": 900, "width": 900,
"spacing": 0, "spacing": 0,
"margin-bottom": 0, "margin-bottom": 5,
"layer": "top", "layer": "top",
"modules-left": ["tray"], "modules-left": ["custom/power", "custom/runner"],
"modules-center": ["hyprland/workspaces"], "modules-center": ["hyprland/workspaces"],
"modules-right": ["wireplumber", "hyprland/language", "clock"], "modules-right": ["tray", "wireplumber", "hyprland/language", "clock"],
"custom/power": { "custom/power": {
"format": "", "format": "",
"on-click": "~/.config/hypr/bin/powermenu" "on-click": "~/.config/hypr/bin/powermenu"
}, },
"custom/runner": { "custom/runner": {
"format": "", "format": "",
"on-click": "hyprlauncher" "on-click": "~/.config/hypr/bin/runner"
}, },
"hyprland/workspaces": { "hyprland/workspaces": {
"format": "{name}", "format": "{name}",
"on-click": "activate", "on-click": "activate",
"tooltip": false, "tooltip": false,
"persistent_workspaces": { "persistent_workspaces": {
"*": 1 "*": 1
} }
}, },
"tray": { "tray": {
"icon-size": 14, "icon-size": 14,
"spacing": 15 "spacing": 15
}, },
"battery": { "wireplumber": {
"bat": "qcom-battery",
"interval": 1,
"states": {
"warning": 30,
"critical": 15
},
"format": "{icon} {capacity}%",
"format-charging": " {capacity}%",
"format-icons": ["", "", "", "", ""],
"max-length": 25
},
"backlight": {
"device": "ktz8866-backlight",
"format": " {percent}%"
},
"wireplumber": {
"scroll-step": 2, "scroll-step": 2,
"format": "{icon} {volume}%", "format": "{icon} {volume}%",
"format-icons":["", "", ""], "format-icons":["", "", ""],
"format-muted": " mute", "format-muted": " mute",
"on-click": "pavucontrol", "on-click": "pavucontrol",
"max-volume": 100 "max-volume": 100
}, },
"hyprland/language": { "hyprland/language": {
"format": "{}", "format": "{}",
"format-en": "Eng", "format-en": "Eng",
"format-ru": "Rus" "format-ru": "Rus"
}, },
"clock": { "clock": {
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format-alt": "{:%Y-%m-%d}", "format-alt": " {:%Y-%m-%d}",
"format": "{:%H:%M}", "format": "{:%H:%M}",
"timezone": "Asia/Yekaterinburg" "timezone": "Asia/Yekaterinburg"
} }
} }