From 3b06aaaeb66ad97876f8ec3562f4e4d9013c8b43 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Wed, 22 Jun 2022 21:54:57 +0200 Subject: [PATCH] init but fail with colmena, because of secret managment --- flake.lock | 795 ++++++++++++++++++++++++- flake.nix | 124 +++- nixos/configs/sterni/configuration.nix | 2 +- 3 files changed, 916 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 8e562f6..6f434af 100644 --- a/flake.lock +++ b/flake.lock @@ -1,6 +1,313 @@ { "nodes": { + "barcode-reader": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1636602745, + "narHash": "sha256-oCpDOT83cQwIz1frgZwhl+g5uzQIOvHfYglbqF7OZ5g=", + "owner": "mrVanDalo", + "repo": "barcode-reader", + "rev": "7ffb09892cd67186b2cb33f001bfe27e1acd6e5d", + "type": "github" + }, + "original": { + "owner": "mrVanDalo", + "repo": "barcode-reader", + "type": "github" + } + }, + "cluster-module": { + "locked": { + "lastModified": 1635790675, + "narHash": "sha256-hWwS/sX46dEIw+swRfB8KZq0T/gDpryswTkZy5n0BAc=", + "owner": "mrvandalo", + "repo": "module.cluster", + "rev": "299f5e9f4d9faa2abce40ae853601e11eecd7383", + "type": "github" + }, + "original": { + "owner": "mrvandalo", + "repo": "module.cluster", + "type": "github" + } + }, + "colmena": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs", + "stable": "stable", + "utils": "utils" + }, + "locked": { + "lastModified": 1655872141, + "narHash": "sha256-ma7Tpz0ymTTrmVXTJ2rwME0nP3Vg9KjIifE77ZA8dr0=", + "owner": "zhaofengli", + "repo": "colmena", + "rev": "a17e4eda1748bee4f2d7e443ac573349f576e81d", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "repo": "colmena", + "type": "github" + } + }, + "doom-emacs": { + "flake": false, + "locked": { + "lastModified": 1654347726, + "narHash": "sha256-B4N+UQ0SvnCH0Hqc62Wl1KS6WcTBGLag0BoH3UZGbgo=", + "owner": "doomemacs", + "repo": "doomemacs", + "rev": "bea3cc161c0a803dcf574f32ee555dccf565a5ce", + "type": "github" + }, + "original": { + "owner": "doomemacs", + "ref": "master", + "repo": "doomemacs", + "type": "github" + } + }, + "doom-emacs-nix": { + "inputs": { + "doom-emacs": "doom-emacs", + "doom-snippets": "doom-snippets", + "emacs-overlay": "emacs-overlay", + "emacs-so-long": "emacs-so-long", + "evil-markdown": "evil-markdown", + "evil-org-mode": "evil-org-mode", + "evil-quick-diff": "evil-quick-diff", + "explain-pause-mode": "explain-pause-mode", + "flake-utils": "flake-utils", + "format-all": "format-all", + "nix-straight": "nix-straight", + "nixpkgs": [ + "nixpkgs" + ], + "nose": "nose", + "ob-racket": "ob-racket", + "org": "org", + "org-contrib": "org-contrib", + "org-yt": "org-yt", + "php-extras": "php-extras", + "revealjs": "revealjs", + "rotate-text": "rotate-text" + }, + "locked": { + "lastModified": 1655429822, + "narHash": "sha256-g1uW2GybLSL0vrBOZWrdket7IHBuWu2S1ev++1WUxuA=", + "owner": "nix-community", + "repo": "nix-doom-emacs", + "rev": "d296d6d44b27a5090c4096ff9a7ded37803a558d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-doom-emacs", + "type": "github" + } + }, + "doom-snippets": { + "flake": false, + "locked": { + "lastModified": 1651768501, + "narHash": "sha256-55mHNFfn3N8k4aWgswX9buATsOhQTJ0L05UaUNNMgDg=", + "owner": "doomemacs", + "repo": "snippets", + "rev": "f74b11b1e0fe8481e20f3065e355efe627e635de", + "type": "github" + }, + "original": { + "owner": "doomemacs", + "repo": "snippets", + "type": "github" + } + }, + "emacs-overlay": { + "flake": false, + "locked": { + "lastModified": 1655408680, + "narHash": "sha256-E6s17Wg3NExV3cxFnVzTEHjcRyBBwvbx6acNEttU40A=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "270d5e914b4c0425a4982cf585c91d6760e78777", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, + "emacs-overlay_2": { + "flake": false, + "locked": { + "lastModified": 1655893294, + "narHash": "sha256-ICpY7sKldeWDIJ1gnIyyLDv2xNKqkczxTy7Xjz2b8s0=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "e0d8cd1477216ece946d472c51e15a27cacf6664", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, + "emacs-so-long": { + "flake": false, + "locked": { + "lastModified": 1575031854, + "narHash": "sha256-xIa5zO0ZaToDrec1OFjBK6l39AbA4l/CE4LInVu2hi0=", + "owner": "hlissner", + "repo": "emacs-so-long", + "rev": "ed666b0716f60e8988c455804de24b55919e71ca", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "emacs-so-long", + "type": "github" + } + }, + "evil-markdown": { + "flake": false, + "locked": { + "lastModified": 1626852210, + "narHash": "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=", + "owner": "Somelauw", + "repo": "evil-markdown", + "rev": "8e6cc68af83914b2fa9fd3a3b8472573dbcef477", + "type": "github" + }, + "original": { + "owner": "Somelauw", + "repo": "evil-markdown", + "type": "github" + } + }, + "evil-org-mode": { + "flake": false, + "locked": { + "lastModified": 1607203864, + "narHash": "sha256-JxwqVYDN6OIJEH15MVI6XOZAPtUWUhJQWHyzcrUvrFg=", + "owner": "hlissner", + "repo": "evil-org-mode", + "rev": "a9706da260c45b98601bcd72b1d2c0a24a017700", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "evil-org-mode", + "type": "github" + } + }, + "evil-quick-diff": { + "flake": false, + "locked": { + "lastModified": 1575189609, + "narHash": "sha256-oGzl1ayW9rIuq0haoiFS7RZsS8NFMdEA7K1BSozgnJU=", + "owner": "rgrinberg", + "repo": "evil-quick-diff", + "rev": "69c883720b30a892c63bc89f49d4f0e8b8028908", + "type": "github" + }, + "original": { + "owner": "rgrinberg", + "repo": "evil-quick-diff", + "type": "github" + } + }, + "explain-pause-mode": { + "flake": false, + "locked": { + "lastModified": 1595842060, + "narHash": "sha256-++znrjiDSx+cy4okFBBXUBkRFdtnE2x+trkmqjB3Njs=", + "owner": "lastquestion", + "repo": "explain-pause-mode", + "rev": "2356c8c3639cbeeb9751744dbe737267849b4b51", + "type": "github" + }, + "original": { + "owner": "lastquestion", + "repo": "explain-pause-mode", + "type": "github" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "nixpkgs-fmt", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1637475807, + "narHash": "sha256-E3nzOvlzZXwyo8Stp5upKsTCDcqUTYAFj4EC060A31c=", + "owner": "nix-community", + "repo": "fenix", + "rev": "960e7fef45692a4fffc6df6d6b613b0399bbdfd5", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -15,9 +322,118 @@ "type": "github" } }, + "flake-utils_4": { + "locked": { + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "locked": { + "lastModified": 1631561581, + "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "format-all": { + "flake": false, + "locked": { + "lastModified": 1581716637, + "narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=", + "owner": "lassik", + "repo": "emacs-format-all-the-code", + "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", + "type": "github" + }, + "original": { + "owner": "lassik", + "repo": "emacs-format-all-the-code", + "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", + "type": "github" + } + }, + "grocy-scanner": { + "inputs": { + "barcode-reader": "barcode-reader", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1637608833, + "narHash": "sha256-mjbNI3AKFA8O/kjUlzP0t3e9oI5SmU5/49aHPcwssZw=", + "owner": "mrVanDalo", + "repo": "grocy-scanner", + "rev": "7ae77b0881a993e0a91623341327f15e40564e48", + "type": "github" + }, + "original": { + "owner": "mrVanDalo", + "repo": "grocy-scanner", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1651519540, + "narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-21.11", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager-utils": { + "inputs": { + "home-manager": [ + "home-manager" + ] + }, + "locked": { + "lastModified": 1636824615, + "narHash": "sha256-nGIu5Yons4/2vBswaV6jsiv4eSHEVeX+HaPzjP3GFsE=", + "owner": "mrvandalo", + "repo": "home-manager-utils", + "rev": "18f82ade18b71b57612a0a6b1f849da1df702624", + "type": "github" + }, + "original": { + "owner": "mrvandalo", + "repo": "home-manager-utils", + "type": "github" + } + }, "krops": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -36,7 +452,124 @@ "type": "github" } }, + "nix-straight": { + "flake": false, + "locked": { + "lastModified": 1643475817, + "narHash": "sha256-NpExq5nbPbj/ppkBX3SnETEJuOne1MKJxen8vVHsDFg=", + "owner": "nix-community", + "repo": "nix-straight.el", + "rev": "08d75e5651cb52f8a07e03408ed19e04bee07505", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-straight.el", + "type": "github" + } + }, "nixpkgs": { + "locked": { + "lastModified": 1654230545, + "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-21_11": { + "locked": { + "lastModified": 1655562720, + "narHash": "sha256-OrN8DkBRZqZMzMuECuQNvSQ5gWoFBCxDvxYXjIQ/pH0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "27dffce7eaa9648b4a13a461e786f169a17c0889", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-21.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-22_05": { + "locked": { + "lastModified": 1655584987, + "narHash": "sha256-YmWxPm6ctu+9nV80DtYtMfOBosNymeTpj8+Z0JTDfhU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "57622cb817210146b379adbbd036d3da0d1f367c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-fmt": { + "inputs": { + "fenix": "fenix", + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1655463281, + "narHash": "sha256-vkxECKrCjywR13hd+mV3naglzBUSemU2uKW7qXETquo=", + "owner": "nix-community", + "repo": "nixpkgs-fmt", + "rev": "9e8bde571902a3cf0f5a725f27fcf11cb25921c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs-fmt", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1655807518, + "narHash": "sha256-5YV29Ry/DpAJc/0Hc/+ISVBAjwHpJvAkeKkcUG5lWsc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a72d7811be1162dd6804c4e36e5402d76fb6e921", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1636416043, + "narHash": "sha256-Esz9X97OeAsNoJUVuqlCu2LDWcyLE24huUonhOY3JGw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "db6044d5debaff0749420c3553d1b89fc6c5c5f8", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1655096306, "narHash": "sha256-3B3zBaQVLL956deZgmucouvkZroObQ4JKHzbIfFS9/c=", @@ -52,11 +585,216 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1632855891, + "narHash": "sha256-crW76mt9/kbUBiKy/KiSnsQ9JEYgD3StDuYAMVkTbM0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "73086069ebd402e85eaa39c06aef33c2b917f532", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1655481042, + "narHash": "sha256-XHbcywq2vIQ5CeH1OK3TN793jkiNAAZsSctS1PFgseo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "103a4c0ae46afa9cf008c30744175315ca38e9f9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nose": { + "flake": false, + "locked": { + "lastModified": 1400604510, + "narHash": "sha256-daEi8Kta1oGaDEmUUDDQMahTTPOpvNpDKk22rlr7cB0=", + "owner": "emacsattic", + "repo": "nose", + "rev": "f8528297519eba911696c4e68fa88892de9a7b72", + "type": "github" + }, + "original": { + "owner": "emacsattic", + "repo": "nose", + "type": "github" + } + }, + "ob-racket": { + "flake": false, + "locked": { + "lastModified": 1584656173, + "narHash": "sha256-rBUYDDCXb+3D4xTPQo9UocbTPZ32kWV1Uya/1DmZknU=", + "owner": "xchrishawk", + "repo": "ob-racket", + "rev": "83457ec9e1e96a29fd2086ed19432b9d75787673", + "type": "github" + }, + "original": { + "owner": "xchrishawk", + "repo": "ob-racket", + "type": "github" + } + }, + "org": { + "flake": false, + "locked": { + "lastModified": 1655383862, + "narHash": "sha256-WZLa8ly+WjLVIhiKf0m1hwJ3c1BJVwBZgr9AHAJ6zQw=", + "owner": "emacs-straight", + "repo": "org-mode", + "rev": "e9da29b6fafe63abbc2774e9d485ac13d2811b65", + "type": "github" + }, + "original": { + "owner": "emacs-straight", + "repo": "org-mode", + "type": "github" + } + }, + "org-contrib": { + "flake": false, + "locked": { + "lastModified": 1654411077, + "narHash": "sha256-ywXAI+s+D701PvuDEQljDmFWrTPymqustSYVyf3NYRk=", + "ref": "refs/heads/master", + "rev": "c6aef31ccfc7c4418c3b51e98f7c3bd8e255f5e6", + "revCount": 2622, + "type": "git", + "url": "https://git.sr.ht/~bzg/org-contrib" + }, + "original": { + "type": "git", + "url": "https://git.sr.ht/~bzg/org-contrib" + } + }, + "org-yt": { + "flake": false, + "locked": { + "lastModified": 1527381913, + "narHash": "sha256-dzQ6B7ryzatHCTLyEnRSbWO0VUiX/FHYnpHTs74aVUs=", + "owner": "TobiasZawada", + "repo": "org-yt", + "rev": "40cc1ac76d741055cbefa13860d9f070a7ade001", + "type": "github" + }, + "original": { + "owner": "TobiasZawada", + "repo": "org-yt", + "type": "github" + } + }, + "php-extras": { + "flake": false, + "locked": { + "lastModified": 1573312690, + "narHash": "sha256-r4WyVbzvT0ra4Z6JywNBOw5RxOEYd6Qe2IpebHXkj1U=", + "owner": "arnested", + "repo": "php-extras", + "rev": "d410c5af663c30c01d461ac476d1cbfbacb49367", + "type": "github" + }, + "original": { + "owner": "arnested", + "repo": "php-extras", + "type": "github" + } + }, + "polygon-art": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1632864714, + "narHash": "sha256-aKYFPoMlTVovXk8fM7KZOc1HhusF/PEFEV9haBMJvuA=", + "ref": "refs/heads/develop", + "rev": "a5d6e6ec4348af2c963c4cb5c5d04e1f805a9bc2", + "revCount": 23, + "type": "git", + "url": "https://git.ingolf-wagner.de/palo/polygon-art.git" + }, + "original": { + "type": "git", + "url": "https://git.ingolf-wagner.de/palo/polygon-art.git" + } + }, + "revealjs": { + "flake": false, + "locked": { + "lastModified": 1653993278, + "narHash": "sha256-X43lsjoLBWmttIKj9Jzut0UP0dZlsue3fYbJ3++ojbU=", + "owner": "hakimel", + "repo": "reveal.js", + "rev": "039972c730690af7a83a5cb832056a7cc8b565d7", + "type": "github" + }, + "original": { + "owner": "hakimel", + "repo": "reveal.js", + "type": "github" + } + }, "root": { "inputs": { + "cluster-module": "cluster-module", + "colmena": "colmena", + "doom-emacs-nix": "doom-emacs-nix", + "emacs-overlay": "emacs-overlay_2", + "grocy-scanner": "grocy-scanner", + "home-manager": "home-manager", + "home-manager-utils": "home-manager-utils", "krops": "krops", - "nixpkgs": "nixpkgs", - "secrets": "secrets" + "nixpkgs": "nixpkgs_3", + "nixpkgs-fmt": "nixpkgs-fmt", + "nixpkgs-unstable": "nixpkgs-unstable", + "polygon-art": "polygon-art", + "secrets": "secrets", + "sops-nix": "sops-nix" + } + }, + "rotate-text": { + "flake": false, + "locked": { + "lastModified": 1322962747, + "narHash": "sha256-SOeOgSlcEIsKhUiYDJv0p+mLUb420s9E2BmvZQvZ0wk=", + "owner": "debug-ito", + "repo": "rotate-text.el", + "rev": "48f193697db996855aee1ad2bc99b38c6646fe76", + "type": "github" + }, + "original": { + "owner": "debug-ito", + "repo": "rotate-text.el", + "type": "github" + } + }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1637439871, + "narHash": "sha256-2awQ/obzl7zqYgLwbQL0zT58gN8Xq7n+81GcMiS595I=", + "owner": "rust-analyzer", + "repo": "rust-analyzer", + "rev": "4566414789310acb2617543f4b50beab4bb48e06", + "type": "github" + }, + "original": { + "owner": "rust-analyzer", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" } }, "secrets": { @@ -75,6 +813,57 @@ "type": "git", "url": "ssh://gitea@git.ingolf-wagner.de/palo/nixos-secrets.git" } + }, + "sops-nix": { + "inputs": { + "nixpkgs": "nixpkgs_5", + "nixpkgs-21_11": "nixpkgs-21_11", + "nixpkgs-22_05": "nixpkgs-22_05" + }, + "locked": { + "lastModified": 1655707707, + "narHash": "sha256-PlDTG9w4FtoqnELKC+FYS2d2XCG/HGpBMqDX+V98pu4=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "2a8d731e401889bd3e03b40da50f7314dee4a4da", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, + "stable": { + "locked": { + "lastModified": 1653996475, + "narHash": "sha256-r/UA7h3Dfgf4dlOCkakpqejf1Tagfb+6T+9OdT0qBgU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ec6eaba9dfcfdd11547d75a193e91e26701bf7e3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-21.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "utils": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index fc3e933..21cce8f 100644 --- a/flake.nix +++ b/flake.nix @@ -12,9 +12,60 @@ url = "github:Mic92/krops"; inputs.nixpkgs.follows = "nixpkgs"; }; + # colmena + colmena.url = "github:zhaofengli/colmena"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + polygon-art = { + url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git"; + }; + sops-nix.url = "github:Mic92/sops-nix"; + emacs-overlay = { + url = "github:nix-community/emacs-overlay"; + flake = false; + }; + doom-emacs-nix = { + url = "github:nix-community/nix-doom-emacs"; + inputs.nixpkgs.follows = "nixpkgs"; + #inputs.emacs-overlay.follows = "emacs-overlay"; + }; + home-manager = { + url = "github:nix-community/home-manager/release-21.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + home-manager-utils = { + url = "github:mrvandalo/home-manager-utils"; + inputs.home-manager.follows = "home-manager"; + }; + cluster-module = { + url = "github:mrvandalo/module.cluster"; + }; + nixpkgs-fmt = { + url = "github:nix-community/nixpkgs-fmt"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + grocy-scanner = { + url = "github:mrVanDalo/grocy-scanner"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, krops, secrets, ... }: + outputs = + { self + , cluster-module + , colmena + , doom-emacs-nix + , emacs-overlay + , grocy-scanner + , home-manager + , home-manager-utils + , nixpkgs + , nixpkgs-fmt + , nixpkgs-unstable + , polygon-art + , sops-nix + , krops + , secrets + }: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; @@ -37,5 +88,76 @@ }; }; + # colmena + devShell.x86_64-linux = + pkgs.mkShell { + buildInputs = [ colmena.packages.${system}.colmena ]; + }; + + colmena = { + + meta = { + nixpkgs = import nixpkgs { + system = "x86_64-linux"; + overlays = [ + (_self: _super: { + # we assign the overlay created before to the overlays of nixpkgs. + unstable = nixpkgs-unstable.legacyPackages.${pkgs.system}; + polygon-art = polygon-art.packages.${pkgs.system}; + }) + + ]; + }; + }; + + sterni = { name, nodes, pkgs, ... }: { + deployment = { + buildOnTarget = true; + targetHost = "sterni.private"; + keys = { + "onion_id_pepe".text = "yolo"; + }; + }; + + imports = [ + ./nixos/configs/sterni/configuration.nix + sops-nix.nixosModules.sops + cluster-module.nixosModules.tinc + grocy-scanner.nixosModule + home-manager.nixosModules.home-manager + ]; + + # todo + sops.defaultSopsFile = "${secrets}/secrets/sterni.yaml"; + + nix = { + # no channesl needed this way + nixPath = [ "nixpkgs=${pkgs.path}" ]; + # make flakes available + package = pkgs.nixUnstable; + extraOptions = '' + experimental-features = nix-command flakes + ''; + }; + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.mainUser = { + imports = [ + doom-emacs-nix.hmModule + home-manager-utils.hmModule + ]; + }; + environment.systemPackages = [ + nixpkgs-fmt.defaultPackage."x86_64-linux" + ]; + + }; + }; }; } + + + + + + diff --git a/nixos/configs/sterni/configuration.nix b/nixos/configs/sterni/configuration.nix index 03fba91..49bd3d5 100644 --- a/nixos/configs/sterni/configuration.nix +++ b/nixos/configs/sterni/configuration.nix @@ -15,7 +15,7 @@ ]; - sops.defaultSopsFile = ../../secrets/sterni.yaml; + #sops.defaultSopsFile = ../../secrets/sterni.yaml; networking.hostName = "sterni"; system.custom.wifi.interfaces = [ "wlp3s0" ];