From 7f0070e14cccd851f2096390a0f51f845301be14 Mon Sep 17 00:00:00 2001
From: Joeri Exelmans <joeri.exelmans@gmail.com>
Date: Mon, 2 Jun 2025 19:10:56 +0200
Subject: [PATCH 1/2] do NOT wakeup from sleep with mouse

---
 t14/configuration.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/t14/configuration.nix b/t14/configuration.nix
index 7c470b9..07c995c 100644
--- a/t14/configuration.nix
+++ b/t14/configuration.nix
@@ -200,6 +200,10 @@
     GTK_OVERLAY_SCROLLING = 0;
   };
 
+  services.udev.extraRules = ''
+    ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ATTR{power/wakeup}="disabled"
+  '';
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave

From e3a8bdfcf07929f7da70c7b5b52096bd8f1e1484 Mon Sep 17 00:00:00 2001
From: Joeri Exelmans <joeri.exelmans@gmail.com>
Date: Fri, 20 Jun 2025 11:01:06 +0200
Subject: [PATCH 2/2] upgrade to 25.05

---
 flake.lock              | 8 ++++----
 flake.nix               | 2 +-
 t14/configuration.nix   | 5 +++--
 t14/system-packages.nix | 7 +++++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index e009405..577b5b8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1746055187,
-        "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=",
+        "lastModified": 1749086602,
+        "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5",
+        "rev": "4792576cb003c994bd7cc1edada3129def20b27d",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index a4d9e24..6954e94 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "system config";
 
   inputs = {
-    nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-24.11";
+    nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-25.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
   };
 
diff --git a/t14/configuration.nix b/t14/configuration.nix
index 07c995c..b03e51d 100644
--- a/t14/configuration.nix
+++ b/t14/configuration.nix
@@ -48,7 +48,7 @@
   #time.timeZone = "America/Barbados";
 
   # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.utf8";
+  i18n.defaultLocale = "en_US.UTF-8";
   i18n.extraLocaleSettings = {
     LC_ADDRESS = "nl_BE.utf8";
     LC_IDENTIFICATION = "nl_BE.utf8";
@@ -86,12 +86,13 @@
     # sensitivity = 90;  # default: 128
     speed = 110;        # default: 97
   };
+  hardware.logitech.wireless.enable = true;
 
   # Huion tablet:
   hardware.opentabletdriver.enable = true;
 
   # Sound...
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
diff --git a/t14/system-packages.nix b/t14/system-packages.nix
index 911f6ec..8ed84b1 100644
--- a/t14/system-packages.nix
+++ b/t14/system-packages.nix
@@ -36,7 +36,7 @@ in [
   fuse3  # User space filesystems - need this to run AppImages with steam-run
   gnupg
   bottles # Wrapper around wine
-  filelight # Disk space analysis
+  kdePackages.filelight # Disk space analysis
   dconf-editor
   gnome-calculator
   gnome-disk-utility
@@ -47,7 +47,7 @@ in [
 
   # Programming
   git
-  kate
+  kdePackages.kate
   vim
   vimPlugins.vim-nix
   graphviz
@@ -104,6 +104,7 @@ in [
   cheese
   playerctl # command line media control (play/pause)
   finamp
+  easyeffects
 
   # Belgian eID software and hardware drivers
   eid-mw
@@ -114,4 +115,6 @@ in [
   libacr38u
   scmccid
   qdigidoc
+
+  solaar # extra options for logitech mouse
 ]