From a441a61f093aecc106ef540a839a40977f93d751 Mon Sep 17 00:00:00 2001 From: Chris Wong Date: Tue, 6 Oct 2026 19:25:06 +0100 Subject: [PATCH] fix(framework): include shared desktop applications - Import the desktop applications module on Framework - Update module and README descriptions to cover all hosts --- README.md | 3 +-- hosts/framework/configuration.nix | 1 + modules/desktop-apps.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 73b0f81..e0d6007 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,7 @@ Each `hosts//configuration.nix` explicitly imports its own generated - `kde.nix`: Plasma 6, SDDM, US keyboard, PipeWire, Bluetooth, printing, Flatpak. - `development.nix`: Emacs, VS Code, htop, general CLI/DevOps tools, Docker, direnv and nix-direnv on every host. -- `desktop-apps.nix`: selected shared desktop applications, imported by the two - ThinkPads only. +- `desktop-apps.nix`: selected shared desktop applications on every host. - `gaming.nix`: shared Steam setup on all three hosts. The ThinkPads' different games, Wine variants and X1EG2 GameMode customization stay at host level. diff --git a/hosts/framework/configuration.nix b/hosts/framework/configuration.nix index f837e47..1ce1e00 100644 --- a/hosts/framework/configuration.nix +++ b/hosts/framework/configuration.nix @@ -5,6 +5,7 @@ ../../modules/common.nix ../../modules/kde.nix ../../modules/development.nix + ../../modules/desktop-apps.nix ../../modules/gaming.nix ]; diff --git a/modules/desktop-apps.nix b/modules/desktop-apps.nix index 0b92bdc..1983d60 100644 --- a/modules/desktop-apps.nix +++ b/modules/desktop-apps.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - # Shared desktop applications; imported by the two ThinkPads. + # Shared desktop applications for all three hosts. environment.systemPackages = with pkgs; [ bitwarden-desktop brave