diff options
Diffstat (limited to 'os/core')
| -rw-r--r-- | os/core/drivers.nix | 75 | ||||
| -rw-r--r-- | os/core/home-manager.nix | 26 | ||||
| -rw-r--r-- | os/core/networking.nix | 3 |
3 files changed, 62 insertions, 42 deletions
diff --git a/os/core/drivers.nix b/os/core/drivers.nix index 3bb2291..b674c9a 100644 --- a/os/core/drivers.nix +++ b/os/core/drivers.nix @@ -1,4 +1,10 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + inputs, + ... +}: let cfg = config.os.core.drivers; in @@ -7,41 +13,46 @@ in enable = lib.mkEnableOption "enables hardware drivers"; amdgpu.enable = lib.mkEnableOption "AMD specific drivers and microcode"; stability = lib.mkOption { - type = lib.types.enum [ "stable" "unstable" ]; + type = lib.types.enum [ + "stable" + "unstable" + ]; default = "stable"; }; }; - config = lib.mkIf cfg.enable (lib.mkMerge [ - { - programs.coolercontrol.enable = true; - services.lact.enable = true; - services.smartd.enable = true; - hardware.sensor.iio.enable = true; - hardware.enableAllFirmware = true; - hardware.cpu.amd.updateMicrocode = true; - hardware.graphics = { - enable = true; - enable32Bit = true; - extraPackages = with pkgs; [ - rocmPackages.clr.icd - ]; - }; - environment.systemPackages = [ pkgs.rivalcfg ]; - } + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + { + programs.coolercontrol.enable = true; + services.lact.enable = true; + services.smartd.enable = true; + hardware.sensor.iio.enable = true; + hardware.enableAllFirmware = true; + hardware.cpu.amd.updateMicrocode = true; + hardware.graphics = { + enable = true; + enable32Bit = true; + extraPackages = with pkgs; [ + rocmPackages.clr.icd + ]; + }; + environment.systemPackages = [ pkgs.rivalcfg ]; + } - (lib.mkIf cfg.amdgpu.enable { - hardware.amdgpu = { - initrd.enable = true; - overdrive.enable = true; - }; - # boot.kernelParams = [ "amdgpu.gpu_recovery=1" ]; - }) + (lib.mkIf cfg.amdgpu.enable { + hardware.amdgpu = { + initrd.enable = true; + overdrive.enable = true; + }; + }) - (lib.mkIf (cfg.amdgpu.enable && cfg.stability == "unstable") { - }) + (lib.mkIf (cfg.amdgpu.enable && cfg.stability == "unstable") { + boot.kernelPackages = inputs.kernelv.legacyPackages.x86_64-linux.linuxPackages_6_17; + }) - (lib.mkIf (cfg.amdgpu.enable && cfg.stability == "stable") { - boot.kernelPackages = pkgs.linuxPackages_6_12; - }) - ]); + (lib.mkIf (cfg.amdgpu.enable && cfg.stability == "stable") { + boot.kernelPackages = pkgs.linuxPackages_latest; + }) + ] + ); } diff --git a/os/core/home-manager.nix b/os/core/home-manager.nix index 32b39b8..63f3dfd 100644 --- a/os/core/home-manager.nix +++ b/os/core/home-manager.nix @@ -1,4 +1,10 @@ -{ inputs, config, lib, username, ... }: +{ + inputs, + config, + lib, + username, + ... +}: let cfg = config.os.core.home-manager; in @@ -9,16 +15,18 @@ in enable = lib.mkEnableOption "home Manager configuration"; users = lib.mkOption { - default = {}; + default = { }; description = "Attribute set of users and their home-manager configurations"; - type = lib.types.attrsOf (lib.types.submodule { - options = { - path = lib.mkOption { - type = lib.types.path; - description = "Path to the user's home.nix file"; + type = lib.types.attrsOf ( + lib.types.submodule { + options = { + path = lib.mkOption { + type = lib.types.path; + description = "Path to the user's home.nix file"; + }; }; - }; - }); + } + ); }; }; config = lib.mkIf cfg.enable { diff --git a/os/core/networking.nix b/os/core/networking.nix index 32a5b47..bf611a3 100644 --- a/os/core/networking.nix +++ b/os/core/networking.nix @@ -13,7 +13,8 @@ in }; firewall = { enable = true; - allowedTCPPorts = [ 22 ]; + allowedTCPPorts = [ 7960 ]; + allowedUDPPorts = [ 7960 ]; }; }; systemd.services."NetworkManager-wait-online".enable = false; |