disko changes

This commit is contained in:
Gerg-L 2023-04-21 10:09:31 -04:00
parent 9c61a38653
commit 3ba8494da1
7 changed files with 256 additions and 255 deletions

View file

@ -45,7 +45,6 @@
flake-utils,
nvim-flake,
nixos-generators,
disko,
...
}:
{
@ -59,7 +58,6 @@
};
};
modules = [
disko.nixosModules.disko
(import ./modules inputs)
(import ./systems/gerg-desktop inputs)
{
@ -78,7 +76,6 @@
};
};
modules = [
disko.nixosModules.disko
(import ./modules inputs)
(import ./systems/game-laptop inputs)
];
@ -92,7 +89,6 @@
};
};
modules = [
disko.nixosModules.disko
(import ./modules inputs)
(import ./systems/moms-laptop inputs)
];

View file

@ -1,16 +1,14 @@
inputs: {
pkgs,
lib,
settings,
config,
...
}: {
imports = [
(import ./prime.nix inputs)
(import ./disko.nix inputs)
];
disko.devices = import ./disko.nix;
localModules = {
DE.gnome.enable = true;
DM = {

View file

@ -1,4 +1,6 @@
_: {
{disko, ...}: {
imports = [disko.nixosModules.disko];
disko.devices = {
disk.nvme0n1 = {
device = "/dev/disk/by-id/nvme-WDC_PC_SN530_SDBPNPZ-512G-1006_21311N802456";
type = "disk";
@ -32,4 +34,5 @@ _: {
];
};
};
};
}

View file

@ -11,10 +11,9 @@ inputs: {
(import ./zfs.nix inputs)
(import ./containers inputs)
(import ./erase-your-darlings.nix inputs)
(import ./disko.nix inputs)
];
disko.devices = import ./disko.nix;
localModules = {
X11Programs = {
sxhkd.enable = true;

View file

@ -1,4 +1,6 @@
_: {
{disko, ...}: {
imports = [disko.nixosModules.disko];
disko.devices = {
disk = {
nvme0 = {
type = "disk";
@ -186,4 +188,5 @@ _: {
};
};
};
};
}

View file

@ -6,10 +6,9 @@ inputs: {
}: {
imports = [
(import ./printing.nix inputs)
(import ./disko.nix inputs)
];
disko.devices = import ./disko.nix;
localModules = {
DM = {
lightdm.enable = true;

View file

@ -1,4 +1,6 @@
_: {
{disko, ...}: {
imports = [disko.nixosModules.disko];
disko.devices = {
disk.sda = {
device = "/dev/disk/by-id/ata-WDC_WDS240G2G0A-00JH30_180936803144";
type = "disk";
@ -34,4 +36,5 @@ _: {
];
};
};
};
}