All the option are with us now

This commit is contained in:
teutat3s 2021-10-24 22:55:28 +02:00
parent 2588264d88
commit 2340270d81
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
6 changed files with 76 additions and 12 deletions

View file

@ -106,8 +106,55 @@ steps:
- nix -Lv develop -c echo OK - nix -Lv develop -c echo OK
- nix -Lv develop --command bud --help - nix -Lv develop --command bud --help
---
kind: pipeline
type: docker
name: Publish ISO
steps:
- name: "Build ISO"
image: nixpkgs/nix-flakes:nixos-21.05
volumes:
- name: nix-store
path: /nix/store
when:
event:
- push
branch:
- main
commands:
- echo "" >> /etc/nix/nix.conf
- echo "system-features = nixos-test benchmark big-parallel kvm recursive-nix" >> /etc/nix/nix.conf
- echo "substituters = https://nrdxp.cachix.org https://nix-community.cachix.org https://cache.nixos.org" >> /etc/nix/nix.conf
- echo "trusted-public-keys = nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" >> /etc/nix/nix.conf
- nix-shell
- bud build bootstrap bootstrapIso
- name: "Publish ISO"
image: appleboy/drone-scp
volumes:
- name: nix-store
path: /nix/store
settings:
host:
from_secret: ssh_host
user:
from_secret: ssh_user
port:
from_secret: ssh_port
key:
from_secret: ssh_key
target: /var/www/pub.solar
source:
- result/iso/*.iso
volumes:
- name: nix-store
host:
path: "/var/nix/build-store"
--- ---
kind: signature kind: signature
hmac: 36b824020f2bafbb46bc0b4087296e82db41677a3b5b85c7851b90322492343c hmac: a1c4dfbb3185a6185cc80622b0d78ff50a45c208fcbed963dbca894c8f47c6b3
... ...

View file

@ -129,7 +129,7 @@
}; };
suites = with profiles; rec { suites = with profiles; rec {
base = [ core users.pub-solar users.root ]; base = [ core users.pub-solar users.root ];
pubsolaros = [ core installed base-user users.root ]; pubsolaros = [ core full-install base-user users.root ];
anonymous = [ pubsolaros users.pub-solar ]; anonymous = [ pubsolaros users.pub-solar ];
}; };
}; };

View file

@ -8,6 +8,8 @@ in
{ {
options.pub-solar.audio = { options.pub-solar.audio = {
enable = mkEnableOption "Life in highs and lows"; enable = mkEnableOption "Life in highs and lows";
mopidy.enable = mkEnableOption "Life with mopidy";
bluetooth.enable = mkEnableOption "Life with bluetooth";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -36,7 +38,7 @@ in
config.pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json); config.pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json);
# Bluetooth configuration for pipewire # Bluetooth configuration for pipewire
media-session.config.bluez-monitor.rules = [ media-session.config.bluez-monitor.rules = mkIf cfg.bluetooth.enable [
{ {
# Matches all cards # Matches all cards
matches = [{ "device.name" = "~bluez_card.*"; }]; matches = [{ "device.name" = "~bluez_card.*"; }];
@ -63,10 +65,10 @@ in
}; };
# Enable bluetooth # Enable bluetooth
hardware.bluetooth.enable = true; hardware.bluetooth.enable = mkIf cfg.bluetooth.enable true;
services.blueman.enable = true; services.blueman.enable = mkIf cfg.bluetooth.enable true;
# Enable audio server & client # Enable audio server & client
services.mopidy = import ./mopidy.nix pkgs; services.mopidy = mkIf cfg.mopidy.enable ((import ./mopidy.nix) pkgs);
}; };
} }

View file

@ -0,0 +1,6 @@
{ self, config, lib, pkgs, ... }:
let inherit (lib) fileContents;
in
{
pub-solar.audio.enable = true;
}

View file

@ -9,11 +9,6 @@ in
pub-solar.audio.enable = true; pub-solar.audio.enable = true;
pub-solar.crypto.enable = true; pub-solar.crypto.enable = true;
pub-solar.devops.enable = true; pub-solar.devops.enable = true;
pub-solar.docker.enable = true;
pub-solar.nextcloud.enable = true;
pub-solar.office.enable = true;
# pub-solar.printing.enable = true; # this is enabled automatically if office is enabled
pub-solar.printing.enable = true;
nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
@ -30,7 +25,6 @@ in
git git
git-lfs git-lfs
git-bug git-bug
git-crypt
wget wget
openssl openssl
openssh openssh

View file

@ -0,0 +1,15 @@
{ self, config, lib, pkgs, ... }:
let inherit (lib) fileContents;
in
{
imports = [ ../cachix ];
config = {
pub-solar.audio.mopidy.enable = true;
pub-solar.audio.bluetooth.enable = true;
pub-solar.docker.enable = true;
pub-solar.nextcloud.enable = true;
pub-solar.office.enable = true;
# pub-solar.printing.enable = true; # this is enabled automatically if office is enabled
};
}