From a711bf5dd67b3cdf952276c3b6201e688f419955 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 25 Sep 2025 20:43:34 +0200 Subject: [PATCH 1/6] chore: remove displaylink from all hosts to re-add to laptops, as it is not required for desktops or servers --- modules/core/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/default.nix b/modules/core/default.nix index f4d87d3..96f0236 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) ] From 341a99b1fb049ddffb1b86285b9c06c83fa09d57 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 25 Sep 2025 20:43:55 +0200 Subject: [PATCH 2/6] chore: adds `cifs-utils` to desktops --- roles/desktop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/desktop.nix b/roles/desktop.nix index fc6fcdb..23c75df 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -16,6 +16,7 @@ in }; config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ cifs-utils ]; home-manager = { users.${username} = { home.packages = with pkgs; [ From 6b0bf699b74e8105533434253a7550103743a126 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 25 Sep 2025 20:44:23 +0200 Subject: [PATCH 3/6] chore: adds displaylink to laptop role; adds `cifs-utils` to laptop role too --- roles/laptop.nix | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/roles/laptop.nix b/roles/laptop.nix index 4a61e0d..5b37a81 100644 --- a/roles/laptop.nix +++ b/roles/laptop.nix @@ -1,13 +1,32 @@ -{ 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"; }; + # DisplayLink + services.xserver.videoDrivers = [ + "displaylink" + "modesetting" + ]; + systemd.services.dlm.wantedBy = [ "multi-user.target" ]; + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + cifs-utils + powertop + ]; home-manager = { users.${username} = { home.packages = with pkgs; [ @@ -19,20 +38,16 @@ in { 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; From 1e9ad6c6b3e6ea7ce21480f4e90200c3d8e3da83 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 25 Sep 2025 20:44:46 +0200 Subject: [PATCH 4/6] chore: adds `steam` to iris --- hosts/iris/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/iris/default.nix b/hosts/iris/default.nix index 56df25e..84fd5e4 100644 --- a/hosts/iris/default.nix +++ b/hosts/iris/default.nix @@ -9,7 +9,7 @@ imports = [ ./hardware-configuration.nix ./../../modules/core - # ./../../modules/home/nfs.nix + ./../../modules/home/steam.nix ./../../modules/core/virtualization.nix ./../../modules/services/tailscale.nix ./../../modules/services/mpd.nix From 25d6d805e105266771d8267e865dd5335d8f9240 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 25 Sep 2025 20:44:58 +0200 Subject: [PATCH 5/6] chore: simple steam module --- modules/home/steam.nix | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 modules/home/steam.nix diff --git a/modules/home/steam.nix b/modules/home/steam.nix new file mode 100644 index 0000000..05f296d --- /dev/null +++ b/modules/home/steam.nix @@ -0,0 +1,3 @@ +{ + programs.steam.enable = true; +} From efff74008b59e7706065450fcb6c222a4799eb29 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 25 Sep 2025 20:49:27 +0200 Subject: [PATCH 6/6] fix: move displaylink stuff to be inside cfg argument, of course that doesn't work otherwise --- roles/laptop.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/laptop.nix b/roles/laptop.nix index 5b37a81..76cb8f8 100644 --- a/roles/laptop.nix +++ b/roles/laptop.nix @@ -15,13 +15,6 @@ in enable = mkEnableOption "Enable laptop"; }; - # DisplayLink - services.xserver.videoDrivers = [ - "displaylink" - "modesetting" - ]; - systemd.services.dlm.wantedBy = [ "multi-user.target" ]; - config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ cifs-utils @@ -36,6 +29,13 @@ in }; }; + # DisplayLink + services.xserver.videoDrivers = [ + "displaylink" + "modesetting" + ]; + systemd.services.dlm.wantedBy = [ "multi-user.target" ]; + networking.networkmanager.enable = true; boot = { @@ -56,6 +56,6 @@ in criticalPowerAction = "Hibernate"; }; }; - # powerManagement.powertop.enable = true; + powerManagement.powertop.enable = true; }; }