aboutsummaryrefslogtreecommitdiff
path: root/nixos/modules
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2024-11-25 20:37:11 +0100
committerKarel Kočí <cynerd@email.cz>2024-11-25 20:37:11 +0100
commit13931279551d856824bd784886ba536c962c2735 (patch)
treed7507c43cfb9a763a1c8d49468e12aeef548a52a /nixos/modules
parent1a85ae7a0ccc8eb7fd4ba2bf91309be0de44946c (diff)
downloadnixos-personal-13931279551d856824bd784886ba536c962c2735.tar.gz
nixos-personal-13931279551d856824bd784886ba536c962c2735.tar.bz2
nixos-personal-13931279551d856824bd784886ba536c962c2735.zip
nixos: various fixes and temporally disablesHEADmaster
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/develop.nix5
-rw-r--r--nixos/modules/gaming.nix4
-rw-r--r--nixos/modules/packages.nix2
-rw-r--r--nixos/modules/users.nix2
4 files changed, 7 insertions, 6 deletions
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index 446d205..e61ab3e 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -157,7 +157,10 @@ in {
# Images
imagemagick
];
- programs.wireshark.package = pkgs.wireshark;
+ programs.wireshark = {
+ enable = true;
+ package = pkgs.wireshark;
+ };
documentation = {
nixos = {
diff --git a/nixos/modules/gaming.nix b/nixos/modules/gaming.nix
index 0f944bd..76b2b94 100644
--- a/nixos/modules/gaming.nix
+++ b/nixos/modules/gaming.nix
@@ -31,7 +31,7 @@ in {
with pkgs; [
ncurses
xorg.libXpm
- flac1_3
+ flac134
libopus
];
};
@@ -40,7 +40,7 @@ in {
with pkgs; [
ncurses
xorg.libXpm
- flac1_3
+ flac134
libopus
SDL
SDL2_image
diff --git a/nixos/modules/packages.nix b/nixos/modules/packages.nix
index 1052f56..d42cade 100644
--- a/nixos/modules/packages.nix
+++ b/nixos/modules/packages.nix
@@ -65,7 +65,7 @@ in {
wakeonlan
speedtest-cli
librespeed-cli
- termshark
+ #termshark
w3m
lm_sensors
diff --git a/nixos/modules/users.nix b/nixos/modules/users.nix
index 1c143bb..0956c93 100644
--- a/nixos/modules/users.nix
+++ b/nixos/modules/users.nix
@@ -73,8 +73,6 @@ in {
defaultEditor = !isArm;
withNodeJs = true;
};
-
- wireshark.enable = true;
};
programs.fuse.userAllowOther = true;