From 0205b8fe890d036185c1f01293b9a42ef18d0327 Mon Sep 17 00:00:00 2001
From: KptltD00M <admin@doomlabs.de>
Date: Tue, 23 Jun 2026 16:37:01 +0200
Subject: [PATCH] Refactor flake.nix and home.nix: modernize homeManagerModules
 output and comment out secrets import

---
 flake.nix                   |  8 +-------
 home/programs/nvf/flake.nix | 32 +++++++++++++++++---------------
 hosts/home-pc/home.nix      |  2 +-
 hosts/laptop/home.nix       |  2 +-
 hosts/work/home.nix         |  2 +-
 5 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/flake.nix b/flake.nix
index 82580f1..18f4469 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,14 +82,8 @@
         # Formatter output
         formatter.${system} = pkgs.alejandra;
 
-        # Explicit homeManagerModules output (needed for home-manager packages)
-        # Define homeManagerModules output for home-manager integration
-        homeManagerModules = {
-					default = import ./home/programs/group/flake.nix args;
-				};
-
-
         # Update to modern syntax (no defaultApp)
+
         nixosConfigurations = {
           thinkpad = import ./hosts/laptop/flake.nix args;
           home-pc = import ./hosts/home-pc/flake.nix args;
diff --git a/home/programs/nvf/flake.nix b/home/programs/nvf/flake.nix
index c4c8984..a9e3354 100644
--- a/home/programs/nvf/flake.nix
+++ b/home/programs/nvf/flake.nix
@@ -19,22 +19,24 @@
 in {
   packages.${system}.nvim = nvimConfig.neovim;
 
-  apps.${system}.nvim = {
-    type = "app";
-    program = "${nvimConfig.neovim}/bin/nvim";
-		meta = {
-              description = "Improved Vim-based text editor";
-              homepage = "https://neovim.io";
-              license = "Apache-2.0";
+  apps.${system} = {
+    nvim = {
+      type = "app";
+      program = "${nvimConfig.neovim}/bin/nvim";
+      meta = {
+        description = "Improved Vim-based text editor";
+        homepage = "https://neovim.io";
+        license = "Apache-2.0";
+      };
     };
-  };
-  defaultApp.${system} = {
-    type = "app";
-    program = "${nvimConfig.neovim}/bin/nvim";
-		meta = {
-              description = "Improved Vim-based text editor";
-              homepage = "https://neovim.io";
-              license = "Apache-2.0";
+    default = {
+      type = "app";
+      program = "${nvimConfig.neovim}/bin/nvim";
+      meta = {
+        description = "Improved Vim-based text editor";
+        homepage = "https://neovim.io";
+        license = "Apache-2.0";
+      };
     };
   };
 
diff --git a/hosts/home-pc/home.nix b/hosts/home-pc/home.nix
index 39c64dc..b12ce14 100644
--- a/hosts/home-pc/home.nix
+++ b/hosts/home-pc/home.nix
@@ -28,7 +28,7 @@
     ../../home/system/udiskie
 
     ./variables.nix # Mostly user-specific configuration
-    ./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
+    #./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
   ];
 
   home = {
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index e9fcada..ad8fef1 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -30,7 +30,7 @@
     ../../home/system/udiskie
 
     ./variables.nix # Mostly user-specific configuration
-    ./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
+    #./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
   ];
 
   home = {
diff --git a/hosts/work/home.nix b/hosts/work/home.nix
index 860dee8..a64d1a9 100644
--- a/hosts/work/home.nix
+++ b/hosts/work/home.nix
@@ -28,7 +28,7 @@
     ../../home/system/udiskie
 
     ./variables.nix # Mostly user-specific configuration
-    ./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
+    #./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
   ];
 
   home = {