From 9c18c64edf8d4fff405c6d52cd1e324bdbd28225 Mon Sep 17 00:00:00 2001 From: Xe Date: Sat, 30 Apr 2022 03:00:40 +0000 Subject: [PATCH] fix??? Signed-off-by: Xe --- flake.lock | 83 +++++++++++++++++++++++++++------------ hosts/kos-mos/default.nix | 10 +++++ 2 files changed, 68 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 5768f6f..9bcbd46 100644 --- a/flake.lock +++ b/flake.lock @@ -55,12 +55,16 @@ } }, "emacs-overlay": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_3" + }, "locked": { - "lastModified": 1652072170, - "narHash": "sha256-7aWTXT+tM6yNYwq6HYzNmnFvkosygMMFy0QPiLgBt6M=", + "lastModified": 1652528291, + "narHash": "sha256-02IeJtY9NmUbyVqkAp9R4E4jSTHlJCtYQYjpuIoPy+g=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ff6f93f4d156d7e9b48bb9cc986d119775e7df1f", + "rev": "7965b47c428473943a49873385f5b168baeb7357", "type": "github" }, "original": { @@ -101,6 +105,21 @@ "type": "github" } }, + "flake-utils": { + "locked": { + "lastModified": 1652372896, + "narHash": "sha256-lURGussfF3mGrFPQT3zgW7+RC0pBhbHzco0C7I+ilow=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "0d347c56f6f41de822a4f4c7ff5072f3382db121", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gomod2nix": { "inputs": { "nixpkgs": [ @@ -128,14 +147,14 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1651886851, - "narHash": "sha256-kbXOJSf1uho0/7P54nZkJdJY3oAelIjyc6tfiRhaXJI=", + "lastModified": 1652452043, + "narHash": "sha256-nh3mdVB/Kk5ag1uRMAlKo8r+ssN3HNxwbLsqRG4xZkw=", "owner": "nix-community", "repo": "home-manager", - "rev": "882bd8118bdbff3a6e53e5ced393932b351ce2f6", + "rev": "273598f53e04f0111dca5724b37640e3907edaaf", "type": "github" }, "original": { @@ -193,7 +212,7 @@ }, "naersk_2": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1650265945, @@ -265,11 +284,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1652059086, - "narHash": "sha256-CjHSbr6LSFkN4YBdTB6+8ZQmSqhsbiXqAeQ9hQJ/gBI=", + "lastModified": 1652252629, + "narHash": "sha256-SvT64apetqc8P5nYp1/fOZvUmHUPdPFUZbhSpKy+1aI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "934e076a441e318897aa17540f6cf7caadc69028", + "rev": "d2fc6856824cb87742177eefc8dd534bdb6c3439", "type": "github" }, "original": { @@ -279,11 +298,25 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1651726670, - "narHash": "sha256-dSGdzB49SEvdOJvrQWfQYkAefewXraHIV08Vz6iDXWQ=", + "lastModified": 1652252629, + "narHash": "sha256-SvT64apetqc8P5nYp1/fOZvUmHUPdPFUZbhSpKy+1aI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01", + "rev": "d2fc6856824cb87742177eefc8dd534bdb6c3439", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1652378906, + "narHash": "sha256-DeV2myAMArPvyqxp0M6z30kuXb2L9SO2QXjxbbsZQyY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d89d7af1ba23bd8a5341d00bdd862e8e9a808f56", "type": "github" }, "original": { @@ -293,7 +326,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1650555608, "narHash": "sha256-e34oMPWPwRWhF1K6NZnF0mNle7qDADJzjWujp8UupGo=", @@ -307,7 +340,7 @@ "type": "indirect" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1650161686, "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=", @@ -322,7 +355,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1640319671, "narHash": "sha256-ZkKmakwaOaLiZOpIZWbeJZwap5CzJ30s4UJTfydYIYc=", @@ -338,7 +371,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1650161686, "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=", @@ -355,7 +388,7 @@ }, "portable-svc": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1650586426, @@ -374,7 +407,7 @@ }, "portable-svc_2": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1650586426, @@ -445,7 +478,7 @@ "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "mara": "mara", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "printerfacts": "printerfacts", "rhea": "rhea", "utils": "utils_3", @@ -486,11 +519,11 @@ }, "utils_3": { "locked": { - "lastModified": 1649676176, - "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "lastModified": 1652372896, + "narHash": "sha256-lURGussfF3mGrFPQT3zgW7+RC0pBhbHzco0C7I+ilow=", "owner": "numtide", "repo": "flake-utils", - "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "rev": "0d347c56f6f41de822a4f4c7ff5072f3382db121", "type": "github" }, "original": { @@ -575,7 +608,7 @@ }, "xess": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "utils": "utils_2" }, "locked": { diff --git a/hosts/kos-mos/default.nix b/hosts/kos-mos/default.nix index 3b33ece..8b8f766 100644 --- a/hosts/kos-mos/default.nix +++ b/hosts/kos-mos/default.nix @@ -9,4 +9,14 @@ networking.hostName = "kos-mos"; networking.hostId = "472479d4"; +<<<<<<< HEAD +======= + + xeserv.services.robocadey.enable = true; + age.secrets.robocadey = { + file = ../../secret/robocadey.age; + path = "/var/lib/private/xeserv.robocadey/.env"; + mode = "0666"; + }; +>>>>>>> 8c3057c (fix???) }