fix: gpg-keygrip path
feat: nom in system-path for nixpkgs-review fix: include htop
This commit is contained in:
parent
935925f7d0
commit
4087bdd3e5
|
@ -63,6 +63,7 @@ lib.optionalAttrs (!minimal) {
|
|||
./programs/git.nix
|
||||
./programs/gpg
|
||||
./programs/gpu-screen-recorder.nix
|
||||
./programs/htop.nix
|
||||
./programs/kitty.nix
|
||||
./programs/minecraft.nix
|
||||
./programs/minion.nix
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
mpv
|
||||
netflix
|
||||
nextcloud-client
|
||||
nix-output-monitor
|
||||
nixpkgs-review
|
||||
orca-slicer
|
||||
osu-lazer-bin
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
{
|
||||
age.secrets."my-gpg-yubikey-keygrip.tar" = {
|
||||
rekeyFile = ./secrets/gpg-keygrip.tar.age;
|
||||
rekeyFile = ../../secrets/gpg-keygrip.tar.age;
|
||||
group = "patrick";
|
||||
mode = "640";
|
||||
};
|
||||
|
|
|
@ -1,37 +1,40 @@
|
|||
{ config, ... }:
|
||||
{
|
||||
hm-all.programs.htop = {
|
||||
enable = true;
|
||||
settings =
|
||||
{
|
||||
tree_view = 1;
|
||||
highlight_base_name = 1;
|
||||
show_cpu_frequency = 1;
|
||||
show_cpu_temperature = 1;
|
||||
show_program_path = 0;
|
||||
hide_kernel_threads = 1;
|
||||
hide_userland_threads = 1;
|
||||
sort_key = 46; # Sort by %CPU if not in tree mode
|
||||
}
|
||||
// (
|
||||
with config.lib.htop;
|
||||
leftMeters [
|
||||
(bar "LeftCPUs2")
|
||||
(bar "Memory")
|
||||
(bar "Swap")
|
||||
(bar "ZFSARC")
|
||||
(text "NetworkIO")
|
||||
]
|
||||
)
|
||||
// (
|
||||
with config.lib.htop;
|
||||
rightMeters [
|
||||
(bar "RightCPUs2")
|
||||
(text "LoadAverage")
|
||||
(text "Tasks")
|
||||
(text "Uptime")
|
||||
(text "Systemd")
|
||||
]
|
||||
);
|
||||
};
|
||||
hm-all =
|
||||
{ config, ... }:
|
||||
{
|
||||
programs.htop = {
|
||||
enable = true;
|
||||
settings =
|
||||
{
|
||||
tree_view = 1;
|
||||
highlight_base_name = 1;
|
||||
show_cpu_frequency = 1;
|
||||
show_cpu_temperature = 1;
|
||||
show_program_path = 0;
|
||||
hide_kernel_threads = 1;
|
||||
hide_userland_threads = 1;
|
||||
sort_key = 46; # Sort by %CPU if not in tree mode
|
||||
}
|
||||
// (
|
||||
with config.lib.htop;
|
||||
leftMeters [
|
||||
(bar "LeftCPUs2")
|
||||
(bar "Memory")
|
||||
(bar "Swap")
|
||||
(bar "ZFSARC")
|
||||
(text "NetworkIO")
|
||||
]
|
||||
)
|
||||
// (
|
||||
with config.lib.htop;
|
||||
rightMeters [
|
||||
(bar "RightCPUs2")
|
||||
(text "LoadAverage")
|
||||
(text "Tasks")
|
||||
(text "Uptime")
|
||||
(text "Systemd")
|
||||
]
|
||||
);
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue