diff --git a/flake.lock b/flake.lock index 1f2e336..2766bd8 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1652372896, - "narHash": "sha256-lURGussfF3mGrFPQT3zgW7+RC0pBhbHzco0C7I+ilow=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "0d347c56f6f41de822a4f4c7ff5072f3382db121", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1653937612, - "narHash": "sha256-HybwffYKOM3UwlY54ZVCZgX7o5xpp2KhbZyyOnvwFMo=", + "lastModified": 1654113405, + "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=", "owner": "nix-community", "repo": "home-manager", - "rev": "bda2c80b4c1a8d85c84c343a25ac7303fbc7999d", + "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675", "type": "github" }, "original": { @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1652452043, - "narHash": "sha256-nh3mdVB/Kk5ag1uRMAlKo8r+ssN3HNxwbLsqRG4xZkw=", + "lastModified": 1654113406, + "narHash": "sha256-70esZvhal+FsyU89mJRcAb+cDGHKt0sgZ6MlRr9Cplg=", "owner": "nix-community", "repo": "home-manager", - "rev": "273598f53e04f0111dca5724b37640e3907edaaf", + "rev": "684e85d01d333be91c4875baebb05b93c7d2ffaa", "type": "github" }, "original": { @@ -80,11 +80,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1650522846, - "narHash": "sha256-SxWHXRI3qJwswyXAtzsi6PKVY3KLNNnb072KaJthII8=", + "lastModified": 1654057797, + "narHash": "sha256-mXo7C4v7Jj2feBzcReu1Eu/3Rnw5b023E9kOyFsHZQw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6b4ebea9093c997c5f275c820e679108de4871ab", + "rev": "0cab18a48de7914ef8cad35dca0bb36868f3e1af", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1653979012, - "narHash": "sha256-Md1OeSa4WwrtsjJKanOyrNfo9WbRCgURk23iRhUI2LU=", + "lastModified": 1654252671, + "narHash": "sha256-R5kyXCUC8wy4tsCbXppfyvk/q0CgiHtq7zbvR7SXoZ4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b5e34626fbb7c251bf2c994f0b4334ab21df631", + "rev": "d06103277d3982e86d7eea927706376b42085c61", "type": "github" }, "original": { @@ -211,11 +211,11 @@ }, "unstable": { "locked": { - "lastModified": 1652378906, - "narHash": "sha256-DeV2myAMArPvyqxp0M6z30kuXb2L9SO2QXjxbbsZQyY=", + "lastModified": 1654019511, + "narHash": "sha256-s3fcwUxa2rV2ZmSbdOtisNmXqeqnF9IFrvhPQL5GCBU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d89d7af1ba23bd8a5341d00bdd862e8e9a808f56", + "rev": "692517bf851f2d8d999f0ad50f53fa1d2dd5c8f9", "type": "github" }, "original": { diff --git a/loki/configuration.nix b/loki/configuration.nix index 83615b5..708460c 100644 --- a/loki/configuration.nix +++ b/loki/configuration.nix @@ -80,7 +80,7 @@ gvfs = { enable = true; package = lib.mkForce pkgs.gnome3.gvfs; }; jackett = { enable = true; openFirewall = true; group = "users"; }; logind.lidSwitch = "ignore"; - node-red = { enable = false; openFirewall = true; withNpmAndGcc = true; }; + node-red = { enable = true; openFirewall = true; withNpmAndGcc = true; }; openssh = { enable = true; openFirewall = true; permitRootLogin = "no"; passwordAuthentication = false; }; plex = { enable = true; openFirewall = true; group = "users"; }; power-profiles-daemon.enable = true; @@ -263,7 +263,7 @@ kvmgt.enable = true; libvirtd.enable = true; podman.enable = true; - virtualbox.host.enable = true; + # virtualbox.host.enable = true; oci-containers.containers = { hass = { diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix index e19bf6a..5ca529d 100644 --- a/odin/common_configuration.nix +++ b/odin/common_configuration.nix @@ -9,6 +9,8 @@ # # Cross-build arm boot.binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ]; + + hardware.enableRedistributableFirmware = true; # Use same ACPI identifier as Dell Ubuntu boot.kernelParams = [ diff --git a/odin/configuration-intel.nix b/odin/configuration-intel.nix index 9504ec0..0f11acf 100644 --- a/odin/configuration-intel.nix +++ b/odin/configuration-intel.nix @@ -7,8 +7,6 @@ { boot.initrd.kernelModules = [ "i915" ]; - hardware.cpu.intel.updateMicrocode = config.hardware.enableRedistributableFirmware; - hardware.opengl.enable = true; hardware.opengl.extraPackages = with pkgs; [ intel-media-driver diff --git a/odin/configuration-nvidia.nix b/odin/configuration-nvidia.nix index e442b7c..6e34b1f 100644 --- a/odin/configuration-nvidia.nix +++ b/odin/configuration-nvidia.nix @@ -7,8 +7,6 @@ { boot.initrd.kernelModules = [ "i915" ]; - hardware.cpu.intel.updateMicrocode = config.hardware.enableRedistributableFirmware; - services.xserver = { videoDrivers = [ "nvidia" ]; displayManager.sddm = {