From 69e13ac02d1d6c11237e3ed18365232885b043ff Mon Sep 17 00:00:00 2001
From: Youwen Wu <youwenw@gmail.com>
Date: Wed, 7 Aug 2024 07:14:18 -0700
Subject: [PATCH] refactor: move common-de stuff to home.nix

---
 .../linux/common-desktop-environment.nix      | 24 ------------------
 users/youwen/linux/desktop/default.nix        |  2 +-
 users/youwen/linux/home.nix                   | 25 ++++++++++++++++++-
 users/youwen/linux/laptop/default.nix         |  2 +-
 4 files changed, 26 insertions(+), 27 deletions(-)
 delete mode 100755 users/youwen/linux/common-desktop-environment.nix

diff --git a/users/youwen/linux/common-desktop-environment.nix b/users/youwen/linux/common-desktop-environment.nix
deleted file mode 100755
index a2eb3e3..0000000
--- a/users/youwen/linux/common-desktop-environment.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ pkgs, ... }: {
-  # Audio effects and EQ tool
-  services.easyeffects.enable = true;
-  services.easyeffects.package = pkgs.easyeffects;
-
-  # Notification daemon
-  services.dunst = {
-    enable = true;
-    catppuccin.enable = true;
-    iconTheme = {
-      name = "Papirus-Dark";
-      package = pkgs.papirus-icon-theme;
-      size = "32x32";
-    };
-  };
-
-  # Currently non-functional
-  programs.wlogout.enable = true;
-  programs.rofi = {
-    enable = true;
-    package = pkgs.rofi-wayland;
-    theme = "gruvbox-dark";
-  };
-}
diff --git a/users/youwen/linux/desktop/default.nix b/users/youwen/linux/desktop/default.nix
index 7ce9639..a76013f 100644
--- a/users/youwen/linux/desktop/default.nix
+++ b/users/youwen/linux/desktop/default.nix
@@ -1,4 +1,4 @@
 {
-  imports = [ ../theming ../home.nix ../programs ../hyprland/desktop ../common-desktop-environment.nix ];
+  imports = [ ../theming ../home.nix ../programs ../hyprland/desktop ];
 }
 
diff --git a/users/youwen/linux/home.nix b/users/youwen/linux/home.nix
index 47650fa..c8ddd91 100755
--- a/users/youwen/linux/home.nix
+++ b/users/youwen/linux/home.nix
@@ -19,7 +19,7 @@
   #     xxx
   # '';
 
-  home.file.".config/neofetch/config.conf".source = ../common/neofetch.conf
+  home.file.".config/neofetch/config.conf".source = ../common/neofetch.conf;
   home.file.".wallpapers" = {
     source = ../../../wallpapers;
     recursive = true;
@@ -34,6 +34,29 @@
   # the home Manager release notes for a list of state version
   # changes in each release.
 
+  # Audio effects and EQ tool
+  services.easyeffects.enable = true;
+  services.easyeffects.package = pkgs.easyeffects;
+
+  # Notification daemon
+  services.dunst = {
+    enable = true;
+    catppuccin.enable = true;
+    iconTheme = {
+      name = "Papirus-Dark";
+      package = pkgs.papirus-icon-theme;
+      size = "32x32";
+    };
+  };
+
+  # Currently non-functional
+  programs.wlogout.enable = true;
+  programs.rofi = {
+    enable = true;
+    package = pkgs.rofi-wayland;
+    theme = "gruvbox-dark";
+  };
+
   # Let home Manager install and manage itself.
   programs.home-manager.enable = true;
 }
diff --git a/users/youwen/linux/laptop/default.nix b/users/youwen/linux/laptop/default.nix
index 0213217..444b61d 100644
--- a/users/youwen/linux/laptop/default.nix
+++ b/users/youwen/linux/laptop/default.nix
@@ -1,4 +1,4 @@
 {
-  imports = [ ../theming ../home.nix ../programs ../hyprland/laptop ../common-desktop-environment.nix ];
+  imports = [ ../theming ../home.nix ../programs ../hyprland/laptop ];
 }