Merge pull request #47 from ALinkbetweenNets/update_flake_lock_action

flake.lock: Update
ALinkbetweenNets · Apr 27, 2024 · 8cbdff4 · 8cbdff4
2 parents fd78b63 + d9c1c99
commit 8cbdff4
Show file tree

Hide file tree

Showing 8 changed files with 272 additions and 97 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/home-manager/modules/office/default.nix b/home-manager/modules/office/default.nix
@@ -21,7 +21,7 @@ in
         gimp
         inkscape
         thunderbird
-        evolution
+        # evolution
         calcure # tui calendar & task manager
         #teams # insecure
         evince

diff --git a/home-manager/modules/pentesting/default.nix b/home-manager/modules/pentesting/default.nix
@@ -52,7 +52,7 @@ in {
       mitmproxy
       mitmproxy2swagger # for REST APIs
       websploit
-      ssh-mitm
+      # ssh-mitm
       dnschef
       ## Active Directory
       # adreaper

diff --git a/home-manager/profiles/main.nix b/home-manager/profiles/main.nix
@@ -125,7 +125,6 @@ with lib; {
       # mailspring
       ## finances
       # tradingview
-      kdePackages.neochat
       kdePackages.kontact
       kdePackages.akonadi
       libsForQt5.krunner-symbols

diff --git a/machines/dn/configuration.nix b/machines/dn/configuration.nix
@@ -49,7 +49,7 @@
       };
     };
   };
-  services.unifi = { enable = true; openFirewall = true; };
+  # services.unifi = { enable = true; openFirewall = true; };
   networking = {
     hostName = "dn";
     domain = "monitor-banfish.ts.net";

diff --git a/modules/hardware/cpu-intel.nix b/modules/hardware/cpu-intel.nix
@@ -14,7 +14,7 @@ in {
     # };
     environment.systemPackages = with pkgs; [
       intel-gpu-tools
-      nvtop-intel
+      nvtopPackages.intel
       nixgl
     ];
     hardware.opengl.extraPackages = with pkgs; [

diff --git a/modules/hardware/gpu-nvidia.nix b/modules/hardware/gpu-nvidia.nix
@@ -28,7 +28,7 @@ in
       nixgl
       libva-utils
       nvidia-vaapi-driver
-      nvtop-nvidia
+      nvtopPackages.nvidia
       pciutils
       vdpauinfo
       cudaPackages.cudatoolkit

diff --git a/modules/plasma/default.nix b/modules/plasma/default.nix
@@ -5,7 +5,7 @@ in {
   options.link.plasma.enable = mkEnableOption "activate plasma";
   config = mkIf cfg.enable {
     services = {
-      xserver.displayManager.sddm.enable = true;
+      displayManager.sddm.enable = true;
       # desktopManager.plasma5.useQtScaling = true;
       desktopManager.plasma6.enable = true;
     };