flake.lock

@@ -305,11 +305,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1721332628,
-        "narHash": "sha256-kEB88spCIG7xTvKPlkghDNqZz26YHa0B06Ku2zsGFgo=",
+        "lastModified": 1721248202,
+        "narHash": "sha256-VAhuQQ4EKbw/6z7K2IoR83+gXUdMksLWFQOhJNhSvQE=",
         "ref": "refs/heads/main",
-        "rev": "8e15f91c2417c8f05d69a93f1294185ccc5f8f3e",
-        "revCount": 4931,
+        "rev": "300228b503b36e5977b0d58713c5b4cf1f07b8a9",
+        "revCount": 4930,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland/"
@@ -498,11 +498,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1721324432,
-        "narHash": "sha256-SkALa1bLiyROFslXDfBZeitmOSUVUU0+3ewDvDYfxsc=",
-        "rev": "5ee1e6ea9887a54f0af3a66528abc04b17611516",
+        "lastModified": 1721314880,
+        "narHash": "sha256-39RhKptnozRK63T4l6TcXGKjCXsvcetC4zCMj+0Xthw=",
+        "rev": "7b1abf81076c93a84becc310722013e44d850002",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/5ee1e6ea9887a54f0af3a66528abc04b17611516.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7b1abf81076c93a84becc310722013e44d850002.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -679,11 +679,11 @@
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1721317023,
-        "narHash": "sha256-U3vjp0cD8UaLcHgHUkt3Xn2dyjRBczkRElC6QmJRo1A=",
+        "lastModified": 1721048083,
+        "narHash": "sha256-9+v7DYzlQn0djo2j11Ges0uj5WzWajpob/Y3WcsEFks=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "b8d5814544f54426f032ca6f783a00920dc96809",
+        "rev": "7421424feb2e68a173f6fd218bbf71eb352404e5",
         "type": "github"
       },
       "original": {
@@ -742,11 +742,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1721303309,
-        "narHash": "sha256-/+Yw4tW/mcTRKmkEAO64ObzCQClpSUZpk2flUD9GDHE=",
+        "lastModified": 1721116560,
+        "narHash": "sha256-++TYlGMAJM1Q+0nMVaWBSEvEUjRs7ZGiNQOpqbQApCU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7e2fb8e0eb807e139d42b05bf8e28da122396bed",
+        "rev": "9355fa86e6f27422963132c2c9aeedb0fb963d93",
         "type": "github"
       },
       "original": {
@@ -774,11 +774,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1721138476,
-        "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=",
+        "lastModified": 1720957393,
+        "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206",
+        "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
         "type": "github"
       },
       "original": {
@@ -1150,11 +1150,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721352101,
-        "narHash": "sha256-u1lIAYCYE+GJceU4xE6mWY4EQztBqxmFKjDme30xnq4=",
+        "lastModified": 1721306038,
+        "narHash": "sha256-eK+XZUOjz1864Lo7qf8xfLNIL7aeaFUbug9B0k07o08=",
         "owner": "Cloudef",
         "repo": "zig2nix",
-        "rev": "2822a7f996bfb89ed6ea021718e21f93817d48d8",
+        "rev": "7eefb0631345741feb4b31b94898ab20d67f7594",
         "type": "github"
       },
       "original": {

lib/extended.nix

@@ -64,7 +64,9 @@ let
     ]);
 
   flakeVer =
-    flake: "${flake.shortRev or flake.dirtyShortRev}-${mkDate (toString flake.lastModifiedDate)}";
+    flake:
+      "${flake.shortRev or flake.dirtyShortRev}-${mkDate (toString flake.lastModifiedDate)}";
+
 
   isNixFile = p: hasSuffix ".nix" p;
   isDefaultNixFile = p: hasSuffix "default.nix" p;

modules/languages/roc.nix

@@ -16,14 +16,13 @@ let
     inherit version;
 
   };
-  lang-server = rocPkgs.lang-server.overrideAttrs { inherit version; };
+  lang-server = rocPkgs.lang-server.overrideAttrs {
+    inherit version;
+  };
 
 in
 {
   config = mkIfIn "roc" cfg {
-    environment.systemPackages = [
-      roc
-      lang-server
-    ];
+    environment.systemPackages = [roc lang-server];
   };
 }

modules/nix.nix

@@ -2,13 +2,9 @@
   inputs,
   self,
   pkgs,
-  lib,
   enabled,
   ...
 }:
-let
-  inherit (lib) makeBinPath;
-in
 {
   imports = [ inputs.nix-index-database.nixosModules.nix-index ];
 
@@ -46,13 +42,7 @@ in
 
   system.activationScripts.diff = ''
     if [[ -e /run/current-system ]]; then
-      PATH=$PATH:${
-        makeBinPath [
-          pkgs.nvd
-          pkgs.nix
-        ]
-      }
-      nvd diff /run/current-system "$systemConfig"
+      ${pkgs.nix}/bin/nix store diff-closures /run/current-system "$systemConfig"
     fi
   '';
 

pkgs/oizys/default.nix

@@ -25,4 +25,4 @@ buildGoModule {
       --zsh <(OIZYS_SKIP_CHECK=true $out/bin/oizys completion zsh)
   '';
 
-}
+  }