pub-solar/infra
6
1
Fork 3
Code Issues 25 Pull requests 11 Actions Packages Projects 1 Releases Wiki Activity

Put modules into uniform folders #177

Closed
pinpox wants to merge 0 commits from pinpox/infra:auto-modules into main
pull from: pinpox/infra:auto-modules
merge into: pub-solar:main
Conversation 2 Commits - Files changed -
pinpox commented 2024-04-28 17:06:30 +00:00
Member
Copy link

All modules will be read from ./modules in the flake and added to self.nixosModules. Modules are expected to be located at modules/<name of the module>/default.nix possibly with additional files in their respecting subfolder.

All modules will be read from ./modules in the flake and added to self.nixosModules. Modules are expected to be located at `modules/<name of the module>/default.nix` possibly with additional files in their respecting subfolder.
🚀 2
pinpox changed title from Put modules into uniform folders to WIP: Put modules into uniform folders 2024-04-28 17:13:35 +00:00
pinpox force-pushed auto-modules from 74c54a9746 to 512ab12de1 2024-04-28 17:17:17 +00:00 Compare
pinpox changed title from WIP: Put modules into uniform folders to Put modules into uniform folders 2024-04-28 17:19:04 +00:00
pinpox commented 2024-04-28 17:19:39 +00:00
Author
Member
Copy link

nix flake show seems to work as expexted, modules don't have enable options yet.

❯ nix flake show
git+file:///home/pinpox/code/git.pub.solar/pinpox/infra?ref=refs/heads/auto-modules&rev=512ab12de11ac5c754c16f64575a0e603e754da9
├───checks
│   ├───aarch64-darwin
│   │   ├───deploy-activate omitted (use '--all-systems' to show)
│   │   └───deploy-schema omitted (use '--all-systems' to show)
│   ├───aarch64-linux
│   │   ├───deploy-activate omitted (use '--all-systems' to show)
│   │   └───deploy-schema omitted (use '--all-systems' to show)
│   ├───x86_64-darwin
│   │   ├───deploy-activate omitted (use '--all-systems' to show)
│   │   └───deploy-schema omitted (use '--all-systems' to show)
│   └───x86_64-linux
│       ├───deploy-activate: derivation 'deploy-rs-check-activate'
│       └───deploy-schema: derivation 'jsonschema-deploy-system'
├───darwinModules_: unknown
├───deploy: unknown
├───devShells
│   ├───aarch64-linux
│   │   └───default omitted (use '--all-systems' to show)
│   └───x86_64-linux
│       └───default: development environment 'nix-shell'
├───formatter
│   └───x86_64-linux: package 'nixfmt-unstable-2024-03-01'
├───lib: unknown
├───logins: unknown
├───nixos-flake: unknown
├───nixosConfigurations
│   ├───flora-6: NixOS configuration
│   └───nachtigall: NixOS configuration
├───nixosModules
│   ├───apps: NixOS module
│   ├───caddy: NixOS module
│   ├───collabora: NixOS module
│   ├───core: NixOS module
│   ├───coturn: NixOS module
│   ├───docker: NixOS module
│   ├───drone: NixOS module
│   ├───forgejo: NixOS module
│   ├───forgejo-actions-runner: NixOS module
│   ├───grafana: NixOS module
│   ├───home-manager: NixOS module
│   ├───keycloak: NixOS module
│   ├───loki: NixOS module
│   ├───mailman: NixOS module
│   ├───mastodon: NixOS module
│   ├───matrix: NixOS module
│   ├───matrix-irc: NixOS module
│   ├───matrix-telegram: NixOS module
│   ├───mediawiki: NixOS module
│   ├───nextcloud: NixOS module
│   ├───nginx: NixOS module
│   ├───nginx-mastodon: NixOS module
│   ├───nginx-mastodon-files: NixOS module
│   ├───nginx-matrix: NixOS module
│   ├───nginx-prometheus-exporters: NixOS module
│   ├───nginx-website: NixOS module
│   ├───nginx-website-miom: NixOS module
│   ├───obs-portal: NixOS module
│   ├───opensearch: NixOS module
│   ├───overlays: NixOS module
│   ├───owncast: NixOS module
│   ├───postgresql: NixOS module
│   ├───prometheus: NixOS module
│   ├───prometheus-exporters: NixOS module
│   ├───promtail: NixOS module
│   ├───searx: NixOS module
│   ├───tmate: NixOS module
│   └───unlock-zfs-on-boot: NixOS module
├───packages
│   ├───aarch64-linux
│   │   ├───activate omitted (use '--all-systems' to show)
│   │   └───update omitted (use '--all-systems' to show)
│   └───x86_64-linux
│       ├───activate: package 'activate'
│       └───update: package 'update-main-flake-inputs'
└───username: unknown
nix flake show seems to work as expexted, modules don't have `enable` options yet. ``` ❯ nix flake show git+file:///home/pinpox/code/git.pub.solar/pinpox/infra?ref=refs/heads/auto-modules&rev=512ab12de11ac5c754c16f64575a0e603e754da9 ├───checks │ ├───aarch64-darwin │ │ ├───deploy-activate omitted (use '--all-systems' to show) │ │ └───deploy-schema omitted (use '--all-systems' to show) │ ├───aarch64-linux │ │ ├───deploy-activate omitted (use '--all-systems' to show) │ │ └───deploy-schema omitted (use '--all-systems' to show) │ ├───x86_64-darwin │ │ ├───deploy-activate omitted (use '--all-systems' to show) │ │ └───deploy-schema omitted (use '--all-systems' to show) │ └───x86_64-linux │ ├───deploy-activate: derivation 'deploy-rs-check-activate' │ └───deploy-schema: derivation 'jsonschema-deploy-system' ├───darwinModules_: unknown ├───deploy: unknown ├───devShells │ ├───aarch64-linux │ │ └───default omitted (use '--all-systems' to show) │ └───x86_64-linux │ └───default: development environment 'nix-shell' ├───formatter │ └───x86_64-linux: package 'nixfmt-unstable-2024-03-01' ├───lib: unknown ├───logins: unknown ├───nixos-flake: unknown ├───nixosConfigurations │ ├───flora-6: NixOS configuration │ └───nachtigall: NixOS configuration ├───nixosModules │ ├───apps: NixOS module │ ├───caddy: NixOS module │ ├───collabora: NixOS module │ ├───core: NixOS module │ ├───coturn: NixOS module │ ├───docker: NixOS module │ ├───drone: NixOS module │ ├───forgejo: NixOS module │ ├───forgejo-actions-runner: NixOS module │ ├───grafana: NixOS module │ ├───home-manager: NixOS module │ ├───keycloak: NixOS module │ ├───loki: NixOS module │ ├───mailman: NixOS module │ ├───mastodon: NixOS module │ ├───matrix: NixOS module │ ├───matrix-irc: NixOS module │ ├───matrix-telegram: NixOS module │ ├───mediawiki: NixOS module │ ├───nextcloud: NixOS module │ ├───nginx: NixOS module │ ├───nginx-mastodon: NixOS module │ ├───nginx-mastodon-files: NixOS module │ ├───nginx-matrix: NixOS module │ ├───nginx-prometheus-exporters: NixOS module │ ├───nginx-website: NixOS module │ ├───nginx-website-miom: NixOS module │ ├───obs-portal: NixOS module │ ├───opensearch: NixOS module │ ├───overlays: NixOS module │ ├───owncast: NixOS module │ ├───postgresql: NixOS module │ ├───prometheus: NixOS module │ ├───prometheus-exporters: NixOS module │ ├───promtail: NixOS module │ ├───searx: NixOS module │ ├───tmate: NixOS module │ └───unlock-zfs-on-boot: NixOS module ├───packages │ ├───aarch64-linux │ │ ├───activate omitted (use '--all-systems' to show) │ │ └───update omitted (use '--all-systems' to show) │ └───x86_64-linux │ ├───activate: package 'activate' │ └───update: package 'update-main-flake-inputs' └───username: unknown ```
teutat3s requested changes 2024-04-29 23:05:21 +00:00
teutat3s left a comment
Owner
Copy link

This looks great! Just one nit: rm -r modules/apps

This looks great! Just one nit: `rm -r modules/apps`
teutat3s commented 2024-05-06 16:58:10 +00:00
Owner
Copy link

This has been merged with #179.

This has been merged with #179.
teutat3s closed this pull request 2024-05-06 16:58:11 +00:00
All checks were successful
Flake checks / Check (pull_request) Successful in 6m2s
Required
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
teutat3s
Labels
Clear labels   
Bug

   
Docs

   
Feature request

   
Good for newcomers

   
Infra

   
Privacy

   
Refactoring or migration

   
Security
No labels
Bug
Docs
Feature request
Good for newcomers
Infra
Privacy
Refactoring or migration
Security
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: pub-solar/infra#177
No description provided.
Delete branch "pinpox/infra:auto-modules"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?