Merge branch 'main' into b12f

.drone.yml

@@ -10,18 +10,17 @@ steps:
       event:
         - cron
       cron:
-        - sync-master-with-upstream
+        - sync-main-with-upstream
     environment:
       GITEA_SSH_KEY:
         from_secret: gitea_ssh_key
     commands:
       - ./.drone/setup_ssh.sh
-      - git fetch
-      - git checkout devos
       - git remote add devos git@git.b12f.io:pub-solar/devos
       - git remote set-url origin git@git.b12f.io:pub-solar/os
       - git fetch --all
-      - git merge -X theirs devos/master
+      - git checkout -b devos --track origin/devos
+      - git merge -X theirs devos/main
       - git push origin devos
 
   - name: "Sync $BRANCH with upstream"
@@ -30,14 +29,14 @@ steps:
       event:
         - cron
       cron:
-        - sync-master-with-upstream
+        - sync-main-with-upstream
-        - sync-b12f-with-master
+        - sync-b12f-with-main
-        - sync-teutat3s-with-master
+        - sync-teutat3s-with-main
     environment:
       GITEA_SSH_KEY:
         from_secret: gitea_ssh_key
     commands:
-      - git checkout origin/master
+      - git checkout origin/main
       - ./.drone/setup_ssh.sh
       - git remote set-url origin git@git.b12f.io:pub-solar/os
       - ./.drone/upstream-branch.sh
@@ -50,16 +49,16 @@ steps:
       event:
         - cron
       cron:
-        - sync-master-with-upstream
+        - sync-main-with-upstream
-        - sync-b12f-with-master
+        - sync-b12f-with-main
-        - sync-teutat3s-with-master
+        - sync-teutat3s-with-main
     environment:
       TEA_CONFIG:
         from_secret: tea_config
     commands:
       - mkdir -p ~/.config/tea
       - echo "$$TEA_CONFIG" > ~/.config/tea/config.yml
-      - tea pulls create --base master --head devos
+      - tea pulls create --base main --head devos
 
   - name: "Notify matrix"
     image: plugins/matrix
@@ -70,9 +69,9 @@ steps:
       event:
         - cron
       cron:
-        - sync-master-with-upstream
+        - sync-main-with-upstream
-        - sync-b12f-with-master
+        - sync-b12f-with-main
-        - sync-teutat3s-with-master
+        - sync-teutat3s-with-main
     settings:
       homeserver: https://matrix.pub.solar
       roomid: dfQBqwkhIzrFjMSsxy:pub.solar

.drone/upstream-branch.sh

@@ -4,7 +4,7 @@ set -e
 set -u
 
 LOCAL="$DRONE_BRANCH"
-[ "$LOCAL" = "master" ] && UPSTREAM=origin/devos || UPSTREAM=origin/master
+[ "$LOCAL" = "main" ] && UPSTREAM=origin/devos || UPSTREAM=origin/main
 
 git fetch --all
 git checkout "$LOCAL"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -35,4 +35,4 @@ Please search on the [issue tracker](../) before creating one.
 
 ## Your Environment
 <!--- Include relevant details about the environment you experienced the bug in. -->
-<!--- If you have run `flk update`, for example, post the flake.lock file. -->
+<!--- If you have run `bud update`, for example, post the flake.lock file. -->

.github/workflows/check.yml

@@ -2,7 +2,7 @@ name: "Check & Cachix"
 on:
   push:
     branches:
-      - main
+      - master
       - trying
       - staging
 jobs:
@@ -26,3 +26,4 @@ jobs:
     - run: nix -Lv flake check
     - run: nix -Lv build ".#nixosConfigurations.NixOS.config.system.build.toplevel"
     - run: nix -Lv develop -c echo OK
+    - run: nix -Lv develop --command bud --help

.github/workflows/mdbook_docs.yml

@@ -3,7 +3,7 @@ name: Deploy Docs to GitHub Pages
 on:
   push:
     branches:
-      - main
+      - master
 
 jobs:
   deploy:

.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

.gitignore

@@ -2,7 +2,7 @@ result
 .direnv
 doc/index.html
 
-# Result of flk commands
+# Result of bud commands
 vm
 iso
 doi

README.md

@@ -18,7 +18,7 @@ They also make [Nix expressions](https://nixos.org/manual/nix/unstable/expressio
 
 ## Getting Started
 Check out the [guide](https://devos.divnix.com/start) to get up and running.
-Also, have a look at [_flake.nix_][toc]. If anything is not immediately 
+Also, have a look at [_flake.nix_](./flake.nix). If anything is not immediately 
 discoverable via "[`digga`][digga]'s [`mkFlake`][mk-flake],
 please file a bug report.
 
@@ -88,3 +88,4 @@ DevOS is licensed under the [MIT License][mit].
 [nixpkgs]: https://github.com/NixOS/nixpkgs
 [nvfetcher]: https://github.com/berberman/nvfetcher
 [please]: https://github.com/nrdxp/devos/tree/nrd
+[matrix]: https://matrix.to/#/#devos:nixos.org

bud/get.bash

@@ -1 +1 @@
-nix flake new -t "github:divnix/devos/core" "${2:-devos}"
+nix flake new -t "github:divnix/devos/main" "${2:-devos}"

doc/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ## TL;DR;
 - **Target Branch**: `main`
-- **Merge Policy**: [`bors`][bors] is alwyas right (→ `bors try`)
+- **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

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/main/lib/devos/mkProfileAttrs.nix
 [config]: https://nixos.wiki/wiki/Module#structure

doc/concepts/suites.md

@@ -1,9 +1,9 @@
 # Suites
-Suites provide a mechanism for users to easily combine and name collecitons of
+Suites provide a mechanism for users to easily combine and name collections of
 profiles.
 
 `suites` are defined in the `importables` argument in either the `home` or `nixos`
-namespace. They are a special case of an `importable` which get passed as a special
+namespace. They are a special case of an `importable` which is passed as a special
 argument (one that can be use in an `imports` line) to your hosts. All lists defined
 in `suites` are flattened and type-checked as paths.
 

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/main/users/modules/module-list.nix
 [portableuser]: https://digga.divnix.com/api-reference-home.html#homeusers

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:_

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/main/pkgs/sources.toml

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
 ```
 
 

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 \
+nix-shell https://github.com/divnix/devos/archive/main.tar.gz -A shell \
-  --run "flk get core"
+  --run "bud get main"
 
-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.
 

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/main/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

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1620877075,
+        "lastModified": 1631896269,
-        "narHash": "sha256-XvgTqtmQZHegu9UMDSR50gK5cHEM2gbnRH0qecmdN54=",
+        "narHash": "sha256-DAyCxJ8JacayOzGgGSfzrn7ghtsfL/EsCyk1NEUaAR8=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "e543aa7d68f222e1e771165da9e9a64b5bf7b3e3",
+        "rev": "daf1d773989ac5d949aeef03fce0fe27e583dbca",
         "type": "github"
       },
       "original": {
@@ -41,6 +41,29 @@
         "url": "https://git.b12f.io/b12f/nix-fonts"
       }
     },
+    "beautysh": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "bud",
+          "nixpkgs"
+        ],
+        "poetry2nix": "poetry2nix"
+      },
+      "locked": {
+        "lastModified": 1630693543,
+        "narHash": "sha256-7Sly3ReaJZw60Qo0rpfN4jF6zy94nwQz6ENgUUFzJfg=",
+        "owner": "lovesegfault",
+        "repo": "beautysh",
+        "rev": "5609593961b70428f58d5c1b4b25cdda43b0d0bd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lovesegfault",
+        "repo": "beautysh",
+        "type": "github"
+      }
+    },
     "blank": {
       "locked": {
         "lastModified": 1625557891,
@@ -58,6 +81,7 @@
     },
     "bud": {
       "inputs": {
+        "beautysh": "beautysh",
         "devshell": [
           "digga",
           "devshell"
@@ -67,11 +91,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1627855680,
+        "lastModified": 1633877936,
-        "narHash": "sha256-snDOrUp8nth2Vs3GeEXr7Xji+HaHy25htZLNvid/U3I=",
+        "narHash": "sha256-+o3n6s7fR8dBGRldTGelyp2j3jSyTlrniOXwNfmMG20=",
         "owner": "divnix",
         "repo": "bud",
-        "rev": "612228a68d404d559405225427a5d8b3cef9d27c",
+        "rev": "15df091133ff95216c321b09be04905c0a0944c4",
         "type": "github"
       },
       "original": {
@@ -87,11 +111,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1622060422,
+        "lastModified": 1631730143,
-        "narHash": "sha256-hPVlvrAyf6zL7tTx0lpK+tMxEfZeMiIZ/A2xaJ41WOY=",
+        "narHash": "sha256-A8PaUyZu5WVp+IojG5q+39rjf5x57OFDYmVoDFPZLlY=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "007d700e644ac588ad6668e6439950a5b6e2ff64",
+        "rev": "e1a3f7292f085fd588d11f94ed0f47968c16df0c",
         "type": "github"
       },
       "original": {
@@ -103,10 +127,9 @@
     "deploy": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "naersk": "naersk",
         "nixpkgs": [
           "digga",
-          "nixpkgs"
+          "latest"
         ],
         "utils": [
           "digga",
@@ -114,11 +137,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1628752686,
+        "lastModified": 1632822684,
-        "narHash": "sha256-Lzh9MYUJDsjgif+YEyOErXtj1IH+ci8J1C30g1ms69s=",
+        "narHash": "sha256-lt7eayYmgsD5OQwpb1XYfHpxttn43bWo7G7hIJs+zJw=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "e5546f9c2503c26d175f08a81fc0a0f330be4cbe",
+        "rev": "9a02de4373e0ec272d08a417b269a28ac8b961b4",
         "type": "github"
       },
       "original": {
@@ -129,11 +152,11 @@
     },
     "devshell": {
       "locked": {
-        "lastModified": 1629275356,
+        "lastModified": 1632436039,
-        "narHash": "sha256-R17M69EKXP6q8/mNHaK53ECwjFo1pdF+XaJC9Qq8zjg=",
+        "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "26f25a12265f030917358a9632cd600b51af1d97",
+        "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6",
         "type": "github"
       },
       "original": {
@@ -147,11 +170,12 @@
         "blank": "blank",
         "deploy": "deploy",
         "devshell": "devshell",
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "flake-utils-plus": "flake-utils-plus",
         "home-manager": [
           "home"
         ],
+        "latest": "latest",
         "nix": "nix",
         "nixlib": [
           "nixos"
@@ -162,11 +186,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1629419320,
+        "lastModified": 1632959483,
-        "narHash": "sha256-ktoQQnRi/27juWC9YRNBj2RBG7lJU5h/kG8/KYFQt6M=",
+        "narHash": "sha256-jXogai6e+QRtiZFBOrMmYdeLXejzVT91kuDKu2RuJ10=",
         "owner": "divnix",
         "repo": "digga",
-        "rev": "50f10e12156a08f71a189cca98498161fae9c952",
+        "rev": "6549cf4c87d1a77138cbecbc6bb9483c20572cd7",
         "type": "github"
       },
       "original": {
@@ -178,11 +202,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1606424373,
+        "lastModified": 1627913399,
-        "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=",
+        "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf",
+        "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
         "type": "github"
       },
       "original": {
@@ -214,16 +238,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1628855985,
+        "lastModified": 1630859749,
-        "narHash": "sha256-OqhVFoCCA6GfGuMhZXQ5CrmZUYsumCJTwI72FOMf82I=",
+        "narHash": "sha256-qkoU2rIbbP2+T0dfcqXW35GCWNsi0Y1IgN9BELmt4Zo=",
-        "owner": "gytis-ivaskevicius",
+        "owner": "divnix",
         "repo": "flake-utils-plus",
-        "rev": "a79a0b86e59dc087df6704f9b13b1ed951ef5c5f",
+        "rev": "a4e267e3fc87e60c5029c6c3855935ff1ff3018e",
         "type": "github"
       },
       "original": {
-        "owner": "gytis-ivaskevicius",
+        "owner": "divnix",
-        "ref": "staging",
         "repo": "flake-utils-plus",
         "type": "github"
       }
@@ -243,6 +266,21 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "locked": {
+        "lastModified": 1623875721,
+        "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home": {
       "inputs": {
         "nixpkgs": [
@@ -250,11 +288,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1630076227,
+        "lastModified": 1633596850,
-        "narHash": "sha256-p3YdtqSPLnMudWsLMgd6XMEhQKB2oz1hvDkHtOlz5/Q=",
+        "narHash": "sha256-5+qVLYvfOropjLAvpQs/APtD8eYnEIbAd9a36lGHZM0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f5adb9be829f487f99bcc0f1884f74ddb85f70c8",
+        "rev": "49695f33aac22358b59e49c94fe6472218e5d766",
         "type": "github"
       },
       "original": {
@@ -266,11 +304,27 @@
     },
     "latest": {
       "locked": {
-        "lastModified": 1631470189,
+        "lastModified": 1632660378,
-        "narHash": "sha256-hkUPYlpNOY9nbG1ByRin9NzPAYnPtwq/nGxO/DoeZd0=",
+        "narHash": "sha256-sjA8eQlnyDjDLyAyq3XlJmN0nqW0ftl/pb7VnMg86L0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "364b5555ee04bf61ee0075a3adab4c9351a8d38c",
+        "rev": "31ffc50c571e6683e9ecc9dbcbd4a8e9914b4497",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "latest_2": {
+      "locked": {
+        "lastModified": 1633971123,
+        "narHash": "sha256-WmI4NbH1IPGFWVkuBkKoYgOnxgwSfWDgdZplJlQ93vA=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "e4ef597edfd8a0ba5f12362932fc9b1dd01a0aef",
         "type": "github"
       },
       "original": {
@@ -298,40 +352,17 @@
       }
     },
     "naersk": {
-      "inputs": {
-        "nixpkgs": [
-          "digga",
-          "deploy",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1622810282,
-        "narHash": "sha256-4wmvM3/xfD0hCdNDIXVzRMfL4yB1J+DjH6Zte2xbAxk=",
-        "owner": "nmattia",
-        "repo": "naersk",
-        "rev": "e8061169e1495871b56be97c5c51d310fae01374",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nmattia",
-        "ref": "master",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
-    "naersk_2": {
       "inputs": {
         "nixpkgs": [
           "latest"
         ]
       },
       "locked": {
-        "lastModified": 1629707199,
+        "lastModified": 1632266297,
-        "narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=",
+        "narHash": "sha256-J1yeJk6Gud9ef2pEf6aKQemrfg1pVngYDSh+SAY94xk=",
         "owner": "nmattia",
         "repo": "naersk",
-        "rev": "df71f5e4babda41cd919a8684b72218e2e809fa9",
+        "rev": "ee7edec50b49ab6d69b06d62f1de554efccb1ccd",
         "type": "github"
       },
       "original": {
@@ -349,11 +380,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1629360796,
+        "lastModified": 1630335771,
-        "narHash": "sha256-KAcvr8eEhEqOQweDAsHurO9ECmfdptbU1UT7smcpyBs=",
+        "narHash": "sha256-eljjEPJdLK3aDskF7qX4YM/6KCq+w9nr+IKhrKW/AIQ=",
         "owner": "nixos",
         "repo": "nix",
-        "rev": "ffa629b2c0ea6368deca700afdac53a6e14557aa",
+        "rev": "50a35860ee9237d341948437c5f70a7f0987d393",
         "type": "github"
       },
       "original": {
@@ -364,7 +395,7 @@
     },
     "nix-dram": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
@@ -383,11 +414,11 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1631608205,
+        "lastModified": 1634115022,
-        "narHash": "sha256-1lh79H4uxhfimshlSCLIyGRaQPB/ENs/k9+qi9FEZzQ=",
+        "narHash": "sha256-K9DZMQ47VRrg9gtTPwex5p0E8LnwM/dDkNe7AQW0qj0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "626ae0eeba644be0c92789cefc488f8a19ba7684",
+        "rev": "564cb4d81d4f734dd068684adec5a60077397fe9",
         "type": "github"
       },
       "original": {
@@ -424,11 +455,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1625333638,
+        "lastModified": 1633793047,
-        "narHash": "sha256-M6J9RN60XJyv6nUfDFCwnz5aVjhe8+GJnV8Q9VpdQQQ=",
+        "narHash": "sha256-XSMlHMVPKwcEqyHGdFj/ZeGMeZeKNwVExOfLlxcg4oE=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "41775780a0b6b32b3d32dcc32bb9bc6df809062d",
+        "rev": "3aabf78bfcae62f5f99474f2ebbbe418f1c6e54f",
         "type": "github"
       },
       "original": {
@@ -457,10 +488,9 @@
       "locked": {
         "lastModified": 1626378135,
         "narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=",
-        "owner": "nix-community",
+        "path": "/nix/store/6mfkswqi67m35qwv0vh7kpk8rypbl2rq-source",
-        "repo": "NUR",
         "rev": "00c2ec8f0bbdf0cfb2135bde55fbae5d6b64aa6d",
-        "type": "github"
+        "type": "path"
       },
       "original": {
         "id": "nur",
@@ -484,11 +514,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1627523399,
+        "lastModified": 1633886330,
-        "narHash": "sha256-j9CgnUQpWcb8OB4LRzPW8BdxvmoROJptgptDlPA8Heo=",
+        "narHash": "sha256-gYtHVP8oUSxSX8HxlqqA/YH3yQB9eDNYr1W40r/qVEM=",
         "owner": "berberman",
         "repo": "nvfetcher",
-        "rev": "fb8f2cc770ad3dd3e29d7ba3004692d4d53fba9b",
+        "rev": "aacf12e7a13edccccaae2259c0f2a7eb34ceda32",
         "type": "github"
       },
       "original": {
@@ -497,6 +527,33 @@
         "type": "github"
       }
     },
+    "poetry2nix": {
+      "inputs": {
+        "flake-utils": [
+          "bud",
+          "beautysh",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "bud",
+          "beautysh",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1625240517,
+        "narHash": "sha256-2E1gaOP+bCplhf3kliVQWK5N1NV2h06mkJk2KTiRTJQ=",
+        "owner": "nix-community",
+        "repo": "poetry2nix",
+        "rev": "e40e8ed0e8c11e709e4c8c7c20174facd265a021",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "poetry2nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -521,8 +578,8 @@
           "flake-utils-plus"
         ],
         "home": "home",
-        "latest": "latest",
+        "latest": "latest_2",
-        "naersk": "naersk_2",
+        "naersk": "naersk",
         "nix-dram": "nix-dram",
         "nixlib": [
           "digga",

flake.nix

@@ -86,13 +86,16 @@
               nur.overlay
               agenix.overlay
               nvfetcher.overlay
-              deploy.overlay
               nix-dram.overlay
               b12f-nix-fonts.overlay
               ./pkgs/default.nix
             ];
           };
-          latest = { };
+          latest = {
+            overlays = [
+              deploy.overlay
+            ];
+          };
         };
 
         lib = import ./lib { lib = digga.lib // nixos.lib; };
@@ -110,8 +113,8 @@
           hostDefaults = {
             system = "x86_64-linux";
             channelName = "nixos";
-            imports = [ (digga.lib.importModules ./modules) ];
+            imports = [ (digga.lib.importExportableModules ./modules) ];
-            externalModules = [
+            modules = [
               { lib.our = self.lib; }
               digga.nixosModules.bootstrapIso
               digga.nixosModules.nixConfig
@@ -142,8 +145,8 @@
         };
 
         home = {
-          imports = [ (digga.lib.importModules ./users/modules) ];
+          imports = [ (digga.lib.importExportableModules ./users/modules) ];
-          externalModules = [ ];
+          modules = [ ];
           importables = rec {
             profiles = digga.lib.rakeLeaves ./users/profiles;
             suites = with profiles; rec {

modules/graphical/default.nix

@@ -93,7 +93,7 @@ in
       home.packages = [
         alacritty
         chromium
-        firefox
+        firefox-wayland
 
         flameshot
         libnotify

overlays/overrides.nix

@@ -13,7 +13,9 @@ channels: final: prev: {
     nixpkgs-fmt
     qutebrowser
     signal-desktop
-    starship;
+    starship
+    deploy-rs
+    ;
 
 
   haskellPackages = prev.haskellPackages.override

profiles/base-user/.config/vifm/vifmrc

@@ -223,7 +223,7 @@ filextype *.html,*.htm
         \ {Open with vim}
         \ nvim %f,
         \ {Open with firefox}
-        \ firefox-developer-edition %f &,
+        \ firefox %f &,
 filetype *.html,*.htm links, lynx
 
 " Object

profiles/base-user/mimeapps.nix

@@ -12,8 +12,9 @@
     "application/xhtml+xml" = [ "firefox.desktop" ];
     "application/x-extension-xhtml" = [ "firefox.desktop" ];
     "application/x-extension-xht" = [ "firefox.desktop" ];
-    "image/jpeg" = [ "viewnior.desktop" "gpicview.desktop" ];
+    "image/jpeg" = [ "org.gnome.eog.desktop" ];
-    "image/png" = [ "viewnior.desktop" "gpicview.desktop" ];
+    "image/png" = [ "org.gnome.eog.desktop" ];
+    "video/mp4" = [ "vlc.desktop" ];
     "text/plain" = [ "firefox.desktop" ];
     "x-scheme-handler/mailto" = [ "userapp-Thunderbird.desktop" ];
     "message/rfc822" = [ "userapp-Thunderbird.desktop" ];

profiles/core/default.nix

@@ -109,7 +109,8 @@ in
         keep-outputs = true
         keep-derivations = true
         fallback = true
-        experimental-features = nix-command flakes
+        # used by nix-dram
+        default-flake = flake:nixpkgs
       '';
     };
 

shell/default.nix

@@ -1,9 +1,9 @@
 { self, inputs, ... }:
 {
-  externalModules = with inputs; [
+  modules = with inputs; [
     bud.devshellModules.bud
   ];
-  modules = [
+  exportedModules = [
     ./devos.nix
   ];
 }

shell/devos.nix

@@ -41,7 +41,7 @@ in
       category = "devos";
       name = pkgs.nvfetcher-bin.pname;
       help = pkgs.nvfetcher-bin.meta.description;
-      command = "cd $DEVSHELL_ROOT/pkgs; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml --no-output $@";
+      command = "cd $PRJ_ROOT/pkgs; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml $@";
     }
     (linter nixpkgs-fmt)
     (linter editorconfig-checker)