add pkgs-stable

This commit is contained in:
joy 2024-11-17 18:31:53 +01:00
parent 2e1c466410
commit d0ec70972b
4 changed files with 30 additions and 3 deletions

View file

@ -358,6 +358,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1731797254,
"narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nmd": { "nmd": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -403,6 +419,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-on-droid": "nix-on-droid", "nix-on-droid": "nix-on-droid",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable",
"sops": "sops", "sops": "sops",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix" "stylix": "stylix"

View file

@ -2,6 +2,7 @@
outputs = inputs @ { outputs = inputs @ {
self, self,
nixpkgs, nixpkgs,
nixpkgs-stable,
nix-on-droid, nix-on-droid,
ags, ags,
stylix, stylix,
@ -13,6 +14,7 @@
domain = "joygnu.org"; domain = "joygnu.org";
mail = "mail@joygnu.org"; mail = "mail@joygnu.org";
nixpath = "nix/"; nixpath = "nix/";
pkgs-stable = nixpkgs-stable.legacyPackages.x86_64-linux;
nixosconf = {modules}: nixosconf = {modules}:
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
@ -22,12 +24,13 @@
inherit domain; inherit domain;
inherit mail; inherit mail;
inherit nixpath; inherit nixpath;
inherit pkgs-stable;
}; };
modules = modules ++ [home-manager.nixosModules.default sops-nix.nixosModules.sops]; modules = modules ++ [home-manager.nixosModules.default sops-nix.nixosModules.sops];
}; };
in { in {
nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration {
pkgs = import nixpkgs {system = "aarch64-linux";}; pkgs = import nixpkgs-stable {system = "aarch64-linux";};
modules = [./hosts/phone]; modules = [./hosts/phone];
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
@ -55,6 +58,7 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
firefox-addons = { firefox-addons = {
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View file

@ -3,6 +3,7 @@
username, username,
domain, domain,
nixpath, nixpath,
pkgs-stable,
... ...
}: let }: let
mail = { mail = {
@ -18,6 +19,7 @@ in {
inherit mail; inherit mail;
inherit domain; inherit domain;
inherit nixpath; inherit nixpath;
inherit pkgs-stable;
}; };
users = { users = {
"${username}" = import ./user.nix; "${username}" = import ./user.nix;

View file

@ -1,4 +1,8 @@
{pkgs, ...}: { {
pkgs,
pkgs-stable,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
git git
htop htop
@ -14,7 +18,7 @@
yt-dlp yt-dlp
wget wget
cmatrix cmatrix
# cava pkgs-stable.cava
nitch nitch
gotop gotop
sl sl