Move Linux specific programs to if expressions

home-manager/asahi/home.nix

@@ -13,7 +13,7 @@
 {
   imports = [
     { nixpkgs.overlays = [ inputs.nur.overlays.default ]; }
-    ../base-linux.nix
+    ../base.nix
     ../calendar.nix
     ../discord.nix
   ];

home-manager/base-linux.nix

@@ -1,17 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Ethan Reece <contact@ethanreece.com>
-#
-# SPDX-License-Identifier: MIT
-
-{ pkgs, ... }:
-{
-  imports = [ ./base.nix ];
-  home.packages = [
-    pkgs.acpi
-    pkgs.iproute2
-    pkgs.iputils
-    pkgs.julia
-    pkgs.lm_sensors
-    pkgs.psmisc
-    pkgs.strace
-  ];
-}

home-manager/base.nix

@@ -7,6 +7,7 @@
 {
   config,
   inputs,
+  lib,
   pkgs,
   ...
 }:
@@ -68,6 +69,16 @@
       pkgs.uutils-findutils
       pkgs.wget
       pkgs.xz
+    ]
+    ++ lib.optionals pkgs.stdenv.isLinux [
+      pkgs.acpi
+      pkgs.gcr
+      pkgs.iproute2
+      pkgs.iputils
+      pkgs.julia
+      pkgs.lm_sensors
+      pkgs.psmisc
+      pkgs.strace
     ];
     file = { };
     shellAliases = {

home-manager/raspi/home.nix

@@ -10,7 +10,7 @@
   ...
 }:
 {
-  imports = [ ../base-linux.nix ];
+  imports = [ ../base.nix ];
   sops.age.keyFile = "${homeDirectory}/.config/sops/age/keys.txt";
   home = {
     inherit username homeDirectory;

home-manager/secrets.nix

@@ -6,6 +6,8 @@
   config,
   domains,
   inputs,
+  lib,
+  pkgs,
   ...
 }:
 {
@@ -23,4 +25,5 @@
       };
     };
   };
+  services = lib.mkIf pkgs.stdenv.isLinux { gnome-keyring.enable = true; };
 }