From 13931279551d856824bd784886ba536c962c2735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Mon, 25 Nov 2024 20:37:11 +0100
Subject: nixos: various fixes and temporally disables

---
 nixos/configurations/errol.nix | 2 +-
 nixos/modules/develop.nix      | 5 ++++-
 nixos/modules/gaming.nix       | 4 ++--
 nixos/modules/packages.nix     | 2 +-
 nixos/modules/users.nix        | 2 --
 5 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'nixos')

diff --git a/nixos/configurations/errol.nix b/nixos/configurations/errol.nix
index 407cf82..217f946 100644
--- a/nixos/configurations/errol.nix
+++ b/nixos/configurations/errol.nix
@@ -86,7 +86,7 @@ in {
   };
 
   environment.systemPackages = [
-    pkgs.nvtopPackages.amd
+    #pkgs.nvtopPackages.amd
   ];
 
   services.syncthing = {
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;
-- 
cgit v1.2.3