Skip to content

Commit

Permalink
Fix manual
Browse files Browse the repository at this point in the history
  • Loading branch information
pinpox committed Jul 17, 2024
1 parent ab5c174 commit 7982cbe
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 32 deletions.
48 changes: 24 additions & 24 deletions .github/workflows/manual.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
# name: Build and Deploy Manual
# on:
# push:
# branches:
# - main
# jobs:
# tests:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout
# uses: actions/checkout@v3
# - name: Install Nix
# uses: cachix/install-nix-action@v20
# - name: Build manual
# run: |
# nix build '.#flake-manual' --show-trace -vv -L
# mkdir docs
# curl https://nixos.org/favicon.ico -o docs/favicon.ico
# cp result/index.html docs/index.html
# - name: Deploy 🚀
# uses: JamesIves/[email protected]
# with:
# branch: gh-pages # The branch the action should deploy to.
# folder: docs # The folder the action should deploy.
name: Build and Deploy Manual
on:
push:
branches:
- main
jobs:
tests:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install Nix
uses: cachix/install-nix-action@v20
- name: Build manual
run: |
nix build '.#manual' --show-trace -vv -L
mkdir docs
curl https://nixos.org/favicon.ico -o docs/favicon.ico
cp result/index.html docs/index.html
- name: Deploy 🚀
uses: JamesIves/[email protected]
with:
branch: gh-pages # The branch the action should deploy to.
folder: docs # The folder the action should deploy.
3 changes: 1 addition & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,9 @@
mqtt2prometheus
smartmon-script
woodpecker-pipeline
# manual
manual
tfenv
;

}
);

Expand Down
2 changes: 0 additions & 2 deletions modules/sound/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ in
};
config = mkIf cfg.enable {

# Enable sound.
sound.enable = true;
environment.systemPackages = [ pkgs.qjackctl ];

# Use pipeware to emulate jack and pulseaudio
Expand Down
59 changes: 55 additions & 4 deletions overlays/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,61 @@ in
self: super: {

# TODO: fix infinite recursion
# manual = super.callPackage ../packages/manual {
# inherit inputs;
# inherit flake-self;
# };
manual = super.callPackage ../packages/manual {
inherit inputs;
flake-self.nixosModules = with flake-self.nixosModules; {

# TODO:
# Some modules cause infinite recursion, so we only pass the ones that
# work. There is probably a better way, this should be automagic.

# caddy-security = flake-self.nixosModules.caddy-security;

inherit
activation-secrets
binary-cache
bluetooth
ci
default-desktop
default-server
dex
ente
environment
filebrowser
fonts
gitea
hedgedoc
hello
home-assistant
http2irc
kf-homepage
locale
lollypops-common
lvm-grub
mattermost
miniflux
minio
monitoring
networking
nextcloud
nix-common
ntfy-sh
openssh
owncast
restic
sound
thelounge
unbound-desktop
vikunja
virtualisation
wastebin
wireguard-client
xserver
yubikey
zsh
;
};
};

woodpecker-pipeline = super.callPackage ../packages/woodpecker-pipeline {
inherit inputs;
Expand Down

0 comments on commit 7982cbe

Please sign in to comment.