cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

removed lingering nixpkgs-fmt

Browse Source
This commit is contained in:
cnst
2024-08-29 09:04:01 +02:00
parent 03599a2b35
commit 6befe2e0fe
5 changed files with 104 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
hosts/cnix/hardware-configuration.nix
View File

@@ -1,15 +1,16 @@
{ config
, lib
, modulesPath
, ...
{
config,
lib,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot = {
initrd = {
availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
kernelModules = [ ];
availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
kernelModules = [];
luks.devices."enc".device = "/dev/disk/by-uuid/1bda09f1-5b2c-4040-ab71-cee54a6df910";
postDeviceCommands = lib.mkAfter ''
mkdir /mnt
@@ -18,51 +19,51 @@
btrfs subvolume snapshot /mnt/root-blank /mnt/root
'';
};
kernelModules = [ "kvm-amd" ];
extraModulePackages = [ ];
supportedFilesystems = [ "btrfs" ];
kernelModules = ["kvm-amd"];
extraModulePackages = [];
supportedFilesystems = ["btrfs"];
};
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
fsType = "btrfs";
options = [ "subvol=root" "compress=zstd" ];
options = ["subvol=root" "compress=zstd"];
};
"/home" = {
device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
fsType = "btrfs";
options = [ "subvol=home" "compress=zstd" ];
options = ["subvol=home" "compress=zstd"];
};
"/nix" = {
device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
fsType = "btrfs";
options = [ "subvol=nix" "compress=zstd" "noatime" ];
options = ["subvol=nix" "compress=zstd" "noatime"];
};
"/persist" = {
device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
fsType = "btrfs";
options = [ "subvol=persist" "compress=zstd" ];
options = ["subvol=persist" "compress=zstd"];
};
"/var/log" = {
device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
fsType = "btrfs";
options = [ "subvol=log" "compress=zstd" ];
options = ["subvol=log" "compress=zstd"];
neededForBoot = true;
};
"/boot" = {
device = "/dev/disk/by-uuid/12CE-A600";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" "umask=0077" ];
options = ["fmask=0022" "dmask=0022" "umask=0077"];
};
};
swapDevices = [ ];
swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's

159
hosts/default.nix
View File

@@ -1,88 +1,89 @@
# Yanked from fufexan!
{
inputs,
homeImports,
self,
...
{ inputs
, homeImports
, self
, ...
}: {
flake.nixosConfigurations = let
# custom paths
userConfig = "${self}/home";
systemConfig = "${self}/system";
hostConfig = "${self}/hosts";
flake.nixosConfigurations =
let
# custom paths
userConfig = "${self}/home";
systemConfig = "${self}/system";
hostConfig = "${self}/hosts";
cnstConfig = "${self}/home/users/cnst";
toothpickConfig = "${self}/home/users/toothpick";
adamConfig = "${self}/home/users/adam";
cnstConfig = "${self}/home/users/cnst";
toothpickConfig = "${self}/home/users/toothpick";
adamConfig = "${self}/home/users/adam";
userModules = "${self}/home/modules";
systemModules = "${self}/system/modules";
userModules = "${self}/home/modules";
systemModules = "${self}/system/modules";
# shorten paths
inherit (inputs.nixpkgs.lib) nixosSystem;
mod = "${systemConfig}";
# shorten paths
inherit (inputs.nixpkgs.lib) nixosSystem;
mod = "${systemConfig}";
# get the basic config to build on top of
inherit (import "${systemConfig}") shared;
# get the basic config to build on top of
inherit (import "${systemConfig}") shared;
# get these into the module system
specialArgs = {inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig adamConfig userModules systemModules;};
in {
cnix = nixosSystem {
inherit specialArgs;
modules =
shared
++ [
./cnix
"${mod}/boot/lanzaboote"
"${mod}/nix/nh/cnix"
{
home-manager = {
users.cnst.imports = homeImports."cnst@cnix";
extraSpecialArgs = specialArgs;
};
}
inputs.chaotic.nixosModules.default
inputs.sops-nix.nixosModules.sops
(import "${mod}/dev")
];
# get these into the module system
specialArgs = { inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig adamConfig userModules systemModules; };
in
{
cnix = nixosSystem {
inherit specialArgs;
modules =
shared
++ [
./cnix
"${mod}/boot/lanzaboote"
"${mod}/nix/nh/cnix"
{
home-manager = {
users.cnst.imports = homeImports."cnst@cnix";
extraSpecialArgs = specialArgs;
};
}
inputs.chaotic.nixosModules.default
inputs.sops-nix.nixosModules.sops
(import "${mod}/dev")
];
};
toothpc = nixosSystem {
inherit specialArgs;
modules =
shared
++ [
./toothpc
"${mod}/boot/lanzaboote"
"${mod}/nix/nh/toothpc"
{
home-manager = {
users.toothpick.imports = homeImports."toothpick@toothpc";
extraSpecialArgs = specialArgs;
};
}
inputs.chaotic.nixosModules.default
inputs.sops-nix.nixosModules.sops
(import "${mod}/dev")
];
};
adampad = nixosSystem {
inherit specialArgs;
modules =
shared
++ [
./adampad
"${mod}/boot"
"${mod}/nix/nh/adampad"
{
home-manager = {
users.adam.imports = homeImports."adam@adampad";
extraSpecialArgs = specialArgs;
};
}
inputs.chaotic.nixosModules.default
inputs.sops-nix.nixosModules.sops
];
};
};
toothpc = nixosSystem {
inherit specialArgs;
modules =
shared
++ [
./toothpc
"${mod}/boot/lanzaboote"
"${mod}/nix/nh/toothpc"
{
home-manager = {
users.toothpick.imports = homeImports."toothpick@toothpc";
extraSpecialArgs = specialArgs;
};
}
inputs.chaotic.nixosModules.default
inputs.sops-nix.nixosModules.sops
(import "${mod}/dev")
];
};
adampad = nixosSystem {
inherit specialArgs;
modules =
shared
++ [
./adampad
"${mod}/boot"
"${mod}/nix/nh/adampad"
{
home-manager = {
users.adam.imports = homeImports."adam@adampad";
extraSpecialArgs = specialArgs;
};
}
inputs.chaotic.nixosModules.default
inputs.sops-nix.nixosModules.sops
];
};
};
}