gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

disko changes

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

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

4
systems/game-laptop/default.nix
View file

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

5
systems/game-laptop/disko.nix
View file

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

3
systems/gerg-desktop/default.nix
View file

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

5
systems/gerg-desktop/disko.nix
View file

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

3
systems/moms-laptop/default.nix
View file

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

5
systems/moms-laptop/disko.nix
View file

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