diff --git a/flake.lock b/flake.lock index fe2eca3..d8114d2 100755 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1704498488, - "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", + "lastModified": 1705535278, + "narHash": "sha256-V5+XKfNbiY0bLKLQlH+AXyhHttEL7XcZBH9iSbxxexA=", "owner": "nix-community", "repo": "home-manager", - "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", + "rev": "b84191db127c16a92cbdf7f7b9969d58bb456699", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1705316053, + "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370", "type": "github" }, "original": { @@ -36,11 +36,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1704194953, - "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", + "lastModified": 1705496572, + "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", + "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", "type": "github" }, "original": { diff --git a/hosts/server/default.nix b/hosts/server/default.nix index c67094e..b2a06d8 100755 --- a/hosts/server/default.nix +++ b/hosts/server/default.nix @@ -66,7 +66,4 @@ in { hostName = "nixos-server-reid"; networkmanager.enable = true; }; - - boot.loader.grub.enable = false; - boot.loader.generic-extlinux-compatible.enable = true; } diff --git a/hosts/server/hardware-configuration.nix b/hosts/server/hardware-configuration.nix index 2a7de82..f68833e 100755 --- a/hosts/server/hardware-configuration.nix +++ b/hosts/server/hardware-configuration.nix @@ -1,31 +1,34 @@ -# 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") + [ + (modulesPath + "/installer/scan/not-detected.nix") ]; boot = { + initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" ]; + initrd.kernelModules = [ ]; + kernelPackages = pkgs.linuxPackages_hardened; + # for some god awful reason, our HDMI output doesn't show + # init messages??? theres a workaround here though + # + # see: https://nixos.wiki/wiki/NixOS_on_ARM/Raspberry_Pi#Early_boot_messages + kernelModules = [ "vc4" "bcm2835_dma" "i2c_bcm2835" ]; loader = { - grub.enable = false; + # zigglebop 👽 + grub.enable = lib.mkForce false; + generic-extlinux-compatible.enable = true; }; - initrd = { - availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" ]; - kernelModules = [ ]; - }; - kernelModules = [ ]; - extraModulePackages = [ ]; }; - fileSystems."/" = - { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; fsType = "ext4"; }; + }; swapDevices = [ ];