saffron updates

This commit is contained in:
Tyler Mayoff 2025-11-28 23:29:47 -05:00 committed by Tyle Mayoff
parent 563aadecef
commit 007d360b17
3 changed files with 54 additions and 30 deletions

View file

@ -145,6 +145,24 @@
} }
]; ];
}; };
saffron = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs;};
modules = [
determinate.nixosModules.default
./machines/saffron/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.backupFileExtension = "bak";
home-manager.extraSpecialArgs = {inherit inputs outputs nixosModules homeModules darwinModules;};
home-manager.users.tyler = import ./machines/saffron/home.nix;
}
];
};
}; };
darwinConfigurations."MacBook-Pro" = darwin.lib.darwinSystem { darwinConfigurations."MacBook-Pro" = darwin.lib.darwinSystem {
@ -170,13 +188,5 @@
} }
]; ];
}; };
homeConfigurations = {
"tyler@saffron" = home-manager.lib.homeManagerConfiguration {
pkgs = allPkgs."x86_64-linux";
extraSpecialArgs = {inherit inputs outputs;};
modules = [./machines/saffron/home.nix];
};
};
}; };
} }

View file

@ -1,32 +1,36 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") lib,
]; pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "ehci_pci" "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; boot.initrd.availableKernelModules = ["ehci_pci" "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sr_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/093a88f0-7ec2-4672-b7bb-bb7f62df99ca"; device = "/dev/disk/by-uuid/093a88f0-7ec2-4672-b7bb-bb7f62df99ca";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/161E-9FB2"; device = "/dev/disk/by-uuid/161E-9FB2";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = ["fmask=0077" "dmask=0077"];
}; };
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-uuid/b150b63b-c446-4134-a444-e789318b9546"; } {device = "/dev/disk/by-uuid/b150b63b-c446-4134-a444-e789318b9546";}
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (the default) this is the recommended approach. When using systemd-networkd it's

View file

@ -1,9 +1,19 @@
{...}: { {outputs, ...}: {
imports = [ imports = [
# Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
nixpkgs = {
overlays = builtins.attrValues outputs.overlays;
config = {
allowUnfree = true;
permittedInsecurePackages = [
];
};
};
# Use the GRUB 2 boot loader. # Use the GRUB 2 boot loader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
# boot.loader.grub.efiSupport = true; # boot.loader.grub.efiSupport = true;