nixos: update and remove few patches

4 files changed, 30 insertions, 36 deletions

diff --git a/flake.lock b/flake.lock
index 3642f50..607cb25 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1736955230,
-        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
+        "lastModified": 1745630506,
+        "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
+        "rev": "96e078c646b711aee04b82ba01aefbff87004ded",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700795494,
-        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
+        "lastModified": 1744478979,
+        "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
+        "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
         "type": "github"
       },
       "original": {
@@ -169,11 +169,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1703113217,
-        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
+        "lastModified": 1745494811,
+        "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
+        "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
         "type": "github"
       },
       "original": {
@@ -184,11 +184,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1744366945,
-        "narHash": "sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg=",
+        "lastModified": 1745503349,
+        "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1",
+        "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
         "type": "github"
       },
       "original": {
@@ -216,11 +216,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1703013332,
-        "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
+        "lastModified": 1745391562,
+        "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
+        "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
         "type": "github"
       },
       "original": {
@@ -246,11 +246,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1744536153,
-        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
+        "lastModified": 1745377448,
+        "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+        "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c",
         "type": "github"
       },
       "original": {
@@ -349,11 +349,11 @@
     },
     "personal-secret": {
       "locked": {
-        "lastModified": 1743486742,
-        "narHash": "sha256-fbks6PlOYB3QjoVRPGQNFk1mUerfd93X5aGPIL25V6k=",
+        "lastModified": 1744696740,
+        "narHash": "sha256-9QtdTBv3WKr0KOetNwE3EavPiPy4DASsWUTyyPW+rsM=",
         "ref": "refs/heads/master",
-        "rev": "e88b6f6c52270491634468ac518d243d7597b6c5",
-        "revCount": 128,
+        "rev": "e4173c5ba223ce36d3abb1b4ea830596c9cdc1f6",
+        "revCount": 131,
         "type": "git",
         "url": "ssh://git@cynerd.cz/nixos-personal-secret"
       },
@@ -566,11 +566,11 @@
     },
     "vpsadminos": {
       "locked": {
-        "lastModified": 1743867103,
-        "narHash": "sha256-XP5EaDrmk894xuGkBoilrVR/4Gllae5MisdfcdXDiI8=",
+        "lastModified": 1745682885,
+        "narHash": "sha256-fyttqoizcj4fDW9Q5dBCJ/NUnOhPaslNXoBNk725Nco=",
         "owner": "vpsfreecz",
         "repo": "vpsadminos",
-        "rev": "ab6d9539748f120aacc9fe2c4174a2c8953b9606",
+        "rev": "9700f42669ea826fda0eedacb17ccab1364741c1",
         "type": "github"
       },
       "original": {
diff --git a/nixos/modules/gaming.nix b/nixos/modules/gaming.nix
index 3a9d8e7..6dce70d 100644
--- a/nixos/modules/gaming.nix
+++ b/nixos/modules/gaming.nix
@@ -35,7 +35,7 @@ in {
           with pkgs; [
             ncurses
             xorg.libXpm
-            flac134
+            #flac134
             libopus
           ];
       };
@@ -44,7 +44,7 @@ in {
           with pkgs; [
             ncurses
             xorg.libXpm
-            flac134
+            #flac134
             libopus
             SDL
             SDL2_image
diff --git a/nixos/modules/packages.nix b/nixos/modules/packages.nix
index 55db94d..155d8a5 100644
--- a/nixos/modules/packages.nix
+++ b/nixos/modules/packages.nix
@@ -68,6 +68,9 @@ in {
 
       lm_sensors
     ]
+    ++ optionals (system != "armv7l-linux") [
+      ranger
+    ]
     ++ optionals (system == "x86_64-linux") [
       nmap
       ltrace
diff --git a/pkgs/default.nix b/pkgs/default.nix
index ed49588..82bd1a8 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -33,15 +33,6 @@ final: prev: {
     buildInputs = oldAttrs.buildInputs ++ [final.webkitgtk_4_1];
     meta = oldAttrs.meta // {broken = false;};
   });
-  notmuch = prev.notmuch.overrideAttrs {
-    patches = [
-      (final.fetchpatch {
-        name = "add-workaround-for-Emacs-30-pp-changes.patch";
-        url = "https://git.notmuchmail.org/git?p=notmuch;a=patch;h=e3d4721b1ba4836c7646e057b50123fe994652eb";
-        hash = "sha256-phfNSOlTajTmaf+DjtdmBAWSm+2tUbrQEChInUlwn5k=";
-      })
-    ];
-  };
 
   # nixpkgs patches
   zigbee2mqtt = prev.zigbee2mqtt.overrideAttrs {