diff --git a/hosts/iris/default.nix b/hosts/iris/default.nix index 84fd5e4..56df25e 100644 --- a/hosts/iris/default.nix +++ b/hosts/iris/default.nix @@ -9,7 +9,7 @@ imports = [ ./hardware-configuration.nix ./../../modules/core - ./../../modules/home/steam.nix + # ./../../modules/home/nfs.nix ./../../modules/core/virtualization.nix ./../../modules/services/tailscale.nix ./../../modules/services/mpd.nix diff --git a/modules/core/default.nix b/modules/core/default.nix index 96f0236..f4d87d3 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -3,7 +3,7 @@ imports = [ (import ./docker.nix) ] ++ [ (import ./hardware.nix) ] - # ++ [ (import ./displaylink.nix) ] + ++ [ (import ./displaylink.nix) ] # ++ [(import ./printing.nix)] ++ [ (import ./xserver.nix) ] ++ [ (import ./network.nix) ] diff --git a/modules/home/steam.nix b/modules/home/steam.nix deleted file mode 100644 index 05f296d..0000000 --- a/modules/home/steam.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - programs.steam.enable = true; -} diff --git a/roles/desktop.nix b/roles/desktop.nix index 23c75df..fc6fcdb 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -16,7 +16,6 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ cifs-utils ]; home-manager = { users.${username} = { home.packages = with pkgs; [ diff --git a/roles/laptop.nix b/roles/laptop.nix index 76cb8f8..4a61e0d 100644 --- a/roles/laptop.nix +++ b/roles/laptop.nix @@ -1,25 +1,13 @@ -{ - lib, - pkgs, - config, - username, - home-manager, - ... -}: +{ lib, pkgs, config, username, home-manager, ... }: with lib; let cfg = config.liv.laptop; -in -{ +in { options.liv.laptop = { enable = mkEnableOption "Enable laptop"; }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - cifs-utils - powertop - ]; home-manager = { users.${username} = { home.packages = with pkgs; [ @@ -29,25 +17,22 @@ in }; }; - # DisplayLink - services.xserver.videoDrivers = [ - "displaylink" - "modesetting" - ]; - systemd.services.dlm.wantedBy = [ "multi-user.target" ]; - networking.networkmanager.enable = true; + environment.systemPackages = with pkgs; [ + # powertop + ]; boot = { - kernelModules = [ "acpi_call" ]; - extraModulePackages = with config.boot.kernelPackages; [ - acpi_call - ]; - }; - services = { + kernelModules = ["acpi_call"]; + extraModulePackages = with config.boot.kernelPackages; + [ + acpi_call + ]; + }; + services = { thermald.enable = true; power-profiles-daemon.enable = true; - + upower = { enable = true; percentageLow = 20; @@ -56,6 +41,6 @@ in criticalPowerAction = "Hibernate"; }; }; - powerManagement.powertop.enable = true; + # powerManagement.powertop.enable = true; }; }