| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| | |
|
| |
|
|
|
|
| |
This is the first step to re-enable installing custom scripts. The next
step will be to rename `tools` to `packages`, and then if needed I will
be able to support overlays.
|
| | |
|
| |
|
|
| |
Simplify the configuration as this is not something I currently use.
|
| | |
|
| |
|
|
|
|
|
|
|
| |
To make it easier to support multiple systems with this configuration,
move the current configuration for my personal machine to a profile
named `personal.nix`.
When I add a work machine the profile can be named `work.nix` and all
configurations related to that system will live there.
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Bumps [DeterminateSystems/update-flake-lock](https://github.com/determinatesystems/update-flake-lock) from 20 to 21.
- [Release notes](https://github.com/determinatesystems/update-flake-lock/releases)
- [Commits](https://github.com/determinatesystems/update-flake-lock/compare/v20...v21)
---
updated-dependencies:
- dependency-name: DeterminateSystems/update-flake-lock
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flake lock file updates:
• Updated input 'darwin':
'github:lnl7/nix-darwin/bbde06bed1b72eddff063fa42f18644e90a0121e' (2024-02-24)
→ 'github:lnl7/nix-darwin/17c2ca3c7537a2512224242b84e1ea3c08e79b92' (2024-03-03)
• Updated input 'devshell':
'github:numtide/devshell/83cb93d6d063ad290beee669f4badf9914cc16ec' (2024-01-15)
→ 'github:numtide/devshell/5ddecd67edbd568ebe0a55905273e56cc82aabe3' (2024-02-26)
• Updated input 'firefox-darwin':
'github:bandithedoge/nixpkgs-firefox-darwin/79c4e1ad4e14988ef89c4b5946d499e56ab44084' (2024-02-25)
→ 'github:bandithedoge/nixpkgs-firefox-darwin/144a94dc71410d9655e4e73ac4579e9b7405572b' (2024-03-03)
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/b253292d9c0a5ead9bc98c4e9a26c6312e27d69f' (2024-02-01)
→ 'github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2' (2024-03-01)
• Updated input 'flake-parts/nixpkgs-lib':
'github:NixOS/nixpkgs/97b17f32362e475016f942bbdfda4a4a72a8a652?dir=lib' (2024-01-29)
→ 'github:NixOS/nixpkgs/1536926ef5621b09bba54035ae2bb6d806d72ac8?dir=lib' (2024-02-29)
• Updated input 'futils':
'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26' (2024-01-15)
→ 'github:numtide/flake-utils/d465f4819400de7c8d874d50b982301f28a84605' (2024-02-28)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/c5101e457206dd437330d283d6626944e28794b3' (2024-02-23)
→ 'github:nixos/nixpkgs/79baff8812a0d68e24a836df0a364c678089e2c7' (2024-03-01)
• Updated input 'nur':
'github:nix-community/NUR/d825643f7c47eedc0e27abe716df7d3fe7a9182b' (2024-02-25)
→ 'github:nix-community/NUR/9ae561d96a2a08ae0409d887a10d7cb517eddef4' (2024-03-03)
• Updated input 'treefmt-nix':
'github:numtide/treefmt-nix/36fd6923c122a983bc3915692e6cb3ff341ef083' (2024-02-23)
→ 'github:numtide/treefmt-nix/093f82e5707bb6f14ee38a742748f9fb4ab1488e' (2024-03-02)
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flake lock file updates:
• Updated input 'darwin':
'github:lnl7/nix-darwin/0e6857fa1d632637488666c08e7b02c08e3178f8' (2024-02-18)
→ 'github:lnl7/nix-darwin/bbde06bed1b72eddff063fa42f18644e90a0121e' (2024-02-24)
• Updated input 'firefox-darwin':
'github:bandithedoge/nixpkgs-firefox-darwin/2ab9b39e98497584ba952cacb8dfadf8492fd28d' (2024-02-18)
→ 'github:bandithedoge/nixpkgs-firefox-darwin/79c4e1ad4e14988ef89c4b5946d499e56ab44084' (2024-02-25)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/84d981bae8b5e783b3b548de505b22880559515f' (2024-02-17)
→ 'github:nixos/nixpkgs/c5101e457206dd437330d283d6626944e28794b3' (2024-02-23)
• Updated input 'nur':
'github:nix-community/NUR/250e893814c620c9a87e5c007751dd98daa594ee' (2024-02-18)
→ 'github:nix-community/NUR/d825643f7c47eedc0e27abe716df7d3fe7a9182b' (2024-02-25)
• Updated input 'treefmt-nix':
'github:numtide/treefmt-nix/ac599dab59a66304eb511af07b3883114f061b9d' (2024-02-07)
→ 'github:numtide/treefmt-nix/36fd6923c122a983bc3915692e6cb3ff341ef083' (2024-02-23)
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flake lock file updates:
• Updated input 'darwin':
'github:lnl7/nix-darwin/bdbae6ecff8fcc322bf6b9053c0b984912378af7' (2024-02-02)
→ 'github:lnl7/nix-darwin/0e6857fa1d632637488666c08e7b02c08e3178f8' (2024-02-18)
• Updated input 'firefox-darwin':
'github:bandithedoge/nixpkgs-firefox-darwin/121995525d845657b2fea5d7a2b93f0f28540b43' (2024-02-11)
→ 'github:bandithedoge/nixpkgs-firefox-darwin/2ab9b39e98497584ba952cacb8dfadf8492fd28d' (2024-02-18)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/20f65b86b6485decb43c5498780c223571dd56ef' (2024-02-09)
→ 'github:nixos/nixpkgs/84d981bae8b5e783b3b548de505b22880559515f' (2024-02-17)
• Updated input 'nur':
'github:nix-community/NUR/4acc83adfbe8844fdab0b3cc916394c4391379ea' (2024-02-11)
→ 'github:nix-community/NUR/250e893814c620c9a87e5c007751dd98daa594ee' (2024-02-18)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/0db2e67ee49910adfa13010e7f012149660af7f0' (2024-02-07)
→ 'github:cachix/pre-commit-hooks.nix/5df5a70ad7575f6601d91f0efec95dd9bc619431' (2024-02-15)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flake lock file updates:
• Updated input 'firefox-darwin':
'github:bandithedoge/nixpkgs-firefox-darwin/d839feb516758ad28bc1cef43008d55e749c1d6a' (2024-02-04)
→ 'github:bandithedoge/nixpkgs-firefox-darwin/121995525d845657b2fea5d7a2b93f0f28540b43' (2024-02-11)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/25e3d4c0d3591c99929b1ec07883177f6ea70c9d' (2024-02-01)
→ 'github:nixos/nixpkgs/20f65b86b6485decb43c5498780c223571dd56ef' (2024-02-09)
• Updated input 'nur':
'github:nix-community/NUR/5b2e8b3cb4404e60da0c4f64f9c17feae02132e8' (2024-02-04)
→ 'github:nix-community/NUR/4acc83adfbe8844fdab0b3cc916394c4391379ea' (2024-02-11)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf' (2024-01-28)
→ 'github:cachix/pre-commit-hooks.nix/0db2e67ee49910adfa13010e7f012149660af7f0' (2024-02-07)
• Updated input 'treefmt-nix':
'github:numtide/treefmt-nix/c6153c2a3ff4c38d231e3ae99af29b87f1df5901' (2024-01-28)
→ 'github:numtide/treefmt-nix/ac599dab59a66304eb511af07b3883114f061b9d' (2024-02-07)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flake lock file updates:
• Updated input 'darwin':
'github:lnl7/nix-darwin/0108864c15bb68ad57d17fb2e7d3a3e025751d79' (2024-01-28)
→ 'github:lnl7/nix-darwin/bdbae6ecff8fcc322bf6b9053c0b984912378af7' (2024-02-02)
• Updated input 'firefox-darwin':
'github:bandithedoge/nixpkgs-firefox-darwin/61c35a7992e8a540571ae21459f1c6b1c084a773' (2024-02-02)
→ 'github:bandithedoge/nixpkgs-firefox-darwin/d839feb516758ad28bc1cef43008d55e749c1d6a' (2024-02-04)
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/07f6395285469419cf9d078f59b5b49993198c00' (2024-01-11)
→ 'github:hercules-ci/flake-parts/b253292d9c0a5ead9bc98c4e9a26c6312e27d69f' (2024-02-01)
• Updated input 'flake-parts/nixpkgs-lib':
'github:NixOS/nixpkgs/b0d36bd0a420ecee3bc916c91886caca87c894e9?dir=lib' (2023-12-30)
→ 'github:NixOS/nixpkgs/97b17f32362e475016f942bbdfda4a4a72a8a652?dir=lib' (2024-01-29)
• Updated input 'home-manager':
'github:nix-community/home-manager/10cd9c53115061aa6a0a90aad0b0dde6a999cdb9' (2024-01-19)
→ 'github:nix-community/home-manager/652fda4ca6dafeb090943422c34ae9145787af37' (2024-02-03)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/a77ab169a83a4175169d78684ddd2e54486ac651' (2024-01-24)
→ 'github:nixos/nixpkgs/25e3d4c0d3591c99929b1ec07883177f6ea70c9d' (2024-02-01)
• Updated input 'nur':
'github:nix-community/NUR/55de3834d91a4fe68ba2b54253827546d20de133' (2024-02-02)
→ 'github:nix-community/NUR/5b2e8b3cb4404e60da0c4f64f9c17feae02132e8' (2024-02-04)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/f56597d53fd174f796b5a7d3ee0b494f9e2285cc' (2024-01-20)
→ 'github:cachix/pre-commit-hooks.nix/7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf' (2024-01-28)
• Updated input 'treefmt-nix':
'github:numtide/treefmt-nix/fbef7c773be115ed33f37e97256a9e8f6312b925' (2024-01-26)
→ 'github:numtide/treefmt-nix/c6153c2a3ff4c38d231e3ae99af29b87f1df5901' (2024-01-28)
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flake lock file updates:
• Updated input 'darwin':
'github:lnl7/nix-darwin/3ac7acd32db4f7111015e8d5349ff6067df01bf6' (2024-01-21)
→ 'github:lnl7/nix-darwin/0108864c15bb68ad57d17fb2e7d3a3e025751d79' (2024-01-28)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/d2003f2223cbb8cd95134e4a0541beea215c1073' (2024-01-19)
→ 'github:nixos/nixpkgs/a77ab169a83a4175169d78684ddd2e54486ac651' (2024-01-24)
• Updated input 'treefmt-nix':
'github:numtide/treefmt-nix/8cd95da6c30852adb2a06c4b6bdacfe8b64a0a35' (2024-01-19)
→ 'github:numtide/treefmt-nix/fbef7c773be115ed33f37e97256a9e8f6312b925' (2024-01-26)
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
I'm doing some prototyping with it.
|
| |
|
|
|
|
|
|
|
|
|
| |
The firefox packages for darwin are broken.
`bandithedoge/nixpkgs-firefox-darwin` provides an overlay to install
the package on darwin.
Add some specific configurations to make firefox work as I want out of
the box.
We also add NUR to install some firefox extensions (ublock, 1password).
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
CI is currently failing with the following error:
```
go: errors parsing go.mod:
/home/runner/work/world/world/go.mod:3: invalid go version '1.21.4': must match format 1.23
```
From [1]:
> Before Go 1.21, the initial release of a Go toolchain was version 1.N, not 1.N.0
which makes me think that I'm CI is running with a version of go older
than 1.21, while I specify 1.21 in my nix config. If that's the case,
something is not correct in the CI environment and I should fix it.
Hopefully the script will give me the information I need to debug this.
[1] https://go.dev/doc/toolchain#version
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
| |
Add a Makefile to build the local binaries. Rename all the commands
without a dash.
We can build the commands with `make all` or by being explicit, for
example `make bin/x509-info`.
Add a common package to keep track of build information (commit and
build date) so we can reuse the same pattern across all the commands.
|
| |
|
|
|
|
|
| |
This is causing `nix flake check` to fail on CI, and I don't know why.
I don't have issues locally.
Commenting this out until I have a fix.
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
| |
This is too much work to maintain, and I'm going to put all my tools
and scripts in this repository, so I won't need that anymore.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flake lock file updates:
• Updated input 'darwin':
'github:lnl7/nix-darwin/0dd382b70c351f528561f71a0a7df82c9d2be9a4' (2024-01-03)
→ 'github:lnl7/nix-darwin/3ac7acd32db4f7111015e8d5349ff6067df01bf6' (2024-01-21)
• Updated input 'devshell':
'github:numtide/devshell/d45f45b634c624d2be705973b2af3b9bec29deff' (2024-01-11)
→ 'github:numtide/devshell/83cb93d6d063ad290beee669f4badf9914cc16ec' (2024-01-15)
• Updated input 'futils':
'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04)
→ 'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26' (2024-01-15)
• Updated input 'home-manager':
'github:nix-community/home-manager/5f0ab0eedc6ede69beb8f45561ffefa54edc6e65' (2024-01-11)
→ 'github:nix-community/home-manager/10cd9c53115061aa6a0a90aad0b0dde6a999cdb9' (2024-01-19)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/3dc440faeee9e889fe2d1b4d25ad0f430d449356' (2024-01-10)
→ 'github:nixos/nixpkgs/d2003f2223cbb8cd95134e4a0541beea215c1073' (2024-01-19)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/274ae3979a0eacae422e1bbcf63b8b7a335e1114' (2024-01-12)
→ 'github:cachix/pre-commit-hooks.nix/f56597d53fd174f796b5a7d3ee0b494f9e2285cc' (2024-01-20)
• Updated input 'pre-commit-hooks/flake-compat':
'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17)
→ 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
• Updated input 'pre-commit-hooks/flake-utils':
'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31)
→ 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04)
• Updated input 'pre-commit-hooks/gitignore':
'github:hercules-ci/gitignore.nix/a20de23b925fd8264fd7fad6454652e142fd7f73' (2022-08-14)
→ 'github:hercules-ci/gitignore.nix/43e1aa1308018f37118e34d3a9cb4f5e75dc11d5' (2023-12-29)
• Updated input 'pre-commit-hooks/nixpkgs-stable':
'github:NixOS/nixpkgs/c37ca420157f4abc31e26f436c1145f8951ff373' (2023-06-03)
→ 'github:NixOS/nixpkgs/3dc440faeee9e889fe2d1b4d25ad0f430d449356' (2024-01-10)
• Updated input 'treefmt-nix':
'github:numtide/treefmt-nix/04f25d7bec9fb29d2c3bacaa48a3304840000d36' (2024-01-07)
→ 'github:numtide/treefmt-nix/8cd95da6c30852adb2a06c4b6bdacfe8b64a0a35' (2024-01-19)
|
| |
|
|
|
| |
A tool to display information about a flake. For now we shows all the
inputs and when they were updated last.
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 24 to 25.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v24...v25)
---
updated-dependencies:
- dependency-name: cachix/install-nix-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flake lock file updates:
• Updated input 'devshell':
'github:numtide/devshell/44ddedcbcfc2d52a76b64fb6122f209881bd3e1e' (2023-12-05)
→ 'github:numtide/devshell/d45f45b634c624d2be705973b2af3b9bec29deff' (2024-01-11)
• Added input 'devshell/flake-utils':
'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04)
• Added input 'devshell/flake-utils/systems':
'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
• Updated input 'devshell/nixpkgs':
'github:NixOS/nixpkgs/9952d6bc395f5841262b006fbace8dd7e143b634' (2023-02-26)
→ 'github:NixOS/nixpkgs/63143ac2c9186be6d9da6035fa22620018c85932' (2024-01-02)
• Removed input 'devshell/systems'
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/88a2cd8166694ba0b6cb374700799cec53aef527' (2024-01-01)
→ 'github:hercules-ci/flake-parts/07f6395285469419cf9d078f59b5b49993198c00' (2024-01-11)
• Updated input 'home-manager':
'github:nix-community/home-manager/7e398b3d76bc1503171b1364c9d4a07ac06f3851' (2024-01-01)
→ 'github:nix-community/home-manager/5f0ab0eedc6ede69beb8f45561ffefa54edc6e65' (2024-01-11)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/c1be43e8e837b8dbee2b3665a007e761680f0c3d' (2024-01-05)
→ 'github:nixos/nixpkgs/3dc440faeee9e889fe2d1b4d25ad0f430d449356' (2024-01-10)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/9d3d7e18c6bc4473d7520200d4ddab12f8402d38' (2023-12-30)
→ 'github:cachix/pre-commit-hooks.nix/274ae3979a0eacae422e1bbcf63b8b7a335e1114' (2024-01-12)
• Updated input 'treefmt-nix':
'github:numtide/treefmt-nix/e434da615ef74187ba003b529cc72f425f5d941e' (2024-01-02)
→ 'github:numtide/treefmt-nix/04f25d7bec9fb29d2c3bacaa48a3304840000d36' (2024-01-07)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flake lock file updates:
• Updated input 'darwin':
'github:lnl7/nix-darwin/1a41453cba42a3a1af2fff003be455ddbd75386c' (2023-12-31)
→ 'github:lnl7/nix-darwin/0dd382b70c351f528561f71a0a7df82c9d2be9a4' (2024-01-03)
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5' (2023-12-01)
→ 'github:hercules-ci/flake-parts/88a2cd8166694ba0b6cb374700799cec53aef527' (2024-01-01)
• Updated input 'flake-parts/nixpkgs-lib':
'github:NixOS/nixpkgs/e92039b55bcd58469325ded85d4f58dd5a4eaf58?dir=lib' (2023-11-29)
→ 'github:NixOS/nixpkgs/b0d36bd0a420ecee3bc916c91886caca87c894e9?dir=lib' (2023-12-30)
• Updated input 'home-manager':
'github:nix-community/home-manager/d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224' (2023-12-23)
→ 'github:nix-community/home-manager/7e398b3d76bc1503171b1364c9d4a07ac06f3851' (2024-01-01)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/d02d818f22c777aa4e854efc3242ec451e5d462a' (2023-12-25)
→ 'github:nixos/nixpkgs/c1be43e8e837b8dbee2b3665a007e761680f0c3d' (2024-01-05)
• Updated input 'treefmt-nix':
'github:numtide/treefmt-nix/2961375283668d867e64129c22af532de8e77734' (2023-12-19)
→ 'github:numtide/treefmt-nix/e434da615ef74187ba003b529cc72f425f5d941e' (2024-01-02)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flake lock file updates:
• Updated input 'darwin':
'github:lnl7/nix-darwin/010a625bd74bc623153344f52f71cc965b31d75a' (2023-12-22)
→ 'github:lnl7/nix-darwin/1a41453cba42a3a1af2fff003be455ddbd75386c' (2023-12-31)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/d65bceaee0fb1e64363f7871bc43dc1c6ecad99f' (2023-12-20)
→ 'github:nixos/nixpkgs/d02d818f22c777aa4e854efc3242ec451e5d462a' (2023-12-25)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/007a45d064c1c32d04e1b8a0de5ef00984c419bc' (2023-12-13)
→ 'github:cachix/pre-commit-hooks.nix/9d3d7e18c6bc4473d7520200d4ddab12f8402d38' (2023-12-30)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flake lock file updates:
• Updated input 'darwin':
'github:lnl7/nix-darwin/4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d' (2023-11-24)
→ 'github:lnl7/nix-darwin/010a625bd74bc623153344f52f71cc965b31d75a' (2023-12-22)
• Updated input 'home-manager':
'github:nix-community/home-manager/1488651d02c1a7a15e284210f0d380a62d8d8cef' (2023-12-17)
→ 'github:nix-community/home-manager/d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224' (2023-12-23)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/40c3c94c241286dd2243ea34d3aef8a488f9e4d0' (2023-12-15)
→ 'github:nixos/nixpkgs/d65bceaee0fb1e64363f7871bc43dc1c6ecad99f' (2023-12-20)
• Updated input 'treefmt-nix':
'github:numtide/treefmt-nix/d06b70e5163a903f19009c3f97770014787a080f' (2023-12-13)
→ 'github:numtide/treefmt-nix/2961375283668d867e64129c22af532de8e77734' (2023-12-19)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 23 to 24.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v23...v24)
---
updated-dependencies:
- dependency-name: cachix/install-nix-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
| |
Flake lock file updates:
• Updated input 'home-manager':
'github:nix-community/home-manager/6761b8188b860f374b457eddfdb05c82eef9752f' (2023-12-10)
→ 'github:nix-community/home-manager/1488651d02c1a7a15e284210f0d380a62d8d8cef' (2023-12-17)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7' (2023-12-12)
→ 'github:nixos/nixpkgs/40c3c94c241286dd2243ea34d3aef8a488f9e4d0' (2023-12-15)
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Now that I've deleted all unused code, I can run this properly.
|
| | |
|
| | |
|
| |
|
|
| |
Delete unused/outdated documentations.
|
| |
|
|
| |
This is a better code than whatever I was doing in the first place.
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
|
| |
|
|
| |
Clean up the yaml file for the GHA.
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flake lock file updates:
• Updated input 'devshell':
'github:numtide/devshell/c3bd77911391eb1638af6ce773de86da57ee6df5' (2023-12-04)
→ 'github:numtide/devshell/44ddedcbcfc2d52a76b64fb6122f209881bd3e1e' (2023-12-05)
• Updated input 'futils':
'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12)
→ 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04)
• Updated input 'home-manager':
'github:nix-community/home-manager/aeb2232d7a32530d3448318790534d196bf9427a' (2023-11-24)
→ 'github:nix-community/home-manager/6761b8188b860f374b457eddfdb05c82eef9752f' (2023-12-10)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/933d7dc155096e7575d207be6fb7792bc9f34f6d' (2023-12-02)
→ 'github:nixos/nixpkgs/cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7' (2023-12-12)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/e5ee5c5f3844550c01d2131096c7271cec5e9b78' (2023-11-25)
→ 'github:cachix/pre-commit-hooks.nix/007a45d064c1c32d04e1b8a0de5ef00984c419bc' (2023-12-13)
• Updated input 'pre-commit-hooks/flake-utils':
'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04)
→ 'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31)
• Updated input 'pre-commit-hooks/nixpkgs-stable':
'github:NixOS/nixpkgs/6386d8aafc28b3a7ed03880a57bdc6eb4465491d' (2023-12-02)
→ 'github:NixOS/nixpkgs/c37ca420157f4abc31e26f436c1145f8951ff373' (2023-06-03)
• Updated input 'treefmt-nix':
'github:numtide/treefmt-nix/e82f32aa7f06bbbd56d7b12186d555223dc399d1' (2023-11-12)
→ 'github:numtide/treefmt-nix/d06b70e5163a903f19009c3f97770014787a080f' (2023-12-13)
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 23 to 24.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v23...v24)
---
updated-dependencies:
- dependency-name: cachix/install-nix-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
|
| | |
|
| | |
|
| |
|
|
| |
These machines are gone, no need to keep the configuration around.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 23 to 24.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v23...v24)
---
updated-dependencies:
- dependency-name: cachix/install-nix-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
|
| |
|
|
| |
As suggested by shellcheck.
|
| | |
|
| |
|
|
|
| |
Move the host configuration to `flake/hosts.nix` to follow what we did
with `devshell`.
|
| | |
|
| |
|
|
|
|
|
|
| |
Update to 23.11 for both nix and home-manager.
Break down the flake in multiple parts (hosts, devshell) so that they
are easier to maintain. The main reason to start this is because `nix
flake check` was failing, the flake was not correct.
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flake lock file updates:
• Updated input 'darwin':
'github:lnl7/nix-darwin/afe83cbc2e673b1f08d32dd0f70df599678ff1e7' (2023-10-27)
→ 'github:lnl7/nix-darwin/4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d' (2023-11-24)
• Updated input 'home-manager':
'github:nix-community/home-manager/07682fff75d41f18327a871088d20af2710d4744' (2023-09-19)
→ 'github:nix-community/home-manager/28535c3a34d79071f2ccb68671971ce0c0984d7e' (2023-11-19)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/ea758da1a6dcde6dc36db348ed690d09b9864128' (2023-11-06)
→ 'github:cachix/pre-commit-hooks.nix/e5ee5c5f3844550c01d2131096c7271cec5e9b78' (2023-11-25)
|
| |
|
|
| |
[1] https://monaspace.githubnext.com
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flake lock file updates:
• Updated input 'darwin':
'github:lnl7/nix-darwin/4496ab26628c5f43d2a5c577a06683c753e32fe2' (2023-09-12)
→ 'github:lnl7/nix-darwin/afe83cbc2e673b1f08d32dd0f70df599678ff1e7' (2023-10-27)
• Updated input 'home-manager':
'github:nix-community/home-manager/9787dffff5d315c9593d3f9fb0f9bf2097e1b57b' (2023-09-11)
→ 'github:nix-community/home-manager/07682fff75d41f18327a871088d20af2710d4744' (2023-09-19)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/e5f018cf150e29aac26c61dac0790ea023c46b24' (2023-09-12)
→ 'github:NixOS/nixpkgs/aeefe2054617cae501809b82b44a8e8f7be7cc4b' (2023-11-05)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/4f883a76282bc28eb952570afc3d8a1bf6f481d7' (2023-09-10)
→ 'github:cachix/pre-commit-hooks.nix/ea758da1a6dcde6dc36db348ed690d09b9864128' (2023-11-06)
|
| |
|
|
| |
I only have one host (the macbook air) to configure.
|
| | |
|
| |
|
|
| |
Enable ssh configuration on darwin.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flake lock file updates:
• Removed input 'emacs-overlay'
• Removed input 'emacs-overlay/flake-utils'
• Removed input 'emacs-overlay/flake-utils/systems'
• Removed input 'emacs-overlay/nixpkgs'
• Removed input 'emacs-overlay/nixpkgs-stable'
• Removed input 'naersk'
• Removed input 'naersk/nixpkgs'
• Removed input 'nur'
• Removed input 'rust'
• Removed input 'rust/flake-utils'
• Removed input 'rust/flake-utils/systems'
• Removed input 'rust/nixpkgs'
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flake lock file updates:
• Updated input 'agenix':
'github:ryantm/agenix/d8c973fd228949736dedf61b7f8cc1ece3236792' (2023-07-24)
→ 'github:ryantm/agenix/20deb735cc405831ba04a0088fecb3887aa255c0' (2023-09-14)
• Updated input 'darwin':
'github:lnl7/nix-darwin/511177ffe8226c78c9cf6a92a7b5f2df3684956b' (2023-08-17)
→ 'github:lnl7/nix-darwin/4496ab26628c5f43d2a5c577a06683c753e32fe2' (2023-09-12)
• Updated input 'emacs-overlay':
'github:nix-community/emacs-overlay/d532507e854bbfb3f311a9f30dcbffaeceeff83f' (2023-09-11)
→ 'github:nix-community/emacs-overlay/918199aeaa2c9b9d0f73e304a187a05b99fd9050' (2023-09-14)
• Updated input 'emacs-overlay/flake-utils':
'github:numtide/flake-utils/f9e7cf818399d17d347f847525c5a5a8032e4e44' (2023-08-23)
→ 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12)
• Updated input 'emacs-overlay/nixpkgs':
'github:NixOS/nixpkgs/db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b' (2023-09-08)
→ 'github:NixOS/nixpkgs/3a2786eea085f040a66ecde1bc3ddc7099f6dbeb' (2023-09-11)
• Updated input 'emacs-overlay/nixpkgs-stable':
'github:NixOS/nixpkgs/4c8cf44c5b9481a4f093f1df3b8b7ba997a7c760' (2023-09-10)
→ 'github:NixOS/nixpkgs/e5f018cf150e29aac26c61dac0790ea023c46b24' (2023-09-12)
• Updated input 'futils':
'github:numtide/flake-utils/f9e7cf818399d17d347f847525c5a5a8032e4e44' (2023-08-23)
→ 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12)
• Updated input 'naersk/nixpkgs':
'github:NixOS/nixpkgs/78058d810644f5ed276804ce7ea9e82d92bee293' (2023-09-10)
→ 'github:NixOS/nixpkgs/1697b7d480449b01111e352021f46e5879e47643' (2023-09-13)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/4c8cf44c5b9481a4f093f1df3b8b7ba997a7c760' (2023-09-10)
→ 'github:NixOS/nixpkgs/e5f018cf150e29aac26c61dac0790ea023c46b24' (2023-09-12)
• Updated input 'nur':
'github:nix-community/NUR/edcd2fecb43eb52963423348caa1301e443eb392' (2023-09-12)
→ 'github:nix-community/NUR/cb2b66a5b85eef0465c7202aaed38773a8c7e4c8' (2023-09-14)
• Updated input 'rust':
'github:oxalica/rust-overlay/f77e108350b821d62b7c2ee43fe411a9f4738099' (2023-09-11)
→ 'github:oxalica/rust-overlay/7c4f46f0b3597e3c4663285e6794194e55574879' (2023-09-14)
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 22 to 23.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v22...v23)
---
updated-dependencies:
- dependency-name: cachix/install-nix-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Add a new network interface on the host (10Gb).
|
| | |
|
| | |
|
| |
|
|
| |
kitty is not clicking for me. I still prefer tmux.
|
| |
|
|
|
|
| |
For some reasons, while google-fonts install noto, emacs was unable to
find it (but was able to find source code pro). List the fonts
explicitly to make emacs happy.
|
| |
|
|
| |
This is so I can use emacs as a client for matrix.
|
| |
|
|
|
|
|
|
| |
Fix the following error:
```
trace: warning: The option `services.openssh.permitRootLogin' defined in `/nix/store/l0n3297c7znfapx32a6av1c26yj042j4-source/profiles/server.nix' has been renamed to `services.openssh.settings.PermitRootLogin'.
trace: warning: The option `services.openssh.passwordAuthentication' defined in `/nix/store/l0n3297c7znfapx32a6av1c26yj042j4-source/profiles/server.nix' has been renamed to `services.openssh.settings.PasswordAuthentication'.
```
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
| |
I got the settings wrong. The `weekly` applies to `nix.gc.dates`,
which is for how often the GC should run. While `nix.gc.options` is to
delete content in the store older than 14 days (in my case).
|
| | |
|
| |
|
|
|
|
|
|
| |
Get a list of failed systemd units (both user and systems), and
generate an output compatible to what waybar expects.
Refer to https://github.com/Alexays/Waybar/wiki/Module:-Custom for
more details about the format.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
| |
If we don't set a default port, with `statusPage` enabled, we can't
start nginx on the router, since we also need to bind to port 80 for the
stream.
|
| | |
|
| |
|
|
|
| |
Add a nginx virtualhost for loki too, so that we can use a valid SSL
certificate.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
| |
It creates the user, ensure sftp is configured correctly, and rsync the
backups to rsync.net once a day.
|
| |
|
|
|
| |
I don't use terraform anymore and GCP services, so I can get rid of
everything there.
|
| | |
|
| |
|
|
|
| |
Note that this is not used by anything yet, as a password needs to be
set first.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
| |
Get rid of configuration that was duplicated (a lot of things are
already handled by the upstream module).
|
| |
|
|
| |
The wrong certificate was served.
|
| |
|
|
| |
I need to set a password.
|
| | |
|
| |
|
|
|
|
| |
Both tahoe and carmel are using nginx, and we can simplify the
configuration by moving common parts to the profile and have these hosts
import it.
|
| |
|
|
| |
It's the only host that uses this code.
|
| |
|
|
| |
The hosts should be explicit about what to import.
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
| |
Add the API key for gandi to the secrest, create a profile for acme with
my defaults.
The profile is loaded by tahoe since that's where our services are
running on.
Update all the servers in nginx to listen on their wireguard interface.
|
| | |
|
| |
|
|
| |
I don't use GPG anymore and I don't read mail in Emacs anymore.
|
| | |
|
| | |
|
| |
|
|
| |
Coming from https://github.com/NixOS/nixos-hardware/blob/51559e691f1493a26f94f1df1aaf516bb507e78b/dell/xps/13-9300/default.nix
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Without this I was seeing the following error:
```
Unknown key Settings in /home/fcuny/.config/gtk-3.0/settings.ini
```
And the configuration contained:
```
[Settings]
Settings=gtk-application-prefer-dark-theme=1
```
|
| |
|
|
|
|
|
|
|
| |
I was getting:
```
Error in configuration at CPU_SCALING_GOVERNOR_ON_AC="schedutil": governor not available. Skipped.
```
Restore to the previous configuration.
|
| |
|
|
| |
Easier on my eyes.
|
| |
|
|
|
| |
This is a major refactor, similar to what was done for the hosts, but in
a single commit.
|
| | |
|
| | |
|
| |
|
|
| |
This remove ssh on workstations. I also drop mosh since I don't use it.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
| |
The NAS and the router are "servers", and we create a base profile for
them.
We add a default profile that will set things that are common to all my
hosts, and we start with the locales.
Update tahoe/carmel to use the server profile.
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
| |
There's too many moving parts and layers of abstractions, for no
benefits: I only have to manage 3-4 machines.
Going to create profiles, move things there, and stop with the `enable`
pattern.
|
| |
|
|
|
| |
This function produces a shell script with dependencies, set the PATH,
set some SHELLOPTS, and check the script with shellcheck.
|
| |
|
|
|
| |
This is to call restic on the nas from a remote machine. It sets
variables and run everything via sudo.
|
| |
|
|
|
| |
I'm not using rclone anymore and I'm not storing the backups to GCS
buckets either.
|
| | |
|
| | |
|
| |
|
|
|
| |
The NAS will rsync all the backups to rsync.net. This new module creates
a systemd unit and timer to do this task.
|
| | |
|
| | |
|
| |
|
|
| |
These keys are stable, they can be set on every hosts.
|
| |
|
|
|
| |
Backups are not synchronized with rclone to gcloud, but instead with
rsync to rsync.net.
|
| |
|
|
|
| |
The path to the restic repository has changed, and we are a bit more
specific about the paths we want to backup.
|
| |
|
|
|
|
|
| |
Configure correctly the systemd unit to run restic on aptos.
Be more specific about the paths we want to backup, instead of backing
up '/home' and maintaining a large exclusion list.
|
| |
|
|
|
|
|
|
|
|
|
| |
For a host to use a repository from a remote machine, we need to
configure options for the CLI. For this we add a new setting
`extraOptions` where we can define the sftp command.
Remove the setting for the user that will run restic, since it's always
'root' in our situation.
Clean some descriptions.
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
The dedicated account for backup should be named 'backup', as it's more
generic.
While it's a system account, I still need to be able to log in the host
remotely with sftp, so we give it a UID (991).
The account needs to be able to sftp to tahoe in order to store the
backups from remote hosts. However we don't want this user to get a
shell and be able to browse the host, so we configure sshd to chroot the
user to where the backups are stored.
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
| |
This is the user I'll be using to do my backups. This is a system user,
and there's only one public key added to it. This key is only used for
backups and will be managed in this repository.
|
| |
|
|
| |
I'm not using anymore sourcegraph drone and gitea.
|
| | |
|
| | |
|
| |
|
|
|
|
|
| |
I don't want to have to deal with authentication and TLS certificates
for these endpoints. If they are only listening on the wireguard
interface I can trust that only authorized hosts are sending traffic to
these endpoints. I trust what's running on these machines.
|
| |
|
|
|
| |
This will help to organize and structure monitoring modules a bit
better.
|
| | |
|
| | |
|
| |
|
|
|
| |
This is now handled by
https://git.fcuny.net/monitoring/commit/?id=b4abbf2d86d06d243b639d06a576f542f3dd5824
|
| |
|
|
| |
This is way too verbose
|
| | |
|
| |
|
|
| |
No need to release the lease if we are rebooting.
|
| | |
|
| | |
|
| |
|
|
| |
It's now managed in https://git.fcuny.net/monitoring/
|
| |
|
|
|
| |
Bind to the wireguard interface, and use the port 8067 (67 is the port
used for DHCP requests).
|
| |
|
|
|
|
| |
The option `dhcp-script` can be used to run a script every time a new
lease is added or deleted. We configure this option to run the script
that generates a static HTML file with the leases.
|
| |
|
|
|
|
|
| |
Parse the file that contains all the leases assigned by dnsmasq, and
create a static HTML page from it. This can be served by nginx to make
it easy to see what IP is assigned to a machine, and which machines are
currently on the network.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
This is managed in the tailscale module.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
I'm not using it as a desktop, and the current router is getting old and
will likely fail in the near future. It's also a debian machine
configured manually, so let's reconfigure carmel as our new router.
There are three NICs in the host: 2 are 10Gb and one is 1Gb. The 1Gb
will be used as the upstream interface, and one of the 10Gb will be for
the LAN.
There are 2 VLANs to configure: one for IoT devices and one for guest.
|
| | |
|
| | |
|
| |
|
|
|
| |
I only need to run sway and the ssh-agent on a workstation (desktop or
laptop). Start these two processes when the window manager starts.
|
| |
|
|
|
|
|
|
|
|
| |
To prevent the unit to be triggered multiple times if the host has
already rebooted, we create a gate file when we're done running, and
before running, we check if the file exists.
Enable the service on tahoe.
Don't restart the unit when its definition has changed.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
fractal requires the gnome key chain but I got rid of it.
|
| |
|
|
|
|
| |
- source code pro for monospace
- dejavu sans for sans serif
- dejavu serif for serif
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
