Misc updatesHEADmaster

5 files changed, 69 insertions, 35 deletions

diff --git a/nix_archive/flake.lock b/nix_archive/flake.lock
index 7cd61bd..d67cb57 100644
--- a/nix_archive/flake.lock
+++ b/nix_archive/flake.lock
@@ -10,16 +10,14 @@
           "nixos-hardware"
         ],
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1776119159,
-        "narHash": "sha256-9HiqDiptdmTUM5NoJ6h0wnneXUrnVXyflC2mymBcGRQ=",
+        "lastModified": 1783711061,
+        "narHash": "sha256-KB3356Ft/KNxAo1paF5RI/+QamttA92nm2YSY4Bjpmo=",
         "ref": "refs/heads/master",
-        "rev": "22d3be9264087ed80d034df0e805bd8101a7d381",
-        "revCount": 165,
+        "rev": "da9bddc70ff8544f3294b880d719c4605e87ad97",
+        "revCount": 172,
         "type": "git",
         "url": "https://git.akon.city/camu"
       },
@@ -90,11 +88,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779202205,
-        "narHash": "sha256-UFt7q51IIhBzo1L+4MqNNljIrMOtrrjiT4vrOmz+wDA=",
+        "lastModified": 1786487128,
+        "narHash": "sha256-ad60hrRVhH/bo3Jl1YLzO+QcS3mUNZr9LNJdzhMO2P4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "16663cb13826d6aa519fb8c622460e3ce2a04dc1",
+        "rev": "f404edbfa4117810c96b97048299242fc50e5362",
         "type": "github"
       },
       "original": {
@@ -110,11 +108,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764640700,
-        "narHash": "sha256-WNNK2hZt54+3VM6n4Tac4w/ilE5Ov40E/dinlzOG8is=",
+        "lastModified": 1779209856,
+        "narHash": "sha256-aIekyxRFy0TT5F4L5YifRJkScZIskOcT2rjPuQdUM8k=",
         "ref": "refs/heads/master",
-        "rev": "596a2a0f86800ce2bdee55f1fffdede7d64d64c0",
-        "revCount": 78,
+        "rev": "8ec05d47840f7064945b48312579911ed06614a1",
+        "revCount": 80,
         "type": "git",
         "url": "https://git.akon.city/mauri"
       },
@@ -143,12 +141,15 @@
       }
     },
     "nixos-hardware": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_4"
+      },
       "locked": {
-        "lastModified": 1779099457,
-        "narHash": "sha256-u73aVD/lUmmT3JV+kPDztl7zPwQKd0eobD1AbJltaGs=",
+        "lastModified": 1786437054,
+        "narHash": "sha256-I++HzBBAgQ17UaLVU6aSm1/7LDo6c9xr8rAbpByWywE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "8792fab9d4a6454a9201675f01326f827ce35ead",
+        "rev": "6ed13b1d888d5cb07dbb0723eb1df86bbacd0b9c",
         "type": "github"
       },
       "original": {
@@ -164,11 +165,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1774972752,
-        "narHash": "sha256-DnLIpFxznohpLkIFs390uZ0gxwkVyhtknhKNu+lQJK8=",
+        "lastModified": 1783336371,
+        "narHash": "sha256-ZisTtweyb7JUwPP54HAXE9TypT8m89dIxDI36Ak0hAs=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "d97e078f4788cddb8d11c3c99f72a4bb9ddec221",
+        "rev": "a9620cfa43f0c1c30a46c31ae3c6e58cdb124a14",
         "type": "github"
       },
       "original": {
@@ -195,11 +196,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1773734432,
-        "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=",
+        "lastModified": 1780243769,
+        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cda48547b432e8d3b18b4180ba07473762ec8558",
+        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
         "type": "github"
       },
       "original": {
@@ -211,11 +212,40 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1778869304,
-        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
+        "lastModified": 1783224372,
+        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1767892417,
+        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
+        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1786384358,
+        "narHash": "sha256-RzPPiWeUtuvymnpuEWsdtzli5w4kjZs49FqEs3/1u+I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
+        "rev": "2fcb964de67fcf60b43471c55d5d99e61a9ccb5a",
         "type": "github"
       },
       "original": {
@@ -233,11 +263,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779198268,
-        "narHash": "sha256-v83Ri37cD4f4cfYuXm9XhUavcp7UJmOiypAafi64/NA=",
+        "lastModified": 1786493247,
+        "narHash": "sha256-TIZjK2XM7yjA9jGjTP+DrcVP1FRLwO1E9ZoU9Lezlo4=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "25413609751dd974d5c21c74241a9309b892d0ec",
+        "rev": "a78633d3281f5e95c769b1c72bfab7f821911f08",
         "type": "github"
       },
       "original": {
@@ -252,7 +282,7 @@
         "home-manager": "home-manager",
         "mauri": "mauri",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_5",
         "nur": "nur"
       }
     },
diff --git a/nix_archive/flake.nix b/nix_archive/flake.nix
index ca1992f..a852899 100644
--- a/nix_archive/flake.nix
+++ b/nix_archive/flake.nix
@@ -19,7 +19,7 @@
     #};
     camu = {
       url = "git+https://git.akon.city/camu";
-      inputs.nixpkgs.follows = "nixpkgs";
+      #inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
       inputs.nixos-hardware.follows = "nixos-hardware";
     };
diff --git a/nix_archive/hosts/palm/configuration.nix b/nix_archive/hosts/palm/configuration.nix
index 9fd4ebc..380c6d8 100644
--- a/nix_archive/hosts/palm/configuration.nix
+++ b/nix_archive/hosts/palm/configuration.nix
@@ -133,7 +133,7 @@ in {
       allowedTCPPorts = [];
     };
     extraHosts = ''
-      192.168.1.153 iroha
+      192.168.1.182 iroha
       192.168.1.158 moyo
       66.135.26.42 rod
     '';
@@ -187,7 +187,7 @@ in {
             allow_tearing = "no";
             max_render_time = "10";
             scale = "2";
-            bg = "${../../themes/year_of_snake/wallpaper.png} fit";
+            bg = "#${colo.background-alt} solid_color";
           };
           "${monitor2}" = {
             mode = "1024x768@60.004Hz";
diff --git a/nix_archive/nix/programs/waydroid.nix b/nix_archive/nix/programs/waydroid.nix
index af0c207..4410be5 100644
--- a/nix_archive/nix/programs/waydroid.nix
+++ b/nix_archive/nix/programs/waydroid.nix
@@ -1,3 +1,6 @@
-{ ... }: {
-  virtualisation.waydroid.enable = true;
+{ pkgs, ... }: {
+  virtualisation.waydroid = {
+    package = pkgs.waydroid-nftables;
+    enable = true;
+  };
 }
diff --git a/nix_archive/nix/user.nix b/nix_archive/nix/user.nix
index 7dd53cc..f71cf62 100644
--- a/nix_archive/nix/user.nix
+++ b/nix_archive/nix/user.nix
@@ -63,6 +63,7 @@ in {
     bc
     screen
     loccount
+    asciidoctor-with-extensions
     (aspellWithDicts (dicts: with dicts; [ en en-computers en-science ]))
     rsync
     (python3.withPackages (python-pkgs: [ python-pkgs.requests python-pkgs.beautifulsoup4 ]))