Compare commits

...
3 Commits
Author SHA1 Message Date
hektor 13ba070eda fix(flake): expose Colmena executable directly
check / lint (push) Successful in 6s
2026-11-07 23:11:02 +01:00
hektor b94d83164c fix(reference-manager): disable zotero while it pins an EOL gecko 2026-11-07 23:10:37 +01:00
hektor 91ab0f9902 feat(hecuba): switch to UEFI (and modularize)
check / lint (push) Successful in 6s
2026-11-07 21:56:25 +01:00
6 changed files with 602 additions and 201 deletions

No files matched your search

+3 -1
View File
@@ -158,7 +158,9 @@
}; };
}; };
apps.${system}.colmena = inputs.colmena.apps.${system}.default // { apps.${system}.colmena = {
type = "app";
program = lib.getExe inputs.colmena.packages.${system}.colmena;
meta.description = "colmena"; meta.description = "colmena";
}; };
+1 -1
View File
@@ -52,7 +52,7 @@
nvim.enable = true; nvim.enable = true;
pandoc.enable = true; pandoc.enable = true;
photography.enable = true; photography.enable = true;
reference-manager.enable = true; reference-manager.enable = false;
scripts.enable = true; scripts.enable = true;
secrets.enable = true; secrets.enable = true;
shell = { shell = {
+1 -1
View File
@@ -56,7 +56,7 @@
deploy.enable = true; deploy.enable = true;
taskwarrior.enable = true; taskwarrior.enable = true;
terminal.enable = true; terminal.enable = true;
reference-manager.enable = true; reference-manager.enable = false;
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;
+47 -10
View File
@@ -1,5 +1,6 @@
{ {
inputs, inputs,
lib,
pkgs, pkgs,
config, config,
... ...
@@ -9,6 +10,8 @@
let let
meta = import ./meta.nix; meta = import ./meta.nix;
bios = config.bootloader.firmware == "bios";
uefi = config.bootloader.firmware == "uefi";
in in
{ {
imports = [ imports = [
@@ -23,6 +26,10 @@ in
hardware.facter.reportPath = ./facter.json; hardware.facter.reportPath = ./facter.json;
bootloader = {
enable = true;
firmware = "uefi";
};
docker.enable = true; docker.enable = true;
hardening = { hardening = {
enable = true; enable = true;
@@ -61,22 +68,56 @@ in
networking.hostName = config.host.name; networking.hostName = config.host.name;
fileSystems."/" = { boot.loader.grub.device = lib.mkIf bios "/dev/sda";
boot.loader.systemd-boot.bootCounting.enable = lib.mkIf uefi true;
fileSystems = lib.mkIf bios {
"/" = {
device = "/dev/disk/by-label/nixos"; device = "/dev/disk/by-label/nixos";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = { "/boot" = {
device = "/dev/disk/by-label/boot"; device = "/dev/disk/by-label/boot";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = [ };
swapDevices = lib.mkIf bios [
{ {
device = "/dev/disk/by-label/swap"; device = "/dev/disk/by-label/swap";
} }
]; ];
boot.loader.grub.enable = true; disko.devices.disk.main = lib.mkIf uefi {
boot.loader.grub.device = "/dev/sda"; type = "disk";
device = "/dev/sda";
content = {
type = "gpt";
partitions = {
ESP = {
size = "512M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [ "umask=0077" ];
};
};
swap = {
size = "4G";
content.type = "swap";
};
root = {
size = "100%";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/";
};
};
};
};
};
users.users = { users.users = {
root.hashedPassword = "!"; root.hashedPassword = "!";
@@ -88,11 +129,7 @@ in
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
nix.gc = { nix.gc.options = "--delete-older-than 14d";
automatic = true;
dates = "weekly";
options = "-d";
};
virtualisation.docker.autoPrune = { virtualisation.docker.autoPrune = {
enable = true; enable = true;
+530 -182
View File
File diff suppressed because it is too large. Load diff
+20 -6
View File
@@ -1,17 +1,31 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.bootloader.enable = lib.mkOption { options.bootloader = {
enable = lib.mkOption {
default = false; default = false;
type = lib.types.bool; type = lib.types.bool;
}; };
firmware = lib.mkOption {
default = "uefi";
type = lib.types.enum [
"bios"
"uefi"
];
};
};
config = lib.mkIf config.bootloader.enable { config = lib.mkIf config.bootloader.enable (
boot = { lib.mkMerge [
loader = { (lib.mkIf (config.bootloader.firmware == "uefi") {
boot.loader = {
systemd-boot.enable = true; systemd-boot.enable = true;
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
}; };
}; })
}; (lib.mkIf (config.bootloader.firmware == "bios") {
boot.loader.grub.enable = true;
})
]
);
} }