Compare commits
2 Commits
76389b1902
...
cb686c36ec
| Author | SHA1 | Date | |
|---|---|---|---|
|
cb686c36ec
|
|||
|
9864dbd348
|
73
flake.lock
generated
73
flake.lock
generated
@@ -28,15 +28,16 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764510518,
|
||||
"narHash": "sha256-hDFkciyjhjMLRC/qXCREWX1dgq8kopiuJdwXdfVlJuQ=",
|
||||
"lastModified": 1764613336,
|
||||
"narHash": "sha256-L979az28t/+SXvYw9qhOno5HLlDwkZOpz6LzCLnjmRM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "83053e1d337f33e0b48250588006e4b9df2f0d9d",
|
||||
"rev": "f3902b5d8767985680875ad86d028371100faeb3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -107,6 +108,38 @@
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1764494334,
|
||||
"narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d542db745310b6929708d9abea513f3ff19b1341",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1764546042,
|
||||
"narHash": "sha256-+9lpYa2zGOH+wKRMEJcm/cycJe7nHZkFZUbvK30HKlc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0f2f740139ea83741ba38413ce427b0e222467e3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "master",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1764242076,
|
||||
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
|
||||
@@ -122,38 +155,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1764517825,
|
||||
"narHash": "sha256-nSnujSkevFTp9Uj2oF0EgUGDN6JQrF0+t0s0wmo4sZ8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a6cbeb112d847fe6196f1040d663c797f7ecfd04",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "master",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1764316264,
|
||||
"narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"photocatalog": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -212,7 +213,7 @@
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-master": "nixpkgs-master",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"photocatalog": "photocatalog",
|
||||
"raspberry-pi-nix": "raspberry-pi-nix"
|
||||
}
|
||||
|
||||
16
flake.nix
16
flake.nix
@@ -2,11 +2,11 @@
|
||||
description = "Fxnet system configurations";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixpkgs-master.url = "github:NixOS/nixpkgs/master";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
photocatalog = {
|
||||
@@ -33,7 +33,7 @@
|
||||
{
|
||||
self,
|
||||
nixpkgs,
|
||||
nixpkgs-stable,
|
||||
nixpkgs-unstable,
|
||||
nixpkgs-master,
|
||||
...
|
||||
}@inputs:
|
||||
@@ -56,9 +56,9 @@
|
||||
config.allowUnfree = true;
|
||||
}
|
||||
);
|
||||
pkgsStableSettings =
|
||||
pkgsUnstableSettings =
|
||||
system:
|
||||
import nixpkgs-stable {
|
||||
import nixpkgs-unstable {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
@@ -93,7 +93,7 @@
|
||||
];
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
pkgsStable = pkgsStableSettings pkgs.system;
|
||||
pkgsUnstable = pkgsUnstableSettings pkgs.system;
|
||||
pkgsMaster = pkgsMasterSettings pkgs.system;
|
||||
hosts = hosts;
|
||||
};
|
||||
@@ -120,7 +120,7 @@
|
||||
system = host.system;
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
pkgsStable = pkgsStableSettings host.system;
|
||||
pkgsUnstable = pkgsUnstableSettings host.system;
|
||||
pkgsMaster = pkgsMasterSettings host.system;
|
||||
hosts = hosts;
|
||||
quirks = (quirks: (import ./quirks { inherit quirks; }));
|
||||
|
||||
@@ -37,6 +37,7 @@ in
|
||||
sauerbraten
|
||||
|
||||
#Development
|
||||
yandex-cloud
|
||||
devenv
|
||||
direnv
|
||||
yaml-language-server
|
||||
|
||||
Reference in New Issue
Block a user