From c9ccb53bac7f032a5c026d7daffd8196c97dbfc3 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foo.dogsquared@gmail.com>
Date: Sat, 27 Aug 2022 13:30:04 +0800
Subject: [PATCH] flake.nix: use Nix-built Guix service module

---
 flake.nix                           | 11 +++++++----
 hosts/ni/default.nix                |  2 +-
 hosts/ni/hardware-configuration.nix |  4 ++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index f0051e7c..bc873dae 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,8 +9,10 @@
   };
 
   inputs = {
-    # I know NixOS can be stable but we're going cutting edge, baybee!
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    # I know NixOS can be stable but we're going cutting edge, baybee! While
+    # `nixpkgs-unstable` branch could be faster delivering updates, it is
+    # looser when it comes to stability for the entirety of this configuration.
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     # We're using this library for other functions, mainly testing.
     flake-utils.url = "github:numtide/flake-utils";
@@ -127,13 +129,14 @@
       # The default configuration for our NixOS systems.
       hostDefaultConfig = { pkgs, system, ... }: {
         # Only use imports as minimally as possible with the absolute
-        # requirements of a host.
+        # requirements of a host. On second thought, only on flakes with
+        # optional NixOS modules.
         imports = [
           inputs.home-manager.nixosModules.home-manager
           inputs.nix-ld.nixosModules.nix-ld
           inputs.nur.nixosModules.nur
           inputs.sops-nix.nixosModules.sops
-          inputs.guix-overlay.nixosModules.guix-binary
+          inputs.guix-overlay.nixosModules.guix
         ];
 
         environment.extraOutputsToInstall = [ "doc" "devdoc" "info" ];
diff --git a/hosts/ni/default.nix b/hosts/ni/default.nix
index 656db2e7..b106438e 100644
--- a/hosts/ni/default.nix
+++ b/hosts/ni/default.nix
@@ -100,7 +100,7 @@
   ];
 
   # Enable Guix service.
-  services.guix-binary.enable = true;
+  services.guix.enable = true;
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
diff --git a/hosts/ni/hardware-configuration.nix b/hosts/ni/hardware-configuration.nix
index 17732b18..4abdff0c 100644
--- a/hosts/ni/hardware-configuration.nix
+++ b/hosts/ni/hardware-configuration.nix
@@ -14,6 +14,10 @@
 
   fileSystems."/" = {
     label = "root";
+    options = [
+      "defaults"
+      "noatime"
+    ];
     fsType = "ext4";
   };