fix: fix some issues causes by latest flake update
parent
0f3b552573
commit
3fae724275
|
@ -9,17 +9,17 @@
|
||||||
modules-left = [ "river/tags" ];
|
modules-left = [ "river/tags" ];
|
||||||
modules-center = [ "river/window" ];
|
modules-center = [ "river/window" ];
|
||||||
modules-right = [ "tray" "pulseaudio" "battery" "network" "clock" ];
|
modules-right = [ "tray" "pulseaudio" "battery" "network" "clock" ];
|
||||||
clock.format = ''{: %m/%d <span color="#a89984">|</span> %H:%M}'';
|
clock.format = ''{: %m/%d <span color="#a89984">|</span> %H:%M}'';
|
||||||
network = {
|
network = {
|
||||||
format-icons = [
|
format-icons = [
|
||||||
''<span color="#fb4944">直</span>''
|
''<span color="#fb4944"> </span>''
|
||||||
''<span color="#fabd2f">直</span>''
|
''<span color="#fabd2f"> </span>''
|
||||||
''<span color="#b8bb26">直</span>''
|
''<span color="#b8bb26"> </span>''
|
||||||
];
|
];
|
||||||
format = "({ifname})";
|
format = "({ifname})";
|
||||||
format-wifi = "{icon} {signalStrength}";
|
format-wifi = "{icon} {signalStrength}";
|
||||||
format-disconnected = ''<span color="#a89974">睊</span>'';
|
format-disconnected = ''<span color="#a89974"> </span>'';
|
||||||
format-ethernet = "";
|
format-ethernet = "";
|
||||||
};
|
};
|
||||||
battery = {
|
battery = {
|
||||||
states = {
|
states = {
|
||||||
|
@ -27,31 +27,35 @@
|
||||||
warning = 50;
|
warning = 50;
|
||||||
critical = 20;
|
critical = 20;
|
||||||
};
|
};
|
||||||
|
|
||||||
format-icons = {
|
format-icons = {
|
||||||
discharging = [
|
discharging = [
|
||||||
''<span color="#fb4944"></span>''
|
''<span color="#fb4944"> </span>''
|
||||||
''<span color="#fb4944"></span>''
|
''<span color="#fb4944"> </span>''
|
||||||
''<span color="#fb4944"></span>''
|
''<span color="#fb4944"> </span>''
|
||||||
''<span color="#fabd2f"></span>''
|
''<span color="#fabd2f"> </span>''
|
||||||
''<span color="#fabd2f"></span>''
|
''<span color="#fabd2f"> </span>''
|
||||||
''<span color="#fabd2f"></span>''
|
''<span color="#fabd2f"> </span>''
|
||||||
''<span color="#b8bb26"></span>''
|
''<span color="#b8bb26"> </span>''
|
||||||
''<span color="#b8bb26"></span>''
|
''<span color="#b8bb26"> </span>''
|
||||||
''<span color="#b8bb26"></span>''
|
''<span color="#b8bb26"> </span>''
|
||||||
]; #
|
]; #
|
||||||
charging = [
|
charging = [
|
||||||
''<span color="#fb4944"></span>''
|
''<span color="#fb4944"> </span>''
|
||||||
''<span color="#fb4944"></span>''
|
''<span color="#fb4944"> </span>''
|
||||||
''<span color="#fabd2f"></span>''
|
''<span color="#fb4944"> </span>''
|
||||||
''<span color="#fabd2f"></span>''
|
''<span color="#fabd2f"> </span>''
|
||||||
''<span color="#b8bb26"></span>''
|
''<span color="#fabd2f"> </span>''
|
||||||
''<span color="#b8bb26"></span>''
|
''<span color="#fabd2f"> </span>''
|
||||||
|
''<span color="#b8bb26"> </span>''
|
||||||
|
''<span color="#b8bb26"> </span>''
|
||||||
|
''<span color="#b8bb26"> </span>''
|
||||||
]; #
|
]; #
|
||||||
};
|
};
|
||||||
format = " {capacity}";
|
format = " {capacity}";
|
||||||
format-full = "";
|
format-full = "";
|
||||||
format-good-charging = "";
|
format-good-charging = " ";
|
||||||
format-plugged = "";
|
format-plugged = " ";
|
||||||
format-charging = "{icon} {capacity}";
|
format-charging = "{icon} {capacity}";
|
||||||
format-discharging = "{icon} {capacity} ({time})";
|
format-discharging = "{icon} {capacity} ({time})";
|
||||||
interval = 5;
|
interval = 5;
|
||||||
|
@ -62,13 +66,13 @@
|
||||||
very_high = 111;
|
very_high = 111;
|
||||||
};
|
};
|
||||||
format-icons = [
|
format-icons = [
|
||||||
''<span color="#a89974">奄</span>''
|
''<span color="#a89974"> </span>''
|
||||||
''<span color="#83a587">奔</span>''
|
''<span color="#83a587"> </span>''
|
||||||
''<span color="#b8bb26">墳</span>''
|
''<span color="#b8bb26"> </span>''
|
||||||
];
|
];
|
||||||
format = "{icon} {volume}";
|
format = "{icon} {volume}";
|
||||||
format-bluetooth = "{icon} {volume}";
|
format-bluetooth = " {icon} {volume}";
|
||||||
format-muted = "ﱝ";
|
format-muted = " ";
|
||||||
};
|
};
|
||||||
|
|
||||||
tray.icon-size = 14;
|
tray.icon-size = 14;
|
||||||
|
|
|
@ -2,18 +2,20 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
|
nixpkgs.config = { allowUnfree = true; };
|
||||||
|
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
(self: super: {
|
# (self: super: {
|
||||||
# use lf fork with support for sixel graphics
|
# # use lf fork with support for sixel graphics
|
||||||
lf = super.lf.overrideAttrs (old: {
|
# lf = super.lf.overrideAttrs (old: {
|
||||||
src = super.fetchFromGitHub {
|
# src = super.fetchFromGitHub {
|
||||||
owner = "horriblename";
|
# owner = "horriblename";
|
||||||
repo = "lf";
|
# repo = "lf";
|
||||||
rev = "8997e5b03772d5628ed6a490777048581d978674";
|
# rev = "8997e5b03772d5628ed6a490777048581d978674";
|
||||||
sha256 = "rJq2Tv3py6HvRI1O2odTdGb1ksdijhO3FcJsPj5dm34=";
|
# sha256 = "rJq2Tv3py6HvRI1O2odTdGb1ksdijhO3FcJsPj5dm34=";
|
||||||
};
|
# };
|
||||||
});
|
# });
|
||||||
})
|
# })
|
||||||
|
|
||||||
(self: super: {
|
(self: super: {
|
||||||
# get latest version of kile-wl for compatibility with river's latest version
|
# get latest version of kile-wl for compatibility with river's latest version
|
||||||
|
@ -181,6 +183,7 @@
|
||||||
android-tools
|
android-tools
|
||||||
ansible
|
ansible
|
||||||
bind.dnsutils
|
bind.dnsutils
|
||||||
|
# pyenv
|
||||||
docker-compose
|
docker-compose
|
||||||
file
|
file
|
||||||
gimp
|
gimp
|
||||||
|
@ -199,6 +202,7 @@
|
||||||
mosh
|
mosh
|
||||||
mpv
|
mpv
|
||||||
neofetch
|
neofetch
|
||||||
|
pynitrokey
|
||||||
networkmanagerapplet
|
networkmanagerapplet
|
||||||
nextcloud-client
|
nextcloud-client
|
||||||
pandoc
|
pandoc
|
||||||
|
@ -206,10 +210,11 @@
|
||||||
pv
|
pv
|
||||||
ripgrep
|
ripgrep
|
||||||
sassc
|
sassc
|
||||||
|
screen
|
||||||
shellcheck
|
shellcheck
|
||||||
signify
|
signify
|
||||||
vagrant
|
|
||||||
unzip
|
unzip
|
||||||
|
vagrant
|
||||||
virt-manager
|
virt-manager
|
||||||
virtiofsd
|
virtiofsd
|
||||||
wget
|
wget
|
||||||
|
|
Loading…
Reference in New Issue