diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index e220df3..657fb04 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -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 { @@ -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]; - }; - }; }; } diff --git a/dot_config/flake/machines/kaylee/hardware-configuration.nix b/dot_config/flake/machines/kaylee/hardware-configuration.nix index 7f73064..42555c3 100644 --- a/dot_config/flake/machines/kaylee/hardware-configuration.nix +++ b/dot_config/flake/machines/kaylee/hardware-configuration.nix @@ -1,32 +1,36 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + 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.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["ehci_pci" "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sr_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/093a88f0-7ec2-4672-b7bb-bb7f62df99ca"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/093a88f0-7ec2-4672-b7bb-bb7f62df99ca"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/161E-9FB2"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/161E-9FB2"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/b150b63b-c446-4134-a444-e789318b9546"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/b150b63b-c446-4134-a444-e789318b9546";} + ]; # 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 diff --git a/dot_config/flake/machines/saffron/configuration.nix b/dot_config/flake/machines/saffron/configuration.nix index 7bee4c1..78953ca 100644 --- a/dot_config/flake/machines/saffron/configuration.nix +++ b/dot_config/flake/machines/saffron/configuration.nix @@ -1,9 +1,19 @@ -{...}: { +{outputs, ...}: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix ]; + nixpkgs = { + overlays = builtins.attrValues outputs.overlays; + + config = { + allowUnfree = true; + permittedInsecurePackages = [ + ]; + }; + }; + # Use the GRUB 2 boot loader. boot.loader.systemd-boot.enable = true; # boot.loader.grub.efiSupport = true;