Skip to content

Clanify #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 234 commits into from
Apr 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
234 commits
Select commit Hold shift + click to select a range
992e1b0
add clan inupt
pinpox Jan 8, 2025
6d70869
move one machine to clan
pinpox Jan 8, 2025
1902475
add clan targetHost ip
pinpox Jan 8, 2025
17f4909
fix clan integration
pinpox Jan 8, 2025
dde827c
move ahorn to clan
pinpox Jan 8, 2025
c434c5a
flake.lock: Update
pinpox Jan 8, 2025
4bf9c3f
flake.lock: Update
pinpox Jan 8, 2025
e4630f4
shallow clone
pinpox Jan 8, 2025
7983a8f
clanify porree
pinpox Jan 9, 2025
6c7d432
Remove explicit disko import (DOC!)
pinpox Jan 9, 2025
096ab95
Clanify remaining machines
pinpox Jan 9, 2025
003e8f8
simplify reading machines from ./machines
pinpox Jan 9, 2025
b3458ad
Add direnv clan shell (DOC!)
pinpox Jan 9, 2025
17f8a3f
flake.lock: Update
pinpox Jan 9, 2025
dea4b5f
flake.lock: Update
pinpox Jan 9, 2025
f1e9d1d
flake.lock: Update
pinpox Jan 9, 2025
af6189a
Set up test-password with password-store
pinpox Jan 9, 2025
beaa1b1
migrate hedgedoc secrets
pinpox Jan 9, 2025
5a3f54f
flake.lock: Update
pinpox Jan 11, 2025
7a3c6bb
flake.lock: Update
pinpox Jan 12, 2025
cdcf3c6
flake.lock: Update
pinpox Jan 12, 2025
b38037d
add jitsi-presence module
pinpox Jan 12, 2025
c9aaa0b
flake.lock: Update
pinpox Jan 13, 2025
84044c2
Update vars via generator state-version for machine ahorn
pinpox Jan 13, 2025
bc7947c
use clan's auto-importing of machines
pinpox Jan 14, 2025
81fe449
flake.lock: Update
pinpox Jan 15, 2025
a116308
Update vars via generator state-version for machine kfbox
pinpox Jan 15, 2025
d2f57ea
flake.lock: Update
pinpox Jan 16, 2025
6e427bd
Add shell stuff
pinpox Jan 16, 2025
e9466e8
Add second presence bot
pinpox Jan 16, 2025
f617c18
Update vars via generator borgbackup for machine ahorn
pinpox Jan 17, 2025
f6104b6
Update vars via generator state-version for machine birne
pinpox Jan 17, 2025
bcb518c
Unbind zellij quit button
pinpox Jan 19, 2025
b451461
Update vars via generator restic-server for machine birne
pinpox Jan 20, 2025
e581e59
Update vars via generator restic-server for machine birne
pinpox Jan 20, 2025
8a8a633
Update vars via generator restic-server for machine birne
pinpox Jan 20, 2025
fd7b327
Update vars via generator restic-server for machine birne
pinpox Jan 20, 2025
65b86ce
Update vars via generator restic-server for machine birne
pinpox Jan 20, 2025
35b0b3b
Update vars via generator restic-ahorn for machine ahorn
pinpox Jan 20, 2025
af20524
Update vars via generator restic-kfbox for machine birne
pinpox Jan 20, 2025
f01dab0
Update vars via generator restic-server for machine birne
pinpox Jan 20, 2025
a2c6382
Update vars via generator restic-server for machine birne
pinpox Jan 21, 2025
14649c9
flake.lock: Update
pinpox Jan 21, 2025
8d550d0
flake.lock: Update
pinpox Jan 21, 2025
dbe673f
Update vars via generator restic-cert for machine birne
pinpox Jan 21, 2025
b4c3150
delta: side-by-side
pinpox Jan 22, 2025
d67e005
flake.lock: Update
pinpox Jan 22, 2025
2b86ae0
fmt
pinpox Jan 22, 2025
f26f1ad
migrate screego to clan
pinpox Jan 22, 2025
3228d0a
jitsi-presence: add another instance
pinpox Jan 22, 2025
a07cedf
comment out birne wireguard hooks
pinpox Jan 22, 2025
8a35e17
add backup target to flake
pinpox Jan 22, 2025
435da1a
Update vars via generator restic-cert for machine birne
pinpox Jan 22, 2025
7eb785e
Update vars via generator restic-cert for machine birne
pinpox Jan 22, 2025
5683745
Update vars via generator restic-cert for machine birne
pinpox Jan 22, 2025
9423727
Update vars via generator restic-cert for machine birne
pinpox Jan 22, 2025
3b032e2
Setup restic test
pinpox Jan 22, 2025
5ccbd95
flake.lock: Update
pinpox Jan 22, 2025
6bd58c2
Add backblaze-clan restic target
pinpox Jan 23, 2025
9676d41
Add dir hash for nix-config
pinpox Jan 23, 2025
2c11750
Add wastebin alias
pinpox Jan 25, 2025
0d83f48
flake.lock: Update
pinpox Jan 25, 2025
587f2c0
Update vars via generator state-version for machine porree
pinpox Jan 25, 2025
b8990bb
Update jitsi presence config
pinpox Jan 26, 2025
0ad60aa
flake.lock: Update
pinpox Jan 26, 2025
e7ab831
Update vars via generator go-karma-bot for machine kfbox
pinpox Jan 26, 2025
f50dd80
Update vars via generator jitsi-presence for machine kfbox
pinpox Jan 26, 2025
c7161a5
flake.lock: Update
pinpox Jan 30, 2025
6918dd8
Update presence notifier config
pinpox Jan 30, 2025
b400a53
Validate env generator on script
pinpox Jan 30, 2025
0b97cc8
nextcloud: 29->30
pinpox Jan 30, 2025
19f00a8
Disable vikunja
pinpox Jan 30, 2025
c61b68d
add target ip for restic
pinpox Jan 31, 2025
1817264
Add ai shell bind
pinpox Jan 31, 2025
19ba1eb
flake.lock: Update
pinpox Feb 2, 2025
23ee6a4
comment out clan-restic, posponed
pinpox Feb 3, 2025
d638894
flake.lock: Update
pinpox Feb 3, 2025
789df94
remove fernuni host entry
pinpox Feb 3, 2025
97211b3
flake.lock: Update
pinpox Feb 3, 2025
74a2777
filebrowser: migrate to clan secrets
pinpox Feb 4, 2025
2729d45
http2irc: migrate to clan secrets
pinpox Feb 4, 2025
d661434
fix deprecated buildClan opitons
pinpox Feb 4, 2025
b97ec46
mattermost: remove module
pinpox Feb 4, 2025
ea0b6b7
flake.lock: Update
pinpox Feb 4, 2025
e4f6ba8
flake.lock: Update
pinpox Feb 6, 2025
b3925a8
flake.lock: Update
pinpox Feb 6, 2025
e2b76fc
flake.lock: Update
pinpox Feb 6, 2025
5f699fc
Use radio stream for @lassulus radio
pinpox Feb 6, 2025
a33a120
sway: reduce drowdown border
pinpox Feb 6, 2025
c85a67c
Add ranger
pinpox Feb 6, 2025
afc50ab
nix-common: add uid-range options
pinpox Feb 6, 2025
2926b02
add mpv
pinpox Feb 6, 2025
ced0258
Update readme
pinpox Feb 6, 2025
43de94f
remove mattermost
pinpox Feb 12, 2025
f0f2076
Update flake.lock
pinpox Feb 12, 2025
46579d4
Add FZF plugin for fish
pinpox Feb 12, 2025
ac88c28
fix swaylock bind
pinpox Feb 12, 2025
7611302
fix shell bindigs
pinpox Feb 14, 2025
0f592d6
flake.lock: Update
pinpox Feb 14, 2025
3eaba9f
flake.lock: Update
pinpox Feb 15, 2025
9fa2b63
Add gtk banana cursor
pinpox Feb 15, 2025
b3b3a76
Fix banana
pinpox Feb 16, 2025
9c33292
flake.lock: Update
pinpox Feb 17, 2025
7ac45e0
Cleanup foot config
pinpox Feb 18, 2025
7a075aa
disable droidcam-obs
pinpox Feb 18, 2025
176a7c5
flake.lock: Update
pinpox Feb 18, 2025
bb27ec1
flake.lock: Update
pinpox Feb 18, 2025
177095a
Use passage for nixos-secrets
pinpox Feb 18, 2025
55abb0c
flake.lock: Update
pinpox Feb 19, 2025
97aaeba
rm mdm stuff
pinpox Feb 19, 2025
58a7d29
firefox: migrate options
pinpox Feb 19, 2025
426e40c
fmt
pinpox Feb 19, 2025
f470c42
Update vars via generator hedgedoc for machine kfbox
pinpox Feb 19, 2025
43117f5
flake.lock: Update
pinpox Feb 23, 2025
bdd64d5
Update flake.lock
pinpox Feb 25, 2025
338b707
wastebin: include max size
pinpox Mar 3, 2025
8c03552
hedgedoc: clanify
pinpox Mar 3, 2025
cbe4c4e
Pass pinpox-utils in nix-common
pinpox Mar 3, 2025
34a1fc9
flake.lock: Update
pinpox Mar 3, 2025
018bdb4
nextcloud: switch to nix-apps
pinpox Mar 3, 2025
67d3bff
nextcloud: fixes
pinpox Mar 3, 2025
fc6e516
kfbox: set buildhost to localhost
pinpox Mar 4, 2025
7a1e3d7
home-manager: enable jujutsu
pinpox Mar 4, 2025
11b91e1
clan-common: add extra caches
pinpox Mar 4, 2025
2bd471d
flake.lock: Update
pinpox Mar 4, 2025
7e3a6d0
flake.lock: Update
pinpox Mar 5, 2025
2029265
taskwarrior: add
pinpox Mar 5, 2025
b12c4f3
move neomutt config
pinpox Mar 5, 2025
d522ae3
taskwarrior: fix
pinpox Mar 5, 2025
ab8698b
flake.lock: Update
pinpox Mar 5, 2025
c7a19cb
gitea: clanify
pinpox Mar 6, 2025
e5dbf0e
Update vars via generator state-version for machine kartoffel
pinpox Mar 11, 2025
669ecb5
kartoffel: set targethost
pinpox Mar 12, 2025
533a375
Move wayland stuff to module
pinpox Mar 14, 2025
033c01e
Add nextcloud-client
pinpox Mar 14, 2025
082d191
wireguard-client: clanify
pinpox Mar 14, 2025
b0c241e
Update flake.lock
pinpox Mar 14, 2025
44cc54f
jitsi-presence: remove clan instance
pinpox Mar 14, 2025
1b0351c
Update vars via generator state-version for machine limette
pinpox Mar 15, 2025
ba62f54
Update vars via generator wireguard for machine limette
pinpox Mar 15, 2025
cf3ee64
caddy-security: clanify
pinpox Mar 15, 2025
e807850
machines/limette: add targetHost
pinpox Mar 15, 2025
b2bab17
wezterm: remove
pinpox Mar 16, 2025
48c12de
flake.lock: Update
pinpox Mar 16, 2025
a8dff28
machines/kartoffel: re-use retiolum keys from ahorn
pinpox Mar 16, 2025
eabd134
home-manager: remove broken mvp overrides
pinpox Mar 16, 2025
37e4105
home-manager: add tea package
pinpox Mar 16, 2025
cb26c28
Remove presence bot for clan rooms
pinpox Mar 19, 2025
94a431a
flake.lock: Update
pinpox Mar 19, 2025
91659ff
zsh: add directory aliases
pinpox Mar 19, 2025
306a63b
sway: add audacious rules
pinpox Mar 19, 2025
30a7ce9
profiles/desktop: add audio players
pinpox Mar 19, 2025
b592a83
move wayland stuff
pinpox Mar 19, 2025
39c3b5a
nix-common: add nix-comminity cache
pinpox Mar 19, 2025
9069b20
Move network-manager workaround to desktop
pinpox Mar 19, 2025
98f403e
btrfs on limitte
pinpox Mar 19, 2025
447d017
flake.lock: Update
pinpox Mar 20, 2025
749ad84
remove gnome-keyring
pinpox Mar 20, 2025
390160f
limette: convert to btrfs
pinpox Mar 20, 2025
b936f47
Wayland: config portals
pinpox Mar 20, 2025
67983df
nextcloud: 30->31
pinpox Mar 20, 2025
95b79b3
vaultwarden: enable ssh-key support
pinpox Mar 20, 2025
e161b33
loki: disable
pinpox Mar 20, 2025
ea3a5e4
profiles/desktop: add deluge
pinpox Mar 20, 2025
45a427e
Update vars via generator wireguard for machine birne
pinpox Mar 20, 2025
9ffa8a0
machines/birne: add disabled seahub config
pinpox Mar 20, 2025
8021b90
waybar: add mpris audio player module
pinpox Mar 21, 2025
9b17474
flake.lock: Update
pinpox Mar 24, 2025
1168abc
Update vars via generator caddy for machine porree
pinpox Mar 25, 2025
ea7076c
Update vars via generator caddy for machine porree
pinpox Mar 25, 2025
0007bbd
Update vars via generator caddy for machine porree
pinpox Mar 25, 2025
fb96eeb
Update vars via generator caddy for machine porree
pinpox Mar 25, 2025
c75cc62
Update vars via generator caddy for machine porree
pinpox Mar 25, 2025
498b6d9
Update vars via generator caddy-basicauth for machine porree
pinpox Mar 25, 2025
320e62b
Update vars via generator caddy-basicauth for machine porree
pinpox Mar 25, 2025
b123215
Update vars via generator alertmanager-ntfy for machine porree
pinpox Mar 25, 2025
4bf3945
Update vars via generator matrix-hook for machine porree
pinpox Mar 25, 2025
0ce40d2
Update vars via generator wireguard for machine porree
pinpox Mar 25, 2025
777d8fa
Update vars via generator wireguard for machine ahorn
pinpox Mar 25, 2025
34b8de0
Update vars via generator caddy for machine kfbox
pinpox Mar 25, 2025
f33ca5c
Update vars via generator wireguard for machine kfbox
pinpox Mar 25, 2025
b94dbd2
home-manager: git settings
pinpox Mar 25, 2025
27576d6
remove lollypops alias
pinpox Mar 25, 2025
366f446
waybar: ignore mpris browsers
pinpox Mar 25, 2025
d4ff11b
caddy-security: fix
pinpox Mar 25, 2025
c209648
limette: growpartition
pinpox Mar 25, 2025
d7a2f3e
wireguard: clanify
pinpox Mar 25, 2025
8acf519
porree: clanify caddy basicauth
pinpox Mar 25, 2025
969de13
flake.lock: Update
pinpox Mar 25, 2025
61e8f3f
machines/limette: try zfs
pinpox Mar 27, 2025
08496f2
machines/birne: enable zfs
pinpox Mar 27, 2025
d386ec4
machines/limette: fix zfs
pinpox Mar 27, 2025
34fb8ab
modules/nextcloud: clanify
pinpox Mar 27, 2025
0332e74
modules/default-server: add utils
pinpox Mar 28, 2025
693c4f7
modules/gitea: clanify
pinpox Mar 28, 2025
dd45382
Update vars via generator vaultwarden for machine porree
pinpox Mar 28, 2025
f9bc377
modules/vaultwarden: clanify and remove workaround
pinpox Mar 28, 2025
f581fe5
machines/kfbox: extract retiolum module
pinpox Mar 31, 2025
dda3d0e
machines/kartoffel: enable zfs support
pinpox Mar 31, 2025
5a78143
machines/kfbox: clanify
pinpox Mar 31, 2025
2174932
Update vars via generator minio for machine birne
pinpox Mar 31, 2025
94a8201
modules/minio: clanify
pinpox Mar 31, 2025
5b3fdd3
Update vars via generator dex for machine kfbox
pinpox Mar 31, 2025
10bcc8e
modules/dex: clanify
pinpox Mar 31, 2025
ea056fb
flake.lock: Update
pinpox Apr 1, 2025
79b273f
Update vars via generator restic-credentials for machine limette
pinpox Apr 1, 2025
20a7c08
Update vars via generator restic-credentials-backblaze for machine li…
pinpox Apr 1, 2025
0d1debd
Update vars via generator restic-credentials for machine kartoffel
pinpox Apr 3, 2025
44b1165
Update vars via generator restic-credentials-backblaze for machine ka…
pinpox Apr 3, 2025
465f48c
Update vars via generator minio for machine birne
pinpox Apr 3, 2025
1a81517
Update vars via generator minio for machine birne
pinpox Apr 3, 2025
e79aafe
Update vars via generator minio for machine birne
pinpox Apr 3, 2025
962560b
flake.lock: Update
pinpox Apr 7, 2025
0d72855
modules/default-desktop: start sway directly
pinpox Apr 7, 2025
ba23e48
modules/minio: clanify
pinpox Apr 7, 2025
dbe679c
modules/restic: fix and simplify
pinpox Apr 9, 2025
104d226
hm/git: set defaults
pinpox Apr 9, 2025
7090980
machines/ahorn: remove
pinpox Apr 9, 2025
17c07f5
modules/home-assistant: clanify
pinpox Apr 9, 2025
26d78bb
modules/miniflux: clanify
pinpox Apr 9, 2025
8543779
Update vars via generator restic-exporter for machine porree
pinpox Apr 9, 2025
29ccd09
Update vars via generator prometheus for machine porree
pinpox Apr 9, 2025
c69a57d
Update vars via generator prometheus for machine porree
pinpox Apr 9, 2025
b02f96f
Update vars via generator prometheus for machine porree
pinpox Apr 9, 2025
26585b1
modules/monitoring: clanify
pinpox Apr 9, 2025
2d9e34e
Update vars via generator restic-exporter for machine kfbox
pinpox Apr 9, 2025
b154078
Update vars via generator vikunja for machine kfbox
pinpox Apr 9, 2025
1969f34
modules/vikunja: clanify
pinpox Apr 9, 2025
29d253c
modules/binary-cache: remove
pinpox Apr 10, 2025
0986c71
home-manager/ntfy-notify: remove
pinpox Apr 10, 2025
43c4ae6
lollypops: remove
pinpox Apr 13, 2025
7e34148
machines/porree: remove self from inputs
pinpox Apr 13, 2025
56893b6
Update readme
pinpox Apr 14, 2025
77f31d1
modules/monitoring: move restic exporter
pinpox Apr 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .drone.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ local hosts = std.objectFields(info.nixosConfigurations);
local packages = std.objectFields(info.packages['x86_64-linux']);

// To overerride the lists use:
// local hosts = ['ahorn', 'birne', 'bob', 'kartoffel', 'kfbox', 'porree'];
// local hosts = ['birne', 'bob', 'kartoffel', 'kfbox', 'porree'];
// local packages = [ 'filebrowser', 'fritzbox_exporter', 'hello-custom', ];

local steps_hosts() = std.flatMap(function(host) [
Expand Down
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use flake
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ tags

tags.lock
tags.temp
.direnv
.env
29 changes: 9 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The structure of this repository is meant to allow easy manual deployment.
Individual hosts are defined in `/machines/<hostname>` and will import re-usable
parts of the configuration as needed.

Deployment is managed with [lollypops](https://github.com/pinpox/lollypops)
Deployment and management is done with [clan](https://clan.lol).
Secrets are stored in [pass](https://www.passwordstore.org/).

**TL;DR** To use a host configuration on a fresh install, make sure that:
Expand Down Expand Up @@ -51,36 +51,25 @@ sudo nixos-rebuild --flake ".#kartoffel" switch
| Configuration | Type | Location | VPN IP | Description |
| ----------------------------------- | --------- | ----------- | -------------- | ---------------------------- |
| [kartoffel](./machines/kartoffel) | Desktop | local | `192.168.7.3` | Desktop |
| [ahorn](./machines/ahorn) | Desktop | local | `192.168.7.2` | Notebook |
| [limette](./machines/limette) | Desktop | local | `192.168.7.2` | Notebook |
| [birne](./machines/birne) | Server | local | `192.168.7.4` | Local NAS |
| [porree](./machines/porree) | Server | netcup.de | `192.168.7.1` | Server for pablo.tools |
| [mega](./machines/mega) | Server | netcup.de | `192.168.7.6` | Server for megaclan3000.de |
| [kfbox](./machines/kfbox) | Server | netcup.de | `192.168.7.5` | Server for 0cx.de |

The services running on each host are documented in the host-specific
`README.md` files.

# Deployment

## Default Deployment

Deployment is handled with [lollypops](https://github.com/pinpox/lollypops).

TODO Update/document

## First Deployment

If the system has not been configured to use flakes (e.g. fresh install), the
first deployment will have to be build on a machine that has. This can be done
from any of the other hosts that have the repository. The configuration will the
have the necessary options set, so that flakes works from now on with the normal
lollypops deployment.

```bash
# bash, zsh doesn't always work correctly
sudo nixos-rebuild --flake .#new-hostname --target-host <new-host-ip> --build-host localhost switch
```
Deployment is done via [clan CLI](https://clan.lol) provided via the flake's
default nix shell. I use [direnv](https://direnv.net/) to automatically start it
when entering the repository's directory. Run `direnv allow` on the first time,
after that, deployment can be done via:

```sh
clan machines update <hostname>
```
# Contributing?

While contributions don't make much sense for a personal configuration repository,
Expand Down
Loading