diff --git a/modules/features/zfs.nix b/modules/features/zfs.nix index deb301f..a9d9dc1 100644 --- a/modules/features/zfs.nix +++ b/modules/features/zfs.nix @@ -3,6 +3,7 @@ { flake.nixosModules.zfs-support = + { config, lib, @@ -36,12 +37,6 @@ kernelPackages = lib.mkForce latestKernelPackage; # adds zfs support at boot supportedFilesystems = [ "zfs" ]; - - # imports zfs pools on host device - zfs = { - extraPools = [ "orcus" ]; - forceImportRoot = false; - }; }; # adds zfs to system packages @@ -53,4 +48,17 @@ # data integrity service services.zfs.autoScrub.enable = true; }; + + flake.nixosModules.zfs-hades = + + { config, pkgs, ... }: + + { + + zfs = { + extraPools = [ "orcus" ]; + forceImportRoot = false; + }; + + }; } diff --git a/modules/hosts/hades/default.nix b/modules/hosts/hades/default.nix index c69843d..e54b877 100644 --- a/modules/hosts/hades/default.nix +++ b/modules/hosts/hades/default.nix @@ -3,37 +3,75 @@ { # defines the hades specific configuration - flake.nixosConfigurations.hades = inputs.nixpkgs.lib.nixosSystem { + flake.nixosConfigurations.hades = + inputs.nixpkgs.lib.nixosSystem - # modules that comprise the host specific configuration - modules = with self.nixosModules; [ + { - # shared system modules - core + # modules that comprise the host specific configuration + modules = with self.nixosModules; [ - # host-specific options - hades-configuration - hades-hardware + # shared system modules + core + #user-options - # extra modules to include on host - # in order of priority - terminal - desktop - multimedia - zfs-support - gaming - music - music-production - virtual-reality - network-proxy - virtualisation + # host-specific modules + #hades-configuration + hades-hardware + zfs-hades - # users to include on host - #user-options - serenity + # feature modules + virtualisation + network-proxy + zfs-support + terminal + desktop + music + gaming + multimedia + virtual-reality + music-production - ]; + # user modules + serenity - }; + ]; + + # set hostname + networking.hostName = "hades"; + + # bootloader settings + boot.loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + + # supported filesystems at boot + boot.supportedFilesystems = [ + "vfat" + "ext4" + #"ntfs" + ]; + + # enable printing support + services.printing.enable = true; + + # fstrim for ssd + services.fstrim.enable = true; + + # corsair mouse software + hardware.ckb-next.enable = true; + + # other packages for hades peripherals + environment.systemPackages = with pkgs; [ + + #input-remapper + #razergenie + #openrazer-daemon + #openrgb-with-all-plugins + + ]; + + }; }