diff --git a/nixos/flake.lock b/nixos/flake.lock deleted file mode 100644 index 3a89cca..0000000 --- a/nixos/flake.lock +++ /dev/null @@ -1,731 +0,0 @@ -{ - "nodes": { - "barcode-reader": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs" - }, - "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" - } - }, - "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": 1655058854, - "narHash": "sha256-q69pc4pQrFW4smr/rbqFLauanvdLgC9gduBm1Cd5148=", - "owner": "nix-community", - "repo": "nix-doom-emacs", - "rev": "ba55ef6f304969dba4e6db00098a6327d3f76813", - "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": 1655032304, - "narHash": "sha256-t0E7c7V+hk6ILXl4+TBLqQfqq8/4IKyb/cFg0a8mqI8=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "a73897fc387a83c8dd2142ed597041113954ec23", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, - "emacs-overlay_2": { - "flake": false, - "locked": { - "lastModified": 1655233443, - "narHash": "sha256-pL5d/smagVpW/7/MuX7uOusCRZ3Ak+uWvr4BK+0WtHQ=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "859fbd8964ae5605e44020a559d73905f1e1cfa5", - "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-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": 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_4": { - "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" - } - }, - "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": 1636416043, - "narHash": "sha256-Esz9X97OeAsNoJUVuqlCu2LDWcyLE24huUonhOY3JGw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "db6044d5debaff0749420c3553d1b89fc6c5c5f8", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-21_11": { - "locked": { - "lastModified": 1654346688, - "narHash": "sha256-Y7QtZkfdxTvACCvWmDjpN6qOf4OKkZATufHcJP2VMKM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2de556c4cd46a59e8ce2f85ee4dd400983213d45", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-21.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-22_05": { - "locked": { - "lastModified": 1654373220, - "narHash": "sha256-3vKFnZz2oYHo4YcelaNOhO4XQ2jiIEXrp1s4w+e773c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d6cb04299ce8964290ae7fdcb87aa50da0500b5c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-fmt": { - "inputs": { - "fenix": "fenix", - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1654597974, - "narHash": "sha256-/h0s8OfYs4c8SPFjZUnY8JmrheWkMMuQ6pkbpPWj5Vs=", - "owner": "nix-community", - "repo": "nixpkgs-fmt", - "rev": "7ddc2a76e6a6f90b4a63723bc0c0bbe8d5324fdc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs-fmt", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1655130522, - "narHash": "sha256-5dzlxE4okyu+M39yeVtHWQXzDZQxFF5rUB1iY9R6Lb4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "13f08d71ceff5101321e0291854495a1ec153a5e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1655200170, - "narHash": "sha256-/yzkX+10sJhYNIcTtZ5ObS+nh/HrJp01XLaubzbRDcU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9ff91ce2e4c5d70551d4c8fd8830931c6c6b26b8", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1632855891, - "narHash": "sha256-crW76mt9/kbUBiKy/KiSnsQ9JEYgD3StDuYAMVkTbM0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "73086069ebd402e85eaa39c06aef33c2b917f532", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1654245945, - "narHash": "sha256-PV6MZ+HuNnyLxQGa2rwt0BmCRkQS2xqhc+SeJLQM+WU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "442db9429b9fbdb6352cfb937afc8ecccfe2633f", - "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": 1654949849, - "narHash": "sha256-1xGPQv2rFF4KglqwjKz+1uzB81nqa+6lgXPpnU3mduE=", - "owner": "emacs-straight", - "repo": "org-mode", - "rev": "ed6f8dc67f5f1abf6b20929bdb571def2c191006", - "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_4", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1632864707, - "narHash": "sha256-aKYFPoMlTVovXk8fM7KZOc1HhusF/PEFEV9haBMJvuA=", - "ref": "master", - "rev": "b39c539f9e720cc144c9ad7fe0d72cd46f793dab", - "revCount": 22, - "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", - "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", - "nixpkgs": "nixpkgs_2", - "nixpkgs-fmt": "nixpkgs-fmt", - "nixpkgs-unstable": "nixpkgs-unstable", - "polygon-art": "polygon-art", - "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" - } - }, - "sops-nix": { - "inputs": { - "nixpkgs": "nixpkgs_4", - "nixpkgs-21_11": "nixpkgs-21_11", - "nixpkgs-22_05": "nixpkgs-22_05" - }, - "locked": { - "lastModified": 1654401128, - "narHash": "sha256-uCdQ2fzIPGakHw2TkvOncUvCl7Fo7z/vagpDWYooO7s=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "f075361ecbde21535b38e41dfaa28a28f160855c", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/nixos/flake.nix b/nixos/flake.nix deleted file mode 100644 index 678d237..0000000 --- a/nixos/flake.nix +++ /dev/null @@ -1,120 +0,0 @@ -{ - description = "system flake.nix"; - inputs = { - sops-nix.url = "github:Mic92/sops-nix"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - polygon-art = { - url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git"; - }; - 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 - , sops-nix - , nixpkgs - , home-manager - , home-manager-utils - , emacs-overlay - , doom-emacs-nix - , nixpkgs-unstable - , cluster-module - , polygon-art - , nixpkgs-fmt - , grocy-scanner - }: - - let - nixosSystem = nixpkgs.lib.nixosSystem; - defaultModules = [ - sops-nix.nixosModules.sops - cluster-module.nixosModules.tinc - grocy-scanner.nixosModule - ({ pkgs, ... }: { - nix = { - # no channesl needed this way - nixPath = [ "nixpkgs=${pkgs.path}" ]; - # make flakes available - package = pkgs.nixUnstable; - extraOptions = '' - experimental-features = nix-command flakes - ''; - }; - # defined overlays injected by the nixflake - nixpkgs.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}; - }) - ]; - }) - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - } - ]; - desktopModules = [ - { - home-manager.users.mainUser = { - imports = [ - doom-emacs-nix.hmModule - home-manager-utils.hmModule - ]; - }; - environment.systemPackages = [ - nixpkgs-fmt.defaultPackage."x86_64-linux" - ]; - } - ]; - desktopConfiguration = initPath: - nixosSystem { - system = "x86_64-linux"; - modules = defaultModules ++ desktopModules ++ [ initPath ]; - }; - serverConfiguration = initPath: - nixosSystem { - system = "x86_64-linux"; - modules = defaultModules ++ [ initPath ]; - }; - in - { - nixosConfigurations = { - sterni = desktopConfiguration ./configs/sterni/configuration.nix; - sternchen = desktopConfiguration ./configs/sternchen/configuration.nix; - pepe = serverConfiguration ./configs/pepe/configuration.nix; - workhorse = serverConfiguration ./configs/workhorse/configuration.nix; - sputnik = serverConfiguration ./configs/sputnik/configuration.nix; - robi = serverConfiguration ./configs/robi/configuration.nix; - }; - }; -} diff --git a/nixos/krops.nix b/nixos/krops.nix deleted file mode 100644 index fe430b1..0000000 --- a/nixos/krops.nix +++ /dev/null @@ -1,135 +0,0 @@ -{ pkgs, writeCommand, lib, secrets, nixosRebuildCommand ? "switch" }: -let - - # command that ensures we use flake.nix during switch - command = targetPath: - let - commandLine = "TMPDIR=/tmp nixos-rebuild ${nixosRebuildCommand} --flake ${targetPath} -L --keep-going"; - in - '' - echo '${commandLine}' - nix-shell \ - -E "with import {}; mkShell { buildInputs = [ git (nixos { nix.package = nixFlakes; }).nixos-rebuild ]; }" \ - --run '${commandLine}' - ''; - - source = { - secrets.file = { - path = "${secrets}/secrets"; - useChecksum = true; - }; - private_assets.pass = { - dir = toString ~/.password-store; - name = "krops/private_assets"; - }; - assets.file = { - path = toString ./assets; - useChecksum = true; - }; - configs.file = { - path = toString ./configs; - useChecksum = true; - }; - library.file = { - path = toString ./library; - useChecksum = true; - }; - modules.file = { - path = toString ./modules; - useChecksum = true; - }; - pkgs.file = { - path = toString ./pkgs; - useChecksum = true; - }; - system.file = { - path = toString ./system; - useChecksum = true; - }; - "flake.nix".file = { - path = toString ./flake.nix; - useChecksum = true; - }; - "flake.lock".file = { - path = toString ./flake.lock; - useChecksum = true; - }; - }; - - server = { name, host }: - let - system = writeCommand "/bin/system" { - source = lib.evalSource [ source ]; - force = true; - target = lib.mkTarget "root@${host}/var/krops"; - inherit command; - }; - in - { - "${name}" = { - type = "app"; - program = toString (pkgs.writers.writeBash name - '' - echo "deploy system" - ${system}/bin/system - ''); - }; - }; - - desktop = { name, host }: - let - system = writeCommand "/bin/system" { - source = lib.evalSource [ source ]; - force = true; - target = lib.mkTarget "root@${host}/var/krops"; - inherit command; - }; - network = writeCommand "/bin/secrets" { - source = lib.evalSource [{ - system-connections.pass = { - dir = toString ~/.password-store; - name = "krops/desktop_secrets/network-manager/system-connections"; - }; - }]; - force = true; - target = lib.mkTarget "root@${host}/etc/NetworkManager"; - }; - in - { - "${name}" = { - type = "app"; - program = toString (pkgs.writers.writeBash "${name}-all" - '' - echo "deploy network secerts" - ${network}/bin/secrets - echo "deploy system" - ${system}/bin/system - ''); - }; - }; - -in -(desktop { - name = "sterni"; - host = "sterni.private"; -}) // -(desktop { - name = "sternchen"; - host = "sternchen.secret"; -}) // -(server { - name = "pepe"; - host = "pepe.private"; -}) // -(server { - name = "workhorse"; - host = "workhorse.private"; -}) // -(server { - name = "sputnik"; - host = "sputnik.private"; -}) // -(server { - name = "robi"; - host = "robi"; -}) diff --git a/shell.nix b/shell.nix deleted file mode 100644 index a108bae..0000000 --- a/shell.nix +++ /dev/null @@ -1,263 +0,0 @@ -let - - # host used to install stuff. (can be an onion id if you use torify) - #installHost = "localhost"; - installHost = "mobi.private"; - - #ops = import ../plops ; - ops = import ((import { }).fetchgit { - url = "https://github.com/mrVanDalo/plops.git"; - rev = "bad0f386afe20cb6a6b8692a3ec365556f8bdabb"; - sha256 = "1qfc7kkfg83dy1jliw3afaq7q758b4ybz9md74g5fqpqjdxhxrnw"; - }); - - lib = ops.lib; - pkgs = ops.pkgs; - - source = { - - raspberryNixPkgs = { - nixpkgs.git = { - ref = (ops.importJson ./.channelRaspberryStable.json).rev; - url = "https://github.com/NixOS/nixpkgs-channels"; - }; - nixpkgs-unstable.git = { - ref = (ops.importJson ./.channelRaspberryUnstable.json).rev; - url = "https://github.com/NixOS/nixpkgs-channels"; - }; - }; - - nixPkgs = { - nixpkgs.git = { - ref = (ops.importJson ./.channelStable.json).rev; - url = "https://github.com/NixOS/nixpkgs"; - }; - nixpkgs-unstable.git = { - ref = (ops.importJson ./.channelUnstable.json).rev; - url = "https://github.com/NixOS/nixpkgs"; - }; - }; - - system = name: - let - exclusive = name: - if name == "workhorse" then { - property.file = toString ./submodules/property; - } else - { }; - in - { - system.file = toString ./system; - configs.file = toString ./configs; - nixos-config.symlink = "configs/${name}/configuration.nix"; - } // (exclusive name); - - desktopSecrets = { - desktop_secrets.pass = { - dir = toString ~/.password-store; - name = "krops/desktop_secrets"; - }; - }; - - keys = name: { - keys.pass = { - dir = toString ~/.password-store; - name = "krops/${name}/keys"; - }; - }; - - secrets = name: { - secrets.pass = { - dir = toString ~/.password-store; - name = "krops/${name}/secrets"; - }; - common_secrets.pass = { - dir = toString ~/.password-store; - name = "krops/common_secrets"; - }; - }; - - modules = { - modules.file = toString ./modules; - library.file = toString ./library; - pkgs.file = toString ./pkgs; - assets.file = toString ./assets; - - mqtt.file = toString ./mqtt; - - nix-writers.git = { - url = "https://cgit.krebsco.de/nix-writers/"; - ref = (ops.importJson ./.nix-writers.json).rev; - }; - - #backup-module.file = toString ~/dev/backup; - backup-module.git = { - url = "https://git.ingolf-wagner.de/nix-modules/backup.git"; - ref = "1.3.3"; - }; - - #kops-lib.file = toString ~/dev/krops-lib; - krops-lib.git = { - url = "https://git.ingolf-wagner.de/nix-modules/krops.git"; - ref = "1.0.3"; - }; - - #cluster-module.file = toString ~/dev/cluster-module; - cluster-module.git = { - url = "https://git.ingolf-wagner.de/nix-modules/cluster.git"; - ref = "1.2.0"; - }; - - #home-manager.file = toString ~/dev/home-manager; - home-manager.git = { - url = "https://github.com/nix-community/home-manager.git"; - ref = "2aa20ae969f2597c4df10a094440a66e9d7f8c86"; - }; - - background-image-generators.git = { - url = - "https://git.ingolf-wagner.de/nix-modules/background-image-generators.git"; - ref = "1.0.0"; - }; - - mozilla-overlay.git = { - url = "https://github.com/mozilla/nixpkgs-mozilla.git"; - ref = "e912ed483e980dfb4666ae0ed17845c4220e5e7c"; - }; - - cleverca22.git = { - url = "https://github.com/mrVanDalo/nixos-configs.git"; - ref = "76260ad60cd99d40ab25df1400b0663d48e736db"; - }; - }; - - }; - - hostPattern = name: - if name == "sternchen" then - "${name}.secret" - else if name == "porani" then - "${name}.secret" - else if name == "dummy" then - "95.217.223.75" - else - "${name}.private"; - - deployment = { secrets, content }: - name: - { host ? (hostPattern name) - , target ? "/var/src/" - , user ? "root" - , commandPrefix ? "deploy" - , enableSwitch ? true - , enableSecrets ? true - }: - with ops; - let - commandName = - if enableSecrets then - "${commandPrefix}-${name}-with-secrets" - else - "${commandPrefix}-${name}-without-secrets"; - populateCommands = with lib; - flatten [ - content - (optionals enableSecrets secrets) - (optionals enableSwitch [ switch ]) - ]; - in - jobs commandName "${user}@${host}${target}" populateCommands; - - serverDeployment = name: - with ops; - deployment - { - content = [ - (populate source.nixPkgs) - (populate source.modules) - (populate (source.system name)) - ]; - secrets = [ (populate (source.secrets name)) ]; - } - name; - - desktopDeployment = name: - with ops; - deployment - { - content = [ - (populate source.nixPkgs) - (populate source.modules) - (populate (source.system name)) - ]; - secrets = - [ (populate (source.secrets name)) (populate source.desktopSecrets) ]; - } - name; - - cleanupNix = name: - { ... }: - let - target = { - host = hostPattern name; - user = "root"; - port = "22"; - }; - in - pkgs.writers.writeDashBin "clean-${name}" # sh - '' - set -eu - ${pkgs.openssh}/bin/ssh \ - ${target.user}@${target.host} -p ${target.port} \ - nix-collect-garbage -d - ''; - - # helper function to make stuff more readable - runForAll = serverList: command: arguments: - let f = args: (map (name: command name (arguments // args)) serverList); - in (f { enableSecrets = false; }) ++ (f { enableSecrets = true; }); - - # generate tasks - servers = serverList: - with lib; - let - doForAll = runForAll serverList; - deployments = doForAll serverDeployment { }; - cleanup = doForAll cleanupNix { }; - install = doForAll serverDeployment { - commandPrefix = "install"; - host = installHost; - target = "/mnt/var/src"; - enableSwitch = false; - }; - in - deployments ++ cleanup ++ install; - - desktops = desktopList: - with lib; - let - doForAll = runForAll desktopList; - deployments = doForAll desktopDeployment { }; - cleanup = doForAll cleanupNix { }; - install = doForAll desktopDeployment { - commandPrefix = "install"; - host = installHost; - target = "/mnt/var/src"; - enableSwitch = false; - }; - in - deployments ++ cleanup ++ install; - -in -pkgs.mkShell { - - buildInputs = with pkgs; - (servers [ "workhorse" "sputnik" "porani" "dummy" ]) - ++ (desktops [ "pepe" "workout" "sterni" "mobi" "sternchen" ]) ++ [ - (pkgs.writers.writeBashBin "reformat" '' - find ${ - toString ./. - } -type f | egrep "nix$" | grep -v wetten | while read line ; do ${pkgs.nixfmt}/bin/nixfmt "$line"; done - '') - ]; -} diff --git a/updateChannels.sh b/updateChannels.sh deleted file mode 100644 index 9c79550..0000000 --- a/updateChannels.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -function fetch (){ - local rev=$1 - local output=$2 - local url=${3:-https://github.com/NixOS/nixpkgs.git} - - echo - echo - echo "update $url to rev $1" - nix-prefetch-git \ - --url ${url} \ - --rev ${rev} \ - > ${output} - -} - -fetch "refs/heads/nixos-21.05" .channelStable.json -fetch "refs/heads/nixos-unstable" .channelUnstable.json -fetch "refs/tags/v3.2.0" .nix-writers.json "https://cgit.krebsco.de/nix-writers/" -fetch "ef1e4480cf8af45cfdeac597b2f1b1af33923e93" .nixos-generators.json "https://github.com/nix-community/nixos-generators.git" - -