From 4806b2b6487fb2f080ca753cc96710837a3cdfe1 Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Sat, 4 Jan 2025 20:40:30 +0100
Subject: [PATCH] Update gnome

---
 nixos/common/desktops/gnome/default.nix | 26 ++++++++++++-------------
 nixos/hosts/framework16/default.nix     | 11 ++++-------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/nixos/common/desktops/gnome/default.nix b/nixos/common/desktops/gnome/default.nix
index f2095434..290a695a 100644
--- a/nixos/common/desktops/gnome/default.nix
+++ b/nixos/common/desktops/gnome/default.nix
@@ -47,27 +47,27 @@
   # https://nixos.wiki/wiki/GNOME
   # Remove unwanted packages
   environment.gnome.excludePackages = (with pkgs; [
-    gnome.cheese
-    gnome.gnome-music
-    gnome.epiphany
-    gnome.geary
-    gnome.totem
-    gnome.gnome-characters
+    cheese
+    gnome-music
+    epiphany
+    geary
+    totem
+    gnome-characters
     gnome-tour
     gnome-photos
-    gnome.yelp
-    gnome.gnome-font-viewer
+    yelp
+    gnome-font-viewer
     gnome-connections
-    gnome.gnome-contacts
-    gnome.gnome-logs
-    gnome.gnome-maps
-    gnome.simple-scan
+    gnome-contacts
+    gnome-logs
+    gnome-maps
+    simple-scan
   ]);
 
   environment.systemPackages = with pkgs; [
     # Gnome Extensions
     gnomeExtensions.arcmenu
-    gnomeExtensions.forge
+    gnomeExtensions.tiling-shell
     gnomeExtensions.dash-to-panel
     gnomeExtensions.blur-my-shell
     gnomeExtensions.caffeine
diff --git a/nixos/hosts/framework16/default.nix b/nixos/hosts/framework16/default.nix
index 2df58153..29ae573c 100644
--- a/nixos/hosts/framework16/default.nix
+++ b/nixos/hosts/framework16/default.nix
@@ -20,20 +20,17 @@
 
   hardware.bluetooth.enable = true; # enables support for Bluetooth
   hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
- 
   services.fwupd.enable = true;
-  # we need fwupd 1.9.7 to downgrade the fingerprint sensor firmware
-  services.fwupd.package = (import (builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/bb2009ca185d97813e75736c2b8d1d8bb81bde05.tar.gz";
-    sha256 = "sha256:003qcrsq5g5lggfrpq31gcvj82lb065xvr7bpfa8ddsw8x4dnysk";
-  }) { inherit (pkgs) system;}).fwupd;
 
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "uas" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
   # boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.kernelParams = [ "boot.shell_on_fail" ];
+  boot.kernelParams = [ 
+    "boot.shell_on_fail" 
+    "amdgpu.abmlevel=0" # Prevents screen washout on power-save modes
+  ];
   # boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
   boot.kernelPackages = pkgs.linuxPackages_latest;