mirror of
https://git.sr.ht/~rouven/nixos-config
synced 2025-01-18 17:11:39 +01:00
flake restructuring
This commit is contained in:
parent
f58be4609b
commit
7182df3bd8
4 changed files with 8 additions and 6 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,2 +1,3 @@
|
||||||
*.swp
|
*.swp
|
||||||
result
|
result
|
||||||
|
*.qcow2
|
||||||
|
|
|
@ -53,9 +53,9 @@
|
||||||
, trucksimulatorbot-images
|
, trucksimulatorbot-images
|
||||||
, ...
|
, ...
|
||||||
}@attrs: {
|
}@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 { };
|
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;
|
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
thinkpad = nixpkgs.lib.nixosSystem {
|
thinkpad = nixpkgs.lib.nixosSystem {
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
{ config, pkgs, ... }:
|
{ pkgs, modulesPath, ... }:
|
||||||
{
|
{
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
imports =
|
imports =
|
||||||
[
|
[
|
||||||
# Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
"${modulesPath}/virtualisation/qemu-vm.nix"
|
||||||
];
|
];
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
|
|
|
@ -68,9 +68,9 @@
|
||||||
# libs
|
# libs
|
||||||
libyubikey
|
libyubikey
|
||||||
libfido2
|
libfido2
|
||||||
(pkgs.texlive.combine {
|
# (pkgs.texlive.combine {
|
||||||
inherit (pkgs.texlive) scheme-medium;
|
# inherit (pkgs.texlive) scheme-medium;
|
||||||
})
|
# })
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.obs-studio.enable = true;
|
programs.obs-studio.enable = true;
|
||||||
|
|
Loading…
Reference in a new issue