From eee5479bf94154a94422298b242f665c28430571 Mon Sep 17 00:00:00 2001
From: Drew Haven <drew.haven@gmail.com>
Date: Wed, 12 Feb 2025 19:38:42 -0800
Subject: [PATCH] [nix] Reorganizes files and makes an apps folder.

---
 home-manager/apps/element.nix            | 14 +++++++++
 home-manager/drew.nix                    | 38 ------------------------
 home-manager/features/linux-desktop.nix  |  2 +-
 home-manager/features/neovim/default.nix |  1 +
 system/hosts/drew-desktop/default.nix    |  2 +-
 system/hosts/drew-desktop/drew.nix       | 29 ++++++++++++++++++
 6 files changed, 46 insertions(+), 40 deletions(-)
 create mode 100644 home-manager/apps/element.nix
 delete mode 100644 home-manager/drew.nix
 create mode 100644 system/hosts/drew-desktop/drew.nix

diff --git a/home-manager/apps/element.nix b/home-manager/apps/element.nix
new file mode 100644
index 0000000..3363a4e
--- /dev/null
+++ b/home-manager/apps/element.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    element-desktop
+  ];
+
+  xdg.desktopEntries = {
+    element-desktop = {
+      name = "Element";
+      # Custom options to reduce flickering under wayland.
+      exec = "element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu";
+    };
+  };
+}
diff --git a/home-manager/drew.nix b/home-manager/drew.nix
deleted file mode 100644
index 0f26354..0000000
--- a/home-manager/drew.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ pkgs, inputs, ... }:
-{
-  imports = [
-    ./features/linux-desktop.nix
-    ./features/development-linux.nix
-    ./features/haskell.nix
-    ./features/nix.nix
-    ./features/gaming.nix
-  ];
-
-  home.stateVersion = "24.11";
-
-  home.username = "drew";
-  home.homeDirectory = "/home/drew";
-
-  home.packages = with pkgs; [
-    # Applications
-    discord
-    element-desktop
-    signal-desktop 
-    obsidian
-    firefox
-    waypaper # Wallpaper switcher
-  ];
-
-  xdg.desktopEntries = {
-    element-desktop = {
-      name = "Element";
-      # Custom options to reduce flickering under wayland.
-      exec = "element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu";
-    };
-  };
-
-  programs.git = {
-    userName = "Drew Haven";
-    userEmail = "drew.haven@gmail.com";
-  };
-}
diff --git a/home-manager/features/linux-desktop.nix b/home-manager/features/linux-desktop.nix
index 075afb1..887e474 100644
--- a/home-manager/features/linux-desktop.nix
+++ b/home-manager/features/linux-desktop.nix
@@ -6,7 +6,6 @@
   ];
 
   home.packages = with pkgs; [
-    # Desktop Environment
     feh
     networkmanagerapplet # network control
     hyprlock # lock screen
@@ -26,6 +25,7 @@
     nwg-look # GTK settings editor
     playerctl # for universal play/pause etc
     wirelesstools
+    waypaper # Wallpaper switcher
   ];
 
   # Hint for electron apps to use wayland
diff --git a/home-manager/features/neovim/default.nix b/home-manager/features/neovim/default.nix
index 29eb02f..4bc93ce 100644
--- a/home-manager/features/neovim/default.nix
+++ b/home-manager/features/neovim/default.nix
@@ -16,6 +16,7 @@ in
     viAlias = true;
     vimAlias = true;
     defaultEditor = true;
+    withNodeJs = true;
 
     plugins = with pkgs.vimPlugins; [
       # lazy-nvim
diff --git a/system/hosts/drew-desktop/default.nix b/system/hosts/drew-desktop/default.nix
index fb85e37..1887113 100644
--- a/system/hosts/drew-desktop/default.nix
+++ b/system/hosts/drew-desktop/default.nix
@@ -16,7 +16,7 @@ in nixpkgs.lib.nixosSystem {
       home-manager.users.drew = { pkgs, inputs, ... }:
         {
           imports = [
-            (self + "/home-manager/drew.nix")
+            ./drew.nix
           ];
         };
       home-manager.useGlobalPkgs = true;
diff --git a/system/hosts/drew-desktop/drew.nix b/system/hosts/drew-desktop/drew.nix
new file mode 100644
index 0000000..75d4bef
--- /dev/null
+++ b/system/hosts/drew-desktop/drew.nix
@@ -0,0 +1,29 @@
+{ pkgs, inputs, self, ... }:
+{
+  imports = map (x: ../../../home-manager + x) [
+    "/features/linux-desktop.nix"
+    "/features/development-linux.nix"
+    "/features/haskell.nix"
+    "/features/nix.nix"
+    "/features/gaming.nix"
+    "/apps/element.nix"
+  ];
+
+  home.stateVersion = "24.11";
+
+  home.username = "drew";
+  home.homeDirectory = "/home/drew";
+
+  programs.git = {
+    userName = "Drew Haven";
+    userEmail = "drew.haven@gmail.com";
+  };
+
+  home.packages = with pkgs; [
+    # Applications
+    discord
+    signal-desktop
+    obsidian
+    firefox
+  ];
+}