From b9ce475a3ec81f6b054d896406abda1e87dc0357 Mon Sep 17 00:00:00 2001
From: materus <materus@podkos.pl>
Date: Fri, 26 Jul 2024 21:23:58 +0200
Subject: [PATCH] Old-materusPC: nvidia settings, renames to new

---
 configurations/host/Old-materusPC/configuration.nix | 6 +++---
 configurations/host/Old-materusPC/nvidia.nix        | 8 --------
 configurations/host/Old-materusPC/plasma.nix        | 6 +++---
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/configurations/host/Old-materusPC/configuration.nix b/configurations/host/Old-materusPC/configuration.nix
index 4a600db..833592f 100755
--- a/configurations/host/Old-materusPC/configuration.nix
+++ b/configurations/host/Old-materusPC/configuration.nix
@@ -34,7 +34,7 @@
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.efi.efiSysMountPoint = "/boot/efi";
   boot.kernelPackages = pkgs.linuxPackages_zen;
-  boot.tmpOnTmpfs = true;
+  boot.tmp.useTmpfs = true;
 
   services.flatpak.enable = true;
   services.gvfs.enable = true;
@@ -79,7 +79,7 @@
 
 
   # Configure keymap in X11
-  services.xserver.layout = "pl";
+  services.xserver.xkb.layout = "pl";
   # services.xserver.xkbOptions = {
   #   "eurosign:e";
   #   "caps:escape" # map caps to escape.
@@ -226,7 +226,7 @@
   ];
 
   fonts.fontDir.enable = true;
-  fonts.enableDefaultFonts = true;
+  fonts.enableDefaultPackages = true;
   fonts.fonts = with pkgs; [
     dejavu_fonts
     hack-font
diff --git a/configurations/host/Old-materusPC/nvidia.nix b/configurations/host/Old-materusPC/nvidia.nix
index 1b7651e..2b0352c 100644
--- a/configurations/host/Old-materusPC/nvidia.nix
+++ b/configurations/host/Old-materusPC/nvidia.nix
@@ -5,14 +5,6 @@
     package = config.boot.kernelPackages.nvidiaPackages.stable;
     modesetting.enable = true;
     nvidiaSettings = true;
-    prime = {
-      offload = {
-        enable = true;
-        enableOffloadCmd = true;
-      };
-      intelBusId = "PCI:0:2:0";
-      nvidiaBusId = "PCI:1:0:0";
-    };
 
   };
   hardware.opengl.extraPackages = with pkgs; [
diff --git a/configurations/host/Old-materusPC/plasma.nix b/configurations/host/Old-materusPC/plasma.nix
index 37ba47d..c0c94ef 100644
--- a/configurations/host/Old-materusPC/plasma.nix
+++ b/configurations/host/Old-materusPC/plasma.nix
@@ -1,9 +1,9 @@
 { pkgs, ... }:
 {
 
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.displayManager.sddm.wayland.enable = true;
-  services.xserver.displayManager.sddm.settings = {
+  services.displayManager.sddm.enable = true;
+  services.displayManager.sddm.wayland.enable = true;
+  services.displayManager.sddm.settings = {
     General = {
       InputMethod = "";
     };