Compare commits
64 Commits
c1aef574b1
...
attic
| Author | SHA1 | Date | |
|---|---|---|---|
| ef247cb3dd | |||
| cad04680c4 | |||
| a2d176a4fc | |||
| 1f813395ee | |||
| 0d5bce2a4f | |||
| 0c2f7cd1b2 | |||
| b80b31d3c3 | |||
| caacb4b7a7 | |||
| 25dba0ee19 | |||
| 4bed47ae43 | |||
| 7c4d2d53f2 | |||
| 9ac9613d67 | |||
| e657ebb134 | |||
| d1b07ec06b | |||
| 89621945f8 | |||
| e69fd5bf8f | |||
| c856b762e7 | |||
| b7f82f2d44 | |||
| 588e94dcf4 | |||
| fd1ead0b62 | |||
| 37bd7254b9 | |||
| 74e41de9d6 | |||
| 0bf0b8b88b | |||
| 702129d778 | |||
| 88c67dde84 | |||
| 8e3a0761e8 | |||
| a785890990 | |||
| b482a8c106 | |||
| efe50be604 | |||
| 99904d0066 | |||
| 55e44bc3d0 | |||
| da7ffa839b | |||
| 01af25a57e | |||
| bfc1bb2da9 | |||
| 0e59fa3518 | |||
| 7e812001f0 | |||
| 14c19b80ef | |||
| e8dd0cb5ff | |||
| dc9f5e969a | |||
| 03150667b6 | |||
| 1dfd7bc8a2 | |||
| fa649b1e2a | |||
| e34752c791 | |||
| 75031567bd | |||
| 800a95d431 | |||
| 932b05a42e | |||
| b5cc4d4609 | |||
| ba3d15d82a | |||
| e80fb7b3db | |||
| 84e1f6e573 | |||
| c4847bd39b | |||
| c0c1ec5c67 | |||
| 6739115cfb | |||
| 4606cc32ba | |||
| 2d27bf7505 | |||
| d07af6d101 | |||
| 4890dc20e0 | |||
| 8b01a9b240 | |||
| 8dfba8646c | |||
| 63c0f52955 | |||
| 5413a8e7db | |||
| 330c801e43 | |||
| 8ba08ce982 | |||
| 2b50aeba93 |
@@ -4,45 +4,25 @@ on: [push]
|
||||
|
||||
env:
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
|
||||
PATH: /run/current-system/sw/bin/
|
||||
|
||||
jobs:
|
||||
check-flake:
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: nixos
|
||||
steps:
|
||||
- name: Install Nix
|
||||
uses: https://github.com/cachix/install-nix-action@v23
|
||||
with:
|
||||
github_access_token: ${{ secrets.__GITHUB_TOKEN }}
|
||||
extra_nix_config: |
|
||||
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= s0.koi-bebop.ts.net:OjbzD86YjyJZpCp9RWaQKANaflcpKhtzBMNP8I2aPUU=
|
||||
substituters = https://cache.nixos.org/ http://s0.koi-bebop.ts.net:5000
|
||||
|
||||
- name: Checkout the repository
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- run: attic -V
|
||||
|
||||
- name: Setup Attic Cache
|
||||
uses: https://git.neet.dev/zuckerberg/attic-action@v0.2.5
|
||||
with:
|
||||
endpoint: ${{ secrets.ATTIC_ENDPOINT }}
|
||||
cache: ${{ secrets.ATTIC_CACHE }}
|
||||
token: ${{ secrets.ATTIC_TOKEN }}
|
||||
|
||||
- name: Check Flake
|
||||
run: |
|
||||
# Can only build x84_64 for now, so pick out those specifically
|
||||
# nix flake check --show-trace
|
||||
|
||||
nix build .#nixosConfigurations."ray".config.system.build.toplevel
|
||||
nix build .#nixosConfigurations."s0".config.system.build.toplevel
|
||||
nix build .#nixosConfigurations."ponyo".config.system.build.toplevel
|
||||
nix build .#nixosConfigurations."zoidberg".config.system.build.toplevel
|
||||
|
||||
- name: Setup SSH For Pushing to Binary Cache
|
||||
run: |
|
||||
# Set up push key with ssh-agent
|
||||
echo "${{ secrets.BINARY_CACHE_PUSH_SSH_KEY }}" | base64 -d > ./.id_ed25519
|
||||
chmod 600 ./.id_ed25519
|
||||
eval $(ssh-agent -a $SSH_AUTH_SOCK)
|
||||
ssh-add ./.id_ed25519
|
||||
# Add Binary Cache as known host
|
||||
mkdir -p ~/.ssh
|
||||
echo "s0.koi-bebop.ts.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAwiXcUFtAvZCayhu4+AIcF+Ktrdgv9ee/mXSIhJbp4q" | tee -a ~/.ssh/known_hosts
|
||||
|
||||
- name: Copy all built derivations to remote cache
|
||||
run: nix copy --to ssh://cache-push@s0.koi-bebop.ts.net /nix/store/*
|
||||
run: nix flake check --all-systems --print-build-logs --log-format raw --show-trace
|
||||
27
Makefile
Normal file
27
Makefile
Normal file
@@ -0,0 +1,27 @@
|
||||
# Lockfile utils
|
||||
.PHONY: update-lockfile
|
||||
update-lockfile:
|
||||
nix flake update --commit-lock-file
|
||||
|
||||
.PHONY: update-lockfile-without-commit
|
||||
update-lockfile-without-commit:
|
||||
nix flake update
|
||||
|
||||
# Agenix utils
|
||||
.PHONY: edit-secret
|
||||
edit-secret:
|
||||
cd secrets && agenix -e $(filter-out $@,$(MAKECMDGOALS))
|
||||
|
||||
.PHONY: rekey-secrets
|
||||
rekey-secrets:
|
||||
cd secrets && agenix -r
|
||||
|
||||
# NixOS utils
|
||||
.PHONY: clean-old-nixos-profiles
|
||||
clean-old-nixos-profiles:
|
||||
doas nix-collect-garbage -d
|
||||
|
||||
# Garbage Collect
|
||||
.PHONY: gc
|
||||
gc:
|
||||
nix store gc
|
||||
@@ -6,11 +6,11 @@
|
||||
substituters = [
|
||||
"https://cache.nixos.org/"
|
||||
"https://nix-community.cachix.org"
|
||||
"http://s0.koi-bebop.ts.net:5000"
|
||||
"http://s0.koi-bebop.ts.net:28338/nixos"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
"s0.koi-bebop.ts.net:OjbzD86YjyJZpCp9RWaQKANaflcpKhtzBMNP8I2aPUU="
|
||||
"nixos:IDhKojUaMz+UIiri1/DQk9EpqDokih8dwxmp41uJnls="
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -10,6 +10,10 @@ in
|
||||
device = mkOption {
|
||||
type = types.str;
|
||||
};
|
||||
configurationLimit = mkOption {
|
||||
default = 20;
|
||||
type = types.int;
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
@@ -19,7 +23,7 @@ in
|
||||
enable = true;
|
||||
device = cfg.device;
|
||||
useOSProber = true;
|
||||
configurationLimit = 20;
|
||||
configurationLimit = cfg.configurationLimit;
|
||||
theme = pkgs.nixos-grub2-theme;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -7,6 +7,10 @@ in
|
||||
{
|
||||
options.efi = {
|
||||
enable = mkEnableOption "enable efi boot";
|
||||
configurationLimit = mkOption {
|
||||
default = 20;
|
||||
type = types.int;
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
@@ -19,7 +23,7 @@ in
|
||||
efiSupport = true;
|
||||
useOSProber = true;
|
||||
# memtest86.enable = true;
|
||||
configurationLimit = 20;
|
||||
configurationLimit = cfg.configurationLimit;
|
||||
theme = pkgs.nixos-grub2-theme;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
# TODO: use tailscale instead of tor https://gist.github.com/antifuchs/e30d58a64988907f282c82231dde2cbc
|
||||
|
||||
let
|
||||
cfg = config.remoteLuksUnlock;
|
||||
in
|
||||
@@ -33,11 +35,6 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
# boot.initrd.luks.devices.${cfg.device.name} = {
|
||||
# device = cfg.device.path;
|
||||
# allowDiscards = cfg.device.allowDiscards;
|
||||
# };
|
||||
|
||||
# Unlock LUKS disk over ssh
|
||||
boot.initrd.network.enable = true;
|
||||
boot.initrd.kernelModules = cfg.kernelModules;
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
nix.flakes.enable = true;
|
||||
|
||||
system.stateVersion = "21.11";
|
||||
system.stateVersion = "23.11";
|
||||
|
||||
networking.useDHCP = false;
|
||||
|
||||
@@ -26,7 +26,13 @@
|
||||
networking.firewall.allowPing = true;
|
||||
|
||||
time.timeZone = "America/Denver";
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
i18n = {
|
||||
defaultLocale = "en_US.UTF-8";
|
||||
extraLocaleSettings = {
|
||||
LANGUAGE = "en_US.UTF-8";
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
};
|
||||
};
|
||||
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
@@ -55,6 +61,9 @@
|
||||
lm_sensors
|
||||
picocom
|
||||
lf
|
||||
gnumake
|
||||
tree
|
||||
attic
|
||||
];
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
@@ -10,7 +10,6 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
nix = {
|
||||
package = pkgs.nixFlakes;
|
||||
extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
'';
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
# TODO implement this module such that the wireguard VPN doesn't have to live in a container
|
||||
# TODO don't add forward rules if the PIA port is the same as cfg.forwardedPort
|
||||
# TODO verify signatures of PIA responses
|
||||
# TODO `RuntimeMaxSec = "30d";` for pia-vpn-wireguard-init isn't allowed per the systemd logs. Find alternative.
|
||||
|
||||
with builtins;
|
||||
with lib;
|
||||
@@ -143,14 +144,14 @@ in
|
||||
systemd.services.pia-vpn-wireguard-init = {
|
||||
description = "Creates PIA VPN Wireguard Interface";
|
||||
|
||||
requires = [ "network-online.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
after = [ "network.target" "network-online.target" ];
|
||||
before = [ containerServiceName ];
|
||||
requiredBy = [ containerServiceName ];
|
||||
partOf = [ containerServiceName ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
path = with pkgs; [ wireguard-tools jq curl iproute ];
|
||||
path = with pkgs; [ wireguard-tools jq curl iproute iputils ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
@@ -162,6 +163,11 @@ in
|
||||
};
|
||||
|
||||
script = ''
|
||||
echo Waiting for internet...
|
||||
while ! ping -c 1 -W 1 1.1.1.1; do
|
||||
sleep 1
|
||||
done
|
||||
|
||||
# Prepare to connect by generating wg secrets and auth'ing with PIA since the container
|
||||
# cannot do without internet to start with. NAT'ing the host's internet would address this
|
||||
# issue but is not ideal because then leaking network outside of the VPN is more likely.
|
||||
@@ -214,7 +220,7 @@ in
|
||||
vpn-container.config.systemd.services.pia-vpn-wireguard = {
|
||||
description = "Initializes the PIA VPN WireGuard Tunnel";
|
||||
|
||||
requires = [ "network-online.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
after = [ "network.target" "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
|
||||
@@ -72,9 +72,6 @@ in
|
||||
config = {
|
||||
imports = allModules ++ [ cfg.config ];
|
||||
|
||||
# speeds up evaluation
|
||||
nixpkgs.pkgs = pkgs;
|
||||
|
||||
# networking.firewall.enable = mkForce false;
|
||||
networking.firewall.trustedInterfaces = [
|
||||
# completely trust internal interface to host
|
||||
|
||||
@@ -6,19 +6,20 @@ in
|
||||
{
|
||||
imports = [
|
||||
./kde.nix
|
||||
./xfce.nix
|
||||
# ./xfce.nix
|
||||
./yubikey.nix
|
||||
./chromium.nix
|
||||
# ./firefox.nix
|
||||
./firefox.nix
|
||||
./audio.nix
|
||||
# ./torbrowser.nix
|
||||
./pithos.nix
|
||||
./spotify.nix
|
||||
./vscodium.nix
|
||||
./discord.nix
|
||||
./steam.nix
|
||||
./touchpad.nix
|
||||
./mount-samba.nix
|
||||
./udev.nix
|
||||
./virtualisation.nix
|
||||
];
|
||||
|
||||
options.de = {
|
||||
@@ -41,12 +42,10 @@ in
|
||||
mpv
|
||||
nextcloud-client
|
||||
signal-desktop
|
||||
minecraft
|
||||
gparted
|
||||
libreoffice-fresh
|
||||
thunderbird
|
||||
spotifyd
|
||||
spotify-qt
|
||||
spotify
|
||||
arduino
|
||||
yt-dlp
|
||||
jellyfin-media-player
|
||||
@@ -57,7 +56,6 @@ in
|
||||
|
||||
# For Nix IDE
|
||||
nixpkgs-fmt
|
||||
rnix-lsp
|
||||
];
|
||||
|
||||
# Networking
|
||||
@@ -71,12 +69,25 @@ in
|
||||
];
|
||||
# Printer discovery
|
||||
services.avahi.enable = true;
|
||||
services.avahi.nssmdns = true;
|
||||
services.avahi.nssmdns4 = true;
|
||||
|
||||
programs.file-roller.enable = true;
|
||||
|
||||
# Security
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
security.pam.services.googlebot.enableGnomeKeyring = true;
|
||||
|
||||
# Android dev
|
||||
programs.adb.enable = true;
|
||||
|
||||
# Mount personal SMB stores
|
||||
services.mount-samba.enable = true;
|
||||
|
||||
# allow building ARM derivations
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
|
||||
# for luks onlock over tor
|
||||
services.tor.enable = true;
|
||||
services.tor.client.enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,31 +20,6 @@ let
|
||||
};
|
||||
|
||||
firefox = pkgs.wrapFirefox somewhatPrivateFF {
|
||||
desktopName = "Sneed Browser";
|
||||
|
||||
nixExtensions = [
|
||||
(pkgs.fetchFirefoxAddon {
|
||||
name = "ublock-origin";
|
||||
url = "https://addons.mozilla.org/firefox/downloads/file/3719054/ublock_origin-1.33.2-an+fx.xpi";
|
||||
sha256 = "XDpe9vW1R1iVBTI4AmNgAg1nk7BVQdIAMuqd0cnK5FE=";
|
||||
})
|
||||
(pkgs.fetchFirefoxAddon {
|
||||
name = "sponsorblock";
|
||||
url = "https://addons.mozilla.org/firefox/downloads/file/3720594/sponsorblock_skip_sponsorships_on_youtube-2.0.12.3-an+fx.xpi";
|
||||
sha256 = "HRtnmZWyXN3MKo4AvSYgNJGkBEsa2RaMamFbkz+YzQg=";
|
||||
})
|
||||
(pkgs.fetchFirefoxAddon {
|
||||
name = "KeePassXC-Browser";
|
||||
url = "https://addons.mozilla.org/firefox/downloads/file/3720664/keepassxc_browser-1.7.6-fx.xpi";
|
||||
sha256 = "3K404/eq3amHhIT0WhzQtC892he5I0kp2SvbzE9dbZg=";
|
||||
})
|
||||
(pkgs.fetchFirefoxAddon {
|
||||
name = "https-everywhere";
|
||||
url = "https://addons.mozilla.org/firefox/downloads/file/3716461/https_everywhere-2021.1.27-an+fx.xpi";
|
||||
sha256 = "2gSXSLunKCwPjAq4Wsj0lOeV551r3G+fcm1oeqjMKh8=";
|
||||
})
|
||||
];
|
||||
|
||||
extraPolicies = {
|
||||
CaptivePortal = false;
|
||||
DisableFirefoxStudies = true;
|
||||
@@ -74,12 +49,6 @@ let
|
||||
ExtensionRecommendations = false;
|
||||
SkipOnboarding = true;
|
||||
};
|
||||
WebsiteFilter = {
|
||||
Block = [
|
||||
"http://paradigminteractive.io/"
|
||||
"https://paradigminteractive.io/"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
extraPrefs = ''
|
||||
|
||||
@@ -5,22 +5,16 @@ let
|
||||
in
|
||||
{
|
||||
config = lib.mkIf cfg.enable {
|
||||
# kde plasma
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
desktopManager.plasma5.enable = true;
|
||||
displayManager.sddm.enable = true;
|
||||
};
|
||||
services.displayManager.sddm.enable = true;
|
||||
services.displayManager.sddm.wayland.enable = true;
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
|
||||
# kde apps
|
||||
nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true;
|
||||
users.users.googlebot.packages = with pkgs; [
|
||||
# akonadi
|
||||
# kmail
|
||||
# plasma5Packages.kmail-account-wizard
|
||||
kate
|
||||
];
|
||||
|
||||
services.xserver.desktopManager.plasma5.useQtScaling = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,6 +13,8 @@ let
|
||||
auth_opts = "sec=ntlmv2i,credentials=/run/agenix/smb-secrets";
|
||||
version_opts = "vers=3.1.1";
|
||||
|
||||
public_user_opts = "gid=${toString config.users.groups.users.gid}";
|
||||
|
||||
opts = "${systemd_opts},${network_opts},${user_opts},${version_opts},${auth_opts}";
|
||||
in
|
||||
{
|
||||
@@ -24,7 +26,7 @@ in
|
||||
fileSystems."/mnt/public" = {
|
||||
device = "//s0.koi-bebop.ts.net/public";
|
||||
fsType = "cifs";
|
||||
options = [ opts ];
|
||||
options = [ "${opts},${public_user_opts}" ];
|
||||
};
|
||||
|
||||
fileSystems."/mnt/private" = {
|
||||
|
||||
@@ -1,86 +0,0 @@
|
||||
{ lib, config, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.spotifyd;
|
||||
toml = pkgs.formats.toml { };
|
||||
spotifydConf = toml.generate "spotify.conf" cfg.settings;
|
||||
in
|
||||
{
|
||||
disabledModules = [
|
||||
"services/audio/spotifyd.nix"
|
||||
];
|
||||
|
||||
options = {
|
||||
services.spotifyd = {
|
||||
enable = mkEnableOption "spotifyd, a Spotify playing daemon";
|
||||
|
||||
settings = mkOption {
|
||||
default = { };
|
||||
type = toml.type;
|
||||
example = { global.bitrate = 320; };
|
||||
description = ''
|
||||
Configuration for Spotifyd. For syntax and directives, see
|
||||
<link xlink:href="https://github.com/Spotifyd/spotifyd#Configuration"/>.
|
||||
'';
|
||||
};
|
||||
|
||||
users = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [ ];
|
||||
description = ''
|
||||
Usernames to be added to the "spotifyd" group, so that they
|
||||
can start and interact with the userspace daemon.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
# username specific stuff because i'm lazy...
|
||||
services.spotifyd.users = [ "googlebot" ];
|
||||
users.users.googlebot.packages = with pkgs; [
|
||||
spotify
|
||||
spotify-tui
|
||||
];
|
||||
|
||||
users.groups.spotifyd = {
|
||||
members = cfg.users;
|
||||
};
|
||||
|
||||
age.secrets.spotifyd = {
|
||||
file = ../../secrets/spotifyd.age;
|
||||
group = "spotifyd";
|
||||
mode = "0440"; # group can read
|
||||
};
|
||||
|
||||
# spotifyd to read secrets and run as user service
|
||||
services.spotifyd = {
|
||||
settings.global = {
|
||||
username_cmd = "sed '1q;d' /run/agenix/spotifyd";
|
||||
password_cmd = "sed '2q;d' /run/agenix/spotifyd";
|
||||
bitrate = 320;
|
||||
backend = "pulseaudio";
|
||||
device_name = config.networking.hostName;
|
||||
device_type = "computer";
|
||||
# on_song_change_hook = "command_to_run_on_playback_events"
|
||||
autoplay = true;
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user.services.spotifyd-daemon = {
|
||||
enable = true;
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
partOf = [ "graphical-session.target" ];
|
||||
description = "spotifyd, a Spotify playing daemon";
|
||||
environment.SHELL = "/bin/sh";
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --config-path ${spotifydConf}";
|
||||
Restart = "always";
|
||||
CacheDirectory = "spotifyd";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -9,7 +9,7 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.xserver.libinput.enable = true;
|
||||
services.xserver.libinput.touchpad.naturalScrolling = true;
|
||||
services.libinput.enable = true;
|
||||
services.libinput.touchpad.naturalScrolling = true;
|
||||
};
|
||||
}
|
||||
|
||||
25
common/pc/udev.nix
Normal file
25
common/pc/udev.nix
Normal file
@@ -0,0 +1,25 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.de;
|
||||
in
|
||||
{
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.udev.extraRules = ''
|
||||
# depthai
|
||||
SUBSYSTEM=="usb", ATTRS{idVendor}=="03e7", MODE="0666"
|
||||
|
||||
# Moonlander
|
||||
# Rules for Oryx web flashing and live training
|
||||
KERNEL=="hidraw*", ATTRS{idVendor}=="16c0", MODE="0664", GROUP="plugdev"
|
||||
KERNEL=="hidraw*", ATTRS{idVendor}=="3297", MODE="0664", GROUP="plugdev"
|
||||
# Wally Flashing rules for the Moonlander and Planck EZ
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
|
||||
'';
|
||||
services.udev.packages = [ pkgs.platformio ];
|
||||
|
||||
users.groups.plugdev = {
|
||||
members = [ "googlebot" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index dace367..8c0e290 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -8,7 +8,7 @@ project(
|
||||
'warning_level=0',
|
||||
],
|
||||
license: 'MIT',
|
||||
- meson_version: '>= 0.58.0',
|
||||
+ meson_version: '>= 0.57.0',
|
||||
)
|
||||
|
||||
cc = meson.get_compiler('c')
|
||||
@@ -47,8 +47,3 @@ shared_library(
|
||||
gnu_symbol_visibility: 'hidden',
|
||||
)
|
||||
|
||||
-meson.add_devenv(environment({
|
||||
- 'NVD_LOG': '1',
|
||||
- 'LIBVA_DRIVER_NAME': 'nvidia',
|
||||
- 'LIBVA_DRIVERS_PATH': meson.project_build_root(),
|
||||
-}))
|
||||
23
common/pc/virtualisation.nix
Normal file
23
common/pc/virtualisation.nix
Normal file
@@ -0,0 +1,23 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.de;
|
||||
in
|
||||
{
|
||||
config = lib.mkIf cfg.enable {
|
||||
# AppVMs
|
||||
virtualisation.appvm.enable = true;
|
||||
virtualisation.appvm.user = "googlebot";
|
||||
|
||||
# Use podman instead of docker
|
||||
virtualisation.podman.enable = true;
|
||||
virtualisation.podman.dockerCompat = true;
|
||||
|
||||
# virt-manager
|
||||
virtualisation.libvirtd.enable = true;
|
||||
programs.dconf.enable = true;
|
||||
virtualisation.spiceUSBRedirection.enable = true;
|
||||
environment.systemPackages = with pkgs; [ virt-manager ];
|
||||
users.users.googlebot.extraGroups = [ "libvirtd" "adbusers" ];
|
||||
};
|
||||
}
|
||||
87
common/server/actualbudget.nix
Normal file
87
common/server/actualbudget.nix
Normal file
@@ -0,0 +1,87 @@
|
||||
# Starting point:
|
||||
# https://github.com/aldoborrero/mynixpkgs/commit/c501c1e32dba8f4462dcecb57eee4b9e52038e27
|
||||
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.actual-server;
|
||||
stateDir = "/var/lib/${cfg.stateDirName}";
|
||||
in
|
||||
{
|
||||
options.services.actual-server = {
|
||||
enable = lib.mkEnableOption "Actual Server";
|
||||
|
||||
hostname = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "localhost";
|
||||
description = "Hostname for the Actual Server.";
|
||||
};
|
||||
|
||||
port = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
default = 25448;
|
||||
description = "Port on which the Actual Server should listen.";
|
||||
};
|
||||
|
||||
stateDirName = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "actual-server";
|
||||
description = "Name of the directory under /var/lib holding the server's data.";
|
||||
};
|
||||
|
||||
upload = {
|
||||
fileSizeSyncLimitMB = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.int;
|
||||
default = null;
|
||||
description = "File size limit in MB for synchronized files.";
|
||||
};
|
||||
|
||||
syncEncryptedFileSizeLimitMB = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.int;
|
||||
default = null;
|
||||
description = "File size limit in MB for synchronized encrypted files.";
|
||||
};
|
||||
|
||||
fileSizeLimitMB = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.int;
|
||||
default = null;
|
||||
description = "File size limit in MB for file uploads.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.services.actual-server = {
|
||||
description = "Actual Server";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.actual-server}/bin/actual-server";
|
||||
Restart = "always";
|
||||
StateDirectory = cfg.stateDirName;
|
||||
WorkingDirectory = stateDir;
|
||||
DynamicUser = true;
|
||||
UMask = "0007";
|
||||
};
|
||||
environment = {
|
||||
NODE_ENV = "production";
|
||||
ACTUAL_PORT = toString cfg.port;
|
||||
|
||||
# Actual is actually very bad at configuring it's own paths despite that information being readily available
|
||||
ACTUAL_USER_FILES = "${stateDir}/user-files";
|
||||
ACTUAL_SERVER_FILES = "${stateDir}/server-files";
|
||||
ACTUAL_DATA_DIR = stateDir;
|
||||
|
||||
ACTUAL_UPLOAD_FILE_SYNC_SIZE_LIMIT_MB = toString (cfg.upload.fileSizeSyncLimitMB or "");
|
||||
ACTUAL_UPLOAD_SYNC_ENCRYPTED_FILE_SIZE_LIMIT_MB = toString (cfg.upload.syncEncryptedFileSizeLimitMB or "");
|
||||
ACTUAL_UPLOAD_FILE_SIZE_LIMIT_MB = toString (cfg.upload.fileSizeLimitMB or "");
|
||||
};
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts.${cfg.hostname} = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/".proxyPass = "http://localhost:${toString cfg.port}";
|
||||
};
|
||||
};
|
||||
}
|
||||
40
common/server/atticd.nix
Normal file
40
common/server/atticd.nix
Normal file
@@ -0,0 +1,40 @@
|
||||
{ config, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.atticd;
|
||||
in
|
||||
{
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.atticd = {
|
||||
credentialsFile = "/run/agenix/atticd-credentials";
|
||||
|
||||
settings = {
|
||||
listen = "[::]:28338";
|
||||
|
||||
# Speed things up
|
||||
require-proof-of-possession = false;
|
||||
|
||||
chunking = {
|
||||
# Disable chunking for performance (I have plenty of space)
|
||||
nar-size-threshold = 0;
|
||||
|
||||
# Chunking is disabled due to poor performance so these values don't matter but are required anyway.
|
||||
# One day, when I move away from ZFS maybe this will perform well enough.
|
||||
# nar-size-threshold = 64 * 1024; # 64 KiB
|
||||
min-size = 16 * 1024; # 16 KiB
|
||||
avg-size = 64 * 1024; # 64 KiB
|
||||
max-size = 256 * 1024; # 256 KiB
|
||||
};
|
||||
|
||||
# Disable compression for performance (I have plenty of space)
|
||||
compression.type = "none";
|
||||
|
||||
garbage-collection = {
|
||||
default-retention-period = "6 months";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
age.secrets.atticd-credentials.file = ../../secrets/atticd-credentials.age;
|
||||
};
|
||||
}
|
||||
53
common/server/dashy.nix
Normal file
53
common/server/dashy.nix
Normal file
@@ -0,0 +1,53 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.dashy;
|
||||
in
|
||||
{
|
||||
options.services.dashy = {
|
||||
enable = mkEnableOption "dashy";
|
||||
imageTag = mkOption {
|
||||
type = types.str;
|
||||
default = "latest";
|
||||
};
|
||||
port = mkOption {
|
||||
type = types.int;
|
||||
default = 56815;
|
||||
};
|
||||
configFile = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
description = "Path to the YAML configuration file";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
virtualisation.oci-containers.containers = {
|
||||
dashy = {
|
||||
image = "lissy93/dashy:${cfg.imageTag}";
|
||||
environment = {
|
||||
TZ = "${config.time.timeZone}";
|
||||
};
|
||||
ports = [
|
||||
"127.0.0.1:${toString cfg.port}:80"
|
||||
];
|
||||
volumes = [
|
||||
"${cfg.configFile}:/app/public/conf.yml"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
services.nginx.enable = true;
|
||||
services.nginx.virtualHosts."s0.koi-bebop.ts.net" = {
|
||||
default = true;
|
||||
addSSL = true;
|
||||
serverAliases = [ "s0" ];
|
||||
sslCertificate = "/secret/ssl/s0.koi-bebop.ts.net.crt";
|
||||
sslCertificateKey = "/secret/ssl/s0.koi-bebop.ts.net.key";
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:${toString cfg.port}";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -18,5 +18,10 @@
|
||||
./nextcloud.nix
|
||||
./iodine.nix
|
||||
./searx.nix
|
||||
./gitea-actions-runner.nix
|
||||
./dashy.nix
|
||||
./librechat.nix
|
||||
./actualbudget.nix
|
||||
./atticd.nix
|
||||
];
|
||||
}
|
||||
|
||||
137
common/server/gitea-actions-runner.nix
Normal file
137
common/server/gitea-actions-runner.nix
Normal file
@@ -0,0 +1,137 @@
|
||||
{ config, pkgs, lib, allModules, ... }:
|
||||
|
||||
# Gitea Actions Runner. Starts 'host' runner that runs directly on the host inside of a nixos container
|
||||
# This is useful for providing a real Nix/OS builder to gitea.
|
||||
# Warning, NixOS containers are not secure. For example, the container shares the /nix/store
|
||||
# Therefore, this should not be used to run untrusted code.
|
||||
# To enable, assign a machine the 'gitea-actions-runner' system role
|
||||
|
||||
# TODO: skipping running inside of nixos container for now because of issues getting docker/podman running
|
||||
|
||||
let
|
||||
runnerRole = "gitea-actions-runner";
|
||||
runners = config.machines.roles.${runnerRole};
|
||||
thisMachineIsARunner = builtins.elem config.networking.hostName runners;
|
||||
|
||||
containerName = "gitea-runner";
|
||||
in
|
||||
{
|
||||
config = lib.mkIf (thisMachineIsARunner && !config.boot.isContainer) {
|
||||
# containers.${containerName} = {
|
||||
# ephemeral = true;
|
||||
# autoStart = true;
|
||||
|
||||
# # for podman
|
||||
# enableTun = true;
|
||||
|
||||
# # privateNetwork = true;
|
||||
# # hostAddress = "172.16.101.1";
|
||||
# # localAddress = "172.16.101.2";
|
||||
|
||||
# bindMounts =
|
||||
# {
|
||||
# "/run/agenix/gitea-actions-runner-token" = {
|
||||
# hostPath = "/run/agenix/gitea-actions-runner-token";
|
||||
# isReadOnly = true;
|
||||
# };
|
||||
# "/var/lib/gitea-runner" = {
|
||||
# hostPath = "/var/lib/gitea-runner";
|
||||
# isReadOnly = false;
|
||||
# };
|
||||
# };
|
||||
|
||||
# extraFlags = [
|
||||
# # Allow podman
|
||||
# ''--system-call-filter=thisystemcalldoesnotexistforsure''
|
||||
# ];
|
||||
|
||||
# additionalCapabilities = [
|
||||
# "CAP_SYS_ADMIN"
|
||||
# ];
|
||||
|
||||
# config = {
|
||||
# imports = allModules;
|
||||
|
||||
# # speeds up evaluation
|
||||
# nixpkgs.pkgs = pkgs;
|
||||
|
||||
# networking.hostName = lib.mkForce containerName;
|
||||
|
||||
# # don't use remote builders
|
||||
# nix.distributedBuilds = lib.mkForce false;
|
||||
|
||||
# environment.systemPackages = with pkgs; [
|
||||
# git
|
||||
# # Gitea Actions rely heavily on node. Include it because it would be installed anyway.
|
||||
# nodejs
|
||||
# ];
|
||||
|
||||
# services.gitea-actions-runner.instances.inst = {
|
||||
# enable = true;
|
||||
# name = config.networking.hostName;
|
||||
# url = "https://git.neet.dev/";
|
||||
# tokenFile = "/run/agenix/gitea-actions-runner-token";
|
||||
# labels = [
|
||||
# "ubuntu-latest:docker://node:18-bullseye"
|
||||
# "nixos:host"
|
||||
# ];
|
||||
# };
|
||||
|
||||
# # To allow building on the host, must override the the service's config so it doesn't use a dynamic user
|
||||
# systemd.services.gitea-runner-inst.serviceConfig.DynamicUser = lib.mkForce false;
|
||||
# users.users.gitea-runner = {
|
||||
# home = "/var/lib/gitea-runner";
|
||||
# group = "gitea-runner";
|
||||
# isSystemUser = true;
|
||||
# createHome = true;
|
||||
# };
|
||||
# users.groups.gitea-runner = { };
|
||||
|
||||
# virtualisation.podman.enable = true;
|
||||
# boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
# };
|
||||
# };
|
||||
|
||||
# networking.nat.enable = true;
|
||||
# networking.nat.internalInterfaces = [
|
||||
# "ve-${containerName}"
|
||||
# ];
|
||||
# networking.ip_forward = true;
|
||||
|
||||
# don't use remote builders
|
||||
nix.distributedBuilds = lib.mkForce false;
|
||||
|
||||
services.gitea-actions-runner.instances.inst = {
|
||||
enable = true;
|
||||
name = config.networking.hostName;
|
||||
url = "https://git.neet.dev/";
|
||||
tokenFile = "/run/agenix/gitea-actions-runner-token";
|
||||
labels = [
|
||||
"ubuntu-latest:docker://node:18-bullseye"
|
||||
"nixos:host"
|
||||
];
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
# Gitea Actions rely heavily on node. Include it because it would be installed anyway.
|
||||
nodejs
|
||||
attic
|
||||
];
|
||||
|
||||
# To allow building on the host, must override the the service's config so it doesn't use a dynamic user
|
||||
systemd.services.gitea-runner-inst.serviceConfig.DynamicUser = lib.mkForce false;
|
||||
users.users.gitea-runner = {
|
||||
home = "/var/lib/gitea-runner";
|
||||
group = "gitea-runner";
|
||||
isSystemUser = true;
|
||||
createHome = true;
|
||||
};
|
||||
users.groups.gitea-runner = { };
|
||||
|
||||
virtualisation.podman.enable = true;
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
|
||||
age.secrets.gitea-actions-runner-token.file = ../../secrets/gitea-actions-runner-token.age;
|
||||
};
|
||||
}
|
||||
@@ -12,12 +12,14 @@ in
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.gitea = {
|
||||
domain = cfg.hostname;
|
||||
rootUrl = "https://${cfg.hostname}/";
|
||||
appName = cfg.hostname;
|
||||
# lfs.enable = true;
|
||||
lfs.enable = true;
|
||||
# dump.enable = true;
|
||||
settings = {
|
||||
server = {
|
||||
ROOT_URL = "https://${cfg.hostname}/";
|
||||
DOMAIN = cfg.hostname;
|
||||
};
|
||||
other = {
|
||||
SHOW_FOOTER_VERSION = false;
|
||||
};
|
||||
@@ -29,6 +31,9 @@ in
|
||||
};
|
||||
session = {
|
||||
COOKIE_SECURE = true;
|
||||
PROVIDER = "db";
|
||||
SESSION_LIFE_TIME = 259200; # 3 days
|
||||
GC_INTERVAL_TIME = 259200; # 3 days
|
||||
};
|
||||
mailer = {
|
||||
ENABLED = true;
|
||||
@@ -42,6 +47,9 @@ in
|
||||
actions = {
|
||||
ENABLED = true;
|
||||
};
|
||||
indexer = {
|
||||
REPO_INDEXER_ENABLED = true;
|
||||
};
|
||||
};
|
||||
mailerPasswordFile = "/run/agenix/robots-email-pw";
|
||||
};
|
||||
@@ -60,7 +68,7 @@ in
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:${toString cfg.httpPort}";
|
||||
proxyPass = "http://localhost:${toString cfg.settings.server.HTTP_PORT}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
62
common/server/librechat.nix
Normal file
62
common/server/librechat.nix
Normal file
@@ -0,0 +1,62 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.librechat;
|
||||
in
|
||||
{
|
||||
options.services.librechat = {
|
||||
enable = mkEnableOption "librechat";
|
||||
port = mkOption {
|
||||
type = types.int;
|
||||
default = 3080;
|
||||
};
|
||||
host = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
example = "example.com";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
virtualisation.oci-containers.containers = {
|
||||
librechat = {
|
||||
image = "ghcr.io/danny-avila/librechat:v0.6.6";
|
||||
environment = {
|
||||
HOST = "0.0.0.0";
|
||||
MONGO_URI = "mongodb://host.containers.internal:27017/LibreChat";
|
||||
ENDPOINTS = "openAI,google,bingAI,gptPlugins";
|
||||
};
|
||||
environmentFiles = [
|
||||
"/run/agenix/librechat-env-file"
|
||||
];
|
||||
ports = [
|
||||
"${toString cfg.port}:3080"
|
||||
];
|
||||
};
|
||||
};
|
||||
age.secrets.librechat-env-file.file = ../../secrets/librechat-env-file.age;
|
||||
|
||||
services.mongodb.enable = true;
|
||||
services.mongodb.bind_ip = "0.0.0.0";
|
||||
|
||||
# easier podman maintenance
|
||||
virtualisation.oci-containers.backend = "podman";
|
||||
virtualisation.podman.dockerSocket.enable = true;
|
||||
virtualisation.podman.dockerCompat = true;
|
||||
|
||||
# For mongodb access
|
||||
networking.firewall.trustedInterfaces = [
|
||||
"podman0" # for librechat
|
||||
];
|
||||
|
||||
services.nginx.virtualHosts.${cfg.host} = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:${toString cfg.port}";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -55,6 +55,7 @@ in
|
||||
"joslyn@runyan.org"
|
||||
"damon@runyan.org"
|
||||
"jonas@runyan.org"
|
||||
"simon@neet.dev"
|
||||
];
|
||||
forwards = {
|
||||
"amazon@runyan.org" = [
|
||||
@@ -62,7 +63,7 @@ in
|
||||
"cris@runyan.org"
|
||||
];
|
||||
};
|
||||
certificateScheme = 3; # use let's encrypt for certs
|
||||
certificateScheme = "acme-nginx"; # use let's encrypt for certs
|
||||
};
|
||||
age.secrets.hashed-email-pw.file = ../../secrets/hashed-email-pw.age;
|
||||
age.secrets.cris-hashed-email-pw.file = ../../secrets/cris-hashed-email-pw.age;
|
||||
|
||||
@@ -8,13 +8,12 @@ in
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.nextcloud = {
|
||||
https = true;
|
||||
package = pkgs.nextcloud25;
|
||||
package = pkgs.nextcloud29;
|
||||
hostName = "neet.cloud";
|
||||
config.dbtype = "sqlite";
|
||||
config.adminuser = "jeremy";
|
||||
config.adminpassFile = "/run/agenix/nextcloud-pw";
|
||||
autoUpdateApps.enable = true;
|
||||
enableBrokenCiphersForSSE = false;
|
||||
};
|
||||
age.secrets.nextcloud-pw = {
|
||||
file = ../../secrets/nextcloud-pw.age;
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
# Printer discovery
|
||||
# (is this needed?)
|
||||
services.avahi.enable = true;
|
||||
services.avahi.nssmdns = true;
|
||||
services.avahi.nssmdns4 = true;
|
||||
|
||||
# printer sharing
|
||||
systemd.tmpfiles.rules = [
|
||||
|
||||
@@ -34,6 +34,8 @@
|
||||
io_seq_write = "${pkgs.fio}/bin/fio --name TEST --eta-newline=5s --filename=temp.file --rw=write --size=2g --io_size=10g --blocksize=1024k --ioengine=libaio --fsync=10000 --iodepth=32 --direct=1 --numjobs=1 --runtime=60 --group_reporting; rm temp.file";
|
||||
io_rand_read = "${pkgs.fio}/bin/fio --name TEST --eta-newline=5s --filename=temp.file --rw=randread --size=2g --io_size=10g --blocksize=4k --ioengine=libaio --fsync=1 --iodepth=1 --direct=1 --numjobs=32 --runtime=60 --group_reporting; rm temp.file";
|
||||
io_rand_write = "${pkgs.fio}/bin/fio --name TEST --eta-newline=5s --filename=temp.file --rw=randrw --size=2g --io_size=10g --blocksize=4k --ioengine=libaio --fsync=1 --iodepth=1 --direct=1 --numjobs=1 --runtime=60 --group_reporting; rm temp.file";
|
||||
|
||||
llsblk = "lsblk -o +uuid,fsType";
|
||||
};
|
||||
|
||||
nixpkgs.overlays = [
|
||||
|
||||
201
flake.lock
generated
201
flake.lock
generated
@@ -6,14 +6,17 @@
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1690228878,
|
||||
"narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=",
|
||||
"lastModified": 1716561646,
|
||||
"narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "d8c973fd228949736dedf61b7f8cc1ece3236792",
|
||||
"rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -22,6 +25,36 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"attic": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"flake-compat": [
|
||||
"flake-compat"
|
||||
],
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717279440,
|
||||
"narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=",
|
||||
"owner": "zhaofengli",
|
||||
"repo": "attic",
|
||||
"rev": "717cc95983cdc357bc347d70be20ced21f935843",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "zhaofengli",
|
||||
"repo": "attic",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"blobs": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@@ -38,6 +71,27 @@
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"attic",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717025063,
|
||||
"narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"dailybuild_modules": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
@@ -54,11 +108,11 @@
|
||||
"rev": "1290ddd9a2ff2bf2d0f702750768312b80efcd34",
|
||||
"revCount": 19,
|
||||
"type": "git",
|
||||
"url": "https://git.neet.dev/zuckerberg/dailybuild_modules.git"
|
||||
"url": "https://git.neet.dev/zuckerberg/dailybot.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.neet.dev/zuckerberg/dailybuild_modules.git"
|
||||
"url": "https://git.neet.dev/zuckerberg/dailybot.git"
|
||||
}
|
||||
},
|
||||
"darwin": {
|
||||
@@ -69,11 +123,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1673295039,
|
||||
"narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
|
||||
"lastModified": 1700795494,
|
||||
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
|
||||
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -85,21 +139,22 @@
|
||||
},
|
||||
"deploy-rs": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-compat": [
|
||||
"flake-compat"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": [
|
||||
"simple-nixos-mailserver",
|
||||
"utils"
|
||||
"flake-utils"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1686747123,
|
||||
"narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=",
|
||||
"lastModified": 1718194053,
|
||||
"narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=",
|
||||
"owner": "serokell",
|
||||
"repo": "deploy-rs",
|
||||
"rev": "724463b5a94daa810abfc64a4f87faef4e00f984",
|
||||
"rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -111,11 +166,11 @@
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1668681692,
|
||||
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -126,14 +181,16 @@
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
"systems": [
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1689068808,
|
||||
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -150,11 +207,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1682203081,
|
||||
"narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
|
||||
"lastModified": 1703113217,
|
||||
"narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
|
||||
"rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -170,11 +227,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1691292840,
|
||||
"narHash": "sha256-NA+o/NoOOQhzAQwB2JpeKoG+iYQ6yn/XXVxaGd5HSQI=",
|
||||
"lastModified": 1716772633,
|
||||
"narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=",
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "6c626d54d0414d34c771c0f6f9d771bc8aaaa3c4",
|
||||
"rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -183,7 +240,39 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1717248095,
|
||||
"narHash": "sha256-e8X2eWjAHJQT82AAN+mCI0B68cIDBJpqJ156+VRrFO0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "7b49d3967613d9aacac5b340ef158d493906ba79",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "master",
|
||||
"repo": "nixos-hardware",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1717144377,
|
||||
"narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "805a384895c696f802a9bf5bf4720f37385df547",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-frigate": {
|
||||
"locked": {
|
||||
"lastModified": 1695825837,
|
||||
"narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
|
||||
@@ -194,26 +283,11 @@
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-23.05",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-22_05": {
|
||||
"locked": {
|
||||
"lastModified": 1654936503,
|
||||
"narHash": "sha256-soKzdhI4jTHv/rSbh89RdlcJmrPgH8oMb/PLqiqIYVQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "dab6df51387c3878cdea09f43589a15729cae9f4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-22.05",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"radio": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
@@ -258,36 +332,48 @@
|
||||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"attic": "attic",
|
||||
"dailybuild_modules": "dailybuild_modules",
|
||||
"deploy-rs": "deploy-rs",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-utils": "flake-utils",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-frigate": "nixpkgs-frigate",
|
||||
"radio": "radio",
|
||||
"radio-web": "radio-web",
|
||||
"simple-nixos-mailserver": "simple-nixos-mailserver"
|
||||
"simple-nixos-mailserver": "simple-nixos-mailserver",
|
||||
"systems": "systems"
|
||||
}
|
||||
},
|
||||
"simple-nixos-mailserver": {
|
||||
"inputs": {
|
||||
"blobs": "blobs",
|
||||
"flake-compat": [
|
||||
"flake-compat"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-22_05": "nixpkgs-22_05",
|
||||
"utils": "utils"
|
||||
"nixpkgs-24_05": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": [
|
||||
"flake-utils"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1655930346,
|
||||
"narHash": "sha256-ht56HHOzEhjeIgAv5ZNFjSVX/in1YlUs0HG9c1EUXTM=",
|
||||
"lastModified": 1718084203,
|
||||
"narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=",
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "nixos-mailserver",
|
||||
"rev": "f535d8123c4761b2ed8138f3d202ea710a334a1d",
|
||||
"rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"ref": "nixos-22.05",
|
||||
"ref": "master",
|
||||
"repo": "nixos-mailserver",
|
||||
"type": "gitlab"
|
||||
}
|
||||
@@ -306,21 +392,6 @@
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"locked": {
|
||||
"lastModified": 1605370193,
|
||||
"narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "5021eac20303a61fafe17224c087f5519baed54d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
||||
115
flake.nix
115
flake.nix
@@ -1,37 +1,91 @@
|
||||
{
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
|
||||
# nixpkgs
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
|
||||
nixpkgs-frigate.url = "github:NixOS/nixpkgs/5cfafa12d57374f48bcc36fda3274ada276cf69e";
|
||||
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
# Common Utils Among flake inputs
|
||||
systems.url = "github:nix-systems/default";
|
||||
flake-utils = {
|
||||
url = "github:numtide/flake-utils";
|
||||
inputs.systems.follows = "systems";
|
||||
};
|
||||
flake-compat = {
|
||||
url = "github:edolstra/flake-compat";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
# mail server
|
||||
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.05";
|
||||
simple-nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs";
|
||||
# NixOS hardware
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
|
||||
# agenix
|
||||
agenix.url = "github:ryantm/agenix";
|
||||
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
# Mail Server
|
||||
simple-nixos-mailserver = {
|
||||
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
nixpkgs-24_05.follows = "nixpkgs";
|
||||
flake-compat.follows = "flake-compat";
|
||||
utils.follows = "flake-utils";
|
||||
};
|
||||
};
|
||||
|
||||
# radio
|
||||
radio.url = "git+https://git.neet.dev/zuckerberg/radio.git?ref=main&rev=5bf607fed977d41a269942a7d1e92f3e6d4f2473";
|
||||
radio.inputs.nixpkgs.follows = "nixpkgs";
|
||||
radio.inputs.flake-utils.follows = "flake-utils";
|
||||
radio-web.url = "git+https://git.neet.dev/zuckerberg/radio-web.git";
|
||||
radio-web.flake = false;
|
||||
# Agenix
|
||||
agenix = {
|
||||
url = "github:ryantm/agenix";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
systems.follows = "systems";
|
||||
};
|
||||
};
|
||||
|
||||
# drastikbot
|
||||
dailybuild_modules.url = "git+https://git.neet.dev/zuckerberg/dailybuild_modules.git";
|
||||
dailybuild_modules.inputs.nixpkgs.follows = "nixpkgs";
|
||||
dailybuild_modules.inputs.flake-utils.follows = "flake-utils";
|
||||
# Radio
|
||||
radio = {
|
||||
url = "git+https://git.neet.dev/zuckerberg/radio.git?ref=main&rev=5bf607fed977d41a269942a7d1e92f3e6d4f2473";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
flake-utils.follows = "flake-utils";
|
||||
};
|
||||
};
|
||||
radio-web = {
|
||||
url = "git+https://git.neet.dev/zuckerberg/radio-web.git";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
# nixos config deployment
|
||||
deploy-rs.url = "github:serokell/deploy-rs";
|
||||
deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
|
||||
deploy-rs.inputs.utils.follows = "simple-nixos-mailserver/utils";
|
||||
# Dailybot
|
||||
dailybuild_modules = {
|
||||
url = "git+https://git.neet.dev/zuckerberg/dailybot.git";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
flake-utils.follows = "flake-utils";
|
||||
};
|
||||
};
|
||||
|
||||
# prebuilt nix-index database
|
||||
nix-index-database.url = "github:Mic92/nix-index-database";
|
||||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||
# NixOS deployment
|
||||
deploy-rs = {
|
||||
url = "github:serokell/deploy-rs";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
flake-compat.follows = "flake-compat";
|
||||
utils.follows = "flake-utils";
|
||||
};
|
||||
};
|
||||
|
||||
# Prebuilt nix-index database
|
||||
nix-index-database = {
|
||||
url = "github:Mic92/nix-index-database";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# Attic
|
||||
attic = {
|
||||
url = "github:zhaofengli/attic";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
nixpkgs-stable.follows = "nixpkgs";
|
||||
flake-utils.follows = "flake-utils";
|
||||
flake-compat.follows = "flake-compat";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, ... }@inputs:
|
||||
@@ -51,8 +105,12 @@
|
||||
agenix.nixosModules.default
|
||||
dailybuild_modules.nixosModule
|
||||
nix-index-database.nixosModules.nix-index
|
||||
attic.nixosModules.atticd
|
||||
self.nixosModules.kernel-modules
|
||||
({ lib, ... }: {
|
||||
config = {
|
||||
nixpkgs.overlays = [ self.overlays.default ];
|
||||
|
||||
environment.systemPackages = [
|
||||
agenix.packages.${system}.agenix
|
||||
];
|
||||
@@ -87,6 +145,8 @@
|
||||
|
||||
specialArgs = {
|
||||
inherit allModules;
|
||||
lib = self.lib;
|
||||
nixos-hardware = inputs.nixos-hardware;
|
||||
};
|
||||
};
|
||||
in
|
||||
@@ -115,6 +175,9 @@
|
||||
"aarch64-linux"."iso" = mkIso "aarch64-linux";
|
||||
};
|
||||
|
||||
overlays.default = import ./overlays { inherit inputs; };
|
||||
nixosModules.kernel-modules = import ./overlays/kernel-modules;
|
||||
|
||||
deploy.nodes =
|
||||
let
|
||||
mkDeploy = configName: arch: hostname: {
|
||||
@@ -130,5 +193,7 @@
|
||||
machines;
|
||||
|
||||
checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib;
|
||||
|
||||
lib = nixpkgs.lib.extend (final: prev: import ./lib { lib = nixpkgs.lib; });
|
||||
};
|
||||
}
|
||||
|
||||
56
lib/default.nix
Normal file
56
lib/default.nix
Normal file
@@ -0,0 +1,56 @@
|
||||
{ lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
# Passthrough trace for debugging
|
||||
pTrace = v: traceSeq v v;
|
||||
# find the total sum of a int list
|
||||
sum = foldr (x: y: x + y) 0;
|
||||
# splits a list of length two into two params then they're passed to a func
|
||||
splitPair = f: pair: f (head pair) (last pair);
|
||||
# Finds the max value in a list
|
||||
maxList = foldr max 0;
|
||||
# Sorts a int list. Greatest value first
|
||||
sortList = sort (x: y: x > y);
|
||||
# Cuts a list in half and returns the two parts in a list
|
||||
cutInHalf = l: [ (take (length l / 2) l) (drop (length l / 2) l) ];
|
||||
# Splits a list into a list of lists with length cnt
|
||||
chunksOf = cnt: l:
|
||||
if length l > 0 then
|
||||
[ (take cnt l) ] ++ chunksOf cnt (drop cnt l)
|
||||
else [ ];
|
||||
# same as intersectLists but takes an array of lists to intersect instead of just two
|
||||
intersectManyLists = ll: foldr intersectLists (head ll) ll;
|
||||
# converts a boolean to a int (c style)
|
||||
boolToInt = b: if b then 1 else 0;
|
||||
# drops the last element of a list
|
||||
dropLast = l: take (length l - 1) l;
|
||||
# transposes a matrix
|
||||
transpose = ll:
|
||||
let
|
||||
outerSize = length ll;
|
||||
innerSize = length (elemAt ll 0);
|
||||
in
|
||||
genList (i: genList (j: elemAt (elemAt ll j) i) outerSize) innerSize;
|
||||
# attriset recursiveUpdate but for a list of attrisets
|
||||
combineAttrs = foldl recursiveUpdate { };
|
||||
# visits every single attriset element of an attriset recursively
|
||||
# and accumulates the result of every visit in a flat list
|
||||
recurisveVisitAttrs = f: set:
|
||||
let
|
||||
visitor = n: v:
|
||||
if isAttrs v then [ (f n v) ] ++ recurisveVisitAttrs f v
|
||||
else [ (f n v) ];
|
||||
in
|
||||
concatLists (map (name: visitor name set.${name}) (attrNames set));
|
||||
# merges two lists of the same size (similar to map but both lists are inputs per iteration)
|
||||
mergeLists = f: a: imap0 (i: f (elemAt a i));
|
||||
map2D = f: ll:
|
||||
let
|
||||
outerSize = length ll;
|
||||
innerSize = length (elemAt ll 0);
|
||||
getElem = x: y: elemAt (elemAt ll y) x;
|
||||
in
|
||||
genList (y: genList (x: f x y (getElem x y)) innerSize) outerSize;
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p bash
|
||||
|
||||
nix flake update --commit-lock-file
|
||||
57
machines/ephemeral/sdimg.nix
Normal file
57
machines/ephemeral/sdimg.nix
Normal file
@@ -0,0 +1,57 @@
|
||||
{ config, modulesPath, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
pinecube-uboot = pkgs.buildUBoot {
|
||||
defconfig = "pinecube_defconfig";
|
||||
extraMeta.platforms = [ "armv7l-linux" ];
|
||||
filesToInstall = [ "u-boot-sunxi-with-spl.bin" ];
|
||||
};
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/sd-card/sd-image.nix")
|
||||
./minimal.nix
|
||||
];
|
||||
|
||||
sdImage.populateFirmwareCommands = "";
|
||||
sdImage.populateRootCommands = ''
|
||||
mkdir -p ./files/boot
|
||||
${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot
|
||||
'';
|
||||
sdImage.postBuildCommands = ''
|
||||
dd if=${pinecube-uboot}/u-boot-sunxi-with-spl.bin of=$img bs=1024 seek=8 conv=notrunc
|
||||
'';
|
||||
|
||||
###
|
||||
|
||||
networking.hostName = "pinecube";
|
||||
|
||||
boot.loader.grub.enable = false;
|
||||
boot.loader.generic-extlinux-compatible.enable = true;
|
||||
boot.consoleLogLevel = 7;
|
||||
|
||||
# cma is 64M by default which is waay too much and we can't even unpack initrd
|
||||
boot.kernelParams = [ "console=ttyS0,115200n8" "cma=32M" ];
|
||||
|
||||
boot.kernelModules = [ "spi-nor" ]; # Not sure why this doesn't autoload. Provides SPI NOR at /dev/mtd0
|
||||
boot.extraModulePackages = [ config.boot.kernelPackages.rtl8189es ];
|
||||
|
||||
zramSwap.enable = true; # 128MB is not much to work with
|
||||
|
||||
sound.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
ffmpeg
|
||||
(v4l_utils.override { withGUI = false; })
|
||||
usbutils
|
||||
];
|
||||
|
||||
services.getty.autologinUser = lib.mkForce "googlebot";
|
||||
users.users.googlebot = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "networkmanager" "video" ];
|
||||
openssh.authorizedKeys.keys = config.machines.ssh.userKeys;
|
||||
};
|
||||
|
||||
networking.wireless.enable = true;
|
||||
}
|
||||
13
machines/howl/default.nix
Normal file
13
machines/howl/default.nix
Normal file
@@ -0,0 +1,13 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
# don't use remote builders
|
||||
nix.distributedBuilds = lib.mkForce false;
|
||||
|
||||
de.enable = true;
|
||||
de.touchpad.enable = true;
|
||||
}
|
||||
58
machines/howl/hardware-configuration.nix
Normal file
58
machines/howl/hardware-configuration.nix
Normal file
@@ -0,0 +1,58 @@
|
||||
{ config, lib, pkgs, modulesPath, nixos-hardware, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
nixos-hardware.nixosModules.framework-13-7040-amd
|
||||
];
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
hardware.framework.amd-7040.preventWakeOnAC = true;
|
||||
services.fwupd.enable = true;
|
||||
# fingerprint reader has initially shown to be more of a nuisance than a help
|
||||
# it makes sddm log in fail most of the time and take several minutes to finish
|
||||
services.fprintd.enable = false;
|
||||
|
||||
# boot
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ "dm-snapshot" ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
# thunderbolt
|
||||
services.hardware.bolt.enable = true;
|
||||
|
||||
# firmware
|
||||
firmware.x86_64.enable = true;
|
||||
|
||||
# disks
|
||||
remoteLuksUnlock.enable = true;
|
||||
boot.initrd.luks.devices."enc-pv" = {
|
||||
device = "/dev/disk/by-uuid/c801586b-f0a2-465c-8dae-532e61b83fee";
|
||||
allowDiscards = true;
|
||||
};
|
||||
fileSystems."/" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/95db6950-a7bc-46cf-9765-3ea675ccf014";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
fileSystems."/boot" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/B087-2C20";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
swapDevices =
|
||||
[{ device = "/dev/disk/by-uuid/49fbdf62-eef4-421b-aac3-c93494afd23c"; }];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
}
|
||||
26
machines/howl/properties.nix
Normal file
26
machines/howl/properties.nix
Normal file
@@ -0,0 +1,26 @@
|
||||
{
|
||||
hostNames = [
|
||||
"howl"
|
||||
];
|
||||
|
||||
arch = "x86_64-linux";
|
||||
|
||||
systemRoles = [
|
||||
"personal"
|
||||
];
|
||||
|
||||
hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEQi3q8jU6vRruExAL60J7GFO1gS8HsmXVJuKRT4ljrG";
|
||||
|
||||
userKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKPnLt84bKhUgFxjQf10+Htro9Lo1Pabqm8mGalBUniv"
|
||||
];
|
||||
|
||||
deployKeys = [
|
||||
# TODO
|
||||
];
|
||||
|
||||
remoteUnlock = {
|
||||
hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN0N80r0Sl2WlJaUqfxZPkOtYyGumFazkIqq7eq3Gd2o";
|
||||
onionHost = "ll6yjnkh4psmfwmtkmqoutl4gq4elqzbmjxv4s6gpgoavyi3kwhjvnqd.onion";
|
||||
};
|
||||
}
|
||||
@@ -6,17 +6,4 @@
|
||||
];
|
||||
|
||||
networking.hostName = "phil";
|
||||
|
||||
services.gitea-actions-runner.instances.inst = {
|
||||
enable = true;
|
||||
name = config.networking.hostName;
|
||||
url = "https://git.neet.dev/";
|
||||
tokenFile = "/run/agenix/gitea-actions-runner-token";
|
||||
labels = [
|
||||
"debian-latest:docker://catthehacker/ubuntu:act-latest"
|
||||
"ubuntu-latest:docker://catthehacker/ubuntu:act-latest"
|
||||
];
|
||||
};
|
||||
virtualisation.docker.enable = true;
|
||||
age.secrets.gitea-actions-runner-token.file = ../../secrets/gitea-actions-runner-token.age;
|
||||
}
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
systemRoles = [
|
||||
"server"
|
||||
"nix-builder"
|
||||
"gitea-actions-runner"
|
||||
];
|
||||
|
||||
hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBlgRPpuUkZqe8/lHugRPm/m2vcN9psYhh5tENHZt9I2";
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
system.autoUpgrade.enable = true;
|
||||
# system.autoUpgrade.enable = true;
|
||||
|
||||
# p2p mesh network
|
||||
services.tailscale.exitNode = true;
|
||||
@@ -63,17 +63,32 @@
|
||||
};
|
||||
};
|
||||
pia.wireguard.badPortForwardPorts = [ ];
|
||||
services.nginx.virtualHosts."radio.runyan.org" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations = {
|
||||
"/stream.mp3" = {
|
||||
proxyPass = "http://vpn.containers:8001/stream.mp3";
|
||||
extraConfig = ''
|
||||
add_header Access-Control-Allow-Origin *;
|
||||
'';
|
||||
services.nginx.virtualHosts = {
|
||||
"radio.runyan.org" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations = {
|
||||
"/stream.mp3" = {
|
||||
proxyPass = "http://vpn.containers:8001/stream.mp3";
|
||||
extraConfig = ''
|
||||
add_header Access-Control-Allow-Origin *;
|
||||
'';
|
||||
};
|
||||
"/".root = config.inputs.radio-web;
|
||||
};
|
||||
};
|
||||
"radio.neet.space" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations = {
|
||||
"/stream.mp3" = {
|
||||
proxyPass = "http://vpn.containers:8001/stream.mp3";
|
||||
extraConfig = ''
|
||||
add_header Access-Control-Allow-Origin *;
|
||||
'';
|
||||
};
|
||||
"/".root = config.inputs.radio-web;
|
||||
};
|
||||
"/".root = config.inputs.radio-web;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -96,7 +111,7 @@
|
||||
};
|
||||
};
|
||||
# pin postgresql for matrix (will need to migrate eventually)
|
||||
services.postgresql.package = pkgs.postgresql_11;
|
||||
services.postgresql.package = pkgs.postgresql_15;
|
||||
|
||||
# iodine DNS-based vpn
|
||||
services.iodine.server.enable = true;
|
||||
@@ -136,4 +151,11 @@
|
||||
# owncast live streaming
|
||||
services.owncast.enable = true;
|
||||
services.owncast.hostname = "live.neet.dev";
|
||||
|
||||
# librechat
|
||||
services.librechat.enable = true;
|
||||
services.librechat.host = "chat.neet.dev";
|
||||
|
||||
services.actual-server.enable = true;
|
||||
services.actual-server.hostname = "actual.runyan.org";
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
bios = {
|
||||
enable = true;
|
||||
device = "/dev/sda";
|
||||
configurationLimit = 3; # Save room in /nix/store
|
||||
};
|
||||
|
||||
remoteLuksUnlock.enable = true;
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
"nextcloud"
|
||||
"dailybot"
|
||||
"gitea"
|
||||
"librechat"
|
||||
];
|
||||
|
||||
hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMBBlTAIp38RhErU1wNNV5MBeb+WGH0mhF/dxh5RsAXN";
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
# for luks onlock over tor
|
||||
services.tor.enable = true;
|
||||
services.tor.client.enable = true;
|
||||
|
||||
# don't use remote builders
|
||||
nix.distributedBuilds = lib.mkForce false;
|
||||
|
||||
# services.howdy.enable = true;
|
||||
|
||||
hardware.openrazer.enable = true;
|
||||
hardware.openrazer.users = [ "googlebot" ];
|
||||
hardware.openrazer.devicesOffOnScreensaver = false;
|
||||
users.users.googlebot.packages = [ pkgs.polychromatic ];
|
||||
|
||||
services.udev.extraRules = ''
|
||||
# depthai
|
||||
SUBSYSTEM=="usb", ATTRS{idVendor}=="03e7", MODE="0666"
|
||||
|
||||
# Moonlander
|
||||
# Rules for Oryx web flashing and live training
|
||||
KERNEL=="hidraw*", ATTRS{idVendor}=="16c0", MODE="0664", GROUP="plugdev"
|
||||
KERNEL=="hidraw*", ATTRS{idVendor}=="3297", MODE="0664", GROUP="plugdev"
|
||||
# Wally Flashing rules for the Moonlander and Planck EZ
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
|
||||
'';
|
||||
services.udev.packages = [ pkgs.platformio ];
|
||||
users.groups.plugdev = {
|
||||
members = [ "googlebot" ];
|
||||
};
|
||||
|
||||
# virt-manager
|
||||
virtualisation.libvirtd.enable = true;
|
||||
programs.dconf.enable = true;
|
||||
virtualisation.spiceUSBRedirection.enable = true;
|
||||
environment.systemPackages = with pkgs; [ virt-manager ];
|
||||
users.users.googlebot.extraGroups = [ "libvirtd" ];
|
||||
|
||||
# allow building ARM derivations
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
|
||||
services.spotifyd.enable = true;
|
||||
|
||||
virtualisation.docker.enable = true;
|
||||
|
||||
virtualisation.appvm.enable = true;
|
||||
virtualisation.appvm.user = "googlebot";
|
||||
|
||||
services.mount-samba.enable = true;
|
||||
|
||||
de.enable = true;
|
||||
de.touchpad.enable = true;
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
# barrier
|
||||
24800
|
||||
];
|
||||
}
|
||||
@@ -1,62 +0,0 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
# boot
|
||||
efi.enable = true;
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ "dm-snapshot" ];
|
||||
|
||||
# kernel
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
# firmware
|
||||
firmware.x86_64.enable = true;
|
||||
hardware.enableAllFirmware = true;
|
||||
|
||||
# gpu
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
hardware.nvidia = {
|
||||
modesetting.enable = true; # for nvidia-vaapi-driver
|
||||
prime = {
|
||||
reverseSync.enable = true;
|
||||
offload.enableOffloadCmd = true;
|
||||
nvidiaBusId = "PCI:1:0:0";
|
||||
amdgpuBusId = "PCI:4:0:0";
|
||||
};
|
||||
};
|
||||
|
||||
# disks
|
||||
remoteLuksUnlock.enable = true;
|
||||
boot.initrd.luks.devices."enc-pv" = {
|
||||
device = "/dev/disk/by-uuid/c1822e5f-4137-44e1-885f-954e926583ce";
|
||||
allowDiscards = true;
|
||||
};
|
||||
fileSystems."/" =
|
||||
{
|
||||
device = "/dev/vg/root";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" ];
|
||||
};
|
||||
fileSystems."/home" =
|
||||
{
|
||||
device = "/dev/vg/root";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=home" ];
|
||||
};
|
||||
fileSystems."/boot" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/2C85-2B59";
|
||||
fsType = "vfat";
|
||||
};
|
||||
swapDevices =
|
||||
[{ device = "/dev/vg/swap"; }];
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
{
|
||||
hostNames = [
|
||||
"ray"
|
||||
];
|
||||
|
||||
arch = "x86_64-linux";
|
||||
|
||||
systemRoles = [
|
||||
"personal"
|
||||
"deploy"
|
||||
];
|
||||
|
||||
hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDQM8hwKRgl8cZj7UVYATSLYu4LhG7I0WFJ9m2iWowiB";
|
||||
|
||||
userKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeTK1iARlNIKP/DS8/ObBm9yUM/3L1Ub4XI5A2r9OzP"
|
||||
];
|
||||
|
||||
deployKeys = [
|
||||
"sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIEaGIwLiUa6wQLlEF+keQOIYy/tCmJvV6eENzUQjSqW2AAAABHNzaDo="
|
||||
];
|
||||
}
|
||||
249
machines/storage/s0/dashy.yaml
Normal file
249
machines/storage/s0/dashy.yaml
Normal file
@@ -0,0 +1,249 @@
|
||||
appConfig:
|
||||
theme: vaporware
|
||||
customColors:
|
||||
material-dark-original:
|
||||
primary: '#f36558'
|
||||
background: '#39434C'
|
||||
background-darker: '#eb615c'
|
||||
material-light: '#f36558'
|
||||
item-text-color: '#ff948a'
|
||||
curve-factor: 5px
|
||||
enableErrorReporting: false
|
||||
layout: auto
|
||||
iconSize: large
|
||||
language: en
|
||||
startingView: default
|
||||
defaultOpeningMethod: sametab
|
||||
statusCheck: true
|
||||
statusCheckInterval: 20
|
||||
faviconApi: faviconkit
|
||||
routingMode: history
|
||||
enableMultiTasking: false
|
||||
webSearch:
|
||||
disableWebSearch: false
|
||||
searchEngine: duckduckgo
|
||||
openingMethod: sametab
|
||||
searchBangs: {}
|
||||
enableFontAwesome: true
|
||||
cssThemes: []
|
||||
externalStyleSheet: []
|
||||
hideComponents:
|
||||
hideHeading: false
|
||||
hideNav: false
|
||||
hideSearch: false
|
||||
hideSettings: false
|
||||
hideFooter: false
|
||||
hideSplashScreen: false
|
||||
auth:
|
||||
enableGuestAccess: false
|
||||
users: []
|
||||
enableKeycloak: false
|
||||
keycloak: {}
|
||||
allowConfigEdit: true
|
||||
enableServiceWorker: false
|
||||
disableContextMenu: false
|
||||
disableUpdateChecks: false
|
||||
disableSmartSort: false
|
||||
pageInfo:
|
||||
title: s0
|
||||
description: s0
|
||||
sections:
|
||||
- name: Media & Entertainment
|
||||
icon: fas fa-photo-video
|
||||
displayData:
|
||||
sortBy: most-used
|
||||
cols: 1
|
||||
rows: 1
|
||||
collapsed: false
|
||||
hideForGuests: false
|
||||
items:
|
||||
- &ref_0
|
||||
title: Jellyfin
|
||||
icon: hl-jellyfin
|
||||
url: http://s0:8097
|
||||
target: sametab
|
||||
statusCheck: true
|
||||
statusCheckUrl: http://jellyfin.s0
|
||||
id: 0_1956_jellyfin
|
||||
- &ref_1
|
||||
title: Sonarr
|
||||
description: Manage TV
|
||||
icon: hl-sonarr
|
||||
url: http://s0:8989
|
||||
target: sametab
|
||||
statusCheck: true
|
||||
statusCheckUrl: http://sonarr.s0
|
||||
id: 1_1956_sonarr
|
||||
- &ref_2
|
||||
title: Radarr
|
||||
description: Manage Movies
|
||||
icon: hl-radarr
|
||||
url: http://s0:7878
|
||||
target: sametab
|
||||
statusCheck: true
|
||||
statusCheckUrl: http://radarr.s0
|
||||
id: 2_1956_radarr
|
||||
- &ref_3
|
||||
title: Lidarr
|
||||
description: Manage Music
|
||||
icon: hl-lidarr
|
||||
url: http://s0:8686
|
||||
target: sametab
|
||||
statusCheck: true
|
||||
statusCheckUrl: http://lidarr.s0
|
||||
id: 3_1956_lidarr
|
||||
- &ref_4
|
||||
title: Prowlarr
|
||||
description: Indexers
|
||||
icon: hl-prowlarr
|
||||
url: http://prowlarr.s0
|
||||
target: sametab
|
||||
statusCheck: true
|
||||
statusCheckUrl: http://prowlarr.s0
|
||||
id: 4_1956_prowlarr
|
||||
- &ref_5
|
||||
title: Bazarr
|
||||
description: Subtitles
|
||||
icon: hl-bazarr
|
||||
url: http://s0:6767
|
||||
target: sametab
|
||||
statusCheck: true
|
||||
statusCheckUrl: http://bazarr.s0
|
||||
id: 5_1956_bazarr
|
||||
- &ref_6
|
||||
title: Navidrome
|
||||
description: Play Music
|
||||
icon: hl-navidrome
|
||||
url: http://s0:4534
|
||||
target: sametab
|
||||
statusCheck: true
|
||||
statusCheckUrl: http://music.s0
|
||||
id: 6_1956_navidrome
|
||||
- &ref_7
|
||||
title: Transmission
|
||||
description: Torrenting
|
||||
icon: hl-transmission
|
||||
url: http://s0:9091
|
||||
target: sametab
|
||||
statusCheck: true
|
||||
statusCheckUrl: http://transmission.s0
|
||||
id: 7_1956_transmission
|
||||
filteredItems:
|
||||
- *ref_0
|
||||
- *ref_1
|
||||
- *ref_2
|
||||
- *ref_3
|
||||
- *ref_4
|
||||
- *ref_5
|
||||
- *ref_6
|
||||
- *ref_7
|
||||
- name: Network
|
||||
icon: fas fa-network-wired
|
||||
items:
|
||||
- &ref_8
|
||||
title: Gateway
|
||||
description: openwrt
|
||||
icon: hl-openwrt
|
||||
url: http://openwrt.lan/
|
||||
target: sametab
|
||||
statusCheck: true
|
||||
id: 0_746_gateway
|
||||
- &ref_9
|
||||
title: Wireless
|
||||
description: openwrt (ish)
|
||||
icon: hl-openwrt
|
||||
url: http://PacketProvocateur.lan
|
||||
target: sametab
|
||||
statusCheck: true
|
||||
id: 1_746_wireless
|
||||
filteredItems:
|
||||
- *ref_8
|
||||
- *ref_9
|
||||
displayData:
|
||||
sortBy: default
|
||||
rows: 1
|
||||
cols: 1
|
||||
collapsed: false
|
||||
hideForGuests: false
|
||||
- name: Services
|
||||
icon: fas fa-monitor-heart-rate
|
||||
items:
|
||||
- &ref_10
|
||||
title: Matrix
|
||||
description: ''
|
||||
icon: hl-matrix
|
||||
url: https://chat.neet.space
|
||||
target: sametab
|
||||
statusCheck: true
|
||||
id: 0_836_matrix
|
||||
- &ref_11
|
||||
title: Radio
|
||||
description: Radio service
|
||||
icon: generative
|
||||
url: https://radio.runyan.org
|
||||
target: sametab
|
||||
statusCheck: true
|
||||
id: 1_836_radio
|
||||
- &ref_12
|
||||
title: Mumble
|
||||
description: voice.neet.space
|
||||
icon: hl-mumble
|
||||
url: https://voice.neet.space
|
||||
target: sametab
|
||||
statusCheck: false
|
||||
id: 2_836_mumble
|
||||
- &ref_13
|
||||
title: IRC
|
||||
description: irc.neet.dev
|
||||
icon: hl-thelounge
|
||||
url: https://irc.neet.dev
|
||||
target: sametab
|
||||
statusCheck: true
|
||||
id: 3_836_irc
|
||||
- &ref_14
|
||||
title: Git
|
||||
description: git.neet.dev
|
||||
icon: hl-gitea
|
||||
url: https://git.neet.dev
|
||||
target: sametab
|
||||
statusCheck: true
|
||||
id: 4_836_git
|
||||
- &ref_15
|
||||
title: Nextcloud
|
||||
description: neet.cloud
|
||||
icon: hl-nextcloud
|
||||
url: https://neet.cloud
|
||||
target: sametab
|
||||
statusCheck: true
|
||||
id: 5_836_nextcloud
|
||||
- &ref_16
|
||||
title: Roundcube
|
||||
description: mail.neet.dev
|
||||
icon: hl-roundcube
|
||||
url: https://mail.neet.dev
|
||||
target: sametab
|
||||
statusCheck: true
|
||||
id: 6_836_roundcube
|
||||
- &ref_17
|
||||
title: Jitsi Meet
|
||||
description: meet.neet.space
|
||||
icon: hl-jitsimeet
|
||||
url: https://meet.neet.space
|
||||
target: sametab
|
||||
statusCheck: true
|
||||
id: 7_836_jitsimeet
|
||||
filteredItems:
|
||||
- *ref_10
|
||||
- *ref_11
|
||||
- *ref_12
|
||||
- *ref_13
|
||||
- *ref_14
|
||||
- *ref_15
|
||||
- *ref_16
|
||||
- *ref_17
|
||||
displayData:
|
||||
sortBy: default
|
||||
rows: 1
|
||||
cols: 1
|
||||
collapsed: false
|
||||
hideForGuests: false
|
||||
@@ -3,43 +3,13 @@
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
./home-automation.nix
|
||||
];
|
||||
|
||||
networking.hostName = "s0";
|
||||
|
||||
# system.autoUpgrade.enable = true;
|
||||
|
||||
# gitea runner and allow it to build ARM derivationsFV
|
||||
services.gitea-actions-runner.instances.inst = {
|
||||
enable = true;
|
||||
name = config.networking.hostName;
|
||||
url = "https://git.neet.dev/";
|
||||
tokenFile = "/run/agenix/gitea-actions-runner-token";
|
||||
labels = [
|
||||
"debian-latest:docker://catthehacker/ubuntu:act-latest"
|
||||
"ubuntu-latest:docker://catthehacker/ubuntu:act-latest"
|
||||
];
|
||||
};
|
||||
virtualisation.podman.enable = true;
|
||||
age.secrets.gitea-actions-runner-token.file = ../../../secrets/gitea-actions-runner-token.age;
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; # todo: still needed?
|
||||
nix.gc.automatic = lib.mkForce false; # allow the nix store to serve as a build cache
|
||||
|
||||
# binary cache
|
||||
services.nix-serve = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
secretKeyFile = "/run/agenix/binary-cache-private-key";
|
||||
};
|
||||
age.secrets.binary-cache-private-key.file = ../../../secrets/binary-cache-private-key.age;
|
||||
users.users.cache-push = {
|
||||
isNormalUser = true;
|
||||
openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINpUZFFL9BpBVqeeU63sFPhR9ewuhEZerTCDIGW1NPSB" ];
|
||||
};
|
||||
nix.settings = {
|
||||
trusted-users = [ "cache-push" ];
|
||||
};
|
||||
|
||||
services.iperf3.enable = true;
|
||||
services.iperf3.openFirewall = true;
|
||||
|
||||
@@ -53,9 +23,6 @@
|
||||
# samba
|
||||
services.samba.enable = true;
|
||||
|
||||
# disable suspend on lid close
|
||||
services.logind.lidSwitch = "ignore";
|
||||
|
||||
# navidrome
|
||||
services.navidrome = {
|
||||
enable = true;
|
||||
@@ -65,7 +32,6 @@
|
||||
MusicFolder = "/data/samba/Public/Media/Music";
|
||||
};
|
||||
};
|
||||
networking.firewall.allowedTCPPorts = [ config.services.navidrome.settings.Port ];
|
||||
|
||||
# allow access to transmisson data
|
||||
users.users.googlebot.extraGroups = [ "transmission" ];
|
||||
@@ -133,13 +99,19 @@
|
||||
# "speed-limit-up-enabled" = true;
|
||||
|
||||
/* seeding limit */
|
||||
"ratio-limit" = 2;
|
||||
"ratio-limit" = 3;
|
||||
"ratio-limit-enabled" = true;
|
||||
|
||||
"download-queue-enabled" = true;
|
||||
"download-queue-size" = 20; # gotta go fast
|
||||
};
|
||||
};
|
||||
# https://github.com/NixOS/nixpkgs/issues/258793
|
||||
systemd.services.transmission.serviceConfig = {
|
||||
RootDirectoryStartOnly = lib.mkForce (lib.mkForce false);
|
||||
RootDirectory = lib.mkForce (lib.mkForce "");
|
||||
};
|
||||
|
||||
users.groups.public_data.gid = 994;
|
||||
users.users.public_data = {
|
||||
isSystemUser = true;
|
||||
@@ -177,22 +149,75 @@
|
||||
|
||||
# nginx
|
||||
services.nginx.enable = true;
|
||||
services.nginx.virtualHosts."bazarr.s0".locations."/".proxyPass = "http://vpn.containers:6767";
|
||||
services.nginx.virtualHosts."radarr.s0".locations."/".proxyPass = "http://vpn.containers:7878";
|
||||
services.nginx.virtualHosts."lidarr.s0".locations."/".proxyPass = "http://vpn.containers:8686";
|
||||
services.nginx.virtualHosts."sonarr.s0".locations."/".proxyPass = "http://vpn.containers:8989";
|
||||
services.nginx.virtualHosts."prowlarr.s0".locations."/".proxyPass = "http://vpn.containers:9696";
|
||||
services.nginx.virtualHosts."music.s0".locations."/".proxyPass = "http://localhost:4533";
|
||||
services.nginx.virtualHosts."jellyfin.s0".locations."/" = {
|
||||
proxyPass = "http://localhost:8096";
|
||||
proxyWebsockets = true;
|
||||
services.nginx.virtualHosts."bazarr.s0" = {
|
||||
listen = [{ addr = "0.0.0.0"; port = 6767; } { addr = "0.0.0.0"; port = 80; }];
|
||||
locations."/".proxyPass = "http://vpn.containers:6767";
|
||||
};
|
||||
services.nginx.virtualHosts."radarr.s0" = {
|
||||
listen = [{ addr = "0.0.0.0"; port = 7878; } { addr = "0.0.0.0"; port = 80; }];
|
||||
locations."/".proxyPass = "http://vpn.containers:7878";
|
||||
};
|
||||
services.nginx.virtualHosts."lidarr.s0" = {
|
||||
listen = [{ addr = "0.0.0.0"; port = 8686; } { addr = "0.0.0.0"; port = 80; }];
|
||||
locations."/".proxyPass = "http://vpn.containers:8686";
|
||||
};
|
||||
services.nginx.virtualHosts."sonarr.s0" = {
|
||||
listen = [{ addr = "0.0.0.0"; port = 8989; } { addr = "0.0.0.0"; port = 80; }];
|
||||
locations."/".proxyPass = "http://vpn.containers:8989";
|
||||
};
|
||||
services.nginx.virtualHosts."prowlarr.s0" = {
|
||||
listen = [{ addr = "0.0.0.0"; port = 9696; } { addr = "0.0.0.0"; port = 80; }];
|
||||
locations."/".proxyPass = "http://vpn.containers:9696";
|
||||
};
|
||||
services.nginx.virtualHosts."music.s0" = {
|
||||
listen = [{ addr = "0.0.0.0"; port = 4534; } { addr = "0.0.0.0"; port = 80; }];
|
||||
locations."/".proxyPass = "http://localhost:4533";
|
||||
};
|
||||
services.nginx.virtualHosts."jellyfin.s0" = {
|
||||
listen = [{ addr = "0.0.0.0"; port = 8097; } { addr = "0.0.0.0"; port = 80; }];
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:8096";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
services.nginx.virtualHosts."jellyfin.neet.cloud".locations."/" = {
|
||||
proxyPass = "http://localhost:8096";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
services.nginx.virtualHosts."transmission.s0".locations."/" = {
|
||||
proxyPass = "http://vpn.containers:9091";
|
||||
proxyWebsockets = true;
|
||||
services.nginx.virtualHosts."transmission.s0" = {
|
||||
listen = [{ addr = "0.0.0.0"; port = 9091; } { addr = "0.0.0.0"; port = 80; }];
|
||||
locations."/" = {
|
||||
proxyPass = "http://vpn.containers:9091";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
6767
|
||||
7878
|
||||
8686
|
||||
8989
|
||||
9696
|
||||
4534
|
||||
8097
|
||||
9091
|
||||
8443 # unifi
|
||||
];
|
||||
|
||||
virtualisation.oci-containers.backend = "podman";
|
||||
virtualisation.podman.dockerSocket.enable = true; # TODO needed?
|
||||
services.dashy = {
|
||||
enable = true;
|
||||
configFile = ./dashy.yaml;
|
||||
};
|
||||
|
||||
services.unifi = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
unifiPackage = pkgs.unifi8;
|
||||
};
|
||||
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" "armv7l-linux" ];
|
||||
|
||||
services.atticd.enable = true;
|
||||
}
|
||||
|
||||
@@ -39,12 +39,6 @@
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" "X-mount.mkdir" ];
|
||||
};
|
||||
fileSystems."/home" =
|
||||
{
|
||||
device = "rpool/nixos/home";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" "X-mount.mkdir" ];
|
||||
};
|
||||
fileSystems."/var/lib" =
|
||||
{
|
||||
device = "rpool/nixos/var/lib";
|
||||
@@ -57,13 +51,6 @@
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" "X-mount.mkdir" ];
|
||||
};
|
||||
|
||||
fileSystems."/data" =
|
||||
{
|
||||
device = "rpool/nixos/data";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" "X-mount.mkdir" ];
|
||||
};
|
||||
fileSystems."/boot" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/4FB4-738E";
|
||||
@@ -72,6 +59,7 @@
|
||||
swapDevices = [ ];
|
||||
|
||||
networking.interfaces.eth0.useDHCP = true;
|
||||
networking.interfaces.eth1.useDHCP = true;
|
||||
|
||||
powerManagement.cpuFreqGovernor = "powersave";
|
||||
}
|
||||
|
||||
188
machines/storage/s0/home-automation.nix
Normal file
188
machines/storage/s0/home-automation.nix
Normal file
@@ -0,0 +1,188 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
frigateHostname = "frigate.s0";
|
||||
frigatePort = 61617;
|
||||
|
||||
mkEsp32Cam = address: {
|
||||
ffmpeg = {
|
||||
input_args = "";
|
||||
inputs = [{
|
||||
path = address;
|
||||
roles = [ "detect" "record" ];
|
||||
}];
|
||||
|
||||
output_args.record = "-f segment -pix_fmt yuv420p -segment_time 10 -segment_format mp4 -reset_timestamps 1 -strftime 1 -c:v libx264 -preset ultrafast -an ";
|
||||
};
|
||||
rtmp.enabled = false;
|
||||
snapshots = {
|
||||
enabled = true;
|
||||
bounding_box = true;
|
||||
};
|
||||
record = {
|
||||
enabled = true;
|
||||
retain.days = 10; # Keep video for 10 days
|
||||
events.retain = {
|
||||
default = 30; # Keep video with detections for 30 days
|
||||
mode = "active_objects";
|
||||
};
|
||||
};
|
||||
detect = {
|
||||
enabled = true;
|
||||
width = 800;
|
||||
height = 600;
|
||||
fps = 10;
|
||||
};
|
||||
objects = {
|
||||
track = [ "person" ];
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
# 1883 # mqtt
|
||||
55834 # mqtt zigbee frontend
|
||||
frigatePort
|
||||
4180 # oauth proxy
|
||||
];
|
||||
|
||||
services.frigate = {
|
||||
enable = true;
|
||||
hostname = frigateHostname;
|
||||
settings = {
|
||||
mqtt = {
|
||||
enabled = true;
|
||||
host = "localhost:1883";
|
||||
};
|
||||
cameras = {
|
||||
dahlia-cam = mkEsp32Cam "http://dahlia-cam.lan:8080";
|
||||
};
|
||||
# ffmpeg = {
|
||||
# hwaccel_args = "preset-vaapi";
|
||||
# };
|
||||
detectors.coral = {
|
||||
type = "edgetpu";
|
||||
device = "pci";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# AMD GPU for vaapi
|
||||
systemd.services.frigate.environment.LIBVA_DRIVER_NAME = "radeonsi";
|
||||
|
||||
# Coral TPU for frigate
|
||||
services.udev.packages = [ pkgs.libedgetpu ];
|
||||
users.groups.apex = { };
|
||||
systemd.services.frigate.environment.LD_LIBRARY_PATH = "${pkgs.libedgetpu}/lib";
|
||||
systemd.services.frigate.serviceConfig = {
|
||||
SupplementaryGroups = "apex";
|
||||
};
|
||||
# Coral PCIe driver
|
||||
kernel.enableGasketKernelModule = true;
|
||||
|
||||
# Allow accessing frigate UI on a specific port in addition to by hostname
|
||||
services.nginx.virtualHosts.${frigateHostname} = {
|
||||
listen = [{ addr = "0.0.0.0"; port = frigatePort; } { addr = "0.0.0.0"; port = 80; }];
|
||||
};
|
||||
|
||||
services.esphome = {
|
||||
enable = true;
|
||||
address = "0.0.0.0";
|
||||
openFirewall = true;
|
||||
};
|
||||
# TODO remove after upgrading nixos version
|
||||
systemd.services.esphome.serviceConfig.ProcSubset = lib.mkForce "all";
|
||||
systemd.services.esphome.serviceConfig.ProtectHostname = lib.mkForce false;
|
||||
systemd.services.esphome.serviceConfig.ProtectKernelLogs = lib.mkForce false;
|
||||
systemd.services.esphome.serviceConfig.ProtectKernelTunables = lib.mkForce false;
|
||||
|
||||
# TODO lock down
|
||||
services.mosquitto = {
|
||||
enable = true;
|
||||
listeners = [
|
||||
{
|
||||
acl = [ "pattern readwrite #" ];
|
||||
omitPasswordAuth = true;
|
||||
settings.allow_anonymous = true;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
services.zigbee2mqtt = {
|
||||
enable = true;
|
||||
settings = {
|
||||
homeassistant = true;
|
||||
permit_join = false;
|
||||
serial = {
|
||||
port = "/dev/ttyACM0";
|
||||
};
|
||||
mqtt = {
|
||||
server = "mqtt://localhost:1883";
|
||||
# base_topic = "zigbee2mqtt";
|
||||
};
|
||||
frontend = {
|
||||
host = "0.0.0.0";
|
||||
port = 55834;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.home-assistant = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
configWritable = true;
|
||||
extraComponents = [
|
||||
"esphome"
|
||||
"met"
|
||||
"radio_browser"
|
||||
"wled"
|
||||
"mqtt"
|
||||
];
|
||||
# config = null;
|
||||
config = {
|
||||
# Includes dependencies for a basic setup
|
||||
# https://www.home-assistant.io/integrations/default_config/
|
||||
default_config = { };
|
||||
};
|
||||
};
|
||||
|
||||
# TODO need services.oauth2-proxy.cookie.domain ?
|
||||
services.oauth2-proxy =
|
||||
let
|
||||
nextcloudServer = "https://neet.cloud/";
|
||||
in
|
||||
{
|
||||
enable = true;
|
||||
|
||||
httpAddress = "http://0.0.0.0:4180";
|
||||
|
||||
nginx.domain = frigateHostname;
|
||||
# nginx.virtualHosts = [
|
||||
# frigateHostname
|
||||
# ];
|
||||
|
||||
email.domains = [ "*" ];
|
||||
|
||||
cookie.secure = false;
|
||||
|
||||
provider = "nextcloud";
|
||||
|
||||
# redirectURL = "http://s0:4180/oauth2/callback"; # todo forward with nginx?
|
||||
clientID = "4FfhEB2DNzUh6wWhXTjqQQKu3Ibm6TeYpS8TqcHe55PJC1DorE7vBZBELMKDjJ0X";
|
||||
keyFile = "/run/agenix/oauth2-proxy-env";
|
||||
|
||||
loginURL = "${nextcloudServer}/index.php/apps/oauth2/authorize";
|
||||
redeemURL = "${nextcloudServer}/index.php/apps/oauth2/api/v1/token";
|
||||
validateURL = "${nextcloudServer}/ocs/v2.php/cloud/user?format=json";
|
||||
|
||||
# todo --cookie-refresh
|
||||
|
||||
extraConfig = {
|
||||
# cookie-csrf-per-request = true;
|
||||
# cookie-csrf-expire = "5m";
|
||||
# user-id-claim = "preferred_username";
|
||||
};
|
||||
};
|
||||
|
||||
age.secrets.oauth2-proxy-env.file = ../../../secrets/oauth2-proxy-env.age;
|
||||
}
|
||||
@@ -32,33 +32,38 @@
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
hardware.enableAllFirmware = true;
|
||||
|
||||
# ROCm
|
||||
hardware.opengl.extraPackages = with pkgs; [
|
||||
rocm-opencl-icd
|
||||
rocm-opencl-runtime
|
||||
];
|
||||
systemd.tmpfiles.rules = [
|
||||
"L+ /opt/rocm/hip - - - - ${pkgs.hip}"
|
||||
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
|
||||
];
|
||||
|
||||
systemd.services.barrier-sddm = {
|
||||
description = "Barrier mouse/keyboard share";
|
||||
requires = [ "display-manager.service" ];
|
||||
after = [ "network.target" "display-manager.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
Restart = "always";
|
||||
RestartSec = 10;
|
||||
# todo use user/group
|
||||
};
|
||||
path = with pkgs; [ barrier doas ];
|
||||
script = ''
|
||||
# Wait for file to show up. "display-manager.service" finishes a bit too soon
|
||||
while ! [ -e /run/sddm/xauth_* ]; do sleep 1; done;
|
||||
export XAUTHORITY=$(ls /run/sddm/xauth_*)
|
||||
# Disable crypto is fine because tailscale is E2E encrypting better than barrier could anyway
|
||||
barrierc -f --disable-crypto --name zoidberg ray.koi-bebop.ts.net
|
||||
'';
|
||||
};
|
||||
# System wide barrier instance
|
||||
# systemd.services.barrier-sddm = {
|
||||
# description = "Barrier mouse/keyboard share";
|
||||
# requires = [ "display-manager.service" ];
|
||||
# after = [ "network.target" "display-manager.service" ];
|
||||
# wantedBy = [ "multi-user.target" ];
|
||||
# serviceConfig = {
|
||||
# Restart = "always";
|
||||
# RestartSec = 10;
|
||||
# # todo use user/group
|
||||
# };
|
||||
# path = with pkgs; [ barrier doas ];
|
||||
# script = ''
|
||||
# # Wait for file to show up. "display-manager.service" finishes a bit too soon
|
||||
# while ! [ -e /run/sddm/* ]; do sleep 1; done;
|
||||
# export XAUTHORITY=$(ls /run/sddm/*)
|
||||
# # Disable crypto is fine because tailscale is E2E encrypting better than barrier could anyway
|
||||
# barrierc -f --disable-crypto --name zoidberg ray.koi-bebop.ts.net
|
||||
# '';
|
||||
# };
|
||||
|
||||
# Login into X11 plasma so barrier works well
|
||||
services.displayManager.defaultSession = "plasma";
|
||||
|
||||
users.users.cris = {
|
||||
isNormalUser = true;
|
||||
@@ -73,7 +78,32 @@
|
||||
# Dr. John A. Zoidberg
|
||||
users.users.john = {
|
||||
isNormalUser = true;
|
||||
hashedPassword = "";
|
||||
inherit (config.users.users.googlebot) hashedPassword packages;
|
||||
uid = 1002;
|
||||
};
|
||||
|
||||
# Auto login into Plasma in john zoidberg account
|
||||
services.displayManager.sddm.settings = {
|
||||
Autologin = {
|
||||
Session = "plasma";
|
||||
User = "john";
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
jellyfin-media-player
|
||||
config.services.xserver.desktopManager.kodi.package
|
||||
spotify
|
||||
retroarchFull
|
||||
];
|
||||
|
||||
# Command and Conquer Ports
|
||||
networking.firewall.allowedUDPPorts = [ 4321 27900 ];
|
||||
networking.firewall.allowedTCPPorts = [ 6667 28910 29900 29920 ];
|
||||
|
||||
nixpkgs.config.rocmSupport = true;
|
||||
services.ollama = {
|
||||
enable = true;
|
||||
acceleration = "rocm";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
];
|
||||
|
||||
# boot
|
||||
efi.enable = true;
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.timeout = lib.mkForce 15;
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ "dm-snapshot" ];
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
# Fetch key from USB drive
|
||||
keyFileSize = 4096;
|
||||
keyFile = "/dev/disk/by-id/usb-Mass_Storage_Device_121220160204-0:0";
|
||||
keyFile = "/dev/disk/by-id/usb-Mass_Storage_Device_121220160204-0:0-part2";
|
||||
fallbackToPassword = true;
|
||||
};
|
||||
fileSystems."/" =
|
||||
|
||||
39
overlays/actualbudget/default.nix
Normal file
39
overlays/actualbudget/default.nix
Normal file
@@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, nodejs
|
||||
, runtimeShell
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "actual-server";
|
||||
version = "24.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actualbudget";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-y51Dhdn84AWR/gM4LnAzvBIBpvKwUiclnPnwzkRoJ0I=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-/UM2Tz8t4hi621HtXSu0LTDIzZ9SWMqKXqKfPwkdpE8=";
|
||||
|
||||
patches = [
|
||||
./migrations-should-use-pkg-path.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
'';
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
cat <<EOF > $out/bin/actual-server
|
||||
#!${runtimeShell}
|
||||
exec ${nodejs}/bin/node $out/lib/node_modules/actual-sync/app.js "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/actual-server
|
||||
'';
|
||||
}
|
||||
47
overlays/actualbudget/migrations-should-use-pkg-path.patch
Normal file
47
overlays/actualbudget/migrations-should-use-pkg-path.patch
Normal file
@@ -0,0 +1,47 @@
|
||||
diff --git a/src/load-config.js b/src/load-config.js
|
||||
index d3cc5dd..cfcad8a 100644
|
||||
--- a/src/load-config.js
|
||||
+++ b/src/load-config.js
|
||||
@@ -3,7 +3,8 @@ import path from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import createDebug from 'debug';
|
||||
|
||||
-const debug = createDebug('actual:config');
|
||||
+// const debug = createDebug('actual:config');
|
||||
+const debug = console.log;
|
||||
const debugSensitive = createDebug('actual-sensitive:config');
|
||||
|
||||
const projectRoot = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
|
||||
@@ -90,6 +91,7 @@ const finalConfig = {
|
||||
serverFiles: process.env.ACTUAL_SERVER_FILES || config.serverFiles,
|
||||
userFiles: process.env.ACTUAL_USER_FILES || config.userFiles,
|
||||
webRoot: process.env.ACTUAL_WEB_ROOT || config.webRoot,
|
||||
+ dataDir: process.env.ACTUAL_DATA_DIR || config.dataDir,
|
||||
https:
|
||||
process.env.ACTUAL_HTTPS_KEY && process.env.ACTUAL_HTTPS_CERT
|
||||
? {
|
||||
diff --git a/src/migrations.js b/src/migrations.js
|
||||
index 964e1f2..3a341d7 100644
|
||||
--- a/src/migrations.js
|
||||
+++ b/src/migrations.js
|
||||
@@ -1,6 +1,12 @@
|
||||
import migrate from 'migrate';
|
||||
import path from 'node:path';
|
||||
import config from './load-config.js';
|
||||
+import { fileURLToPath } from 'url';
|
||||
+
|
||||
+const __filename = fileURLToPath(import.meta.url);
|
||||
+const __dirname = path.dirname(__filename);
|
||||
+const appRoot = path.dirname(__dirname);
|
||||
+const migrationsDirectory = path.join(appRoot, "migrations");
|
||||
|
||||
export default function run(direction = 'up') {
|
||||
console.log(
|
||||
@@ -13,6 +19,7 @@ export default function run(direction = 'up') {
|
||||
stateStore: `${path.join(config.dataDir, '.migrate')}${
|
||||
config.mode === 'test' ? '-test' : ''
|
||||
}`,
|
||||
+ migrationsDirectory,
|
||||
},
|
||||
(err, set) => {
|
||||
if (err) {
|
||||
8807
overlays/actualbudget/package-lock.json
generated
Normal file
8807
overlays/actualbudget/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
22
overlays/default.nix
Normal file
22
overlays/default.nix
Normal file
@@ -0,0 +1,22 @@
|
||||
{ inputs }:
|
||||
final: prev:
|
||||
|
||||
let
|
||||
system = prev.system;
|
||||
frigatePkgs = inputs.nixpkgs-frigate.legacyPackages.${system};
|
||||
in
|
||||
{
|
||||
# It seems that libedgetpu needs to be built with the newer version of tensorflow in nixpkgs
|
||||
# but I am lazy so I instead just downgrade by using the old nixpkgs
|
||||
libedgetpu = frigatePkgs.callPackage ./libedgetpu { };
|
||||
frigate = frigatePkgs.frigate;
|
||||
|
||||
actual-server = prev.callPackage ./actualbudget { };
|
||||
unifi8 = prev.unifi.overrideAttrs (oldAttrs: rec {
|
||||
version = "8.1.113";
|
||||
src = prev.fetchurl {
|
||||
url = "https://dl.ui.com/unifi/8.1.113/unifi_sysvinit_all.deb";
|
||||
sha256 = "1knm+l8MSb7XKq2WIbehAnz7loRPjgnc+R98zpWKEAE=";
|
||||
};
|
||||
});
|
||||
}
|
||||
19
overlays/kernel-modules/default.nix
Normal file
19
overlays/kernel-modules/default.nix
Normal file
@@ -0,0 +1,19 @@
|
||||
{ config, lib, ... }:
|
||||
|
||||
# Adds additional kernel modules to the nixos system
|
||||
# Not actually an overlay but a module. Has to be this way because kernel
|
||||
# modules are tightly coupled to the kernel version they were built against.
|
||||
# https://nixos.wiki/wiki/Linux_kernel
|
||||
|
||||
let
|
||||
cfg = config.kernel;
|
||||
|
||||
gasket = config.boot.kernelPackages.callPackage ./gasket.nix { };
|
||||
in
|
||||
{
|
||||
options.kernel.enableGasketKernelModule = lib.mkEnableOption "Enable Gasket Kernel Module";
|
||||
|
||||
config = lib.mkIf cfg.enableGasketKernelModule {
|
||||
boot.extraModulePackages = [ gasket ];
|
||||
};
|
||||
}
|
||||
36
overlays/kernel-modules/gasket.nix
Normal file
36
overlays/kernel-modules/gasket.nix
Normal file
@@ -0,0 +1,36 @@
|
||||
{ stdenv, lib, fetchFromGitHub, kernel }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gasket";
|
||||
version = "1.0-18-unstable-2023-09-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "gasket-driver";
|
||||
rev = "5815ee3908a46a415aac616ac7b9aedcb98a504c";
|
||||
sha256 = "sha256-O17+msok1fY5tdX1DvqYVw6plkUDF25i8sqwd6mxYf8=";
|
||||
};
|
||||
|
||||
makeFlags = kernel.makeFlags ++ [
|
||||
"-C"
|
||||
"${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
"M=$(PWD)"
|
||||
];
|
||||
buildFlags = [ "modules" ];
|
||||
|
||||
installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ];
|
||||
installTargets = [ "modules_install" ];
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
hardeningDisable = [ "pic" "format" ];
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Coral Gasket Driver allows usage of the Coral EdgeTPU on Linux systems.";
|
||||
homepage = "https://github.com/google/gasket-driver";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ lib.maintainers.kylehendricks ];
|
||||
platforms = platforms.linux;
|
||||
broken = versionOlder kernel.version "5.15";
|
||||
};
|
||||
}
|
||||
72
overlays/libedgetpu/default.nix
Normal file
72
overlays/libedgetpu/default.nix
Normal file
@@ -0,0 +1,72 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, libusb1
|
||||
, abseil-cpp
|
||||
, flatbuffers
|
||||
, xxd
|
||||
}:
|
||||
|
||||
let
|
||||
flatbuffers_1_12 = flatbuffers.overrideAttrs (oldAttrs: rec {
|
||||
version = "1.12.0";
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=maybe-uninitialized";
|
||||
cmakeFlags = (oldAttrs.cmakeFlags or [ ]) ++ [ "-DFLATBUFFERS_BUILD_SHAREDLIB=ON" ];
|
||||
NIX_CXXSTDLIB_COMPILE = "-std=c++17";
|
||||
configureFlags = (oldAttrs.configureFlags or [ ]) ++ [ "--enable-shared" ];
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "flatbuffers";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-L1B5Y/c897Jg9fGwT2J3+vaXsZ+lfXnskp8Gto1p/Tg=";
|
||||
};
|
||||
});
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libedgetpu";
|
||||
version = "grouper";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google-coral";
|
||||
repo = pname;
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-73hwItimf88Iqnb40lk4ul/PzmCNIfdt6Afi+xjNiBE=";
|
||||
};
|
||||
|
||||
patches = [ ./libedgetpu-stddef.diff ];
|
||||
|
||||
makeFlags = [ "-f" "makefile_build/Makefile" "libedgetpu" ];
|
||||
|
||||
buildInputs = [
|
||||
libusb1
|
||||
abseil-cpp
|
||||
flatbuffers_1_12
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
xxd
|
||||
];
|
||||
|
||||
NIX_CXXSTDLIB_COMPILE = "-std=c++17";
|
||||
|
||||
TFROOT = "${fetchFromGitHub {
|
||||
owner = "tensorflow";
|
||||
repo = "tensorflow";
|
||||
rev = "v2.7.4";
|
||||
sha256 = "sha256-liDbUAdaVllB0b74aBeqNxkYNu/zPy7k3CevzRF5dk0=";
|
||||
}}";
|
||||
|
||||
enableParallelBuilding = false;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib
|
||||
cp out/direct/k8/libedgetpu.so.1.0 $out/lib
|
||||
ln -s $out/lib/libedgetpu.so.1.0 $out/lib/libedgetpu.so.1
|
||||
mkdir -p $out/lib/udev/rules.d
|
||||
cp debian/edgetpu-accelerator.rules $out/lib/udev/rules.d/99-edgetpu-accelerator.rules
|
||||
|
||||
# PCIe rule
|
||||
echo 'SUBSYSTEM=="apex", MODE="0660", GROUP="apex"' > $out/lib/udev/rules.d/65-apex.rules
|
||||
'';
|
||||
}
|
||||
12
overlays/libedgetpu/libedgetpu-stddef.diff
Normal file
12
overlays/libedgetpu/libedgetpu-stddef.diff
Normal file
@@ -0,0 +1,12 @@
|
||||
diff --git a/api/allocated_buffer.h b/api/allocated_buffer.h
|
||||
index 97740f0..7bc0547 100644
|
||||
--- a/api/allocated_buffer.h
|
||||
+++ b/api/allocated_buffer.h
|
||||
@@ -16,6 +16,7 @@
|
||||
#define DARWINN_API_ALLOCATED_BUFFER_H_
|
||||
|
||||
#include <functional>
|
||||
+#include <cstddef>
|
||||
|
||||
namespace platforms {
|
||||
namespace darwinn {
|
||||
@@ -6,8 +6,8 @@ index 29c449c16946..f6c728eb7f0c 100644
|
||||
in
|
||||
pkgs.writeShellScriptBin "steam-gamescope" ''
|
||||
${builtins.concatStringsSep "\n" exports}
|
||||
- gamescope --steam ${toString cfg.gamescopeSession.args} -- steam -tenfoot -pipewire-dmabuf
|
||||
+ gamescope --steam ${toString cfg.gamescopeSession.args} -- steam -gamepadui -steamdeck -pipewire-dmabuf &> /tmp/steamlog
|
||||
- gamescope --steam ${builtins.toString cfg.gamescopeSession.args} -- steam -tenfoot -pipewire-dmabuf
|
||||
+ gamescope --steam ${builtins.toString cfg.gamescopeSession.args} -- steam -gamepadui -steamdeck -pipewire-dmabuf &> /tmp/steamlog
|
||||
'';
|
||||
|
||||
gamescopeSessionFile =
|
||||
|
||||
8
secrets/atticd-credentials.age
Normal file
8
secrets/atticd-credentials.age
Normal file
@@ -0,0 +1,8 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 hPp1nw tMy5kLAcQD62yAfEVJ4LQZjs0kkEEQOfM4HN9yj3hBY
|
||||
JvlklGTxxfAZbP+alm3nxLxqhmcu2mTKwRU5WaapL9w
|
||||
-> ssh-ed25519 w3nu8g ZGzufldXq7kmIpqFecbkpDxiykWZ207k0+09I2dmxEM
|
||||
SK25e5HBe4b5reGXXfCjIFbFGzfu32RFjY++/yteRVc
|
||||
--- xZOe1syYAcVRDhiNRv+CsfFgoQbiANA6vNCon+5NExc
|
||||
-·ñ1Å,C-.M§Áè?ÐêóµµàY|u+
|
||||
‹ ³Ø<C2B3>÷ŽæÒ¡ôm†Œûäfß]=érøÜüÎAg¤€æSú:Ð8•S¦LiœùªsêÁâ9JŠð<>¸ÏæñÄÐÃ<ûAz¹[ý§xï<78>:‡'U*<2A>wÀ™D/…±VpM~!õ,* ¿”µ¡øk¥Ö´ßEíîïh› {¢p$¾R`ÿ”
|
||||
@@ -1,23 +1,24 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 yHDAQw BnVxLTfrWFqaT6+Tz8I0gQReC2NjADak1TlzotVHzEs
|
||||
tzQGIMBFH1v91gezCWjCk3qNi6nhCFVMxaZrrxqFT+c
|
||||
-> ssh-ed25519 jQaHAA BwpFr2XXWTaNeYgieI1rkRw5u/mf55vVooZnJJhMLSI
|
||||
4VmJ1R5lcmD+apxg4WLnMk+aTJt3GOS+6KOE75NqjEY
|
||||
-> ssh-ed25519 dMQYog oBypOzXH4ioZv9PzYGYxG4jBDRv6qIiRglj/f/uJugU
|
||||
SQRv3Iel0jeONRAVp96VFtKjXGJ8PMvp80ys4otQp0U
|
||||
-> ssh-ed25519 WBT1Hw wb7yUuZOQPhCYusR6WS5/e/NgC7UpBnIO0HZaO2+xxM
|
||||
faHL6WBApWk8+871XmVRHcllXN4I7kgnqngY633jSI0
|
||||
-> ssh-ed25519 6AT2/g +l7AjVqKk9oi96mglZDQN5AVncmVqjEjFfPXFZYdGlI
|
||||
nEQtVZGMIKJlIf0Bj8T2YkUKQawpyP0bqCJ3Nj8PDPc
|
||||
-> ssh-ed25519 VyYH/Q QHjWhus6HvedZXiDtkoK9DiS8EPOpUxRHix1cSwVuiU
|
||||
vn0vSFHo6doBH/rzk42DxKN8XzSzMVDMMaeqQX6iuII
|
||||
-> ssh-ed25519 hPp1nw FH8TXl9deDyGS9pCyG3sBvzpi8d9S0u4tprKopO6vBo
|
||||
ZaricPkMTEn+xNPOJP4nLIpsHdFDVCCEqFVq4FxOPCw
|
||||
-> ssh-ed25519 dMQYog FYeNrUyYZ/aYZkmjTEVJ3Fq4J5qAe+Do7IDPiYDZrgw
|
||||
RroBGlF7DyNKmL4+Nd84eKKkJh7AGE9FP1VxgUO3iF4
|
||||
-> htnK=h-grease F7l m it+; <4OvM
|
||||
2MOngVDIi1sJJnjX2eAt4L3jObghFIbv20wJHLb7G0AMyavVmOiQ4xSehDKCb34g
|
||||
10vwok0cSXaKOGmbXOFst9J2tk+z
|
||||
--- nOQEybjt9MPX5X2cUnpKFgHtTSPvJSFnDGyj3ATlrEQ
|
||||
ÞO¸†’¿"of<6F>æÕ¹|ñÜŠšÇ'_j]þ–ëI<u‡‡:*¼†¾hœµÆ?"M‰)Ñ̦Ví*KAôN3µ@rWí¤©¨‹
|
||||
tX€«Ñí…o
|
||||
-> ssh-ed25519 N7drjg YHZO6ENbBihFQFqRRjdWtgfX3R+qHtaJWIa54igHpEc
|
||||
HLeZDyErwJme8knPYCxuSXMmHBkz2kDI6OBG6/EtP7w
|
||||
-> ssh-ed25519 yHDAQw 2YvHNNsiDJSUkKZOlhWzP4l1NfH0zTnldZV4Jjfy620
|
||||
dHM0wG9JLiQJJ+NquhPeI/xv1iEqsxRy9D//NcYTr8k
|
||||
-> ssh-ed25519 jQaHAA QtNkLsgdVgJqbmxLFhaf7AIG208NXHzgBweO8L3Dc3E
|
||||
SGjvdajk9M5azgP4QcynnxKieKEJYil1T2az4hYffdM
|
||||
-> ssh-ed25519 w3nu8g JuFJuOdVOc8Uk5es2rpqPVHgg+l6/K0J+MHDFuffn0A
|
||||
n7tzohV+Uvecu6GVNeht/O/dL4x6e5SVdHEzRbJg3rI
|
||||
-> ssh-ed25519 dMQYog 44RRRe8M2FJWigy3d9TNaUQSM47gLDgU38F6ow1Xe2c
|
||||
uQVkQma/hZVMCMtgcelyZhscvc46LItvbcPBuJI81Ns
|
||||
-> ssh-ed25519 WBT1Hw +b+2TOduL4XERN7qOYPtJ3R5w54m7VYqmyy8Smz6tXU
|
||||
TyQ+bjSK6IYSulW0rm12V+lpXYCt5kr3byaNNGJeMVc
|
||||
-> ssh-ed25519 6AT2/g ZUmtQOHWmn0shq1iP3Ca7aQ74PLcqZGTprvsM/HAXR8
|
||||
eNonzRSAwNCQi0DgtVs67zCjpOYsqeLEJYBmLjuS9rI
|
||||
-> ssh-ed25519 hPp1nw qzrGZr5bFvfPwWrfNIUFubvGXBT+oQo9HZQuePSbPwk
|
||||
MKNlVl3OXBYEFWiu2hbbXDQnqkV4nENG+lcLcd+H33I
|
||||
-> ssh-ed25519 w3nu8g H2UDASHwHNxU74g5IbuHIDHEZYgyWNmSX7Wv/lV41HQ
|
||||
WMgKT0GZxWQoK57E9B2j8MsyOroMhWd5SiCQtZa7AIY
|
||||
-> ssh-ed25519 dMQYog YkL6XApXeP9qc4pVaIHFaNmYIK/PVEKoJz5SotQbGmQ
|
||||
H+3wAxIl9Yip4xQqjhje9tL1V4m00NNSxNjH6Dbb1K8
|
||||
--- vBQpXXpKzzXwpNP17r8OBqO4Q3bIS4pHqbEl4u9dB1w
|
||||
ÎL“9[íg¡dŒxgº8Ø*0‘«šœ’…·¾öWå&`*?`ÔÊIQÛ÷Ýd1*ª–ñ¶bM\‹<>D™+«)‡
|
||||
\ƒg¤hDá3#k3;Åj¾ÞŽ±Ý¾Hš·ÙF&ÙX %6˜Bî8”¹T·fG`Q¯®âñ?[hDªö*c
|
||||
@@ -1,11 +0,0 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 hPp1nw eORh0m8mAPd3H/wjnHocuh/xheMuhLgWyzepL9RNii0
|
||||
154IPIdkb8WpYgX/fj5jraQY5mN7udg3iaZ3VJB+3X8
|
||||
-> ssh-ed25519 dMQYog 0eg1j3jL736OwjeMB55z52A6P34mSEYL6ulrn72blj0
|
||||
UdFKIbrzAKCzZhYfH41z64cwkQRp1RZztYgknIEfoDc
|
||||
-> K/&@p'&{-grease yb~ xHlc7m _t xm{3f
|
||||
Gi2UGm5YXyByJuH6rRRBle/D5T7GS4FDt7Kv8aBKe8dfwUCu65OcvoaXzjm08EKA
|
||||
m0yx
|
||||
--- f79zGG5kBOul/cF0NJu1+f/NmaI0h/JcuHDano/1ghU
|
||||
U¥÷7°åóʤï1måÔE\{^£$ŸÕCx~2"±8¶Æõ?&öó°„ÂË‹(áä±
|
||||
…aÝÀyßÝ쥘g¬â†øÇ CYX}’Ö
|
||||
Binary file not shown.
@@ -1,10 +1,10 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 6AT2/g MmInWcw6GlfzvN9kxFtTVWMX+UX9PHO5V35TzRcmex0
|
||||
dSMoGNuJMpRwyWTAnjHpO9mJBCxsJ77M5fWA0F1gR6s
|
||||
-> ssh-ed25519 dMQYog ua3OPiErZcVRNGf/uxv7PiBBFOKAUkaSSIV4UCMu5Wc
|
||||
L8kYIzyEXcAxAlPQbqasgiaQi7JARhja6vM6WzvdMrs
|
||||
-> CIn-grease !G{f,9h( Hjn\ \hTpE MAP<)J
|
||||
0u+eQDvbxgI6aDT7xqdwOX3A34E2T4Ft9bSF6KBpHqucHib9tA5lJHgtXwgkpa/P
|
||||
nbaJDnRWbM/AL7nnT7XpdLVO2r7w2ish4ALBgPvXxH/0iUXqvQk1B/E
|
||||
--- +aKXbSfk6VkxqtTn+fI8VhcgO7Dw0jNSUJOJlqCbEGM
|
||||
á? Þ÷Ùþq}` ¿Žiämó<>.6Û{I
|
||||
-> ssh-ed25519 6AT2/g WZ9p/pCsEDpKbgGDLcTtisn25kExQX9iv+tL3wyPwiY
|
||||
vom2z9QRIQSFB0+4/7lSWUEB0eoAG+08nXgiUg/OSX4
|
||||
-> ssh-ed25519 w3nu8g ECLZwCRJVJqyUMf70EOl2/3ExTruKaxCSQlY5fBZqxk
|
||||
VemnmGpzx1VprkybW1hPlkfmiDaNcBDoEzX0mDZgmu0
|
||||
-> ssh-ed25519 dMQYog QiPsbFE8MtXnRNBwkUEC+6grqXEbDstEtxYR8uJks2w
|
||||
O3JWQGppFeZEd6o3W0KVTEIyNVGeLxKfTYTlgsAEVHQ
|
||||
--- RncZzBFEyMAkpZRWrPORA0DPHuCTNswmWG5CMNnfm4A
|
||||
ñ/¼ÔËõôŒ8nàÅ¥«¸7hîtä?T˜=‘%zˆ°[¤ÝØ!(…uÔdÇuò@
|
||||
×¢Ebƒyަù¦D=Ü!‹„XþtÞÔ:#¦þþãÞXÈX@ú_M‘
|
||||
@@ -1,11 +1,11 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 WBT1Hw ucC+p6pRevUWJIVqG5DfXSO4W0PjR2lUW7tY924FVHA
|
||||
te6rrH/nsn/Pn4mySjQ0mv2M3ZTCOwbglCcnH2ZiUJQ
|
||||
-> ssh-ed25519 hPp1nw 1nmzowG+nzD8ixyqTU+duUxV3g4yWo7RqKJ+dDlf0g8
|
||||
ln3CyhUYuZ71EdyqIPBdeRP98dun4cs9uZnxAGadDG0
|
||||
-> ssh-ed25519 dMQYog pHRtIaJr39QqD7xqX2ovUf8QfUPwDl58TmqHa1xhSDQ
|
||||
dr8tYQ3oFrQehq2326jimOCRDX6Zrsq/epQbVA8+UPw
|
||||
-> I)m(V&-grease i5{
|
||||
lYnHQc5cQahDoah2rPlIlGOLc49nTDp+aHPB
|
||||
--- AdMW2y8Z9XmbxzmvSAP9NKqgj2JGgkimXJqcXIFPdtI
|
||||
]°m]pmòžY.ؽ¢âÞzÀhÑ<68>Sß!fI~Åpô³ˆ]¦KÅ‹Còü\KHgÎí_ÇÌ»§6ÌÑðÜ–Üj”)ü«@á‹[¿
|
||||
-> ssh-ed25519 WBT1Hw PbGwwDeulHF6kdh073rq0RvD1hlx6spnKNgKU+QeDAw
|
||||
7dITwSQ2p1LZuaVEzLxcGOhB97MQT2zGoRrnNUMcOFk
|
||||
-> ssh-ed25519 hPp1nw Dn+5Fpme+JmRZKkCkqtCuD87p+sDYDA6OZ2aUmBkCRs
|
||||
Dgg3orXF4RYT/fHtc2tRuIhOQu48zICMqgPyV47vpf4
|
||||
-> ssh-ed25519 w3nu8g dghNLDH1Tm+sm42HXDhrLFtmU4iDF1yCGrO2VSgzZjo
|
||||
71scUVrGr4c4dunAFJYKd+uJ6aYJpSWBAk9swbv+IzM
|
||||
-> ssh-ed25519 dMQYog Wnl1+rh0Q3YD2s1UD0OYVm39wY/Uw1NRK3K7EFhFMls
|
||||
wXF6QBonlCalS1vI9cxzWgv1Gi+yAtYn6HrYCfpl5Nw
|
||||
--- rLOoGk0iX+wuNd1CKv7g2PRd2Ic+8JHCQhrVBaF9zbE
|
||||
<EFBFBD>òüüˤ/A¦Ì(ØiHC¸@¢Þð‰h`ˆ3ªá´' ¬ÚöáDì>ð¿¤~¸ÿÁö?ÑÃMêÙ@<40>t°(“Ò@ö׿^xÆMÉ}
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,10 +1,7 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 VyYH/Q evYn+9ipH4t4cT2lZOiwnGqSkU+bbdVw80S0rgAqt00
|
||||
Vr24AqHOqH5DQYYlyS0X+k6TnczKHRDGZCeoLOJkybE
|
||||
-> ssh-ed25519 dMQYog 23GqNi0N24EtnRV25Ick+aurPOngZ2Zd279LmZH15WY
|
||||
FEo0GyymjnPrSjf608SyCH22FvaqEixyVcbXdQ+Z3zA
|
||||
-> (Rd{ky@}-grease D f/KA]Pe
|
||||
8Ip1fddb0BYUwg62FSmUBp7O+TILFaCtWHcxheEyUlXPoY9TGTaySl6Znw9Mksde
|
||||
q2aAHn8
|
||||
--- ibLXcq9R/5X2jFKBABgsUcDiBjjuoA9SrCuFbGOiNBI
|
||||
¸Ó;ù½XôóÀ m£h޲ý%펗+6â×k@nWÃäT®‘0
|
||||
-> ssh-ed25519 w3nu8g ER07FH17Wm9op5F4pCftNK76f+nNjtA6zQc/2dLyAHI
|
||||
nxxq/8tS3ENJhAEIhJCiSi7dV+68AmcEMh9zvZoWpdY
|
||||
-> ssh-ed25519 dMQYog JelCfh+akP7C/i1kimq3fC5PRQa9gHbmBaOnjKu+PDw
|
||||
GVTwo7MzkpCereZRh0HVjGYmtdMY1gHowMZtUQl7XQw
|
||||
--- p2l83t3bEdBrrp1ctaqqKhwB4l2McgZqZTtc2SXgd8Q
|
||||
ø±ôeÆd\Yå4lXVF§U©<55>þM||)دÔûú•¶Ü8¿>ëž%ðóJ$à´Õè
|
||||
Binary file not shown.
@@ -1,11 +1,9 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 6AT2/g UG+Ub0bZK74/Ifa/YkZOc6B3cPl6oI7M4Ev1zxkFEh0
|
||||
z71vjnEqhL3kuLePbP0nKQNwU0mrCOO386wLdUhH5tU
|
||||
-> ssh-ed25519 dMQYog t8H6XoIhhE4H9g4913sWgZ5BaYK04uk7Mj0FYnOdtTo
|
||||
U4Ygto4z3l4dcCsnGxnRo1YGBl6YZ5y5pnVBJXCSrOc
|
||||
-> Bad-grease <$Y
|
||||
1xw
|
||||
--- wiGO0H6gfd+3D/+V/rMNLGkDk6FPFUihXi43J82LAkg
|
||||
³8>`®Às«»pú¨€¿U#ü™º¯KV%jbwïxN¸@
|
||||
Žî@œª€iæ
|
||||
Ow\º(@@Tòìèzá
|
||||
-> ssh-ed25519 6AT2/g Knb25oYknkiXyMqVBR3T0sFSO4hDjWUTq3xIml/b4ig
|
||||
n7xamnrZ+SCWiKqniF3r2JvH4G8q2pJaHzF0riNEDf4
|
||||
-> ssh-ed25519 w3nu8g 7+2R5RpLjBf4jjj3S8ibMquUWgRMrifziGQubwuLrhA
|
||||
3jLCalnbA3Z2jr8Zs+qrpzSoi3Jv6E5OV2binpr3Kk4
|
||||
-> ssh-ed25519 dMQYog Nh2e7me0tiG7ZwQK8669VS0LCYFSH+b33I9tr8uI5CY
|
||||
7Gs1N9eZa1CGR9pczzugHbqnghqevX7kQCOeqR4q0eI
|
||||
--- OzW+omJsZA/b4DMF4hdQga7JVgiEYluZok3r8JM258I
|
||||
*³²ÝPކAcèÈ1·@Át¸e÷nf&ù#I7‡a‰Ûâc†ÃÀ<C383>êbDâ–~aõ]1w=Á
|
||||
BIN
secrets/librechat-env-file.age
Normal file
BIN
secrets/librechat-env-file.age
Normal file
Binary file not shown.
Binary file not shown.
BIN
secrets/oauth2-proxy-env.age
Normal file
BIN
secrets/oauth2-proxy-env.age
Normal file
Binary file not shown.
@@ -1,13 +1,11 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 6AT2/g gPeZnJ8arK6xAGnEK9uTcGfwBI1pYjjv6VX4o9EBIns
|
||||
sKFfqnafLachTKE93Pb7gsZ5gdKis64N64BK5128LKg
|
||||
-> ssh-ed25519 hPp1nw e2taazZ3R6EBCbgh6Gg0Dc9p1K7zp5R7n9LIkWF/Wj8
|
||||
+/VkcMDL1HNJhbc6/OxpiUe1dlO0lrc1hgkD/RrYXjY
|
||||
-> ssh-ed25519 dMQYog znMKkv1O7F/EeAyvTfULUn/pWdai2NI0uBfWn/02xg0
|
||||
45W9s4Vo8J+xOTGec9h6s0ra9ZSUA6JkorAAyqqlPfg
|
||||
-> T/!XI-grease GJ_O'
|
||||
mAOW54Txa2H9WdEMog0g1XQjkC5z0wQIoqNlnbsjCSvM1UaPiiu6vJOJKCmJb1Z6
|
||||
3wyLN6lCIjkR
|
||||
--- yX7lzKnDkn+KkRVTumffcd/SJSznR5n6JtUgWkSSohk
|
||||
ãQô^àèyW; â§]Š+u>¥3wŒz±¨oêM:ã™øêúÀöŸÃ9,xv×KÁÜXT-K8rÔAç(@Ø-|³
|
||||
:PÈ<50>‡*H6€'¹&Ôi
|
||||
-> ssh-ed25519 6AT2/g MGKlbzVOk5+czgAOerwl+eIyOifXJm/q4UgQUXVpx1c
|
||||
43l6s4+5TSMQyO9tAg7v9Y5OdXOjKYz56lbr9Jm2r+o
|
||||
-> ssh-ed25519 hPp1nw aOxni4sFPPgedUkBOuOyEWfFPJrhdTJnivIaWt5RJxM
|
||||
KNaxijzSMp7EjYKwWiAP66nPYYZK3/VXL8u+3uJt6bg
|
||||
-> ssh-ed25519 w3nu8g qTAzEzQbFze35AtbvkYREw3wa7ApDN5u7RSZUXrEpms
|
||||
Dy0uGF458A9RJMvDl2XKOkEABbbRgT+eIgvb6ZOEQqg
|
||||
-> ssh-ed25519 dMQYog 5DfYuGeWuN0/CO6WWbFIi7LaKl23FXYVdPROM+TFpCA
|
||||
PDBdDn+YUMKYNKFkCEfXesmkB/XUxZRK3ddQt0kqQ7g
|
||||
--- JOeG87EVD+QBx6n+rMoPTOni0PyoG7xx4a2USNiapYI
|
||||
Zsý{ÅiÁ_QÂ\+ô@@Üò߸ù&_š5$¿Gt2¢rF“y×ÄQ§Iaž7ôÙÉzàgf%O(µÙ,VéÂ}ÿn|û'J¸2ø¨óQÑB
|
||||
@@ -1,5 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -e
|
||||
|
||||
agenix -r
|
||||
git commit . -m "Rekey secrets"
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -20,10 +20,7 @@ with roles;
|
||||
"robots-email-pw.age".publicKeys = gitea;
|
||||
|
||||
# nix binary cache
|
||||
# public key: s0.koi-bebop.ts.net:OjbzD86YjyJZpCp9RWaQKANaflcpKhtzBMNP8I2aPUU=
|
||||
"binary-cache-private-key.age".publicKeys = binary-cache;
|
||||
# public key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINpUZFFL9BpBVqeeU63sFPhR9ewuhEZerTCDIGW1NPSB
|
||||
"binary-cache-push-sshkey.age".publicKeys = nobody; # this value is directly given to gitea
|
||||
"atticd-credentials.age".publicKeys = binary-cache;
|
||||
|
||||
# vpn
|
||||
"iodine.age".publicKeys = iodine;
|
||||
@@ -32,15 +29,15 @@ with roles;
|
||||
# cloud
|
||||
"nextcloud-pw.age".publicKeys = nextcloud;
|
||||
"smb-secrets.age".publicKeys = personal ++ media-center;
|
||||
"oauth2-proxy-env.age".publicKeys = server;
|
||||
|
||||
# services
|
||||
"searx.age".publicKeys = nobody;
|
||||
"spotifyd.age".publicKeys = personal;
|
||||
"wolframalpha.age".publicKeys = dailybot;
|
||||
|
||||
# hostapd
|
||||
"hostapd-pw-experimental-tower.age".publicKeys = wireless;
|
||||
"hostapd-pw-CXNK00BF9176.age".publicKeys = wireless;
|
||||
"hostapd-pw-experimental-tower.age".publicKeys = nobody;
|
||||
"hostapd-pw-CXNK00BF9176.age".publicKeys = nobody;
|
||||
|
||||
# backups
|
||||
"backblaze-s3-backups.age".publicKeys = personal ++ server;
|
||||
@@ -48,4 +45,7 @@ with roles;
|
||||
|
||||
# gitea actions runner
|
||||
"gitea-actions-runner-token.age".publicKeys = gitea-actions-runner;
|
||||
|
||||
# Librechat
|
||||
"librechat-env-file.age".publicKeys = librechat;
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,10 +1,10 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 6AT2/g 3xkROcKh6I/oVGRwnvJ9Dy36JvYmsJQZq2DBvYC4Dz4
|
||||
JunaGg8zg2SJZmBnuV0ZcDSc8vsMHgTd1RbDn8giy+Y
|
||||
-> ssh-ed25519 dMQYog JG8QC1thl+CMlxoI1Y+ZUj0dQ3FXF4cquk7tdzfaS0E
|
||||
zW7jyrXhVvyIq7HXfcRqkyZdg/wkWwNfPk5KbI2jH7I
|
||||
-> $"v%-grease `Xo|a eIFIq 7hBk?8%1
|
||||
ZoNiAXY1HE1GEQPd1aJirTitFgXf3HKcV2H6HxRpzWysUd1DGOsF/jScUO36JgIP
|
||||
sY8FA22PjyUv7g
|
||||
--- zFpfG3JQpSmE108GMEWLjGWMJe7cXVn3NN9vs8iDY3E
|
||||
8f,ÕªÒÅðÚÏ*}V¥Æ@j†3ÿïCèM*@}ìy2Øì9€Éè ìN|y›æ
|
||||
-> ssh-ed25519 6AT2/g Kw5/he5m/XAJUNv8XEJQU+e+Ou7hCYluMXXWlHiePXY
|
||||
GkhJOzSlcC9S7bs8FuDNMvMaFU3+fQ5z+o+Pb8wllp8
|
||||
-> ssh-ed25519 w3nu8g fUORtXN1ygOeV42jveCosGXR/Y6R6OG6DK7LPDBEAk8
|
||||
yFpoasbY/sl6BQp0LVBQnInA4Kxd8A8meEObU1KD108
|
||||
-> ssh-ed25519 dMQYog 75qVEe6/1yOV4DDLAOGaufs3ojx1/Sc1fIQOe+Oirz0
|
||||
iDFsr6/30AHKH6hUs/WTpHEM8WQ03QMlGbtQkGrnVCU
|
||||
--- islx8t7a6bShXGxvYeDVuUxkmAMtpUfr0Gp7aYrJUkI
|
||||
2Ûí4¤†7Õ
|
||||
?Õw€À<E282AC>JÁÆØv ¨º9’,ËxÅŠò¨‰¦Æ¦ñnäH?>I
|
||||
Reference in New Issue
Block a user