From f71fed2884f2ec8857c0bd59884be1b28049c581 Mon Sep 17 00:00:00 2001
From: Schrottkatze <git@schrottkatze.de>
Date: Thu, 20 Mar 2025 17:27:45 +0100
Subject: [PATCH] fix eval warnings

---
 hosts/monosodium-glutamate-g/configuration.nix    |  6 ------
 hosts/monosodium-glutamate-g/modules/graphics.nix |  2 +-
 hosts/potatobook-g/configuration.nix              | 14 --------------
 modules/desktop-environment/home/layaway.nix      |  3 ++-
 modules/input/evremap.nix                         |  5 +----
 5 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/hosts/monosodium-glutamate-g/configuration.nix b/hosts/monosodium-glutamate-g/configuration.nix
index a418f74..c0bac2f 100644
--- a/hosts/monosodium-glutamate-g/configuration.nix
+++ b/hosts/monosodium-glutamate-g/configuration.nix
@@ -40,12 +40,6 @@
 
   networking.hostName = "monosodium-glutamate-g";
   services = {
-    xserver = {
-      layout = "us";
-      xkbVariant = "altgr-intl";
-      enable = true;
-    };
-
     openssh.settings.PermitRootLogin = "without-password";
 
     blueman.enable = true;
diff --git a/hosts/monosodium-glutamate-g/modules/graphics.nix b/hosts/monosodium-glutamate-g/modules/graphics.nix
index 5732629..baa608b 100644
--- a/hosts/monosodium-glutamate-g/modules/graphics.nix
+++ b/hosts/monosodium-glutamate-g/modules/graphics.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   environment.systemPackages = [
-    pkgs.nvtop-amd
+    pkgs.nvtopPackages.amd
     pkgs.radeontop
     pkgs.rgp
   ];
diff --git a/hosts/potatobook-g/configuration.nix b/hosts/potatobook-g/configuration.nix
index 530f8db..6cbd34c 100644
--- a/hosts/potatobook-g/configuration.nix
+++ b/hosts/potatobook-g/configuration.nix
@@ -67,24 +67,10 @@
 
   services.libinput.touchpad = {
     disableWhileTyping = true;
-    tapping = false;
   };
-  networking.networkmanager.enable = true;
 
   networking.hostName = "potatobook-g";
 
-  services.xserver = {
-    resolutions = [
-      {
-        x = 1920;
-        y = 1200;
-      }
-    ];
-    # dpi = 180;
-    layout = "us";
-    xkbVariant = "altgr-intl";
-  };
-
   services.autorandr = {
     enable = true;
     profiles = {
diff --git a/modules/desktop-environment/home/layaway.nix b/modules/desktop-environment/home/layaway.nix
index e0f45b5..ba0354f 100644
--- a/modules/desktop-environment/home/layaway.nix
+++ b/modules/desktop-environment/home/layaway.nix
@@ -15,7 +15,8 @@
       hash = "sha256-SzAuVFEy56svasO3+1p6ysBRrIQd0UZX++/P4ZuwWm0=";
     };
 
-    cargoHash = "sha256-liWP6AI72xG1O+MbCZ0cjJ2llHj/iv3hR/U3BLv5fKA=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-QVxlkE+sq4U048LnshI/tq6HInKiSgjQLAdR+27/wEI=";
 
     meta = with lib; {
       description = "Layout creation for Sway via a relative and human-readable DSL.";
diff --git a/modules/input/evremap.nix b/modules/input/evremap.nix
index 24115de..05eb08f 100644
--- a/modules/input/evremap.nix
+++ b/modules/input/evremap.nix
@@ -14,11 +14,8 @@
       rev = "4480c4eda223b98899b0fbd926bc34f7bd0e1a18";
       sha256 = "sha256-BxSrphgW1n465FX6bKVkq6O0XE2JqanfSYlsGwWUWkQ=";
     };
+    useFetchCargoVendor = true;
     cargoHash = "";
-    cargoLock.lockFile = ../../other/evremap.Cargo.lock;
-    postPatch = ''
-      cp ${../../other/evremap.Cargo.lock} Cargo.lock
-    '';
     nativeBuildInputs = [pkgs.pkg-config];
     buildInputs = [pkgs.libevdev];
   };