From e2047cba7b1f59179700316cbba9ac0b1569b418 Mon Sep 17 00:00:00 2001 From: blake Date: Tue, 4 Nov 2025 00:03:35 -0600 Subject: [PATCH] final test of mixed stable and unstable --- .../nixos/yveltal/hardware-configuration.nix | 19 ------ .../yveltal/hardware-configuration.nix.bak | 59 ------------------- users/blake/home.nix | 1 - 3 files changed, 79 deletions(-) delete mode 100644 hosts/nixos/yveltal/hardware-configuration.nix delete mode 100644 hosts/nixos/yveltal/hardware-configuration.nix.bak diff --git a/hosts/nixos/yveltal/hardware-configuration.nix b/hosts/nixos/yveltal/hardware-configuration.nix deleted file mode 100644 index 20445c9..0000000 --- a/hosts/nixos/yveltal/hardware-configuration.nix +++ /dev/null @@ -1,19 +0,0 @@ -# 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") - ]; - - - - # 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 - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - -} diff --git a/hosts/nixos/yveltal/hardware-configuration.nix.bak b/hosts/nixos/yveltal/hardware-configuration.nix.bak deleted file mode 100644 index 5d69991..0000000 --- a/hosts/nixos/yveltal/hardware-configuration.nix.bak +++ /dev/null @@ -1,59 +0,0 @@ -# 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") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/mapper/crypted"; - fsType = "btrfs"; - options = [ "subvol=@root" ]; - }; - - boot.initrd.luks.devices."crypted".device = "/dev/disk/by-partlabel/disk-main-luks"; - - fileSystems."/.swapvol" = - { device = "/dev/mapper/crypted"; - fsType = "btrfs"; - options = [ "subvol=@swap" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-partlabel/disk-main-ESP"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - fileSystems."/home" = - { device = "/dev/mapper/crypted"; - fsType = "btrfs"; - options = [ "subvol=@home" ]; - }; - - fileSystems."/nix" = - { device = "/dev/mapper/crypted"; - fsType = "btrfs"; - options = [ "subvol=@nix" ]; - }; - - 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 - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/users/blake/home.nix b/users/blake/home.nix index aa96aa3..e562003 100644 --- a/users/blake/home.nix +++ b/users/blake/home.nix @@ -21,7 +21,6 @@ in { imports = [ inputs.sops-nix.homeManagerModules.sops - #./dots ./dots/core ];