messed with disko and zfs, removed direnv module as it got upstreamed

This commit is contained in:
Gerg-L 2023-07-16 15:33:43 -04:00
parent 3e0398f799
commit 29fa4dff1d
11 changed files with 109 additions and 297 deletions

View file

@ -1,6 +1,7 @@
_: {
pkgs,
config,
lib,
...
}: {
local = {
@ -15,13 +16,13 @@ _: {
enable = true;
kmscon.enable = true;
};
allowedUnfree = [
"nvidia-x11"
"nvidia-persistenced"
"steam"
"steam-original"
];
};
nixpkgs.allowedUnfree = [
"nvidia-x11"
"nvidia-persistenced"
"steam"
"steam-original"
];
environment = {
systemPackages = builtins.attrValues {
inherit
@ -38,8 +39,8 @@ _: {
;
};
etc = {
"jdks/17".source = "${pkgs.openjdk17}/bin";
"jdks/8".source = "${pkgs.openjdk8}/bin";
"jdks/17".source = lib.getBin pkgs.openjdk17;
"jdks/8".source = lib.getBin pkgs.openjdk8;
};
};
networking = {

View file

@ -1,5 +1,4 @@
{disko, ...}: {disks ? [], ...}: {
dummyvalue = {inherit disks;};
{disko, ...}: {
imports = [disko.nixosModules.disko];
disko.devices = {
disk.nvme0n1 = {