mirror of
https://github.com/TheWanderingCrow/CrOS.git
synced 2026-01-10 17:34:05 -05:00
NixOS 25.11 migration
This commit is contained in:
parent
bc5129a87d
commit
5718c8ca6d
16 changed files with 107 additions and 463 deletions
|
|
@ -3,13 +3,15 @@
|
|||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
environment.systemPackages =
|
||||
if config.hostSpec.isMinimal
|
||||
then [
|
||||
inputs.nvix.packages.${pkgs.system}.mini
|
||||
]
|
||||
else [
|
||||
inputs.nvix.packages.${pkgs.system}.default
|
||||
];
|
||||
if config.hostSpec.isMinimal then
|
||||
[
|
||||
inputs.nvix.packages.${pkgs.stdenv.hostPlatform.system}.mini
|
||||
]
|
||||
else
|
||||
[
|
||||
inputs.nvix.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,8 +10,7 @@ lib.mkIf (!config.hostSpec.isMinimal) {
|
|||
# Emoji and general symbols
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-emoji
|
||||
noto-fonts-extra
|
||||
noto-fonts-color-emoji
|
||||
unifont
|
||||
|
||||
# Nerd fonts
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
# Setup access to protected repos via our host ssh key
|
||||
environment.etc."ssh/root_config".text = ''
|
||||
Host github.com
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@
|
|||
acmeCA = "https://acme-v02.api.letsencrypt.org/directory";
|
||||
package = pkgs.caddy.withPlugins {
|
||||
plugins = [ "github.com/greenpau/caddy-security@v1.1.31" ];
|
||||
hash = "sha256-6WJ403U6XbaNfncIvEJEwUc489yyRhv4jP7H/RVJWlM=";
|
||||
hash = "sha256-65Z20N16/jHOtVb85HLx0z4nHEuG9POEV7D5QXOGYQM=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,15 +7,23 @@
|
|||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
|
||||
boot.initrd.kernelModules = ["amdgpu"];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"usb_storage"
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/b1a6e175-8510-47d1-94b1-db74d050fe05";
|
||||
|
|
@ -25,10 +33,13 @@
|
|||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/8082-C66D";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0077" "dmask=0077"];
|
||||
options = [
|
||||
"fmask=0077"
|
||||
"dmask=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
|
||||
|
|
@ -43,11 +54,6 @@
|
|||
initrd.enable = true;
|
||||
legacySupport.enable = true;
|
||||
opencl.enable = true;
|
||||
amdvlk = {
|
||||
enable = true;
|
||||
supportExperimental.enable = true;
|
||||
support32Bit.enable = true;
|
||||
};
|
||||
};
|
||||
hardware.graphics.enable32Bit = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,8 +39,6 @@
|
|||
"hosts/common/optional/vbox.nix"
|
||||
"hosts/common/optional/printing.nix"
|
||||
"hosts/common/optional/docker.nix"
|
||||
"hosts/common/optional/services/monero/node.nix"
|
||||
"hosts/common/optional/services/monero/miner.nix"
|
||||
"modules/services/ollama"
|
||||
"modules/services/mesh/client.nix"
|
||||
])
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@
|
|||
|
||||
hardware.amdgpu = {
|
||||
initrd.enable = true;
|
||||
amdvlk.enable = true;
|
||||
opencl.enable = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue