nixinated
This commit is contained in:
parent
6a210dc4ee
commit
6337166829
57
flake.lock
57
flake.lock
@ -218,6 +218,24 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixinate": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1654872030,
|
||||||
|
"narHash": "sha256-a1e49vvdEapkG9tbC0WLEemLGXbMR6hEBeW22aGwueQ=",
|
||||||
|
"owner": "matthewcroughan",
|
||||||
|
"repo": "nixinate",
|
||||||
|
"rev": "0f53b4f183fbde2ba2b50d3e7dd910b86ea179ed",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "matthewcroughan",
|
||||||
|
"repo": "nixinate",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1656933710,
|
"lastModified": 1656933710,
|
||||||
@ -249,6 +267,22 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1653060744,
|
||||||
|
"narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "dfd82985c273aac6eced03625f454b334daae2e8",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1657447684,
|
"lastModified": 1657447684,
|
||||||
"narHash": "sha256-FCP9AuU1q6PE3vOeM5SFf58f/UKPBAsoSGDUGamNBbo=",
|
"narHash": "sha256-FCP9AuU1q6PE3vOeM5SFf58f/UKPBAsoSGDUGamNBbo=",
|
||||||
@ -285,11 +319,11 @@
|
|||||||
"helix": "helix",
|
"helix": "helix",
|
||||||
"home": "home",
|
"home": "home",
|
||||||
"hyprland": "hyprland",
|
"hyprland": "hyprland",
|
||||||
|
"nixinate": "nixinate",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixos-persistence": "nixos-persistence",
|
"nixos-persistence": "nixos-persistence",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nur": "nur",
|
"nur": "nur"
|
||||||
"smos": "smos"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
@ -314,23 +348,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"smos": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1654691963,
|
|
||||||
"narHash": "sha256-XY2esyEIZJr37aflbkn37a3wWBTAtl93a7pAHKfDH5E=",
|
|
||||||
"owner": "yusdacra",
|
|
||||||
"repo": "smos",
|
|
||||||
"rev": "c11222bc1c836746dbaf1fdffea92509ce775faf",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "yusdacra",
|
|
||||||
"ref": "chore/fix-nix-flakes",
|
|
||||||
"repo": "smos",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"utils": {
|
"utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1653893745,
|
"lastModified": 1653893745,
|
||||||
|
20
flake.nix
20
flake.nix
@ -11,8 +11,7 @@
|
|||||||
nixos-hardware.url = "github:nixos/nixos-hardware";
|
nixos-hardware.url = "github:nixos/nixos-hardware";
|
||||||
nixos-persistence.url = "github:nix-community/impermanence";
|
nixos-persistence.url = "github:nix-community/impermanence";
|
||||||
|
|
||||||
smos.url = "github:yusdacra/smos/chore/fix-nix-flakes";
|
nixinate.url = "github:matthewcroughan/nixinate";
|
||||||
smos.flake = false;
|
|
||||||
|
|
||||||
helix.url = "github:helix-editor/helix";
|
helix.url = "github:helix-editor/helix";
|
||||||
helix.inputs.nixpkgs.follows = "nixpkgs";
|
helix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@ -32,22 +31,27 @@
|
|||||||
};
|
};
|
||||||
genPkgs = f: prev.genSystems (system: f (makePkgs system));
|
genPkgs = f: prev.genSystems (system: f (makePkgs system));
|
||||||
});
|
});
|
||||||
allPkgs = tlib.genPkgs (x: x);
|
|
||||||
in rec {
|
|
||||||
nixosConfigurations = import ./hosts {inherit lib tlib inputs;};
|
|
||||||
|
|
||||||
packages = lib.mapAttrs (_: pkgs: pkgs._exported) allPkgs;
|
allPkgs = tlib.genPkgs (x: x);
|
||||||
apps =
|
|
||||||
|
miscApps =
|
||||||
lib.mapAttrs
|
lib.mapAttrs
|
||||||
(
|
(
|
||||||
_: pkgs: {
|
_: pkgs: {
|
||||||
generate-firefox-addons = {
|
generate-firefox-addons = {
|
||||||
type = "app";
|
type = "app";
|
||||||
program = toString "${pkgs.generate-firefox-addons}/bin/generate-firefox-addons";
|
program =
|
||||||
|
toString
|
||||||
|
"${pkgs.generate-firefox-addons}/bin/generate-firefox-addons";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
allPkgs;
|
allPkgs;
|
||||||
|
in rec {
|
||||||
|
nixosConfigurations = import ./hosts {inherit lib tlib inputs;};
|
||||||
|
|
||||||
|
packages = lib.mapAttrs (_: pkgs: pkgs._exported) allPkgs;
|
||||||
|
apps = miscApps // (inputs.nixinate.nixinate.x86_64-linux inputs.self);
|
||||||
|
|
||||||
devShells = import ./shells {inherit lib tlib inputs;};
|
devShells = import ./shells {inherit lib tlib inputs;};
|
||||||
};
|
};
|
||||||
|
@ -14,4 +14,12 @@
|
|||||||
users.users.root.openssh.authorizedKeys.keys = [
|
users.users.root.openssh.authorizedKeys.keys = [
|
||||||
(builtins.readFile "${inputs.self}/secrets/ssh-key.pub")
|
(builtins.readFile "${inputs.self}/secrets/ssh-key.pub")
|
||||||
];
|
];
|
||||||
|
|
||||||
|
_module.args.nixinate = {
|
||||||
|
host = builtins.readFile "${inputs.self}/secrets/wolumonde-ip";
|
||||||
|
sshUser = "root";
|
||||||
|
buildOn = "local"; # valid args are "local" or "remote"
|
||||||
|
substituteOnTarget = true; # if buildOn is "local" then it will substitute on the target, "-s"
|
||||||
|
hermetic = true;
|
||||||
|
};
|
||||||
}
|
}
|
@ -1,8 +1,10 @@
|
|||||||
{ modulesPath, ... }:
|
{modulesPath, ...}: {
|
||||||
{
|
|
||||||
imports = [(modulesPath + "/profiles/qemu-guest.nix")];
|
imports = [(modulesPath + "/profiles/qemu-guest.nix")];
|
||||||
boot.loader.grub.device = "/dev/sda";
|
boot.loader.grub.device = "/dev/sda";
|
||||||
boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront"];
|
boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront"];
|
||||||
boot.initrd.kernelModules = ["nvme"];
|
boot.initrd.kernelModules = ["nvme"];
|
||||||
fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; };
|
fileSystems."/" = {
|
||||||
|
device = "/dev/sda1";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
}
|
}
|
BIN
secrets/wolumonde-ip
Normal file
BIN
secrets/wolumonde-ip
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user