daniel/dotfiles
1
0
Fork 0
Code Actions Activity

flake: Update inputs

Browse source
This commit is contained in:
Daniel Kempkens 2023-09-12 15:18:09 +02:00
parent a7f2ea7baa
commit 1b4c9d6539
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
3 changed files with 37 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
flake.lock
View file

@ -5,9 +5,11 @@
"darwin": [ "darwin": [
"nix-darwin" "nix-darwin"
], ],
"home-manager": "home-manager", "home-manager": [
"home-manager"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixos-unstable"
] ]
}, },
"locked": { "locked": {
@ -103,7 +105,7 @@
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixos-unstable"
] ]
}, },
"locked": { "locked": {
@ -294,28 +296,7 @@
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"agenix", "nixos-unstable"
"nixpkgs"
]
},
"locked": {
"lastModified": 1682203081,
"narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
] ]
}, },
"locked": { "locked": {
@ -414,18 +395,18 @@
"type": "github" "type": "github"
} }
}, },
"nixos-stable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1694426803, "lastModified": 1694422566,
"narHash": "sha256-osusXQo0zkEqs502SNMffsKp1O9evpDM54A37MuyT2Q=", "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9a74ffb2ca1fc91c6ccc48bd3f8cbc1501bf7b8a", "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.05", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -546,11 +527,11 @@
"disko": "disko", "disko": "disko",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-root": "flake-root", "flake-root": "flake-root",
"home-manager": "home-manager_2", "home-manager": "home-manager",
"nifoc-overlay": "nifoc-overlay", "nifoc-overlay": "nifoc-overlay",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-stable": "nixos-stable", "nixos-unstable": "nixos-unstable",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"pre-commit-hooks-nix": "pre-commit-hooks-nix", "pre-commit-hooks-nix": "pre-commit-hooks-nix",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"

33
flake.nix
View file

@ -1,7 +1,7 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixos-stable.url = "github:nixos/nixpkgs/nixos-23.05"; nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# nixpkgs-master.url = "github:nixos/nixpkgs/master"; # nixpkgs-master.url = "github:nixos/nixpkgs/master";
# Tools # Tools
@ -24,7 +24,7 @@
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixos-unstable";
}; };
nix-darwin = { nix-darwin = {
@ -34,15 +34,18 @@
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixos-unstable";
}; };
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
agenix = { agenix = {
url = "github:ryantm/agenix"; url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs"; inputs = {
inputs.darwin.follows = "nix-darwin"; nixpkgs.follows = "nixos-unstable";
darwin.follows = "nix-darwin";
home-manager.follows = "home-manager";
};
}; };
attic = { attic = {
@ -71,27 +74,37 @@
}; };
tanker = import ./system/flakes/tanker.nix { tanker = import ./system/flakes/tanker.nix {
inherit (inputs) nixpkgs nixos-stable disko deploy-rs home-manager agenix attic; nixpkgs = inputs.nixos-unstable;
inherit (inputs) disko deploy-rs home-manager agenix attic;
inherit inputs; inherit inputs;
}; };
mediaserver = import ./system/flakes/mediaserver.nix { mediaserver = import ./system/flakes/mediaserver.nix {
inherit (inputs) nixpkgs deploy-rs home-manager agenix; nixpkgs = inputs.nixos-unstable;
inherit (inputs) deploy-rs home-manager agenix;
inherit inputs; inherit inputs;
}; };
argon = import ./system/flakes/argon.nix { argon = import ./system/flakes/argon.nix {
inherit (inputs) nixpkgs nixos-hardware deploy-rs home-manager agenix; nixpkgs = inputs.nixos-unstable;
inherit (inputs) nixos-hardware deploy-rs home-manager agenix;
inherit inputs; inherit inputs;
}; };
weather-sdr = import ./system/flakes/weather-sdr.nix { weather-sdr = import ./system/flakes/weather-sdr.nix {
inherit (inputs) nixpkgs deploy-rs home-manager agenix; nixpkgs = inputs.nixos-unstable;
inherit (inputs) deploy-rs home-manager agenix;
inherit inputs; inherit inputs;
}; };
adsb-antenna = import ./system/flakes/adsb-antenna.nix { adsb-antenna = import ./system/flakes/adsb-antenna.nix {
inherit (inputs) nixpkgs nixos-hardware deploy-rs home-manager; nixpkgs = inputs.nixos-unstable;
inherit (inputs) nixos-hardware deploy-rs home-manager;
inherit inputs; inherit inputs;
}; };
in in

4
system/flakes/tanker.nix
View file

@ -1,15 +1,13 @@
{ nixpkgs, nixos-stable, disko, deploy-rs, home-manager, agenix, attic, inputs, ... }: { nixpkgs, disko, deploy-rs, home-manager, agenix, attic, inputs, ... }:
let let
default-system = "x86_64-linux"; default-system = "x86_64-linux";
overlay-stable = _: _: { pkgs-stable = import nixos-stable { system = default-system; }; };
# overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; }; # overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; };
overlay-nifoc = inputs.nifoc-overlay.overlay; overlay-nifoc = inputs.nifoc-overlay.overlay;
nixpkgsConfig = { nixpkgsConfig = {
overlays = [ overlays = [
overlay-stable
# overlay-master # overlay-master
overlay-nifoc overlay-nifoc
]; ];