From 988c06c58bc1fa76aa213d7a0af04a040a17ef67 Mon Sep 17 00:00:00 2001 From: Alexander Wainwright Date: Mon, 18 Aug 2025 12:46:15 +1000 Subject: [PATCH] Separate out home module --- hosts/case/configuration.nix | 1 + hosts/count/configuration.nix | 1 + hosts/modules/desktop.nix | 13 ------------- hosts/modules/home.nix | 15 +++++++++++++++ 4 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 hosts/modules/home.nix diff --git a/hosts/case/configuration.nix b/hosts/case/configuration.nix index 8c2b871..4c9ff5b 100644 --- a/hosts/case/configuration.nix +++ b/hosts/case/configuration.nix @@ -10,6 +10,7 @@ ./hardware-configuration.nix ../modules/base.nix ../modules/desktop.nix + ../modules/home.nix ../modules/laptop.nix ]; diff --git a/hosts/count/configuration.nix b/hosts/count/configuration.nix index 9fa4ed6..f81ecc3 100644 --- a/hosts/count/configuration.nix +++ b/hosts/count/configuration.nix @@ -11,6 +11,7 @@ ../modules/base.nix ../modules/desktop.nix ../modules/brother-printer.nix + ../modules/home.nix ]; # Bootloader. diff --git a/hosts/modules/desktop.nix b/hosts/modules/desktop.nix index 318afa5..a66261b 100644 --- a/hosts/modules/desktop.nix +++ b/hosts/modules/desktop.nix @@ -47,22 +47,9 @@ #media-session.enable = true; }; - # Mullvad vpn - services.mullvad-vpn = { - enable = true; - }; - # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; # Install firefox. programs.firefox.enable = true; - - environment.systemPackages = with pkgs; [ - foliate - inputs.locutus.packages.${pkgs.system}.default - mullvad-browser - mullvad-vpn - tor-browser - ]; } diff --git a/hosts/modules/home.nix b/hosts/modules/home.nix new file mode 100644 index 0000000..7cdb0c4 --- /dev/null +++ b/hosts/modules/home.nix @@ -0,0 +1,15 @@ +{ config, pkgs, inputs, ... }: +{ + # Mullvad vpn + services.mullvad-vpn = { + enable = true; + }; + + environment.systemPackages = with pkgs; [ + foliate + inputs.locutus.packages.${pkgs.system}.default + mullvad-browser + mullvad-vpn + tor-browser + ]; +}