diff --git a/flake.lock b/flake.lock index ac339bc..7be0d86 100644 --- a/flake.lock +++ b/flake.lock @@ -407,11 +407,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1734129402, - "narHash": "sha256-SSyk9SJ5Uu3/LhaoH2Bsgbx8fDgR6ZYQZG/13aNjL3M=", + "lastModified": 1734219437, + "narHash": "sha256-NVQIAvfSpBSJaJ4BP1cE1yVGjCuvXs0NN1G1t+f52Ss=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "3cba4ba44e7ba3cc8bb67ac71bc61245b5aca347", + "rev": "db249648776875ce3142141d0d3055e43ce606aa", "type": "github" }, "original": { @@ -633,11 +633,11 @@ }, "nixpkgs-smol": { "locked": { - "lastModified": 1734143535, - "narHash": "sha256-YVchPYuRpCFWqx6EVA1V1CY0NCTI1d3fADjOlB6oYe0=", + "lastModified": 1734187240, + "narHash": "sha256-I8cMXXWtf/+3DJT3QGm9BAp/b1oOCdKfgvpZ5XAUnp4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6160d771fb09b838abefba72df27c0c32699fe45", + "rev": "119bb2941c87b630c56b5e36b9ed63e3daa0e2d3", "type": "github" }, "original": { @@ -750,11 +750,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734172733, - "narHash": "sha256-26j5mCeAIFmrTCbNyQq4H8Ikda+dX9+n6YJhHcZ6m6Y=", + "lastModified": 1734221225, + "narHash": "sha256-PQtNGbg3B93+MINMe4/mwYWZkVDNzaf+O2Hw7xDznNk=", "owner": "nix-community", "repo": "NUR", - "rev": "e06a083e1258845c7c8bcd5f4dcc2aab9964318c", + "rev": "12bcdb7c86a2598761a7e2ada1b1e6cd7542197c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f005024..41a9c9e 100644 --- a/flake.nix +++ b/flake.nix @@ -99,6 +99,12 @@ }; epimetheus = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs; + pkgs-smol = import nixpkgs-smol { + inherit system; + }; + }; modules = [ ./hosts/epimetheus/configuration.nix disko.nixosModules.disko ]; }; diff --git a/hosts/epimetheus/configuration.nix b/hosts/epimetheus/configuration.nix index 1c74d3a..8d02719 100644 --- a/hosts/epimetheus/configuration.nix +++ b/hosts/epimetheus/configuration.nix @@ -1,9 +1,14 @@ -{ pkgs, lib, modulesPath, config, ... }: { +{ pkgs, pkgs-smol, lib, modulesPath, config, ... }: { imports = [ "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" ]; boot = { - kernelPackages = pkgs.linuxPackages_6_12; + supportedFilesystems = [ "zfs" ]; + zfs = { + forceImportRoot = false; + package = pkgs-smol.zfs; + }; + kernelPackages = pkgs-smol.linuxPackages_6_12; kernelParams = lib.mkAfter [ "noquiet" "toram" ]; enableContainers = false; }; @@ -18,14 +23,14 @@ git nixd pciutils - + # The installers - arch-install-scripts # For arch and it's + arch-install-scripts # For arch and it's xbps # Void linux dnf5 # Fedora debootstrap # Debin and ubuntu apt # Ubuntu - + ]; documentation = { @@ -80,7 +85,7 @@ "https://anyrun.cachix.org" "https://wezterm.cachix.org" ]; - trusted-public-keys = [ + trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" diff --git a/hosts/nyx/configuration.nix b/hosts/nyx/configuration.nix index 8f94e81..b098b1b 100644 --- a/hosts/nyx/configuration.nix +++ b/hosts/nyx/configuration.nix @@ -18,12 +18,12 @@ }; efi.canTouchEfiVariables = true; }; - #supportedFilesystems = [ "zfs" ]; - #zfs = { - # forceImportRoot = false; - # package = pkgs.zfs; - #}; - kernelPackages = pkgs.linuxPackages_6_12; + supportedFilesystems = [ "zfs" ]; + zfs = { + forceImportRoot = false; + package = pkgs-smol.zfs; + }; + kernelPackages = pkgs-smol.linuxPackages_6_12; kernel = { sysctl = { "vm.max_map_count" = 2147483642; }; }; };