mirror of
https://gitlab.com/Zaney/zaneyos.git
synced 2025-06-27 07:22:05 +02:00
massive update to the waybar config fingers crossed its great
This commit is contained in:
Tyler Kelley
parent
e98fcf127b
commit
af16a4bb15
@ -31,13 +31,12 @@ with lib;
|
|||||||
];
|
];
|
||||||
modules-right = [
|
modules-right = [
|
||||||
"custom/hyprbindings"
|
"custom/hyprbindings"
|
||||||
"custom/exit"
|
|
||||||
"idle_inhibitor"
|
"idle_inhibitor"
|
||||||
"custom/themeselector"
|
"custom/themeselector"
|
||||||
"custom/notification"
|
"custom/notification"
|
||||||
"battery"
|
"battery"
|
||||||
"clock"
|
|
||||||
"tray"
|
"tray"
|
||||||
|
"clock"
|
||||||
];
|
];
|
||||||
|
|
||||||
"hyprland/workspaces" = {
|
"hyprland/workspaces" = {
|
||||||
@ -126,7 +125,7 @@ with lib;
|
|||||||
};
|
};
|
||||||
"custom/startmenu" = {
|
"custom/startmenu" = {
|
||||||
tooltip = false;
|
tooltip = false;
|
||||||
format = " ";
|
format = "";
|
||||||
# exec = "rofi -show drun";
|
# exec = "rofi -show drun";
|
||||||
on-click = "sleep 0.1 && rofi-launcher";
|
on-click = "sleep 0.1 && rofi-launcher";
|
||||||
};
|
};
|
||||||
@ -189,231 +188,147 @@ with lib;
|
|||||||
];
|
];
|
||||||
style = concatStrings [
|
style = concatStrings [
|
||||||
''
|
''
|
||||||
* {
|
{
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif;
|
border-radius: 0px;
|
||||||
font-weight: bold;
|
border: none;
|
||||||
}
|
font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif;
|
||||||
window#waybar {
|
min-height: 0px;
|
||||||
background-color: #${palette.base00};
|
}
|
||||||
border-bottom: 1px solid rgba(26,27,38,0);
|
window#waybar {
|
||||||
border-radius: 0px;
|
background-color: #${palette.base00};
|
||||||
color: #${palette.base0F};
|
}
|
||||||
}
|
#workspaces {
|
||||||
#workspaces {
|
color: #${palette.base00};
|
||||||
background: #${palette.base01};
|
background: #${palette.base01};
|
||||||
margin: 2px;
|
margin: 5px 5px;
|
||||||
padding: 0px 1px;
|
padding: 8px 5px;
|
||||||
border-radius: 15px;
|
border-radius: 16px;
|
||||||
border: 0px;
|
}
|
||||||
font-style: normal;
|
#workspaces button {
|
||||||
color: #${palette.base00};
|
padding: 0px 5px;
|
||||||
}
|
margin: 0px 3px;
|
||||||
#workspaces button {
|
border-radius: 16px;
|
||||||
padding: 0px 5px;
|
color: #${palette.base00};
|
||||||
margin: 4px 3px;
|
background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09});
|
||||||
border-radius: 10px;
|
background-size: 300% 300%;
|
||||||
border: 0px;
|
${
|
||||||
color: #${palette.base00};
|
if waybarAnimations == true then
|
||||||
background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09});
|
''
|
||||||
background-size: 300% 300%;
|
animation: gradient_horizontal 15s ease infinite;
|
||||||
${
|
''
|
||||||
if waybarAnimations == true then
|
else
|
||||||
''
|
''''
|
||||||
animation: gradient_horizontal 15s ease infinite;
|
}
|
||||||
''
|
opacity: 0.5;
|
||||||
else
|
transition: ${betterTransition};
|
||||||
''''
|
}
|
||||||
}
|
#workspaces button.active {
|
||||||
opacity: 0.5;
|
padding: 0px 5px;
|
||||||
transition: ${betterTransition};
|
margin: 4px 3px;
|
||||||
}
|
border-radius: 16px;
|
||||||
#workspaces button.active {
|
color: #${palette.base00};
|
||||||
padding: 0px 5px;
|
background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09});
|
||||||
margin: 4px 3px;
|
background-size: 300% 300%;
|
||||||
border-radius: 10px;
|
${
|
||||||
border: 0px;
|
if waybarAnimations == true then
|
||||||
color: #${palette.base00};
|
''
|
||||||
background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09});
|
animation: gradient_horizontal 15s ease infinite;
|
||||||
background-size: 300% 300%;
|
''
|
||||||
${
|
else
|
||||||
if waybarAnimations == true then
|
''''
|
||||||
''
|
}
|
||||||
animation: gradient_horizontal 15s ease infinite;
|
transition: ${betterTransition};
|
||||||
''
|
opacity: 1.0;
|
||||||
else
|
min-width: 40px;
|
||||||
''''
|
}
|
||||||
}
|
#workspaces button:hover {
|
||||||
transition: ${betterTransition};
|
border-radius: 16px;
|
||||||
opacity: 1.0;
|
color: #${palette.base00};
|
||||||
min-width: 40px;
|
background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09});
|
||||||
}
|
background-size: 300% 300%;
|
||||||
#workspaces button:hover {
|
${
|
||||||
border-radius: 10px;
|
if waybarAnimations == true then
|
||||||
color: #${palette.base00};
|
''
|
||||||
background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09});
|
animation: gradient_horizontal 15s ease infinite;
|
||||||
background-size: 300% 300%;
|
''
|
||||||
${
|
else
|
||||||
if waybarAnimations == true then
|
''''
|
||||||
''
|
}
|
||||||
animation: gradient_horizontal 15s ease infinite;
|
opacity: 0.8;
|
||||||
''
|
transition: ${betterTransition};
|
||||||
else
|
}
|
||||||
''''
|
@keyframes gradient_horizontal {
|
||||||
}
|
0% {
|
||||||
opacity: 0.8;
|
background-position: 0% 50%;
|
||||||
transition: ${betterTransition};
|
}
|
||||||
}
|
50% {
|
||||||
@keyframes gradient_horizontal {
|
background-position: 100% 50%;
|
||||||
0% {
|
}
|
||||||
background-position: 0% 50%;
|
100% {
|
||||||
}
|
background-position: 0% 50%;
|
||||||
50% {
|
}
|
||||||
background-position: 100% 50%;
|
}
|
||||||
}
|
@keyframes swiping {
|
||||||
100% {
|
0% {
|
||||||
background-position: 0% 50%;
|
background-position: 0% 200%;
|
||||||
}
|
}
|
||||||
}
|
100% {
|
||||||
@keyframes swiping {
|
background-position: 200% 200%;
|
||||||
0% {
|
}
|
||||||
background-position: 0% 200%;
|
}
|
||||||
}
|
tooltip {
|
||||||
100% {
|
background: #${palette.base00};
|
||||||
background-position: 200% 200%;
|
border: 1px solid #${palette.base0E};
|
||||||
}
|
border-radius: 12px;
|
||||||
}
|
}
|
||||||
tooltip {
|
tooltip label {
|
||||||
background: #${palette.base00};
|
color: #${palette.base07};
|
||||||
border: 1px solid #${palette.base0E};
|
}
|
||||||
border-radius: 10px;
|
#window, #pulseaudio, #cpu, #memory {
|
||||||
}
|
font-weight: bold;
|
||||||
tooltip label {
|
margin: 5px 0px;
|
||||||
color: #${palette.base07};
|
margin-left: 7px;
|
||||||
}
|
padding: 0 18px;
|
||||||
#window {
|
color: #${palette.base05};
|
||||||
margin: 4px;
|
background: #${palette.base01};
|
||||||
padding: 2px 10px;
|
border-radius: 24px 10px 24px 10px;
|
||||||
color: #${palette.base05};
|
}
|
||||||
background: #${palette.base01};
|
#custom-startmenu {
|
||||||
border-radius: 10px;
|
color: #${palette.base0D};
|
||||||
}
|
background: #${palette.base01};
|
||||||
#memory {
|
font-size: 28px;
|
||||||
color: #${palette.base0F};
|
margin: 0px;
|
||||||
background: #${palette.base01};
|
padding: 0px 35px 0px 15px;
|
||||||
margin: 4px;
|
border-radius: 0px 0px 40px 0px;
|
||||||
padding: 2px 10px;
|
}
|
||||||
border-radius: 10px;
|
#custom-hyprbindings, #idle_inhibitor, #custom-themeselector, #battery,
|
||||||
}
|
#custom-notification, tray {
|
||||||
#clock {
|
font-weight: bold;
|
||||||
color: #${palette.base01};
|
background: #${palette.base01};
|
||||||
background: linear-gradient(45deg, #${palette.base0C}, #${palette.base0F}, #${palette.base0B}, #${palette.base08});
|
color: #${palette.base05};
|
||||||
background-size: 300% 300%;
|
margin: 5px 0px;
|
||||||
${
|
margin-left: 7px;
|
||||||
if waybarAnimations == true then
|
border-radius: 10px 24px 10px 24px;
|
||||||
''
|
padding: 0 18px;
|
||||||
animation: gradient_horizontal 15s ease infinite;
|
}
|
||||||
''
|
#clock {
|
||||||
else
|
color: #${palette.base00};
|
||||||
''''
|
background: linear-gradient(45deg, #${palette.base0C}, #${palette.base0F}, #${palette.base0B}, #${palette.base08});
|
||||||
}
|
background-size: 300% 300%;
|
||||||
margin: 4px;
|
${
|
||||||
padding: 2px 10px;
|
if waybarAnimations == true then
|
||||||
border-radius: 10px;
|
''
|
||||||
}
|
animation: gradient_horizontal 15s ease infinite;
|
||||||
#cpu {
|
''
|
||||||
color: #${palette.base07};
|
else
|
||||||
background: #${palette.base01};
|
''''
|
||||||
margin: 4px;
|
}
|
||||||
padding: 2px 10px;
|
margin: 0px;
|
||||||
border-radius: 10px;
|
padding: 0px 35px 0px 15px;
|
||||||
}
|
border-radius: 0px 0px 0px 40px;
|
||||||
#disk {
|
}
|
||||||
color: #${palette.base03};
|
''
|
||||||
background: #${palette.base01};
|
|
||||||
margin: 4px;
|
|
||||||
padding: 2px 10px;
|
|
||||||
border-radius: 10px;
|
|
||||||
}
|
|
||||||
#battery {
|
|
||||||
color: #${palette.base08};
|
|
||||||
background: #${palette.base01};
|
|
||||||
margin: 4px;
|
|
||||||
padding: 2px 10px;
|
|
||||||
border-radius: 10px;
|
|
||||||
}
|
|
||||||
#network {
|
|
||||||
color: #${palette.base09};
|
|
||||||
background: #${palette.base01};
|
|
||||||
margin: 4px;
|
|
||||||
padding: 2px 10px;
|
|
||||||
border-radius: 10px;
|
|
||||||
}
|
|
||||||
#custom-hyprbindings {
|
|
||||||
color: #${palette.base0E};
|
|
||||||
background: #${palette.base01};
|
|
||||||
margin: 4px;
|
|
||||||
padding: 2px 10px;
|
|
||||||
border-radius: 10px;
|
|
||||||
}
|
|
||||||
#tray {
|
|
||||||
color: #${palette.base05};
|
|
||||||
background: #${palette.base01};
|
|
||||||
margin: 4px;
|
|
||||||
padding: 2px 10px;
|
|
||||||
border-radius: 10px;
|
|
||||||
}
|
|
||||||
#pulseaudio {
|
|
||||||
color: #${palette.base0D};
|
|
||||||
background: #${palette.base01};
|
|
||||||
margin: 4px;
|
|
||||||
padding: 2px 10px;
|
|
||||||
border-radius: 10px;
|
|
||||||
}
|
|
||||||
#custom-notification {
|
|
||||||
color: #${palette.base0C};
|
|
||||||
background: #${palette.base01};
|
|
||||||
margin: 4px;
|
|
||||||
padding: 2px 10px;
|
|
||||||
border-radius: 10px;
|
|
||||||
}
|
|
||||||
#custom-themeselector {
|
|
||||||
color: #${palette.base0D};
|
|
||||||
background: #${palette.base01};
|
|
||||||
margin: 4px 0px;
|
|
||||||
padding: 2px 10px 2px 5px;
|
|
||||||
border-radius: 0px 10px 10px 0px;
|
|
||||||
}
|
|
||||||
#custom-startmenu {
|
|
||||||
color: #${palette.base00};
|
|
||||||
background: linear-gradient(45deg, #${palette.base09}, #${palette.base03}, #${palette.base0C}, #${palette.base07});
|
|
||||||
background-size: 300% 300%;
|
|
||||||
${
|
|
||||||
if waybarAnimations == true then
|
|
||||||
''
|
|
||||||
animation: gradient_horizontal 15s ease infinite;
|
|
||||||
''
|
|
||||||
else
|
|
||||||
''''
|
|
||||||
}
|
|
||||||
margin: 4px;
|
|
||||||
padding: 2px 10px;
|
|
||||||
border-radius: 10px;
|
|
||||||
}
|
|
||||||
#idle_inhibitor {
|
|
||||||
color: #${palette.base09};
|
|
||||||
background: #${palette.base01};
|
|
||||||
margin: 4px 0px;
|
|
||||||
padding: 2px 14px;
|
|
||||||
border-radius: 0px;
|
|
||||||
}
|
|
||||||
#custom-exit {
|
|
||||||
color: #${palette.base0E};
|
|
||||||
background: #${palette.base01};
|
|
||||||
border-radius: 10px 0px 0px 10px;
|
|
||||||
margin: 4px 0px;
|
|
||||||
padding: 2px 5px 2px 15px;
|
|
||||||
} ''
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -142,7 +142,7 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
# Scripts
|
# Scripts
|
||||||
home.packages = with pkgs; [
|
home.packages = [
|
||||||
(import ../../scripts/emopicker9000.nix { inherit pkgs; })
|
(import ../../scripts/emopicker9000.nix { inherit pkgs; })
|
||||||
(import ../../scripts/task-waybar.nix { inherit pkgs; })
|
(import ../../scripts/task-waybar.nix { inherit pkgs; })
|
||||||
(import ../../scripts/squirtle.nix { inherit pkgs; })
|
(import ../../scripts/squirtle.nix { inherit pkgs; })
|
||||||
@ -168,86 +168,81 @@ in
|
|||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
gh.enable = true;
|
gh.enable = true;
|
||||||
neovim =
|
neovim = {
|
||||||
let
|
enable = true;
|
||||||
toLua = str: "lua << EOF\n${str}\nEOF\n";
|
defaultEditor = true;
|
||||||
toLuaFile = file: "lua << EOF\n${builtins.readFile file}\nEOF\n";
|
viAlias = true;
|
||||||
in
|
vimAlias = true;
|
||||||
{
|
vimdiffAlias = true;
|
||||||
enable = true;
|
withNodeJs = true;
|
||||||
defaultEditor = true;
|
extraPackages = with pkgs; [
|
||||||
viAlias = true;
|
lua-language-server
|
||||||
vimAlias = true;
|
gopls
|
||||||
vimdiffAlias = true;
|
xclip
|
||||||
withNodeJs = true;
|
wl-clipboard
|
||||||
extraPackages = with pkgs; [
|
luajitPackages.lua-lsp
|
||||||
lua-language-server
|
nil
|
||||||
gopls
|
rust-analyzer
|
||||||
xclip
|
nodePackages.bash-language-server
|
||||||
wl-clipboard
|
yaml-language-server
|
||||||
luajitPackages.lua-lsp
|
pyright
|
||||||
nil
|
marksman
|
||||||
rust-analyzer
|
];
|
||||||
nodePackages.bash-language-server
|
plugins = with pkgs.vimPlugins; [
|
||||||
yaml-language-server
|
alpha-nvim
|
||||||
pyright
|
auto-session
|
||||||
marksman
|
bufferline-nvim
|
||||||
];
|
dressing-nvim
|
||||||
plugins = with pkgs.vimPlugins; [
|
indent-blankline-nvim
|
||||||
alpha-nvim
|
nvim-treesitter.withAllGrammars
|
||||||
auto-session
|
lualine-nvim
|
||||||
bufferline-nvim
|
nvim-autopairs
|
||||||
dressing-nvim
|
nvim-web-devicons
|
||||||
indent-blankline-nvim
|
nvim-cmp
|
||||||
nvim-treesitter.withAllGrammars
|
nvim-surround
|
||||||
lualine-nvim
|
nvim-lspconfig
|
||||||
nvim-autopairs
|
cmp-nvim-lsp
|
||||||
nvim-web-devicons
|
cmp-buffer
|
||||||
nvim-cmp
|
luasnip
|
||||||
nvim-surround
|
cmp_luasnip
|
||||||
nvim-lspconfig
|
friendly-snippets
|
||||||
cmp-nvim-lsp
|
lspkind-nvim
|
||||||
cmp-buffer
|
comment-nvim
|
||||||
luasnip
|
nvim-ts-context-commentstring
|
||||||
cmp_luasnip
|
{
|
||||||
friendly-snippets
|
plugin = dracula-nvim;
|
||||||
lspkind-nvim
|
config = "colorscheme dracula";
|
||||||
comment-nvim
|
}
|
||||||
nvim-ts-context-commentstring
|
plenary-nvim
|
||||||
{
|
neodev-nvim
|
||||||
plugin = dracula-nvim;
|
luasnip
|
||||||
config = "colorscheme dracula";
|
telescope-nvim
|
||||||
}
|
todo-comments-nvim
|
||||||
plenary-nvim
|
nvim-tree-lua
|
||||||
neodev-nvim
|
telescope-fzf-native-nvim
|
||||||
luasnip
|
vim-tmux-navigator
|
||||||
telescope-nvim
|
];
|
||||||
todo-comments-nvim
|
extraLuaConfig = ''
|
||||||
nvim-tree-lua
|
${builtins.readFile ../../config/nvim/options.lua}
|
||||||
telescope-fzf-native-nvim
|
${builtins.readFile ../../config/nvim/keymaps.lua}
|
||||||
vim-tmux-navigator
|
${builtins.readFile ../../config/nvim/plugins/alpha.lua}
|
||||||
];
|
${builtins.readFile ../../config/nvim/plugins/autopairs.lua}
|
||||||
extraLuaConfig = ''
|
${builtins.readFile ../../config/nvim/plugins/auto-session.lua}
|
||||||
${builtins.readFile ../../config/nvim/options.lua}
|
${builtins.readFile ../../config/nvim/plugins/comment.lua}
|
||||||
${builtins.readFile ../../config/nvim/keymaps.lua}
|
${builtins.readFile ../../config/nvim/plugins/cmp.lua}
|
||||||
${builtins.readFile ../../config/nvim/plugins/alpha.lua}
|
${builtins.readFile ../../config/nvim/plugins/lsp.lua}
|
||||||
${builtins.readFile ../../config/nvim/plugins/autopairs.lua}
|
${builtins.readFile ../../config/nvim/plugins/nvim-tree.lua}
|
||||||
${builtins.readFile ../../config/nvim/plugins/auto-session.lua}
|
${builtins.readFile ../../config/nvim/plugins/telescope.lua}
|
||||||
${builtins.readFile ../../config/nvim/plugins/comment.lua}
|
${builtins.readFile ../../config/nvim/plugins/todo-comments.lua}
|
||||||
${builtins.readFile ../../config/nvim/plugins/cmp.lua}
|
${builtins.readFile ../../config/nvim/plugins/treesitter.lua}
|
||||||
${builtins.readFile ../../config/nvim/plugins/lsp.lua}
|
require("ibl").setup()
|
||||||
${builtins.readFile ../../config/nvim/plugins/nvim-tree.lua}
|
require("bufferline").setup{}
|
||||||
${builtins.readFile ../../config/nvim/plugins/telescope.lua}
|
require("lualine").setup({
|
||||||
${builtins.readFile ../../config/nvim/plugins/todo-comments.lua}
|
icons_enabled = true,
|
||||||
${builtins.readFile ../../config/nvim/plugins/treesitter.lua}
|
theme = 'dracula',
|
||||||
require("ibl").setup()
|
})
|
||||||
require("bufferline").setup{}
|
'';
|
||||||
require("lualine").setup({
|
};
|
||||||
icons_enabled = true,
|
|
||||||
theme = 'dracula',
|
|
||||||
})
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
kitty = {
|
kitty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.kitty;
|
package = pkgs.kitty;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user