From 52bb07f7abec84b30e52a4f1b0297a6c5924277f Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Mon, 9 Jan 2023 16:22:48 +0100 Subject: [PATCH] minor fix for docker storage options and agenix input --- flake.lock | 41 ++++++++++++++++++++++++++--- flake.nix | 2 +- hosts/lkk-nix-1/services/docker.nix | 1 - 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index c640853..79cd62f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,9 +1,27 @@ { "nodes": { + "agenix": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1665870395, + "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=", + "owner": "ryantm", + "repo": "agenix", + "rev": "a630400067c6d03c9b3e0455347dc8559db14288", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, "deploy-rs": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "utils": "utils" }, "locked": { @@ -58,6 +76,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1665732960, + "narHash": "sha256-WBZ+uSHKFyjvd0w4inbm0cNExYTn8lpYFcHEes8tmec=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4428e23312933a196724da2df7ab78eb5e67a88e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1671417167, "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=", @@ -73,7 +107,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1671883564, "narHash": "sha256-C15oAtyupmLB3coZY7qzEHXjhtUx/+77olVdqVMruAg=", @@ -91,9 +125,10 @@ }, "root": { "inputs": { + "agenix": "agenix", "deploy-rs": "deploy-rs", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" } }, "utils": { diff --git a/flake.nix b/flake.nix index 9fbfe68..5832817 100644 --- a/flake.nix +++ b/flake.nix @@ -5,10 +5,10 @@ inputs = { home-manager = { - agenix.url = "github:ryantm/agenix"; url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + agenix.url = "github:ryantm/agenix"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; deploy-rs.url = "github:serokell/deploy-rs"; }; diff --git a/hosts/lkk-nix-1/services/docker.nix b/hosts/lkk-nix-1/services/docker.nix index d334888..1c59082 100644 --- a/hosts/lkk-nix-1/services/docker.nix +++ b/hosts/lkk-nix-1/services/docker.nix @@ -3,7 +3,6 @@ virtualisation.docker = { enable = true; enableOnBoot = true; - storageDrive = "btrfs"; rootless = { enable = true; setSocketVariable = true;