flake.nix

@@ -133,7 +133,46 @@
           }
         ];
       };
+    /*
+      nixps = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./system/xps/configuration.nix
+          # ./system/xps/users.nix
+          home-manager.nixosModules.home-manager
+          {
+            system.configurationRevision = self.shortRev or self.dirtyShortRev or "dirty";
 
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+
+              users = {
+                whovian = {
+                  imports = [
+                    ./home/home.nix
+                    agenix.homeManagerModules.default
+                    nix-index-database.hmModules.nix-index
+                  ];
+                };
+              };
+
+              # Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
+              extraSpecialArgs = {
+                system = "x86_64-linux";
+                inherit xil;
+                inherit nixpkgs;
+                pkgs = import nixpkgs {
+                  system = "x86_64-linux";
+                  config.allowUnfree = true;
+                };
+                inherit agenix;
+              };
+            };
+          }
+        ];
+      };
+    */
       isoimage = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
@@ -156,47 +195,6 @@
           "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix"
         ];
       };
-
-      /*
-        nixps = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [
-            ./system/xps/configuration.nix
-            # ./system/xps/users.nix
-            home-manager.nixosModules.home-manager
-            {
-              system.configurationRevision = self.shortRev or self.dirtyShortRev or "dirty";
-
-              home-manager = {
-                useGlobalPkgs = true;
-                useUserPackages = true;
-
-                users = {
-                  whovian = {
-                    imports = [
-                      ./home/home.nix
-                      agenix.homeManagerModules.default
-                      nix-index-database.hmModules.nix-index
-                    ];
-                  };
-                };
-
-                # Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
-                extraSpecialArgs = {
-                  system = "x86_64-linux";
-                  inherit xil;
-                  inherit nixpkgs;
-                  pkgs = import nixpkgs {
-                    system = "x86_64-linux";
-                    config.allowUnfree = true;
-                  };
-                  inherit agenix;
-                };
-              };
-            }
-          ];
-        };
-      */
     };
 
     packages.x86_64-linux = {
@@ -206,9 +204,6 @@
       ps3dec = pkgs.callPackage ./home/packages/ps3dec/package.nix {};
       sabretools = pkgs.callPackage ./home/packages/sabretools/package.nix {};
       rom-properties = pkgs.callPackage ./home/packages/rom-properties/package.nix {};
-      rom-properties_ninja = pkgs.callPackage ./home/packages/rom-properties/package.nix { useNinja = true; };
-      rom-properties_gtracker = pkgs.callPackage ./home/packages/rom-properties/package.nix { useTracker = true; };
-      rom-properties_ninja_gtracker = pkgs.callPackage ./home/packages/rom-properties/package.nix { useNinja = true; useTracker = true; };
       new_rclone = pkgs.rclone.overrideAttrs (
         oldAttrs: {
           patches = [ ./home/packages/new_rclone/patches/rclone_8ffe3e462cbf5688c37c54009db09d8dcb486860.diff ];

home/pkgs_and_programs.nix

@@ -88,6 +88,8 @@ in
     };
   };
 
+
+
   # The home.packages option allows you to install Nix packages into your
   # environment.
 
@@ -143,7 +145,7 @@ in
     pkgs.rclone
       # Replaced with my_packages.new_rclone which is a patched build.
     pkgs.screen
-      # Replaced with System-set "programs.screen.enable"
+      # Replaced with System `programs.screen.enable`
     pkgs.terminator
       # Not needed on WSL, even though I'd like it on WSL sometimes.
     pkgs.yt-dlp

system/nixos-wsl/configuration.nix

@@ -30,14 +30,7 @@
       [/modules/programs/zsh.nix]
     https://github.com/nix-community/home-manager/issues/3521#issuecomment-1367197995
       [Issue #3521]
-
-    06 June 2024:
-    Appears to be handled by "programs.zsh.enableCompletion" being enabled.
-    https://github.com/NixOS/nixpkgs/blob/49f6869f71fb2724674ccc18670bbde70843d43f/nixos/modules/programs/zsh/zsh.nix#L305
-    I appear to have "programs.zsh.enableCompletion" disabled for some reason?
-    Need to look into this again at some point, I suppose.
   */
-
   environment.pathsToLink = [
     "/share/zsh"
   ];