prettyfied flake.nix

flake.lock

@@ -20,7 +20,7 @@
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-unstable"
         ]
       },
       "locked": {
@@ -54,22 +54,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1748693115,
-        "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1741379970,
         "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
@@ -85,7 +69,39 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1749494155,
+        "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "88331c17ba434359491e8d5889cce872464052c2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1749285348,
+        "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1716044191,
         "narHash": "sha256-V/JRCf9iOKGMmmMCs/K1n+vOP01Y7ZPJntHXxDEvzWM=",
@@ -105,7 +121,8 @@
       "inputs": {
         "home-manager": "home-manager",
         "impermanence": "impermanence",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs-stable": "nixpkgs-stable",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "yandex-music": "yandex-music",
         "zapret": "zapret"
       }
@@ -128,7 +145,7 @@
     "yandex-music": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "ymExe": "ymExe"
       },
       "locked": {
@@ -159,7 +176,7 @@
     },
     "zapret": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "zapret-src": "zapret-src"
       },
       "locked": {

flake.nix

@@ -6,13 +6,13 @@
     ];
   };
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05";
     impermanence.url = "github:nix-community/impermanence";
     yandex-music.url = "github:cucumber-sp/yandex-music-linux";
     home-manager = {
       url = "github:nix-community/home-manager/master";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 #    hm-stable = {
 #      url = "github:nix-community/home-manager/release-25.05";
@@ -21,9 +21,9 @@
     zapret.url = "github:n0vvvonder/zapret-flake.nix";
   };
 
-  outputs = { self, nixpkgs, impermanence, home-manager, zapret, nixpkgs-stable, ...}@inputs: {
+  outputs = { self, nixpkgs-unstable, impermanence, home-manager, zapret, nixpkgs-stable, ...}@inputs: {
     nixosConfigurations = {
-      Ratchet = nixpkgs.lib.nixosSystem {
+      Ratchet = nixpkgs-unstable.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
         modules = [
@@ -52,7 +52,7 @@
           }
         ];
       };
-      Aphelion = nixpkgs.lib.nixosSystem {
+      Aphelion = nixpkgs-unstable.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
         modules = [
@@ -90,7 +90,7 @@
           impermanence.nixosModules.impermanence
           ./hosts/generic/configuration_generic.nix
           ./hosts/generic/users.nix
-          ./hosts/Quark/Quark_hardware.nix
+          ./hosts/Quark/Quark-hardware.nix
  #         hm-stable.nixosModules.home-manager {
  #           home-manager.useUserPackages = true;
  #           home-manager.users.yaroslav = {
@@ -102,4 +102,5 @@
         ];
     };
   };
+};
 }