diff --git a/hosts/IROH/hardware.nix b/hosts/IROH/hardware.nix index 156a40b..225f045 100644 --- a/hosts/IROH/hardware.nix +++ b/hosts/IROH/hardware.nix @@ -1,8 +1,8 @@ -{ - config, - lib, - modulesPath, - ... +{ config +, lib +, modulesPath +, pkgs +, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -37,6 +37,8 @@ boot.resumeDevice = "/dev/disk/by-label/ROOT"; + hardware.nvidia.package = pkgs.unstable.linuxPackages.nvidiaPackages.latest; + fileSystems."/" = { device = "/dev/disk/by-label/ROOT"; fsType = "btrfs"; @@ -66,7 +68,7 @@ options = [ "subvol=@" ]; }; - swapDevices = [ { device = "/swap/swapfile"; } ]; + swapDevices = [{ device = "/swap/swapfile"; }]; networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/modules/core/default.nix b/modules/core/default.nix index b4d0c2b..09ea2e2 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -28,7 +28,13 @@ nixpkgs = { overlays = [ (self: super: { - unstable = import inputs.nixpkgs-unstable { system = super.system; }; + unstable = import inputs.nixpkgs-unstable { + system = super.system; + config = { + allowUnfree = true; + allowUnfreePredicate = (_: true); + }; + }; mfcl3750cdwlpr = (super.callPackage ../../overlays/mfcl3750cdw.nix { }).driver; mfcl3750cdwcupswrapper = (super.callPackage ../../overlays/mfcl3750cdw.nix { }).cupswrapper; pppdf = (super.python3Packages.callPackage ../../overlays/pppdf { }); diff --git a/modules/desktop/nautilus.nix b/modules/desktop/nautilus.nix index 6b79a37..e1ec9ee 100644 --- a/modules/desktop/nautilus.nix +++ b/modules/desktop/nautilus.nix @@ -1,8 +1,7 @@ -{ - pkgs, - lib, - config, - ... +{ pkgs +, lib +, config +, ... }: lib.mkIf (config.bchmnn.gui.enable && config.bchmnn.gui.flavour != [ ]) { programs.nautilus-open-any-terminal = { @@ -10,7 +9,7 @@ lib.mkIf (config.bchmnn.gui.enable && config.bchmnn.gui.flavour != [ ]) { terminal = "kitty"; }; - environment = { + environment = lib.mkIf (!builtins.elem "gnome" config.bchmnn.gui.flavour) { sessionVariables.NAUTILUS_4_EXTENSION_DIR = "${pkgs.gnome.nautilus-python}/lib/nautilus/extensions-4"; pathsToLink = [ "/share/nautilus-python/extensions" ];