Migrate from ferdi to ferdium

To avoid CVE-2022-32320.
This commit is contained in:
Jakob Lechner 2022-08-22 10:22:05 +00:00
parent 2d8c49c2c8
commit 544e270d63
No known key found for this signature in database
GPG key ID: 996082EFB5906C10
6 changed files with 38 additions and 3 deletions

17
flake.lock generated
View file

@ -88,6 +88,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgsMaster": {
"locked": {
"lastModified": 1661160886,
"narHash": "sha256-hjxZ3ZjiP3PbsU7++9X4YXlHU2gVVMf8Wua9zTsAAWo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f090e17f3bf257939c1e1158b9429c5b3929b2b6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1661009065, "lastModified": 1661009065,
@ -125,6 +141,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-pre-commit-hooks": "nix-pre-commit-hooks", "nix-pre-commit-hooks": "nix-pre-commit-hooks",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgsMaster": "nixpkgsMaster",
"nur": "nur", "nur": "nur",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }

View file

@ -2,6 +2,7 @@
inputs = { inputs = {
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
nixpkgsMaster.url = "github:NixOS/nixpkgs/master";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
@ -70,6 +71,7 @@
, nixpkgs ? inputs.nixpkgs , nixpkgs ? inputs.nixpkgs
}: nixpkgs.lib.nixosSystem rec { }: nixpkgs.lib.nixosSystem rec {
inherit system; inherit system;
specialArgs = { inherit self system; };
modules = [ modules = [
(./machines + "/${hostname}/configuration.nix") (./machines + "/${hostname}/configuration.nix")

View file

@ -4,7 +4,7 @@
imports = [ imports = [
./${nixosConfig.myConfig.terminalEmulator}.nix ./${nixosConfig.myConfig.terminalEmulator}.nix
./direnv.nix ./direnv.nix
./ferdi.nix ./ferdium.nix
./firefox ./firefox
./fish.nix ./fish.nix
./fpv.nix ./fpv.nix

View file

@ -2,6 +2,6 @@
lib.mkIf nixosConfig.myConfig.tradebyte.enable { lib.mkIf nixosConfig.myConfig.tradebyte.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
ferdi master.ferdium
]; ];
} }

View file

@ -1,9 +1,10 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, self, system, ... }:
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../../home-manager/users/jal.nix ../../home-manager/users/jal.nix
../../overlays/nixpkgsMaster.nix
]; ];
networking = { networking = {

View file

@ -0,0 +1,15 @@
{ self, system, ... }:
let
inherit (self) inputs;
in
{
nixpkgs.overlays = [
(final: prev: {
master = import inputs.nixpkgsMaster {
inherit system;
config = prev.config;
};
})
];
}