diff --git a/_versions/home-manager.json b/.versions/home-manager.json similarity index 100% rename from _versions/home-manager.json rename to .versions/home-manager.json diff --git a/_versions/krops.json b/.versions/krops.json similarity index 100% rename from _versions/krops.json rename to .versions/krops.json diff --git a/_versions/nixpkgs-unstable.json b/.versions/nixpkgs-unstable.json similarity index 100% rename from _versions/nixpkgs-unstable.json rename to .versions/nixpkgs-unstable.json diff --git a/_versions/nixpkgs.json b/.versions/nixpkgs.json similarity index 100% rename from _versions/nixpkgs.json rename to .versions/nixpkgs.json diff --git a/_versions/stockholm.json b/.versions/stockholm.json similarity index 100% rename from _versions/stockholm.json rename to .versions/stockholm.json diff --git a/deploy.nix b/deploy.nix index e5fda1b..376e4a4 100644 --- a/deploy.nix +++ b/deploy.nix @@ -4,7 +4,7 @@ let inherit (object) url; ref = object.rev; }; - krops = builtins.fetchGit (gitFromJson _versions/krops.json); + krops = builtins.fetchGit (gitFromJson .versions/krops.json); lib = import "${krops}/lib"; pkgs = import "${krops}/pkgs" {}; importJson = (import {}).lib.importJSON; @@ -16,10 +16,10 @@ let system.file = toString path; nixos-config.symlink = "system/configuration.nix"; - nixpkgs.git = gitFromJson _versions/nixpkgs.json; - nixos-unstable.git = gitFromJson _versions/nixpkgs-unstable.json; - home-manager.git = gitFromJson _versions/home-manager.json; - stockholm.git = gitFromJson _versions/stockholm.json; + nixpkgs.git = gitFromJson .versions/nixpkgs.json; + nixos-unstable.git = gitFromJson .versions/nixpkgs-unstable.json; + home-manager.git = gitFromJson .versions/home-manager.json; + stockholm.git = gitFromJson .versions/stockholm.json; secrets.pass = { dir = toString ~/.password-store/systems; inherit name; diff --git a/niveum-update b/niveum-update index 2206765..dec972b 100755 --- a/niveum-update +++ b/niveum-update @@ -11,9 +11,9 @@ fetch() { > "${output}" } -fetch "refs/heads/nixos-19.09" _versions/nixpkgs.json & -fetch "refs/heads/nixos-unstable" _versions/nixpkgs-unstable.json & -fetch "refs/heads/release-19.09" _versions/home-manager.json "https://github.com/rycee/home-manager.git" & -fetch "refs/tags/v1.15.0" _versions/krops.json "https://cgit.krebsco.de/krops" & -fetch "ea5b591d065b721666fc3527ad45a7545a594a77" _versions/stockholm.json "https://cgit.krebsco.de/stockholm" & +fetch "refs/heads/nixos-19.09" .versions/nixpkgs.json & +fetch "refs/heads/nixos-unstable" .versions/nixpkgs-unstable.json & +fetch "refs/heads/release-19.09" .versions/home-manager.json "https://github.com/rycee/home-manager.git" & +fetch "refs/tags/v1.15.0" .versions/krops.json "https://cgit.krebsco.de/krops" & +fetch "ea5b591d065b721666fc3527ad45a7545a594a77" .versions/stockholm.json "https://cgit.krebsco.de/stockholm" & wait