chore: Update to unstable and pass stable packages down to home-manager

This commit is contained in:
Alexander Kobjolke 2025-01-01 12:17:39 +01:00
parent a85c016116
commit 49df2ca301
6 changed files with 48 additions and 18 deletions

27
flake.lock generated
View file

@ -268,16 +268,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1735531152, "lastModified": 1735471104,
"narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -457,7 +457,8 @@
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-droid": "nixpkgs-droid", "nixpkgs-droid": "nixpkgs-droid",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"snm": "snm" "snm": "snm",
"stable": "stable"
} }
}, },
"snm": { "snm": {
@ -482,6 +483,22 @@
"type": "gitlab" "type": "gitlab"
} }
}, },
"stable": {
"locked": {
"lastModified": 1735531152,
"narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,

View file

@ -1,6 +1,7 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
stable.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-23.05"; nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-23.05";
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
@ -47,6 +48,7 @@
self, self,
home-manager, home-manager,
nixpkgs, nixpkgs,
stable,
pre-commit-hooks, pre-commit-hooks,
... ...
}@inputs: }@inputs:
@ -102,6 +104,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
stable = import inputs.stable { system = "x86_64-linux"; };
}; };
modules = [ ./hosts/dregil ]; modules = [ ./hosts/dregil ];
}; };

View file

@ -2,6 +2,7 @@
config, config,
lib, lib,
pkgs, pkgs,
stable,
... ...
}: }:
{ {
@ -41,7 +42,6 @@
packages = with pkgs; [ packages = with pkgs; [
# social # social
jitsi-meet-electron
discord # talk to other people discord # talk to other people
google-chrome google-chrome
@ -52,7 +52,7 @@
# gaming support # gaming support
lutris lutris
bottles stable.bottles
wine64Packages.stagingFull wine64Packages.stagingFull
scummvm scummvm

View file

@ -1,5 +1,11 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
stable,
...
}:
{ {
config.home.packages = [ pkgs.jitsi-meet-electron ]; config.home.packages = [ stable.jitsi-meet-electron ];
} }

View file

@ -64,14 +64,16 @@ in
fonts = { fonts = {
enableDefaultPackages = true; enableDefaultPackages = true;
packages = with pkgs; [ packages =
corefonts with pkgs;
noto-fonts [
noto-fonts-emoji corefonts
fira-code noto-fonts
fira-code-symbols noto-fonts-emoji
nerdfonts fira-code
]; fira-code-symbols
]
++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
}; };
# Enable CUPS to print documents. # Enable CUPS to print documents.

View file

@ -3,6 +3,7 @@
config, config,
pkgs, pkgs,
inputs, inputs,
stable,
... ...
}: }:
{ {
@ -13,6 +14,7 @@
nixpkgs = { nixpkgs = {
config.allowUnfree = true; config.allowUnfree = true;
}; };
home-manager.extraSpecialArgs = { inherit stable; };
} }
) )
../../modules/security.nix ../../modules/security.nix