From ece4345b167b6b786fbe1b87bcbeef6c548a1a89 Mon Sep 17 00:00:00 2001 From: Frank LoTurco Date: Wed, 21 Oct 2026 09:37:51 -0400 Subject: [PATCH] features/docker.nix: remove docker data-dir configuration --- features/docker.nix | 4 ---- flake.lock | 21 +++++++++++++++++++++ flake.nix | 12 ++++++++++++ 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/features/docker.nix b/features/docker.nix index 2e519bc..1b161ba 100644 --- a/features/docker.nix +++ b/features/docker.nix @@ -6,10 +6,6 @@ rootless = { enable = true; setSocketVariable = true; - - daemon.settings = { - data-root = "$XDG_DATA_HOME/docker"; - }; }; }; } diff --git a/flake.lock b/flake.lock index 06cbca6..c98342d 100644 --- a/flake.lock +++ b/flake.lock @@ -865,6 +865,7 @@ "nixpkgs-xr": "nixpkgs-xr", "pi": "pi", "scopebuddy": "scopebuddy", + "sops-nix": "sops-nix", "xivlauncher-rb": "xivlauncher-rb" } }, @@ -905,6 +906,26 @@ "type": "github" } }, + "sops-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1792056300, + "narHash": "sha256-YU1LjDe1o2Ymg5zEiCHbmMXLkDCtxHQRiVqZ3nC5GGk=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "44931708c62937c2b1bf7953902989fa5bb9ee1b", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1776166891, diff --git a/flake.nix b/flake.nix index ac4b3ac..978c72c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,11 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + sops-nix = { + url = "github:Mic92/sops-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + xivlauncher-rb = { url = "github:dawei-nh/xivlauncher-rb-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -85,6 +90,7 @@ nix-flatpak, home-manager, affinity-nix, + sops-nix, affinity-thumbnailer-kde, millennium, cheatengine, @@ -119,6 +125,7 @@ nixpkgs-xr.nixosModules.nixpkgs-xr nix-flatpak.nixosModules.nix-flatpak affinity-thumbnailer-kde.nixosModules.default + sops-nix.nixosModules.sops ./hosts/nero/hardware.nix ./hosts/nero/configuration.nix @@ -133,6 +140,8 @@ home-manager-configuration trusted-users-configuration + sops-nix.nixosModules.sops + ./hosts/vergil/hardware.nix ./hosts/vergil/configuration.nix ]; @@ -148,6 +157,7 @@ nix-flatpak.nixosModules.nix-flatpak affinity-thumbnailer-kde.nixosModules.default + sops-nix.nixosModules.sops ./hosts/pdw-frankiel/hardware.nix ./hosts/pdw-frankiel/configuration.nix @@ -166,6 +176,8 @@ home-manager.darwinModules.home-manager home-manager-configuration + sops-nix.darwinModules.sops + { users.users.frank.home = "/Users/frank"; }