Refactor flake.nix and home.nix: modernize homeManagerModules output and comment out secrets import

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;

home/programs/nvf/flake.nix

@@ -19,22 +19,24 @@
 in {
   packages.${system}.nvim = nvimConfig.neovim;
 
-  apps.${system}.nvim = {
+  apps.${system} = {
-    type = "app";
+    nvim = {
-    program = "${nvimConfig.neovim}/bin/nvim";
+      type = "app";
-		meta = {
+      program = "${nvimConfig.neovim}/bin/nvim";
-              description = "Improved Vim-based text editor";
+      meta = {
-              homepage = "https://neovim.io";
+        description = "Improved Vim-based text editor";
-              license = "Apache-2.0";
+        homepage = "https://neovim.io";
+        license = "Apache-2.0";
+      };
     };
-  };
+    default = {
-  defaultApp.${system} = {
+      type = "app";
-    type = "app";
+      program = "${nvimConfig.neovim}/bin/nvim";
-    program = "${nvimConfig.neovim}/bin/nvim";
+      meta = {
-		meta = {
+        description = "Improved Vim-based text editor";
-              description = "Improved Vim-based text editor";
+        homepage = "https://neovim.io";
-              homepage = "https://neovim.io";
+        license = "Apache-2.0";
-              license = "Apache-2.0";
+      };
     };
   };
 

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 = {

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 = {

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 = {