Regenerated

Droidnix/README.org

@@ -153,7 +153,8 @@ in
       # REQUIRED for Home Manager
       home-manager.nixosModules.home-manager
     ]
-    ++ allModules;
+    ++ allModules
+    ++ [ ../modules/traveldroid/system/packages-merge.nix ];  # <- add this last
 
   #################################
   # Home Manager integration
@@ -844,6 +845,56 @@ This sets the dbus implementation
 }
 #+END_SRC
 
+** =generated/modules/traveldroid/system/login-tuigreet.nix=
+This sets up tuigreeter which is not fancy but imo fits the aesthetic I am aiming for
+#+BEGIN_SRC nix :tangle generated/todo/traveldroid/system/login-tuigreet.nix :noweb tangle :mkdirp yes :eval never-html
+{ config, pkgs, lib, ... }:
+
+let
+  tuigreetBin = "${pkgs.tuigreet}/bin/tuigreet";
+  sessionsDir = "${pkgs.hyprland}/share/wayland-sessions";
+in
+{
+  #################################
+  # Greetd (tuigreet)
+  #################################
+
+  services.greetd = {
+    enable = true;
+
+    settings = {
+      default_session = {
+        command = ''
+          ${tuigreetBin} \
+            --time \
+            --remember \
+            --remember-session \
+            --sessions ${sessionsDir} \
+            --cmd "start-hyprland"
+        '';
+        user = "greeter";
+      };
+    };
+  };
+
+  #################################
+  # Fix TTY / boot noise issues
+  #################################
+
+  systemd.services.greetd.serviceConfig = {
+    Type = "idle";
+    StandardInput = "tty";
+    StandardOutput = "tty";
+    StandardError = "journal";
+
+    # Prevent boot log spam on tty
+    TTYReset = true;
+    TTYVHangup = true;
+    TTYVTDisallocate = true;
+  };
+}
+#+END_SRC
+
 ** =generated/modules/traveldroid/system/networking.nix=
 This sets the networking.
 #+BEGIN_SRC nix :tangle generated/modules/traveldroid/system/networking.nix :noweb tangle :mkdirp yes :eval never-html
@@ -918,56 +969,6 @@ This sets the networking.
 }
 #+END_SRC
 
-** =generated/modules/traveldroid/system/login-tuigreet.nix=
-This sets up tuigreeter which is not fancy but imo fits the aesthetic I am aiming for
-#+BEGIN_SRC nix :tangle generated/todo/traveldroid/system/login-tuigreet.nix :noweb tangle :mkdirp yes :eval never-html
-{ config, pkgs, lib, ... }:
-
-let
-  tuigreetBin = "${pkgs.tuigreet}/bin/tuigreet";
-  sessionsDir = "${pkgs.hyprland}/share/wayland-sessions";
-in
-{
-  #################################
-  # Greetd (tuigreet)
-  #################################
-
-  services.greetd = {
-    enable = true;
-
-    settings = {
-      default_session = {
-        command = ''
-          ${tuigreetBin} \
-            --time \
-            --remember \
-            --remember-session \
-            --sessions ${sessionsDir} \
-            --cmd "start-hyprland"
-        '';
-        user = "greeter";
-      };
-    };
-  };
-
-  #################################
-  # Fix TTY / boot noise issues
-  #################################
-
-  systemd.services.greetd.serviceConfig = {
-    Type = "idle";
-    StandardInput = "tty";
-    StandardOutput = "tty";
-    StandardError = "journal";
-
-    # Prevent boot log spam on tty
-    TTYReset = true;
-    TTYVHangup = true;
-    TTYVTDisallocate = true;
-  };
-}
-#+END_SRC
-
 * generated/users
 
 ** =generated/users/copy_2_home.nix=