Compare commits

..

3 Commits

Author SHA1 Message Date
82f1a5b92d Flake update, return vivaldi from nixpkgs 2025-12-05 01:32:30 +03:00
cb686c36ec Add yamdex-cloud cli, update home-manager to 25.11 2025-12-02 20:42:12 +03:00
9864dbd348 Switch to 25.11 2025-12-01 02:47:23 +03:00
3 changed files with 27 additions and 25 deletions

33
flake.lock generated
View File

@@ -28,15 +28,16 @@
]
},
"locked": {
"lastModified": 1764510518,
"narHash": "sha256-hDFkciyjhjMLRC/qXCREWX1dgq8kopiuJdwXdfVlJuQ=",
"lastModified": 1764866045,
"narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "83053e1d337f33e0b48250588006e4b9df2f0d9d",
"rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-25.11",
"repo": "home-manager",
"type": "github"
}
@@ -108,27 +109,27 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1764242076,
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
"lastModified": 1764677808,
"narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
"rev": "1aab89277eb2d87823d5b69bae631a2496cff57a",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1764517825,
"narHash": "sha256-nSnujSkevFTp9Uj2oF0EgUGDN6JQrF0+t0s0wmo4sZ8=",
"lastModified": 1764884164,
"narHash": "sha256-JVBdqcz6O7noXRImADjFh+J7+14wigl+Vkt1hHTr56M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a6cbeb112d847fe6196f1040d663c797f7ecfd04",
"rev": "953a2e2892dc8e6b9623e233853239984c11dd7c",
"type": "github"
},
"original": {
@@ -138,18 +139,18 @@
"type": "github"
}
},
"nixpkgs-stable": {
"nixpkgs-unstable": {
"locked": {
"lastModified": 1764316264,
"narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=",
"lastModified": 1764667669,
"narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0",
"rev": "418468ac9527e799809c900eda37cbff999199b6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@@ -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"
}

View File

@@ -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; }));

View File

@@ -37,6 +37,7 @@ in
sauerbraten
#Development
yandex-cloud
devenv
direnv
yaml-language-server
@@ -59,7 +60,7 @@ in
ssh.enable = true;
vivaldi = {
flatpak = true;
enable = true;
};
firefox = {