From d0ec70972bd5a12f47f1118b54d61be6f5c38d51 Mon Sep 17 00:00:00 2001 From: joy Date: Sun, 17 Nov 2024 18:31:53 +0100 Subject: [PATCH] add pkgs-stable --- flake.lock | 17 +++++++++++++++++ flake.nix | 6 +++++- modules/programs/default.nix | 2 ++ modules/programs/misc/default.nix | 8 ++++++-- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index f7bd5fb..4d3ad1a 100644 --- a/flake.lock +++ b/flake.lock @@ -358,6 +358,22 @@ "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": { "inputs": { "nixpkgs": [ @@ -403,6 +419,7 @@ "home-manager": "home-manager", "nix-on-droid": "nix-on-droid", "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", "sops": "sops", "sops-nix": "sops-nix", "stylix": "stylix" diff --git a/flake.nix b/flake.nix index 15d58a4..f1cd51c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,7 @@ outputs = inputs @ { self, nixpkgs, + nixpkgs-stable, nix-on-droid, ags, stylix, @@ -13,6 +14,7 @@ domain = "joygnu.org"; mail = "mail@joygnu.org"; nixpath = "nix/"; + pkgs-stable = nixpkgs-stable.legacyPackages.x86_64-linux; nixosconf = {modules}: nixpkgs.lib.nixosSystem { @@ -22,12 +24,13 @@ inherit domain; inherit mail; inherit nixpath; + inherit pkgs-stable; }; modules = modules ++ [home-manager.nixosModules.default sops-nix.nixosModules.sops]; }; in { nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { - pkgs = import nixpkgs {system = "aarch64-linux";}; + pkgs = import nixpkgs-stable {system = "aarch64-linux";}; modules = [./hosts/phone]; extraSpecialArgs = { inherit inputs; @@ -55,6 +58,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/programs/default.nix b/modules/programs/default.nix index f6d3e21..67a00d8 100644 --- a/modules/programs/default.nix +++ b/modules/programs/default.nix @@ -3,6 +3,7 @@ username, domain, nixpath, + pkgs-stable, ... }: let mail = { @@ -18,6 +19,7 @@ in { inherit mail; inherit domain; inherit nixpath; + inherit pkgs-stable; }; users = { "${username}" = import ./user.nix; diff --git a/modules/programs/misc/default.nix b/modules/programs/misc/default.nix index 9c8543c..07b782e 100644 --- a/modules/programs/misc/default.nix +++ b/modules/programs/misc/default.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + pkgs-stable, + ... +}: { home.packages = with pkgs; [ git htop @@ -14,7 +18,7 @@ yt-dlp wget cmatrix - # cava + pkgs-stable.cava nitch gotop sl