From c504fd7ac946d7a1b17944d73b261ca0a0b226a5 Mon Sep 17 00:00:00 2001
From: sops-nix-bot <106470913+sops-nix-bot@users.noreply.github.com>
Date: Sun, 20 Oct 2024 05:29:32 +0200
Subject: [PATCH 1/2] flake.lock: Update (#635)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da?narHash=sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M%3D' (2024-10-05)
  → 'github:NixOS/nixpkgs/ccc0c2126893dd20963580b6478d1a10a4512185?narHash=sha256-4HQI%2B6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo%3D' (2024-10-18)
• Updated input 'nixpkgs-stable':
    'github:NixOS/nixpkgs/17ae88b569bb15590549ff478bab6494dde4a907?narHash=sha256-uogSvuAp%2B1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss%3D' (2024-10-05)
  → 'github:NixOS/nixpkgs/bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22?narHash=sha256-66RHecx%2BzohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4%3D' (2024-10-19)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 00a0a9c5..9d6b8e4a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728093190,
-        "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=",
+        "lastModified": 1729265718,
+        "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da",
+        "rev": "ccc0c2126893dd20963580b6478d1a10a4512185",
         "type": "github"
       },
       "original": {
@@ -18,11 +18,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1728156290,
-        "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=",
+        "lastModified": 1729357638,
+        "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "17ae88b569bb15590549ff478bab6494dde4a907",
+        "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22",
         "type": "github"
       },
       "original": {

From 26642e8f193f547e72d38cd4c0c4e45b49236d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 21 Oct 2024 23:06:03 +0200
Subject: [PATCH 2/2] Add some missing literalExpression

---
 modules/home-manager/sops.nix      | 6 +++---
 modules/sops/default.nix           | 2 +-
 modules/sops/templates/default.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/home-manager/sops.nix b/modules/home-manager/sops.nix
index 3520bb9a..a111af16 100644
--- a/modules/home-manager/sops.nix
+++ b/modules/home-manager/sops.nix
@@ -54,7 +54,7 @@ let
       sopsFile = lib.mkOption {
         type = lib.types.path;
         default = cfg.defaultSopsFile;
-        defaultText = "\${config.sops.defaultSopsFile}";
+        defaultText = lib.literalExpression "\${config.sops.defaultSopsFile}";
         description = ''
           Sops file the secret is loaded from.
         '';
@@ -267,7 +267,7 @@ in {
     };
 
     # [re]load secrets on home-manager activation
-    home.activation = let 
+    home.activation = let
       darwin = let
         domain-target = "gui/$(id -u ${config.home.username})";
       in ''
@@ -286,7 +286,7 @@ in {
 
         unset systemdStatus
       '';
-    
+
     in {
       sops-nix = if pkgs.stdenv.isLinux then linux else darwin;
     };
diff --git a/modules/sops/default.nix b/modules/sops/default.nix
index e2d3824a..1a2d7932 100644
--- a/modules/sops/default.nix
+++ b/modules/sops/default.nix
@@ -89,7 +89,7 @@ let
       };
       sopsFile = lib.mkOption {
         type = lib.types.path;
-        defaultText = "\${config.sops.defaultSopsFile}";
+        defaultText = lib.literalExpression "\${config.sops.defaultSopsFile}";
         description = ''
           Sops file the secret is loaded from.
         '';
diff --git a/modules/sops/templates/default.nix b/modules/sops/templates/default.nix
index 892ad9b8..6f2bca76 100644
--- a/modules/sops/templates/default.nix
+++ b/modules/sops/templates/default.nix
@@ -69,7 +69,7 @@ in {
           group = mkOption {
             type = singleLineStr;
             default = users.${config.owner}.group;
-            defaultText = ''config.users.users.''${cfg.owner}.group'';
+            defaultText = lib.literalExpression ''config.users.users.''${cfg.owner}.group'';
             description = ''
               Group of the file.
             '';
@@ -77,7 +77,7 @@ in {
           file = mkOption {
             type = types.path;
             default = pkgs.writeText config.name config.content;
-            defaultText = ''pkgs.writeText config.name config.content'';
+            defaultText = lib.literalExpression ''pkgs.writeText config.name config.content'';
             example = "./configuration-template.conf";
             description = ''
               File used as the template. When this value is specified, `sops.templates.<name>.content` is ignored.