[STYLE/REFACTOR] Deadnix, Alejandra and Statix

This commit is contained in:
Kat Inskip 2023-04-25 16:48:32 -07:00
parent 8573c4508d
commit d4242f9dd8
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
51 changed files with 465 additions and 466 deletions

View file

@ -1,5 +1,10 @@
_: let
hostConfig = {lib, tree, modulesPath, inputs, pkgs, ...}: let
hostConfig = {
lib,
tree,
inputs,
...
}: let
inherit (lib.modules) mkForce;
in {
imports = with tree; [
@ -46,7 +51,7 @@ _: let
};
swapDevices = [
{ device = "/dev/sdb"; }
{device = "/dev/sdb";}
];
wsl = {

View file

@ -110,7 +110,7 @@
{
inherit machine;
systemType = config.folder;
system = config.system;
inherit (config) system;
}
// defaultSpecialArgs;
};

View file

@ -1,17 +1,24 @@
_: let
hostConfig = {config, tree, pkgs, ...}: {
imports = with tree.nixos.hardware; [
lenovo-thinkpad-x260
common-pc-laptop-ssd
] ++ (with tree.nixos.roles; [
graphical
sway
laptop
bootable
]) ++ (with tree; [
kat.gui
kat.sway
]);
hostConfig = {
config,
tree,
...
}: {
imports = with tree.nixos.hardware;
[
lenovo-thinkpad-x260
common-pc-laptop-ssd
]
++ (with tree.nixos.roles; [
graphical
sway
laptop
bootable
])
++ (with tree; [
kat.gui
kat.sway
]);
fileSystems = {
"/" = {
@ -24,7 +31,7 @@ _: let
};
};
services.openssh = {
services.openssh = {
hostKeys = [
{
bits = 4096;

View file

@ -1,7 +1,11 @@
_: let
hostConfig = { lib, tree, ... }: let
inherit (lib.modules) mkDefault;
in {
hostConfig = {
lib,
tree,
...
}: let
inherit (lib.modules) mkDefault;
in {
imports = with tree; [
nixos.rosetta
nixos.roles.bootable
@ -9,7 +13,7 @@ _: let
boot = {
loader.systemd-boot.enable = true;
initrd.availableKernelModules = ["virtio_pci" "xhci_pci" "usb_storage" "usbhid" ];
initrd.availableKernelModules = ["virtio_pci" "xhci_pci" "usb_storage" "usbhid"];
};
fileSystems = {
@ -24,8 +28,8 @@ _: let
};
"/run/rosetta" = {
device = "rosetta";
fsType = "virtiofs";
device = "rosetta";
fsType = "virtiofs";
};
};
swapDevices = [

View file

@ -1,84 +0,0 @@
_: let
hostConfig = {tree, lib, ...}: let
inherit (lib.modules) mkForce;
in {
imports = with tree; [
nixos.arc
/* ./kanidm.nix
./vouch.nix
./home-assistant.nix
./zigbee2mqtt.nix
./mosquitto.nix
./postgres.nix
./nginx.nix
../../gui/nfs.nix */
];
networking = {
useDHCP = false;
interfaces = {
eno1 = {
useDHCP = true;
};
};
};
boot = {
loader = {
systemd-boot = {
enable = true;
};
efi = {
canTouchEfiVariables = true;
};
};
initrd = {
availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
};
kernelModules = [ "kvm-intel" ];
};
/* services.openiscsi = {
enable = true;
name = "";
discoverPortal = "shanghai.tail.cutie.moe";
};
environment.etc."iscsi/initiatorname.iscsi" = mkForce {
source = config.secrets.files.openscsi-config.path;
};
secrets.variables.openscsi-password = {
path = "gensokyo/tewi-scsi";
field = "password";
};
secrets.files.openscsi-config = {
text = "InitiatorName=${tf.variables.openscsi-password.ref}";
}; */
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/6c5d82b1-5d11-4c72-96c6-5f90e6ce57f5";
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-uuid/85DC-72FA";
fsType = "vfat";
};
};
swapDevices = lib.singleton ({
device = "/dev/disk/by-uuid/137605d3-5e3f-47c8-8070-6783ce651932";
});
system.stateVersion = "21.05";
};
in {
arch = "x86_64";
type = "NixOS";
modules = [
hostConfig
];
}