mirror of
https://github.com/donovanglover/nix-config.git
synced 2024-11-22 08:14:00 +01:00
chore: Run nix fmt
This commit is contained in:
parent
09b241b088
commit
be5f0a6183
@ -147,22 +147,25 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = mkMerge [
|
environment.systemPackages = mkMerge [
|
||||||
(mkIf bloat (with pkgs; [
|
(mkIf bloat (
|
||||||
mullvad-browser
|
with pkgs;
|
||||||
spek
|
[
|
||||||
audacity
|
mullvad-browser
|
||||||
gimp
|
spek
|
||||||
libreoffice
|
audacity
|
||||||
element-desktop
|
gimp
|
||||||
signal-desktop
|
libreoffice
|
||||||
qbittorrent
|
element-desktop
|
||||||
popsicle
|
signal-desktop
|
||||||
satty
|
qbittorrent
|
||||||
srb2
|
popsicle
|
||||||
ringracers
|
satty
|
||||||
jamesdsp
|
srb2
|
||||||
texliveFull
|
ringracers
|
||||||
]))
|
jamesdsp
|
||||||
|
texliveFull
|
||||||
|
]
|
||||||
|
))
|
||||||
|
|
||||||
(with nix-config.inputs.sakaya.packages.${pkgs.system}; [ sakaya ])
|
(with nix-config.inputs.sakaya.packages.${pkgs.system}; [ sakaya ])
|
||||||
|
|
||||||
|
@ -1,4 +1,9 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (lib) singleton;
|
inherit (lib) singleton;
|
||||||
@ -56,39 +61,39 @@ in
|
|||||||
${barScript} = {
|
${barScript} = {
|
||||||
executable = true;
|
executable = true;
|
||||||
text = # fish
|
text = # fish
|
||||||
''
|
''
|
||||||
#!/usr/bin/env fish
|
#!/usr/bin/env fish
|
||||||
|
|
||||||
function get_icon
|
function get_icon
|
||||||
if test "$argv" -gt 90
|
if test "$argv" -gt 90
|
||||||
echo " "
|
echo " "
|
||||||
else if test "$argv" -gt 60
|
else if test "$argv" -gt 60
|
||||||
echo " "
|
echo " "
|
||||||
else if test "$argv" -gt 30
|
else if test "$argv" -gt 30
|
||||||
echo " "
|
echo " "
|
||||||
else if test "$argv" -gt 10
|
else if test "$argv" -gt 10
|
||||||
echo " "
|
echo " "
|
||||||
else
|
else
|
||||||
echo " "
|
echo " "
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
function update_bar
|
function update_bar
|
||||||
set VOLUME "音量:$(math "$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | choose 1) * 100")%"
|
set VOLUME "音量:$(math "$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | choose 1) * 100")%"
|
||||||
set TIME "$(date '+%x(%a)%R')"
|
set TIME "$(date '+%x(%a)%R')"
|
||||||
set capacity "$(cat /sys/class/power_supply/BAT0/capacity)"
|
set capacity "$(cat /sys/class/power_supply/BAT0/capacity)"
|
||||||
|
|
||||||
set BATTERY "$(get_icon $capacity)$capacity%"
|
set BATTERY "$(get_icon $capacity)$capacity%"
|
||||||
|
|
||||||
xsetroot -name " $VOLUME・$BATTERY・$TIME "
|
xsetroot -name " $VOLUME・$BATTERY・$TIME "
|
||||||
end
|
end
|
||||||
|
|
||||||
while true
|
while true
|
||||||
update_bar
|
update_bar
|
||||||
|
|
||||||
sleep 10s
|
sleep 10s
|
||||||
end
|
end
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -113,9 +118,7 @@ in
|
|||||||
|
|
||||||
shadowExclude = fadeExclude;
|
shadowExclude = fadeExclude;
|
||||||
|
|
||||||
opacityRules = [
|
opacityRules = [ "95:class_g = 'Thunar'" ];
|
||||||
"95:class_g = 'Thunar'"
|
|
||||||
];
|
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
blur = {
|
blur = {
|
||||||
@ -123,13 +126,9 @@ in
|
|||||||
size = 10;
|
size = 10;
|
||||||
};
|
};
|
||||||
|
|
||||||
blur-background-exclude = [
|
blur-background-exclude = [ "class_g = 'Nemo-desktop'" ];
|
||||||
"class_g = 'Nemo-desktop'"
|
|
||||||
];
|
|
||||||
|
|
||||||
clip-shadow-above = [
|
clip-shadow-above = [ "class_g = 'dwm'" ];
|
||||||
"class_g = 'dwm'"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user