diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index ca1ca28..1040ee6 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -35,4 +35,4 @@ Please search on the [issue tracker](../) before creating one. ## Your Environment - + diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index c8a8f64..e80861b 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -2,7 +2,7 @@ name: "Check & Cachix" on: push: branches: - - main + - master - trying - staging jobs: diff --git a/.github/workflows/mdbook_docs.yml b/.github/workflows/mdbook_docs.yml index 5faf9c2..9d15cc1 100644 --- a/.github/workflows/mdbook_docs.yml +++ b/.github/workflows/mdbook_docs.yml @@ -3,7 +3,7 @@ name: Deploy Docs to GitHub Pages on: push: branches: - - main + - master jobs: deploy: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6b22de0..111be31 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout code uses: actions/checkout@v2 with: - ref: core + ref: master - name: Update Changelog uses: heinrichreimer/github-changelog-generator-action@v2.1.1 with: @@ -49,7 +49,7 @@ jobs: - name: Checkout code uses: actions/checkout@v2 with: - ref: core + ref: master - name: Get Changelog Entry id: changelog_reader diff --git a/.gitignore b/.gitignore index 4a99123..6cce155 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ result .direnv doc/index.html -# Result of flk commands +# Result of bud commands vm iso doi diff --git a/bud/get.bash b/bud/get.bash index 3b4d9a7..770c002 100644 --- a/bud/get.bash +++ b/bud/get.bash @@ -1 +1 @@ -nix flake new -t "github:divnix/devos/core" "${2:-devos}" +nix flake new -t "github:divnix/devos/master" "${2:-devos}" diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md index 8574dae..2b5241a 100644 --- a/doc/CONTRIBUTING.md +++ b/doc/CONTRIBUTING.md @@ -1,8 +1,8 @@ # Pull Requests ## TL;DR; -- **Target Branch**: `main` -- **Merge Policy**: [`bors`][bors] is alwyas right (→ `bors try`) +- **Target Branch**: `master` +- **Merge Policy**: [`bors`][bors] is always right (→ `bors try`) - **Docs**: every changeset is expected to contain doc updates - **Commit Msg**: be a poet! Comprehensive and explanatory commit messages should cover the motivation and use case in an easily understandable manner diff --git a/doc/concepts/profiles.md b/doc/concepts/profiles.md index a5eda3e..36e423f 100644 --- a/doc/concepts/profiles.md +++ b/doc/concepts/profiles.md @@ -63,5 +63,5 @@ specific belongs in your [host](hosts.md) files instead. [definition]: https://nixos.org/manual/nixos/stable/index.html#sec-option-definitions [declaration]: https://nixos.org/manual/nixos/stable/index.html#sec-option-declarations [options]: https://nixos.org/manual/nixos/stable/index.html#sec-writing-modules -[spec]: https://github.com/divnix/devos/tree/core/lib/devos/mkProfileAttrs.nix +[spec]: https://github.com/divnix/devos/tree/master/lib/devos/mkProfileAttrs.nix [config]: https://nixos.wiki/wiki/Module#structure diff --git a/doc/concepts/users.md b/doc/concepts/users.md index 12bf562..d18d51d 100644 --- a/doc/concepts/users.md +++ b/doc/concepts/users.md @@ -48,7 +48,7 @@ argument that gets passed to your home-manager users. ## External Usage You can easily use the defined home-manager configurations outside of NixOS -using the `homeConfigurations` flake output. The [flk](../flk/index.md) helper +using the `homeConfigurations` flake output. The [bud](../bud/index.md) helper script makes this even easier. This is great for keeping your environment consistent across Unix systems, @@ -57,10 +57,10 @@ including OSX. ### From within the projects devshell: ```sh # builds the nixos user defined in the NixOS host -flk home NixOS nixos +bud home NixOS nixos # build and activate -flk home NixOS nixos switch +bud home NixOS nixos switch ``` ### Manually from outside the project: @@ -73,5 +73,5 @@ nix build "github:divnix/devos#homeConfigurations.nixos@NixOS.home.activationPac ``` [home-manager]: https://nix-community.github.io/home-manager -[modules-list]: https://github.com/divnix/devos/tree/core/users/modules/module-list.nix +[modules-list]: https://github.com/divnix/devos/tree/master/users/modules/module-list.nix [portableuser]: https://digga.divnix.com/api-reference-home.html#homeusers diff --git a/doc/integrations/deploy.md b/doc/integrations/deploy.md index 2903210..642267c 100644 --- a/doc/integrations/deploy.md +++ b/doc/integrations/deploy.md @@ -40,7 +40,7 @@ And the private key to your user: And run the deployment: ```sh -deploy "flk#hostName" --hostname host.example.com +deploy '.#hostName' --hostname host.example.com ``` > ##### _Note:_ diff --git a/doc/integrations/nvfetcher.md b/doc/integrations/nvfetcher.md index 4670657..107a169 100644 --- a/doc/integrations/nvfetcher.md +++ b/doc/integrations/nvfetcher.md @@ -40,4 +40,4 @@ fetch.git = "https://github.com/mlvzk/manix.git" # responsible for fetching [nvf]: https://github.com/berberman/nvfetcher [nvf-readme]: https://github.com/berberman/nvfetcher#readme -[sources.toml]: https://github.com/divnix/devos/tree/core/pkgs/sources.toml +[sources.toml]: https://github.com/divnix/devos/tree/master/pkgs/sources.toml diff --git a/doc/start/from-nixos.md b/doc/start/from-nixos.md index 0e1d48c..ce79063 100644 --- a/doc/start/from-nixos.md +++ b/doc/start/from-nixos.md @@ -4,7 +4,7 @@ Assuming you're happy with your existing partition layout, you can generate a basic NixOS configuration for your system using: ```sh -flk up +bud up ``` This will make a new file `hosts/up-$(hostname).nix`, which you can edit to @@ -38,7 +38,7 @@ Now might be a good time to read the docs on [suites](../concepts/suites.md) and Once you're ready to deploy `hosts/my-host.nix`: ```sh -flk my-host switch +bud my-host switch ``` diff --git a/doc/start/index.md b/doc/start/index.md index f3f1127..ed1a114 100644 --- a/doc/start/index.md +++ b/doc/start/index.md @@ -6,10 +6,10 @@ Here is a snippet that will get you the template without the git history: ```sh nix-shell -p cachix --run "cachix use nrdxp" -nix-shell https://github.com/divnix/devos/archive/core.tar.gz -A shell \ - --run "flk get core" +nix-shell https://github.com/divnix/devos/archive/master.tar.gz -A shell \ + --run "bud get master" -cd flk +cd devos nix-shell @@ -18,7 +18,7 @@ git add . git commit -m init ``` -This will place you in a new folder named `flk` with git initialized, and a +This will place you in a new folder named `devos` with git initialized, and a nix-shell that provides all the dependencies, including the unstable nix version required. diff --git a/doc/tests.md b/doc/tests.md index 1d7b65e..6a62c72 100644 --- a/doc/tests.md +++ b/doc/tests.md @@ -26,7 +26,7 @@ and the examples in [nixpkgs][nixos-tests]. [test-doc]: https://nixos.org/manual/nixos/stable/index.html#sec-nixos-tests [test-blog]: https://www.haskellforall.com/2020/11/how-to-use-nixos-for-lightweight.html -[default]: https://github.com/divnix/devos/tree/core/tests/default.nix +[default]: https://github.com/divnix/devos/tree/master/tests/default.nix [run-test]: https://github.com/NixOS/nixpkgs/blob/6571462647d7316aff8b8597ecdf5922547bf365/lib/debug.nix#L154-L166 [nixos-tests]: https://github.com/NixOS/nixpkgs/tree/master/nixos/tests [testing-python]: https://github.com/NixOS/nixpkgs/tree/master/nixos/lib/testing-python.nix diff --git a/flake.lock b/flake.lock index 063ae11..53db62b 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "cachix": { "locked": { - "lastModified": 1631706269, - "narHash": "sha256-KVaS+GC3gz/G5qL09ZUnq4gpQR38C+AWuXJ1ftirgK0=", + "lastModified": 1632639184, + "narHash": "sha256-fRLxre+gPxIkjFVj17O68pyAWU1cxT20XFOiulIWzRw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8dd8bd8be74879f9f7919b16a4cb5ab2a75f18e5", + "rev": "fd8a7fd07da0f3fc0e27575891f45c2f88e5dd44", "type": "github" }, "original": { @@ -36,9 +36,11 @@ "flake-compat": "flake-compat", "naersk": "naersk", "nixpkgs": [ + "digga", "nixpkgs" ], "utils": [ + "digga", "flake-utils" ] }, @@ -106,11 +108,11 @@ ] }, "locked": { - "lastModified": 1631974852, - "narHash": "sha256-f2K83yDufQWp22kjtOQXHfsXXyUbndCMxrhG57mI9DE=", + "lastModified": 1632930345, + "narHash": "sha256-9RFOy/MH1VIPWUv6pVseSjqIK2LnK6ZHV8LM2/jrvaI=", "owner": "divnix", "repo": "digga", - "rev": "8e91e1814ef0ab294731ceb106ffdac009363702", + "rev": "46c7c712d79ea627faf74739a2e89438a9d214f8", "type": "github" }, "original": { @@ -154,6 +156,7 @@ "flake-utils-plus": { "inputs": { "flake-utils": [ + "digga", "flake-utils" ] }, @@ -196,11 +199,11 @@ ] }, "locked": { - "lastModified": 1632450064, - "narHash": "sha256-aeI1iaCYd35MTgQcCELVFk05XXmhwpXP81mofVZgmjU=", + "lastModified": 1632917236, + "narHash": "sha256-ieAp53SlK8d7RinZSueJHBes8l9jssKIYBeBXjRf5LY=", "ref": "master", - "rev": "df55eaae69d0388de26448e82f9ded483fca2f44", - "revCount": 1488, + "rev": "e47632114a92dbabc2f9d41bedb455e13996924e", + "revCount": 1491, "submodules": true, "type": "git", "url": "https://github.com/helix-editor/helix.git" @@ -234,11 +237,11 @@ }, "latest": { "locked": { - "lastModified": 1631785487, - "narHash": "sha256-VSKEvOtaY/roDxEHFxXh6GguOqqWCJZ3E06fBdKu8+I=", + "lastModified": 1632660378, + "narHash": "sha256-sjA8eQlnyDjDLyAyq3XlJmN0nqW0ftl/pb7VnMg86L0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "79c444b5bdeaba142d128afddee14c89ecf2a968", + "rev": "31ffc50c571e6683e9ecc9dbcbd4a8e9914b4497", "type": "github" }, "original": { @@ -268,7 +271,9 @@ "naersk": { "inputs": { "nixpkgs": [ - "latest" + "digga", + "deploy", + "nixpkgs" ] }, "locked": { @@ -293,11 +298,11 @@ ] }, "locked": { - "lastModified": 1631004250, - "narHash": "sha256-LGh0CjAZwh13AVkTi9w9lITEC7x6bwSQyFViOZ6HyNo=", + "lastModified": 1632266297, + "narHash": "sha256-J1yeJk6Gud9ef2pEf6aKQemrfg1pVngYDSh+SAY94xk=", "owner": "nmattia", "repo": "naersk", - "rev": "08afb3d1dbfe016108b72e05b02ba0f6ecb3c8e1", + "rev": "ee7edec50b49ab6d69b06d62f1de554efccb1ccd", "type": "github" }, "original": { @@ -310,6 +315,7 @@ "inputs": { "lowdown-src": "lowdown-src", "nixpkgs": [ + "digga", "nixpkgs" ] }, @@ -352,11 +358,11 @@ }, "nixos": { "locked": { - "lastModified": 1631830867, - "narHash": "sha256-7mas4nl6KnK59i+mlNVrIgR/cOrToU9M1C9waOkRFJE=", + "lastModified": 1632639184, + "narHash": "sha256-fRLxre+gPxIkjFVj17O68pyAWU1cxT20XFOiulIWzRw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ebf419e737bb8154b32010a322dcdffbea596443", + "rev": "fd8a7fd07da0f3fc0e27575891f45c2f88e5dd44", "type": "github" }, "original": { @@ -369,9 +375,11 @@ "nixos-generators": { "inputs": { "nixlib": [ + "digga", "nixlib" ], "nixpkgs": [ + "digga", "blank" ] }, @@ -391,11 +399,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1631875434, - "narHash": "sha256-qmaLTz4ituJJ8DNoHwmrrCRmABMoNqNLJewxWpuZals=", + "lastModified": 1632267580, + "narHash": "sha256-AvNXdmaPHYs6idbfgu1H40vEw4Wq15xLAgCnpCN1l1A=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "16fca9df230408608846940981b4037762420b1b", + "rev": "3cc8c47af31798040ea62499090540413279f832", "type": "github" }, "original": { @@ -427,11 +435,11 @@ ] }, "locked": { - "lastModified": 1631953520, - "narHash": "sha256-IaP5CJfoggUE/7KDmhRWQA2aRuEdKzRU+lcI7kppCXY=", + "lastModified": 1632882519, + "narHash": "sha256-6UC9pi7rqId449AnRdfPv0Sfx+2rpIizaXRikUhHoSA=", "owner": "colemickens", "repo": "nixpkgs-wayland", - "rev": "d226ce0237e6ed6346bffafb949bb50da2c30b3c", + "rev": "42e07dc73fc569322da41cf980bb103fa8d6880c", "type": "github" }, "original": { @@ -453,11 +461,11 @@ ] }, "locked": { - "lastModified": 1632521018, - "narHash": "sha256-worJcyb+s+bUFCpMQx12W8ZLUlVqArWaN9ijxFzOiV8=", + "lastModified": 1632643075, + "narHash": "sha256-I2MPLO3HPM2hMVNDwMV0c9mmZUggWuxtKsVtZG9gm5w=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "f383249f3c6ea24164be5cddbe269626cd3d981e", + "rev": "cc8d7a30eacfc0dd996339942bc024f5c8d7ec5d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a1a6990..05e782b 100644 --- a/flake.nix +++ b/flake.nix @@ -122,8 +122,8 @@ hostDefaults = { system = "x86_64-linux"; channelName = "nixos"; - imports = [ (digga.lib.importModules ./modules) ]; - externalModules = [ + imports = [ (digga.lib.importExportableModules ./modules) ]; + modules = [ { lib.our = self.lib; } digga.nixosModules.bootstrapIso digga.nixosModules.nixConfig @@ -149,8 +149,8 @@ }; home = { - imports = [ (digga.lib.importModules ./users/modules) ]; - externalModules = [ ]; + imports = [ (digga.lib.importExportableModules ./users/modules) ]; + modules = [ ]; importables = rec { profiles = digga.lib.rakeLeaves ./users/profiles; suites = with profiles; rec { diff --git a/shell/default.nix b/shell/default.nix index 46a2326..410410c 100644 --- a/shell/default.nix +++ b/shell/default.nix @@ -1,9 +1,9 @@ { self, inputs, ... }: { - externalModules = with inputs; [ + modules = with inputs; [ #bud.devshellModules.bud ]; - modules = [ + exportedModules = [ ./devos.nix ]; }