Merge remote-tracking branch 'origin/main'

# Conflicts:
#	nix/sources.json
This commit is contained in:
Daniel Langbein 2024-12-03 22:18:20 +01:00
commit 8b42aff442
Signed by: langfingaz
GPG Key ID: 6C47C753F0823002
2 changed files with 6 additions and 4 deletions

View File

@ -2,8 +2,9 @@
{ {
users.users.yoda = { users.users.yoda = {
packages = with pkgs; [ packages = with pkgs; [
btop # Terminal resource monitor zenith # Terminal resource monitor / task manager
htop # Terminal resource monitor btop # Terminal resource monitor / task manager
htop # Terminal resource monitor / task manager
]; ];
}; };

View File

@ -2,8 +2,9 @@
{ {
users.users.yoda = { users.users.yoda = {
packages = with pkgs; [ packages = with pkgs; [
btop # Terminal resource monitor / task manager zenith # Terminal resource monitor / task manager
htop # Terminal resource monitor / task manager btop # Terminal resource monitor / task manager
htop # Terminal resource monitor / task manager
colmena colmena
gnome-tweaks gnome-tweaks