refractor

nixcfgs/modules/nixos/desktop/default.nix

@@ -1,8 +1,7 @@
-{...}: {
-
+{pkgs, ...}: {
   imports = [
-    ../rime.nix
-    ../fonts.nix
+    ./fonts.nix
+    ./gnome-keyring.nix
   ];
   services.pipewire = {
     enable = true;
@@ -47,5 +46,6 @@
   };
   environment.systemPackages = with pkgs; [
     wl-clipboard
+    libnotify
   ];
 }

nixcfgs/modules/nixos/desktop/laptop.nix

@@ -1,9 +1,8 @@
-{ pkgs, ... }:
-
-{
+{pkgs, ...}: {
   environment.systemPackages = with pkgs; [
     powertop
   ];
+  imports = [
+    ./host-machine.nix
+  ];
 }
-
-

nixcfgs/modules/nixos/programs/packages.nix

@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    nil
-    nixd
-    libnotify
-    imagemagick
-  ];
-}