From f55f8e6da80474dfec048d85d3471e53edeebe8b Mon Sep 17 00:00:00 2001
From: jasmine <its.jassy@pm.me>
Date: Mon, 3 Jun 2024 21:17:51 +0800
Subject: [PATCH] Update depreciated values for NixOS 24.05

---
 home-manager/sajenim/features/cli/zsh.nix |  6 +++--
 nixos/common/optional/key.nix             |  2 +-
 nixos/common/users/sajenim/default.nix    |  1 +
 nixos/fuchsia/configuration.nix           | 30 ++++++++++++-----------
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/home-manager/sajenim/features/cli/zsh.nix b/home-manager/sajenim/features/cli/zsh.nix
index 50048a6..8609121 100644
--- a/home-manager/sajenim/features/cli/zsh.nix
+++ b/home-manager/sajenim/features/cli/zsh.nix
@@ -9,11 +9,13 @@
     enable = true;
     
     # Enable extra features
-    enableAutosuggestions = true;
-    enableCompletion = true;
+    autosuggestion = {
+      enable = true;
+    };
     syntaxHighlighting = {
       enable = true;
     };
+    enableCompletion = true;
     dotDir = ".config/zsh";
     
     # Commands that should be added to to top of '.zshrc'
diff --git a/nixos/common/optional/key.nix b/nixos/common/optional/key.nix
index 4fc93a5..6e0aa4c 100644
--- a/nixos/common/optional/key.nix
+++ b/nixos/common/optional/key.nix
@@ -14,7 +14,7 @@
   programs.gnupg.agent = {
     enable = true;
     # Fix: invalid time when using keytocard
-    pinentryFlavor = "gtk2";
+    pinentryPackage = pkgs.pinentry-curses;
   };
 
   # Use our yubikey as a user login or for sudo access 
diff --git a/nixos/common/users/sajenim/default.nix b/nixos/common/users/sajenim/default.nix
index 1d9a8a6..7660fa5 100644
--- a/nixos/common/users/sajenim/default.nix
+++ b/nixos/common/users/sajenim/default.nix
@@ -20,5 +20,6 @@
     users = {
       sajenim = import "${inputs.self}/home-manager/sajenim/${config.networking.hostName}.nix";
     };
+    backupFileExtension = "bak";
   };
 }
diff --git a/nixos/fuchsia/configuration.nix b/nixos/fuchsia/configuration.nix
index 69faac8..9c6a9eb 100644
--- a/nixos/fuchsia/configuration.nix
+++ b/nixos/fuchsia/configuration.nix
@@ -3,9 +3,11 @@
 {
   imports = [
     ../common/global
+
     ../common/users/sajenim
     ../common/users/sajenim/samba
     ../common/users/sajenim/steam
+
     ../common/optional/key.nix
 
     ./services
@@ -65,27 +67,27 @@
     # Setup our display server.
     xserver = {
       enable = true;
-      layout = "au";
+      xkb.layout = "au";
       videoDrivers = [ "amdgpu" ];
-      libinput = {
-        enable = true;
-        mouse = {
-          accelProfile = "flat";
-        };
-      };
       displayManager.startx.enable = true;
     };
 
-    # Get up and running with large language models locally.
-    ollama = {
+    libinput = {
       enable = true;
-      package = pkgs.unstable.ollama;
-      acceleration = "rocm";
-      # environmentVariables = {
-      #  HSA_OVERRIDE_GFX_VERSION = "10.3.0";
-      # };
+      mouse = { accelProfile = "flat"; };
     };
 
+
+    # Get up and running with large language models locally.
+    # ollama = {
+    #   enable = true;
+    #   package = pkgs.unstable.ollama;
+    #   acceleration = "rocm";
+    #   # environmentVariables = {
+    #   #  HSA_OVERRIDE_GFX_VERSION = "10.3.0";
+    #   # };
+    # };
+
     # Enable a few other services.
     ratbagd.enable = true;
     pcscd.enable = true;