From 7182df3bd8e90e0a511f6392c8333a31234b168d Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Sat, 6 May 2023 22:22:05 +0200
Subject: [PATCH] flake restructuring

---
 .gitignore                        | 1 +
 flake.nix                         | 4 ++--
 hosts/vm/default.nix              | 3 ++-
 users/rouven/modules/packages.nix | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4cc9af5..b687b22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.swp
 result
+*.qcow2
diff --git a/flake.nix b/flake.nix
index fc79aff..f38c45c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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 {
diff --git a/hosts/vm/default.nix b/hosts/vm/default.nix
index 34b5f4f..16558d1 100644
--- a/hosts/vm/default.nix
+++ b/hosts/vm/default.nix
@@ -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 = {
diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix
index dd61a16..5c01064 100644
--- a/users/rouven/modules/packages.nix
+++ b/users/rouven/modules/packages.nix
@@ -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;