flake restructuring

This commit is contained in:
Rouven Seifert 2023-05-06 22:22:05 +02:00
parent f58be4609b
commit 7182df3bd8
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
4 changed files with 8 additions and 6 deletions

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
*.swp
result
*.qcow2

View file

@ -53,9 +53,9 @@
, trucksimulatorbot-images
, ...
}@attrs: {
packages.x86_64-linux.default = self.nixosConfigurations.iso.config.system.build.isoImage;
packages.x86_64-linux.iso = self.nixosConfigurations.iso.config.system.build.isoImage;
packages.x86_64-linux.jmri = nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/jmri { };
hydraJobs.x86_64-linux = self.packages.x86_64-linux;
hydraJobs = self.packages;
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
nixosConfigurations = {
thinkpad = nixpkgs.lib.nixosSystem {

View file

@ -1,10 +1,11 @@
{ config, pkgs, ... }:
{ pkgs, modulesPath, ... }:
{
nix.settings.experimental-features = [ "nix-command" "flakes" ];
imports =
[
# Include the results of the hardware scan.
./hardware-configuration.nix
"${modulesPath}/virtualisation/qemu-vm.nix"
];
boot = {

View file

@ -68,9 +68,9 @@
# libs
libyubikey
libfido2
(pkgs.texlive.combine {
inherit (pkgs.texlive) scheme-medium;
})
# (pkgs.texlive.combine {
# inherit (pkgs.texlive) scheme-medium;
# })
];
programs.obs-studio.enable = true;