torjus/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Remove nixpkgs-master input
All checks were successful
flake-check / build (push) Successful in 1m55s
Details

Browse Source
This commit is contained in:
Torjus Håkestad 2024-10-03 11:18:34 +02:00
parent e8c10ec9e9
commit cebeb2be1c
2 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
flake.lock
View File

@ -217,22 +217,6 @@
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1727912358,
"narHash": "sha256-ba06/LDxDIZexS2mCdwRdBluBKwRJ91cAsnnOPmVdfA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "78389c563cbe52a1b5742cd760ef52291b429fc2",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1720535198,
@ -361,7 +345,6 @@
"huecli": "huecli",
"nix-packages": "nix-packages",
"nixpkgs": "nixpkgs",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable",
"nixprstatus": "nixprstatus",
"sops-nix": "sops-nix"

19
flake.nix
View File

@ -2,9 +2,8 @@
description = "Torjus nixos config flake";
inputs = {
# nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-23.11";
nixpkgs-master.url = "github:nixos/nixpkgs?ref=master";
#nixpkgs-master.url = "github:nixos/nixpkgs?ref=master";
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager";
@ -33,7 +32,7 @@
{
self,
nixpkgs,
nixpkgs-master,
# nixpkgs-master,
nixpkgs-stable,
nixprstatus,
sops-nix,
@ -51,12 +50,12 @@
config.allowUnfree = true;
};
};
overlay-master = final: prev: {
master = import nixpkgs-master {
inherit system;
config.allowUnfree = true;
};
};
# overlay-master = final: prev: {
# master = import nixpkgs-master {
# inherit system;
# config.allowUnfree = true;
# };
# };
allSystems = [
"x86_64-linux"
"aarch64-linux"
@ -67,7 +66,7 @@
f: nixpkgs.lib.genAttrs allSystems (system: f { pkgs = import nixpkgs { inherit system; }; });
commonOverlays = [
overlay-stable
overlay-master
# overlay-master
ghettoptt.overlays.default
huecli.overlays.default
nix-packages.overlays.default