Refactor mini.nix: Comment out unused user configuration and enable zsh

ryanwclark1 · Nov 11, 2024 · 40d125b · 40d125b
1 parent fd175b3
commit 40d125b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/flake.nix b/flake.nix
@@ -131,17 +131,17 @@
         specialArgs = {
           inherit inputs outputs;
         };
-        modules = [
+        # modules = [
           # lib.nixosModules.darwin
           # nix-homebrew.darwinModules.nix-homebrew
-          ./hosts/mini
+          # ./hosts/mini
           # ./home/mini.nix
           # home-manager.darwinModules.home-manager
           # {
           #   home-manager.useGlobalPkgs = true;
           #   home-manager.useUserPackages = true;
           # }
-        ];
+        # ];
       };
       # darwinPackages = self.darwinConfigurations."mini".pkgs;
     };

diff --git a/hosts/mini/default.nix b/hosts/mini/default.nix
@@ -9,14 +9,14 @@
 }:
 
 {
-  imports = [
-    inputs.home-manager.nixosModules.home-manager
-  ];
+  # imports = [
+  #   inputs.home-manager.nixosModules.home-manager
+  # ];
 
-  # home-manager.useGlobalPkgs = true;
-  # home-manager.extraSpecialArgs = {
-  #   inherit inputs outputs;
-  # };
+  home-manager.useGlobalPkgs = true;
+  home-manager.extraSpecialArgs = {
+    inherit inputs outputs;
+  };
 
   # The platform the configuration will be used on.
   nixpkgs = {
@@ -51,8 +51,8 @@
   #   onActivation.cleanup = "zap";
   # };
 
-  # programs.home-manager.enable = true;
-  # programs.zsh.enable = true;
+  programs.home-manager.enable = true;
+  programs.zsh.enable = true;
 
   fonts = {
     fontDir.enable = true;
@@ -108,27 +108,27 @@
   };
 
   # Auto upgrade nix package and the daemon service.
-  # services.nix-daemon.enable = true;
+  services.nix-daemon.enable = true;
   # nix.package = pkgs.nix;
 
-  # nix = {
-  #   package = lib.mkDefault pkgs.nixVersions.latest;
-  #   settings = {
-  #     # Necessary for using flakes on this system.
-  #     experimental-features = [
-  #       "nix-command"
-  #       "flakes"
-  #     ];
-  #     warn-dirty = false;
-  #   };
-  # };
+  nix = {
+    package = lib.mkDefault pkgs.nixVersions.latest;
+    settings = {
+      # Necessary for using flakes on this system.
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
+      warn-dirty = false;
+    };
+  };
   # nix.package = pkgs.nix;
 
   # Enable alternative shell support in nix-darwin.
   # programs.fish.enable = true;
 
   # Set Git commit hash for darwin-version.
-  # system.configurationRevision = self.rev or self.dirtyRev or null;
+  system.configurationRevision = self.rev or self.dirtyRev or null;
 
   # Used for backwards compatibility, please read the changelog before changing.
   # $ darwin-rebuild changelog