teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

Merge pull request 'waybar: want improved calendar view on right-click' (#174) from feature/waybar-improved-calendar into main

Browse source 
Reviewed-on: pub-solar/os#174
Reviewed-by: b12f <hello@benjaminbaedorf.eu>
This commit is contained in:
b12f 2023-03-05 14:24:15 +01:00
parent 03aec25c22 a3c4719f9b
commit 153617394b
4 changed files with 51 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
overlays/waybar.nix Normal file
View file

@ -0,0 +1,5 @@
channels: final: prev: {
waybar = channels.latest.waybar.overrideAttrs (oldAttrs: rec {
inherit (prev.sources.waybar-nvfetcher) version src;
});
}

41
pkgs/_sources/generated.nix
View file

@ -6,13 +6,13 @@
}: { }: {
F-Sy-H = { F-Sy-H = {
pname = "F-Sy-H"; pname = "F-Sy-H";
version = "b935a87a75560f8173dd78deee6717c59d464e06"; version = "899f68b52b6b86a36cd8178eb0e9782d4aeda714";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "z-shell"; owner = "z-shell";
repo = "F-Sy-H"; repo = "F-Sy-H";
rev = "b935a87a75560f8173dd78deee6717c59d464e06"; rev = "899f68b52b6b86a36cd8178eb0e9782d4aeda714";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-448OlDnrDkUjvaSLDhXsa9bkgYXzj1Ju8CTpJVjH8LM="; sha256 = "sha256-zhaXjrNL0amxexbZm4Kr5Y/feq1+2zW0O6eo9iZhmi0=";
}; };
}; };
instant-nvim-nvfetcher = { instant-nvim-nvfetcher = {
@ -39,46 +39,46 @@
}; };
ohmyzsh = { ohmyzsh = {
pname = "ohmyzsh"; pname = "ohmyzsh";
version = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf"; version = "b602e0a066d8c98e8c02201ad16c764447fd8531";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ohmyzsh"; owner = "ohmyzsh";
repo = "ohmyzsh"; repo = "ohmyzsh";
rev = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf"; rev = "b602e0a066d8c98e8c02201ad16c764447fd8531";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-qyI7CU0vKhhADZfQtD73GsyAbqdMPhDQ1uA03h4erpw="; sha256 = "sha256-O4thanOQpX/DHPdfW2p/RUXzIPj6GUp9EnKJfkh7yQM=";
}; };
}; };
powerlevel10k = { powerlevel10k = {
pname = "powerlevel10k"; pname = "powerlevel10k";
version = "8091c8a3a8a845c70046684235a01cd500075def"; version = "a30145b0f82d06770e924e9eac064ed223a94e6b";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "romkatv"; owner = "romkatv";
repo = "powerlevel10k"; repo = "powerlevel10k";
rev = "8091c8a3a8a845c70046684235a01cd500075def"; rev = "a30145b0f82d06770e924e9eac064ed223a94e6b";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-I0/tktXCbZ3hMYTNvPoWfOEYWRgmHoXsar/jcUB6bpo="; sha256 = "sha256-jnZXLrywUrJgTX1tFpoNH94r/jcGl2P6R7DoedluHxQ=";
}; };
}; };
rnix-lsp-nvfetcher = { rnix-lsp-nvfetcher = {
pname = "rnix-lsp-nvfetcher"; pname = "rnix-lsp-nvfetcher";
version = "6925256babec4307479a4080b44f2be38056f210"; version = "95d40673fe43642e2e1144341e86d0036abd95d9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nix-community"; owner = "nix-community";
repo = "rnix-lsp"; repo = "rnix-lsp";
rev = "6925256babec4307479a4080b44f2be38056f210"; rev = "95d40673fe43642e2e1144341e86d0036abd95d9";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-OKLyIXIXhUnRB3Xw+7zI3u6XkwF7Mrbfz1XaasV6i7Q="; sha256 = "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=";
}; };
}; };
vim-apprentice-nvfetcher = { vim-apprentice-nvfetcher = {
pname = "vim-apprentice-nvfetcher"; pname = "vim-apprentice-nvfetcher";
version = "9942d0bb0a5d82f7a24450b00051c1f2cc008659"; version = "59ad13661fa15edaf72c62218903c7817b5a3691";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "romainl"; owner = "romainl";
repo = "Apprentice"; repo = "Apprentice";
rev = "9942d0bb0a5d82f7a24450b00051c1f2cc008659"; rev = "59ad13661fa15edaf72c62218903c7817b5a3691";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-Xs+vTdnihNbBFPOKsW+NB40pqN9eaadqzc0DIeNoOFo="; sha256 = "sha256-03B9tmU9+6t2hxhOgZxBqJr9r41CAqhHLUkHYvFdcks=";
}; };
}; };
vim-beautify-nvfetcher = { vim-beautify-nvfetcher = {
@ -125,6 +125,17 @@
sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0="; sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0=";
}; };
}; };
waybar-nvfetcher = {
pname = "waybar-nvfetcher";
version = "09142fa322e080474de0f2dc3ea98036846550df";
src = fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = "09142fa322e080474de0f2dc3ea98036846550df";
fetchSubmodules = false;
sha256 = "sha256-5KqQaaKwW14F/rVWGQ0qBUU0b3Z+v/Mq8lnSwqLtT7U=";
};
};
zsh-nix-shell = { zsh-nix-shell = {
pname = "zsh-nix-shell"; pname = "zsh-nix-shell";
version = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08"; version = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08";

4
pkgs/sources.toml
View file

@ -46,3 +46,7 @@ fetch.github = "zeekay/vim-beautify"
[vim-apprentice-nvfetcher] [vim-apprentice-nvfetcher]
src.git = "https://github.com/romainl/Apprentice" src.git = "https://github.com/romainl/Apprentice"
fetch.github = "romainl/Apprentice" fetch.github = "romainl/Apprentice"
[waybar-nvfetcher]
src.git = "https://github.com/Alexays/Waybar"
fetch.github = "Alexays/Waybar"

18
profiles/base-user/.config/waybar/config
View file

@ -26,8 +26,22 @@
"spacing": 10 "spacing": 10
}, },
"clock": { "clock": {
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", "tooltip-format": "<tt><small>{calendar}</small></tt>",
"format-alt": "{:%a %d. %h %H:%M}" "format-alt": "{:%a %d. %h %H:%M}",
//"on-scroll": {
// "calendar": 1
//}
"calendar": {
"mode-mon-col" : 3,
"on-scroll": -1,
"on-click-right": "mode",
"format": {
"months": "<span color='#ffead3'><b>{}</b></span>",
"days": "<span color='#ecc6d9'><b>{}</b></span>",
"weekdays": "<span color='#ffcc66'><b>{}</b></span>",
"today": "<span color='#ff6699'><b><u>{}</u></b></span>"
},
},
}, },
"backlight": { "backlight": {
// "device": "acpi_video1", // "device": "acpi_video1",