chore: Update to unstable and pass stable packages down to home-manager
This commit is contained in:
parent
a85c016116
commit
49df2ca301
6 changed files with 48 additions and 18 deletions
27
flake.lock
generated
27
flake.lock
generated
|
|
@ -268,16 +268,16 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1735531152,
|
||||
"narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
|
||||
"lastModified": 1735471104,
|
||||
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b",
|
||||
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.11",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -457,7 +457,8 @@
|
|||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-droid": "nixpkgs-droid",
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
"snm": "snm"
|
||||
"snm": "snm",
|
||||
"stable": "stable"
|
||||
}
|
||||
},
|
||||
"snm": {
|
||||
|
|
@ -482,6 +483,22 @@
|
|||
"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": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
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";
|
||||
|
||||
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
|
||||
|
|
@ -47,6 +48,7 @@
|
|||
self,
|
||||
home-manager,
|
||||
nixpkgs,
|
||||
stable,
|
||||
pre-commit-hooks,
|
||||
...
|
||||
}@inputs:
|
||||
|
|
@ -102,6 +104,7 @@
|
|||
system = "x86_64-linux";
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
stable = import inputs.stable { system = "x86_64-linux"; };
|
||||
};
|
||||
modules = [ ./hosts/dregil ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
stable,
|
||||
...
|
||||
}:
|
||||
{
|
||||
|
|
@ -41,7 +42,6 @@
|
|||
|
||||
packages = with pkgs; [
|
||||
# social
|
||||
jitsi-meet-electron
|
||||
discord # talk to other people
|
||||
google-chrome
|
||||
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
|
||||
# gaming support
|
||||
lutris
|
||||
bottles
|
||||
stable.bottles
|
||||
wine64Packages.stagingFull
|
||||
scummvm
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,14 +64,16 @@ in
|
|||
|
||||
fonts = {
|
||||
enableDefaultPackages = true;
|
||||
packages = with pkgs; [
|
||||
packages =
|
||||
with pkgs;
|
||||
[
|
||||
corefonts
|
||||
noto-fonts
|
||||
noto-fonts-emoji
|
||||
fira-code
|
||||
fira-code-symbols
|
||||
nerdfonts
|
||||
];
|
||||
]
|
||||
++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
|
||||
};
|
||||
|
||||
# Enable CUPS to print documents.
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
stable,
|
||||
...
|
||||
}:
|
||||
{
|
||||
|
|
@ -13,6 +14,7 @@
|
|||
nixpkgs = {
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
home-manager.extraSpecialArgs = { inherit stable; };
|
||||
}
|
||||
)
|
||||
../../modules/security.nix
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue