cleanup

flake.nix

@@ -38,16 +38,5 @@
         ];
       };
     };
-
-    # Standalone home-manager configuration entrypoint
-    # Available through 'home-manager --flake .#nils@nixos'
-    /*homeConfigurations = {
-      "nils@nixos" = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
-        extraSpecialArgs = { inherit inputs; }; # Pass flake inputs to our config
-        # > Our main home-manager configuration file <
-        modules = [ ./home-manager/home.nix ];
-      };
-    };*/
   };
 }

home-manager/firefox.nix

@@ -1,4 +1,5 @@
-{ pkgs }: {
+{ pkgs, ... }: {
+  programs.firefox = {
     enable = true;
     profiles = {
       nils = {
@@ -33,4 +34,5 @@
         ];
       };
     };
+  };
 }

home-manager/git.nix

@@ -1,4 +1,5 @@
-{ pkgs }: {
+{ pkgs, ... }: {
+  programs.git = {
     enable = true;
 
     userEmail = "48135649+Nilstrieb@users.noreply.github.com";
@@ -20,4 +21,5 @@
       push.autoSetupRemote = true;
       init.defaultBranch = "main";
     };
+  };
 }

home-manager/home.nix

@@ -18,29 +18,11 @@ in
 
     # You can also split up your configuration and import pieces of it here:
     # ./nvim.nix
+    ./git.nix
+    ./firefox.nix
+    ./vscode.nix
   ];
 
-  /*nixpkgs = {
-    # You can add overlays here
-    overlays = [
-      # If you want to use overlays exported from other flakes:
-      # neovim-nightly-overlay.overlays.default
-
-      # Or define it inline, for example:
-      # (final: prev: {
-      #   hi = final.hello.overrideAttrs (oldAttrs: {
-      #     patches = [ ./change-hello-to-hi.patch ];
-      #   });
-      # })
-    ];
-    # Configure your nixpkgs instance
-    config = {
-      allowUnfree = true;
-      # Workaround for https://github.com/nix-community/home-manager/issues/2942
-      allowUnfreePredicate = (_: true);
-    };
-  };*/
-
   home = {
     username = "nils";
     homeDirectory = "/home/nils";
@@ -80,10 +62,6 @@ in
 
   programs.home-manager.enable = true;
 
-  programs.git = import ./git.nix { inherit pkgs; };
-  programs.firefox = import ./firefox.nix { inherit pkgs; };
-  programs.vscode = import ./vscode.nix { inherit pkgs; };
-
   programs.fish = {
     enable = true;
     interactiveShellInit = ''

home-manager/vscode.nix

@@ -1,4 +1,5 @@
-{ pkgs }: {
+{ pkgs, ... }: {
+  programs.vscode = {
     enable = true;
     package = pkgs.vscode;
     extensions = with pkgs.vscode-extensions; [
@@ -52,4 +53,5 @@
         '';
       })
     ];
+  };
 }