merge

flake.lock

@@ -22,16 +22,16 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1751274312,
-        "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
+        "lastModified": 1758346548,
+        "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
+        "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }

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";
     icomidal = {
       url = "git+https://deemz.org/git/joeri/icomidal";

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;
@@ -99,7 +100,7 @@
     alsa.support32Bit = true;
     pulse.enable = true;
     jack.enable = true;
-    extraConfig = import ./pipewire-extra-config.nix;
+    # extraConfig = import ./pipewire-extra-config.nix;
   };
 
   # Graphics...
@@ -200,6 +201,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

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
 ]