diff options
author | Benjamin Staffin <benley@gmail.com> | 2020-06-17 17:22:24 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-17 17:22:24 -0400 |
commit | 19d3665b75f59eb98ca656c2b643a4adc0f0744e (patch) | |
tree | 455aed025973e748f264df336d5dc0e7ae40dad5 /nixos/modules/module-list.nix | |
parent | 13a14e2bfe4ff3b7da222624ce5749218105e465 (diff) | |
parent | 19dfc1b01149e5d60860cd0f4b0f8abcb3faabbf (diff) | |
download | nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.gz nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.bz2 nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.lz nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.xz nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.zst nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.zip |
Merge branch 'master' into benley/melonDS
Diffstat (limited to 'nixos/modules/module-list.nix')
-rw-r--r-- | nixos/modules/module-list.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c82c70a7b869..448d432853d3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -126,6 +126,7 @@ ./programs/gpaste.nix ./programs/gnupg.nix ./programs/gphoto2.nix + ./programs/hamster.nix ./programs/iftop.nix ./programs/iotop.nix ./programs/java.nix |