Compare commits
1 Commits
wip/ccache
...
wip/arm-fl
| Author | SHA1 | Date | |
|---|---|---|---|
| a17ad5fbf2 |
14
.sops.yaml
14
.sops.yaml
@@ -23,7 +23,6 @@ creation_rules:
|
|||||||
key_groups:
|
key_groups:
|
||||||
- age:
|
- age:
|
||||||
- *user_desko_colin
|
- *user_desko_colin
|
||||||
- *user_lappy_colin
|
|
||||||
- *user_servo_colin
|
- *user_servo_colin
|
||||||
- *host_servo
|
- *host_servo
|
||||||
- path_regex: secrets/desko.yaml$
|
- path_regex: secrets/desko.yaml$
|
||||||
@@ -32,16 +31,3 @@ creation_rules:
|
|||||||
- *user_desko_colin
|
- *user_desko_colin
|
||||||
- *user_lappy_colin
|
- *user_lappy_colin
|
||||||
- *host_desko
|
- *host_desko
|
||||||
- path_regex: secrets/lappy.yaml$
|
|
||||||
key_groups:
|
|
||||||
- age:
|
|
||||||
- *user_lappy_colin
|
|
||||||
- *user_desko_colin
|
|
||||||
- *host_lappy
|
|
||||||
- path_regex: secrets/moby.yaml$
|
|
||||||
key_groups:
|
|
||||||
- age:
|
|
||||||
- *user_desko_colin
|
|
||||||
- *user_lappy_colin
|
|
||||||
- *user_moby_colin
|
|
||||||
- *host_moby
|
|
||||||
|
|||||||
16
TODO.md
Normal file
16
TODO.md
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
# features/tweaks
|
||||||
|
- emoji picker application
|
||||||
|
- find a Masto/Pleroma app which works on mobile
|
||||||
|
- remove hardcoded uid/gids outside of allocations.nix (used in impermanence code -- replace with username/groupname)
|
||||||
|
|
||||||
|
|
||||||
|
# speed up cross compiling
|
||||||
|
- <https://nixos.wiki/wiki/Cross_Compiling>
|
||||||
|
- <https://nixos.wiki/wiki/NixOS_on_ARM>
|
||||||
|
```nix
|
||||||
|
overlays = [{ ... }: {
|
||||||
|
nixpkgs.crossSystem.system = "aarch64-linux";
|
||||||
|
}];
|
||||||
|
```
|
||||||
|
- <https://github.com/nix-community/aarch64-build-box>
|
||||||
|
- apply for access to the community arm build box
|
||||||
154
flake.lock
generated
154
flake.lock
generated
@@ -1,28 +1,49 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"flake-utils": {
|
"home-manager": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1659877975,
|
"lastModified": 1656169755,
|
||||||
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
"narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
|
||||||
"owner": "numtide",
|
"owner": "nix-community",
|
||||||
"repo": "flake-utils",
|
"repo": "home-manager",
|
||||||
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
"rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "numtide",
|
"owner": "nix-community",
|
||||||
"repo": "flake-utils",
|
"ref": "release-22.05",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"impermanence": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1661933071,
|
||||||
|
"narHash": "sha256-RFgfzldpbCvS+H2qwH+EvNejvqs+NhPVD5j1I7HQQPY=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "impermanence",
|
||||||
|
"rev": "def994adbdfc28974e87b0e4c949e776207d5557",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "impermanence",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"mobile-nixos": {
|
"mobile-nixos": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1677431790,
|
"lastModified": 1664852186,
|
||||||
"narHash": "sha256-diCr0inBOSQYehHSxYQ2Wb5dYSrLfJYqbH2gJYmSL/c=",
|
"narHash": "sha256-t0FhmTf3qRs8ScR8H9Rq7FAxptNELLSpxZG2ALL1HnE=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "mobile-nixos",
|
"repo": "mobile-nixos",
|
||||||
"rev": "c252e7bd9122704f0e0303c638f8b8412c2521c2",
|
"rev": "ca872f1a617674c4045e880aab8a45037e73700b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -31,93 +52,89 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nix-serve": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1675958846,
|
|
||||||
"narHash": "sha256-/nf09eM2vey9GrAXoqagccJrBo/fGyVKP7oNSxPqwdo=",
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "nix-serve",
|
|
||||||
"rev": "7089565e260267c9c234a81292c841958737cef6",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "nix-serve",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1606086654,
|
"lastModified": 1665081174,
|
||||||
"narHash": "sha256-VFl+3eGIMqNp7cyOMJ6TjM/+UcsLKtodKoYexrlTJMI=",
|
"narHash": "sha256-6hsmzdhdy8Kbvl5e0xZNE83pW3fKQvNiobJkM6KQrgA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "19db3e5ea2777daa874563b5986288151f502e27",
|
"rev": "598f83ebeb2235435189cf84d844b8b73e858e0f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "nixpkgs",
|
"id": "nixpkgs",
|
||||||
"ref": "nixos-20.09",
|
"ref": "nixos-unstable",
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-22_05": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1665279158,
|
||||||
|
"narHash": "sha256-TpbWNzoJ5RaZ302dzvjY2o//WxtOJuYT3CnDj5N69Hs=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "b3783bcfb8ec54e0de26feccfc6cc36b8e202ed5",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "release-22.05",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1677367679,
|
"lastModified": 1665132027,
|
||||||
"narHash": "sha256-pOMXi7F9tcHls06Qv+7XCPASTJeXu47Jhd0Pk9du8T4=",
|
"narHash": "sha256-zoHPqSQSENt96zTk6Mt1AP+dMNqQDshXKQ4I6MfjP80=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ea736343e4d4a052e023d54b23334cf685de479c",
|
"rev": "9ecc270f02b09b2f6a76b98488554dd842797357",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"id": "nixpkgs",
|
||||||
"ref": "release-22.11",
|
"ref": "nixos-22.05",
|
||||||
"repo": "nixpkgs",
|
"type": "indirect"
|
||||||
"type": "github"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unpatched": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1676569297,
|
"lastModified": 1665197809,
|
||||||
"narHash": "sha256-2n4C4H3/U+3YbDrQB6xIw7AaLdFISCCFwOkcETAigqU=",
|
"narHash": "sha256-dRUzv/zNYV2EYtnxFG31pPBk0nErT+MBTu6ZJHm1o2A=",
|
||||||
"owner": "nixos",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ac1f5b72a9e95873d1de0233fddcb56f99884b37",
|
"rev": "7b06206fa24198912cea58de690aa4943f238fbf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixpkgs-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"home-manager": "home-manager",
|
||||||
|
"impermanence": "impermanence",
|
||||||
"mobile-nixos": "mobile-nixos",
|
"mobile-nixos": "mobile-nixos",
|
||||||
"nix-serve": "nix-serve",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-unpatched": "nixpkgs-unpatched",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix"
|
||||||
"uninsane-dot-org": "uninsane-dot-org"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sops-nix": {
|
"sops-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nixpkgs-unpatched"
|
"nixpkgs-22_05": "nixpkgs-22_05"
|
||||||
],
|
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1677381477,
|
"lastModified": 1665289655,
|
||||||
"narHash": "sha256-NLzWgll+Q0Af8gI1ha34OHt7Y1GtOMYhCWQWV9LXE9Y=",
|
"narHash": "sha256-j1Q9mNBhbzeJykhObiXwEGres9qvP4vH7gxdJ+ihkLI=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "83fe25c8019db8216f5c6ffc65b394707784b4f3",
|
"rev": "0ce0449e6404c4ff9d1b7bd657794ae5ca54deb3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -125,27 +142,6 @@
|
|||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"uninsane-dot-org": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": "flake-utils",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs-unpatched"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1675131883,
|
|
||||||
"narHash": "sha256-yBgJDG72YqIr1bltasqHD1E/kHc9uRFgDjxDmy6kI8M=",
|
|
||||||
"ref": "refs/heads/master",
|
|
||||||
"rev": "b099c24091cc192abf3997b94342d4b31cc5757b",
|
|
||||||
"revCount": 170,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.uninsane.org/colin/uninsane"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.uninsane.org/colin/uninsane"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|||||||
304
flake.nix
304
flake.nix
@@ -1,144 +1,71 @@
|
|||||||
# FLAKE FEEDBACK:
|
# docs:
|
||||||
# - if flake inputs are meant to be human-readable, a human should be able to easily track them down given the URL.
|
# - <https://nixos.wiki/wiki/Flakes>
|
||||||
# - this is not the case with registry URLs, like `nixpkgs/nixos-22.11`.
|
|
||||||
# - this is marginally the case with schemes like `github:nixos/nixpkgs`.
|
|
||||||
# - given the *existing* `git+https://` scheme, i propose expressing github URLs similarly:
|
|
||||||
# - `github+https://github.com/nixos/nixpkgs/tree/nixos-22.11`
|
|
||||||
# - need some way to apply local patches to inputs.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# DEVELOPMENT DOCS:
|
|
||||||
# - Flake docs: <https://nixos.wiki/wiki/Flakes>
|
|
||||||
# - Flake RFC: <https://github.com/tweag/rfcs/blob/flakes/rfcs/0049-flakes.md>
|
|
||||||
# - Discussion: <https://github.com/NixOS/rfcs/pull/49>
|
|
||||||
# - <https://serokell.io/blog/practical-nix-flakes>
|
# - <https://serokell.io/blog/practical-nix-flakes>
|
||||||
|
|
||||||
{
|
{
|
||||||
# XXX: use the `github:` scheme instead of the more readable git+https: because it's *way* more efficient
|
|
||||||
# preferably, i would rewrite the human-readable https URLs to nix-specific github: URLs with a helper,
|
|
||||||
# but `inputs` is required to be a strict attrset: not an expression.
|
|
||||||
inputs = {
|
inputs = {
|
||||||
# <https://github.com/nixos/nixpkgs/tree/nixos-22.11>
|
nixpkgs-stable.url = "nixpkgs/nixos-22.05";
|
||||||
# nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-22.11";
|
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
# <https://github.com/nixos/nixpkgs/tree/nixos-unstable>
|
|
||||||
nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
|
||||||
|
|
||||||
# nixpkgs = {
|
|
||||||
# url = "./nixpatches";
|
|
||||||
# inputs.nixpkgs.follows = "nixpkgs-unpatched";
|
|
||||||
# };
|
|
||||||
|
|
||||||
mobile-nixos = {
|
mobile-nixos = {
|
||||||
# <https://github.com/nixos/mobile-nixos>
|
|
||||||
url = "github:nixos/mobile-nixos";
|
url = "github:nixos/mobile-nixos";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
sops-nix = {
|
home-manager = {
|
||||||
# <https://github.com/Mic92/sops-nix>
|
url = "github:nix-community/home-manager/release-22.05";
|
||||||
url = "github:Mic92/sops-nix";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
# inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs-unpatched";
|
|
||||||
};
|
|
||||||
uninsane-dot-org = {
|
|
||||||
url = "git+https://git.uninsane.org/colin/uninsane";
|
|
||||||
# inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs-unpatched";
|
|
||||||
};
|
|
||||||
nix-serve = {
|
|
||||||
# <https://github.com/edolstra/nix-serve>
|
|
||||||
url = "github:edolstra/nix-serve";
|
|
||||||
};
|
};
|
||||||
|
# TODO: set these up to follow our nixpkgs?
|
||||||
|
sops-nix.url = "github:Mic92/sops-nix";
|
||||||
|
impermanence.url = "github:nix-community/impermanence";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = {
|
outputs = { self, nixpkgs, nixpkgs-stable, mobile-nixos, home-manager, sops-nix, impermanence }:
|
||||||
self,
|
let
|
||||||
nixpkgs-unpatched,
|
patchedPkgs = system: nixpkgs.legacyPackages.${system}.applyPatches {
|
||||||
mobile-nixos,
|
name = "nixpkgs-patched-uninsane";
|
||||||
sops-nix,
|
src = nixpkgs;
|
||||||
uninsane-dot-org,
|
patches = import ./nixpatches/list.nix nixpkgs.legacyPackages.${system}.fetchpatch;
|
||||||
nix-serve,
|
};
|
||||||
...
|
# return something which behaves like `pkgs`, for the provided system
|
||||||
}@inputs:
|
# `local` = architecture of builder. `target` = architecture of the system beying deployed to
|
||||||
|
nixpkgsFor = local: target: import (patchedPkgs target) { crossSystem = target; localSystem = local; };
|
||||||
|
# evaluate ONLY our overlay, for the provided system
|
||||||
|
customPackagesFor = local: target: import ./pkgs/overlay.nix (nixpkgsFor local target) (nixpkgsFor local target);
|
||||||
|
decl-machine = { name, local, target }:
|
||||||
let
|
let
|
||||||
inherit (builtins) attrNames listToAttrs map mapAttrs;
|
nixosSystem = import ((patchedPkgs target) + "/nixos/lib/eval-config.nix");
|
||||||
mapAttrs' = f: set:
|
in (nixosSystem {
|
||||||
listToAttrs (map (attr: f attr set.${attr}) (attrNames set));
|
# by default the local system is the same as the target, employing emulation when they differ
|
||||||
# mapAttrs but without the `name` argument
|
system = target;
|
||||||
mapAttrValues = f: mapAttrs (_: f);
|
specialArgs = { inherit mobile-nixos home-manager impermanence; };
|
||||||
# rather than apply our nixpkgs patches as a flake input, do that here instead.
|
modules = [
|
||||||
# this (temporarily?) resolves the bad UX wherein a subflake residing in the same git
|
./modules
|
||||||
# repo as the main flake causes the main flake to have an unstable hash.
|
./machines/${name}
|
||||||
nixpkgs = (import ./nixpatches/flake.nix).outputs {
|
(import ./helpers/set-hostname.nix name)
|
||||||
self = nixpkgs;
|
home-manager.nixosModule
|
||||||
nixpkgs = nixpkgs-unpatched;
|
impermanence.nixosModule
|
||||||
};
|
sops-nix.nixosModules.sops
|
||||||
|
{
|
||||||
nixpkgsCompiledBy = local: nixpkgs.legacyPackages."${local}";
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
nixpkgs.overlays = [
|
||||||
evalHost = { name, local, target }:
|
(import "${mobile-nixos}/overlay/overlay.nix")
|
||||||
let
|
(import ./pkgs/overlay.nix)
|
||||||
# XXX: we'd prefer to use `nixosSystem = (nixpkgsCompiledBy target).nixos`
|
(next: prev: rec {
|
||||||
# but it doesn't propagate config to the underlying pkgs, meaning it doesn't let you use
|
# non-emulated packages build *from* local *for* target.
|
||||||
# non-free packages even after setting nixpkgs.allowUnfree.
|
# for large packages like the linux kernel which are expensive to build under emulation,
|
||||||
# XXX: patch using the target -- not local -- otherwise the target will
|
# the config can explicitly pull such packages from `pkgs.cross` to do more efficient cross-compilation.
|
||||||
# need to emulate the host in order to rebuild!
|
cross = (nixpkgsFor local target) // (customPackagesFor local target);
|
||||||
nixosSystem = import ((nixpkgsCompiledBy target).path + "/nixos/lib/eval-config.nix");
|
stable = import nixpkgs-stable { system = target; };
|
||||||
in
|
# pinned packages:
|
||||||
(nixosSystem {
|
electrum = stable.electrum;
|
||||||
modules = [
|
|
||||||
(import ./hosts/instantiate.nix { localSystem = local; hostName = name; })
|
|
||||||
self.nixosModules.default
|
|
||||||
self.nixosModules.passthru
|
|
||||||
{
|
|
||||||
nixpkgs.overlays = [
|
|
||||||
self.overlays.default
|
|
||||||
self.overlays.passthru
|
|
||||||
self.overlays.pins
|
|
||||||
# self.overlays.optimizations
|
|
||||||
];
|
|
||||||
nixpkgs.hostPlatform = target;
|
|
||||||
# nixpkgs.buildPlatform = local; # set by instantiate.nix instead
|
|
||||||
# nixpkgs.config.replaceStdenv = { pkgs }: pkgs.ccacheStdenv;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
});
|
|
||||||
in {
|
|
||||||
nixosConfigurations =
|
|
||||||
let
|
|
||||||
hosts = {
|
|
||||||
servo = { name = "servo"; local = "x86_64-linux"; target = "x86_64-linux"; };
|
|
||||||
desko = { name = "desko"; local = "x86_64-linux"; target = "x86_64-linux"; };
|
|
||||||
lappy = { name = "lappy"; local = "x86_64-linux"; target = "x86_64-linux"; };
|
|
||||||
moby = { name = "moby"; local = "x86_64-linux"; target = "aarch64-linux"; };
|
|
||||||
rescue = { name = "rescue"; local = "x86_64-linux"; target = "x86_64-linux"; };
|
|
||||||
};
|
|
||||||
# cross-compiled builds: instead of emulating the host, build using a cross-compiler.
|
|
||||||
# - these are faster to *build* than the emulated variants (useful when tweaking packages),
|
|
||||||
# - but fewer of their packages can be found in upstream caches.
|
|
||||||
cross = mapAttrValues evalHost hosts;
|
|
||||||
emulated = mapAttrValues
|
|
||||||
({name, local, target}: evalHost {
|
|
||||||
inherit name target;
|
|
||||||
local = null;
|
|
||||||
})
|
})
|
||||||
hosts;
|
];
|
||||||
prefixAttrs = prefix: attrs: mapAttrs'
|
}
|
||||||
(name: value: {
|
];
|
||||||
name = prefix + name;
|
});
|
||||||
inherit value;
|
|
||||||
})
|
|
||||||
attrs;
|
|
||||||
in
|
|
||||||
(prefixAttrs "cross-" cross) //
|
|
||||||
(prefixAttrs "emulated-" emulated) // {
|
|
||||||
# prefer native builds for these machines:
|
|
||||||
inherit (emulated) servo desko lappy rescue;
|
|
||||||
# prefer cross-compiled builds for these machines:
|
|
||||||
inherit (cross) moby;
|
|
||||||
};
|
|
||||||
|
|
||||||
# unofficial output
|
decl-bootable-machine = { name, local, target }: rec {
|
||||||
|
nixosConfiguration = decl-machine { inherit name local target; };
|
||||||
# this produces a EFI-bootable .img file (GPT with a /boot partition and a system (/ or /nix) partition).
|
# this produces a EFI-bootable .img file (GPT with a /boot partition and a system (/ or /nix) partition).
|
||||||
# after building this:
|
# after building this:
|
||||||
# - flash it to a bootable medium (SD card, flash drive, HDD)
|
# - flash it to a bootable medium (SD card, flash drive, HDD)
|
||||||
@@ -151,111 +78,24 @@
|
|||||||
# - boot
|
# - boot
|
||||||
# - if fs wasn't resized automatically, then `sudo btrfs filesystem resize max /`
|
# - if fs wasn't resized automatically, then `sudo btrfs filesystem resize max /`
|
||||||
# - checkout this flake into /etc/nixos AND UPDATE THE FS UUIDS.
|
# - checkout this flake into /etc/nixos AND UPDATE THE FS UUIDS.
|
||||||
# - `nixos-rebuild --flake './#<host>' switch`
|
# - `nixos-rebuild --flake './#<machine>' switch`
|
||||||
imgs = mapAttrValues (host: host.config.system.build.img) self.nixosConfigurations;
|
img = nixosConfiguration.config.system.build.img;
|
||||||
|
|
||||||
# unofficial output
|
|
||||||
host-pkgs = mapAttrValues (host: host.config.system.build.pkgs) self.nixosConfigurations;
|
|
||||||
|
|
||||||
overlays = rec {
|
|
||||||
default = pkgs;
|
|
||||||
pkgs = import ./overlays/pkgs.nix;
|
|
||||||
pins = import ./overlays/pins.nix; # TODO: move to `nixpatches/` input
|
|
||||||
optimizations = import ./overlays/optimizations.nix;
|
|
||||||
passthru =
|
|
||||||
let
|
|
||||||
stable =
|
|
||||||
if inputs ? "nixpkgs-stable" then (
|
|
||||||
next: prev: {
|
|
||||||
stable = inputs.nixpkgs-stable.legacyPackages."${prev.stdenv.hostPlatform.system}";
|
|
||||||
}
|
|
||||||
) else (next: prev: {});
|
|
||||||
mobile = (import "${mobile-nixos}/overlay/overlay.nix");
|
|
||||||
uninsane = uninsane-dot-org.overlay;
|
|
||||||
# nix-serve' = nix-serve.overlay;
|
|
||||||
nix-serve' = next: prev: {
|
|
||||||
# XXX(2023/03/02): upstream isn't compatible with modern `nix`. probably the perl bindings.
|
|
||||||
# - we use the package built against `nixpkgs` specified in its flake rather than use its overlay,
|
|
||||||
# to get around this.
|
|
||||||
inherit (nix-serve.packages."${next.system}") nix-serve;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
next: prev:
|
|
||||||
(stable next prev)
|
|
||||||
// (mobile next prev)
|
|
||||||
// (uninsane next prev)
|
|
||||||
// (nix-serve' next prev)
|
|
||||||
;
|
|
||||||
};
|
|
||||||
|
|
||||||
nixosModules = rec {
|
|
||||||
default = sane;
|
|
||||||
sane = import ./modules;
|
|
||||||
passthru = { ... }: {
|
|
||||||
imports = [
|
|
||||||
sops-nix.nixosModules.sops
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# this includes both our native packages and all the nixpkgs packages.
|
|
||||||
legacyPackages =
|
|
||||||
let
|
|
||||||
allPkgsFor = sys: (nixpkgsCompiledBy sys).appendOverlays [
|
|
||||||
self.overlays.passthru self.overlays.pkgs
|
|
||||||
];
|
|
||||||
in {
|
|
||||||
x86_64-linux = allPkgsFor "x86_64-linux";
|
|
||||||
aarch64-linux = allPkgsFor "aarch64-linux";
|
|
||||||
};
|
|
||||||
|
|
||||||
# extract only our own packages from the full set
|
|
||||||
packages = mapAttrValues
|
|
||||||
(full: full.sane // { inherit (full) sane uninsane-dot-org; })
|
|
||||||
self.legacyPackages;
|
|
||||||
|
|
||||||
apps."x86_64-linux" =
|
|
||||||
let
|
|
||||||
pkgs = self.legacyPackages."x86_64-linux";
|
|
||||||
deployScript = action: pkgs.writeShellScript "deploy-moby" ''
|
|
||||||
nixos-rebuild --flake '.#cross-moby' build
|
|
||||||
sudo nix sign-paths -r -k /run/secrets/nix_serve_privkey $(readlink ./result)
|
|
||||||
nixos-rebuild --flake '.#cross-moby' ${action} --target-host colin@moby --use-remote-sudo
|
|
||||||
'';
|
|
||||||
in {
|
|
||||||
update-feeds = {
|
|
||||||
type = "app";
|
|
||||||
program = "${pkgs.feeds.passthru.updateScript}";
|
|
||||||
};
|
|
||||||
|
|
||||||
init-feed = {
|
|
||||||
# use like `nix run '.#init-feed' uninsane.org`
|
|
||||||
type = "app";
|
|
||||||
program = "${pkgs.feeds.passthru.initFeedScript}";
|
|
||||||
};
|
|
||||||
|
|
||||||
deploy-moby-test = {
|
|
||||||
# `nix run '.#deploy-moby-test'`
|
|
||||||
type = "app";
|
|
||||||
program = ''${deployScript "test"}'';
|
|
||||||
};
|
|
||||||
deploy-moby-switch = {
|
|
||||||
# `nix run '.#deploy-moby-switch'`
|
|
||||||
type = "app";
|
|
||||||
program = ''${deployScript "switch"}'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
templates = {
|
|
||||||
python-data = {
|
|
||||||
# initialize with:
|
|
||||||
# - `nix flake init -t '/home/colin/dev/nixos/#python-data'`
|
|
||||||
# then enter with:
|
|
||||||
# - `nix develop`
|
|
||||||
path = ./templates/python-data;
|
|
||||||
description = "python environment for data processing";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
machines.servo = decl-bootable-machine { name = "servo"; local = "aarch64-linux"; target = "aarch64-linux"; };
|
||||||
|
machines.desko = decl-bootable-machine { name = "desko"; local = "x86_64-linux"; target = "x86_64-linux"; };
|
||||||
|
machines.lappy = decl-bootable-machine { name = "lappy"; local = "x86_64-linux"; target = "x86_64-linux"; };
|
||||||
|
machines.moby = decl-bootable-machine { name = "moby"; local = "aarch64-linux"; target = "aarch64-linux"; };
|
||||||
|
# special cross-compiled variant, to speed up deploys from an x86 box to the arm target
|
||||||
|
# note that these *do* produce different store paths, because the closure for the tools used to cross compile
|
||||||
|
# v.s. emulate differ.
|
||||||
|
# so deploying moby-cross and then moby incurs some rebuilding.
|
||||||
|
machines.moby-cross = decl-bootable-machine { name = "moby"; local = "x86_64-linux"; target = "aarch64-linux"; };
|
||||||
|
machines.rescue = decl-bootable-machine { name = "rescue"; local = "x86_64-linux"; target = "x86_64-linux"; };
|
||||||
|
in {
|
||||||
|
nixosConfigurations = builtins.mapAttrs (name: value: value.nixosConfiguration) machines;
|
||||||
|
imgs = builtins.mapAttrs (name: value: value.img) machines;
|
||||||
|
packages.x86_64-linux = customPackagesFor "x86_64-linux" "x86_64-linux";
|
||||||
|
packages.aarch64-linux = customPackagesFor "aarch64-linux" "aarch64-linux";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
4
helpers/set-hostname.nix
Normal file
4
helpers/set-hostname.nix
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
hostName: { ... }:
|
||||||
|
{
|
||||||
|
networking.hostName = hostName;
|
||||||
|
}
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./fs.nix
|
|
||||||
./net.nix
|
|
||||||
./secrets.nix
|
|
||||||
./services
|
|
||||||
];
|
|
||||||
|
|
||||||
sane.programs = {
|
|
||||||
# for administering services
|
|
||||||
freshrss.enableFor.user.colin = true;
|
|
||||||
matrix-synapse.enableFor.user.colin = true;
|
|
||||||
signaldctl.enableFor.user.colin = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.roles.build-machine = true;
|
|
||||||
sane.persist.enable = true;
|
|
||||||
sane.services.dyn-dns.enable = true;
|
|
||||||
sane.services.wg-home.enable = true;
|
|
||||||
sane.services.wg-home.ip = config.sane.hosts.by-name."servo".wg-home.ip;
|
|
||||||
# sane.services.duplicity.enable = true; # TODO: re-enable after HW upgrade
|
|
||||||
|
|
||||||
# automatically log in at the virtual consoles.
|
|
||||||
# using root here makes sure we always have an escape hatch
|
|
||||||
services.getty.autologinUser = "root";
|
|
||||||
|
|
||||||
boot.loader.efi.canTouchEfiVariables = false;
|
|
||||||
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
|
|
||||||
|
|
||||||
# both transmission and ipfs try to set different net defaults.
|
|
||||||
# we just use the most aggressive of the two here:
|
|
||||||
boot.kernel.sysctl = {
|
|
||||||
"net.core.rmem_max" = 4194304; # 4MB
|
|
||||||
};
|
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
|
||||||
# settings for stateful data, like file locations and database versions
|
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
|
||||||
# this value at the release version of the first install of this system.
|
|
||||||
# Before changing this value read the documentation for this option
|
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
|
||||||
system.stateVersion = "21.11";
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
{ ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
sane.persist.root-on-tmpfs = true;
|
|
||||||
# we need a /tmp for building large nix things
|
|
||||||
fileSystems."/tmp" = {
|
|
||||||
device = "none";
|
|
||||||
fsType = "tmpfs";
|
|
||||||
options = [
|
|
||||||
"mode=777"
|
|
||||||
"defaults"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/nix" = {
|
|
||||||
device = "/dev/disk/by-uuid/cc81cca0-3cc7-4d82-a00c-6243af3e7776";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [
|
|
||||||
"compress=zstd"
|
|
||||||
"defaults"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
|
||||||
device = "/dev/disk/by-uuid/6EE3-4171";
|
|
||||||
fsType = "vfat";
|
|
||||||
};
|
|
||||||
|
|
||||||
# slow, external storage (for archiving, etc)
|
|
||||||
fileSystems."/mnt/persist/ext" = {
|
|
||||||
device = "/dev/disk/by-uuid/aa272cff-0fcc-498e-a4cb-0d95fb60631b";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [
|
|
||||||
"compress=zstd"
|
|
||||||
"defaults"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.persist.stores."ext" = {
|
|
||||||
origin = "/mnt/persist/ext/persist";
|
|
||||||
storeDescription = "external HDD storage";
|
|
||||||
};
|
|
||||||
sane.fs."/mnt/persist/ext".mount = {};
|
|
||||||
|
|
||||||
sane.persist.sys.plaintext = [
|
|
||||||
# TODO: this is overly broad; only need media and share directories to be persisted
|
|
||||||
{ user = "colin"; group = "users"; directory = "/var/lib/uninsane"; }
|
|
||||||
];
|
|
||||||
# make sure large media is stored to the HDD
|
|
||||||
sane.persist.sys.ext = [
|
|
||||||
{
|
|
||||||
user = "colin";
|
|
||||||
group = "users";
|
|
||||||
mode = "0777";
|
|
||||||
directory = "/var/lib/uninsane/media/Videos";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
user = "colin";
|
|
||||||
group = "users";
|
|
||||||
mode = "0777";
|
|
||||||
directory = "/var/lib/uninsane/media/freeleech";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
# in-memory compressed RAM (seems to be dynamically sized)
|
|
||||||
# zramSwap = {
|
|
||||||
# enable = true;
|
|
||||||
# };
|
|
||||||
|
|
||||||
# btrfs doesn't easily support swapfiles
|
|
||||||
# swapDevices = [
|
|
||||||
# { device = "/nix/persist/swapfile"; size = 4096; }
|
|
||||||
# ];
|
|
||||||
|
|
||||||
# this can be a partition. create with:
|
|
||||||
# fdisk <dev>
|
|
||||||
# n
|
|
||||||
# <default partno>
|
|
||||||
# <start>
|
|
||||||
# <end>
|
|
||||||
# t
|
|
||||||
# <partno>
|
|
||||||
# 19 # set part type to Linux swap
|
|
||||||
# w # write changes
|
|
||||||
# mkswap -L swap <part>
|
|
||||||
# swapDevices = [
|
|
||||||
# {
|
|
||||||
# label = "swap";
|
|
||||||
# # TODO: randomEncryption.enable = true;
|
|
||||||
# }
|
|
||||||
# ];
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,209 +0,0 @@
|
|||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
networking.domain = "uninsane.org";
|
|
||||||
|
|
||||||
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
|
|
||||||
# Per-interface useDHCP will be mandatory in the future, so this generated config
|
|
||||||
# replicates the default behaviour.
|
|
||||||
networking.useDHCP = false;
|
|
||||||
networking.interfaces.eth0.useDHCP = true;
|
|
||||||
# XXX colin: probably don't need this. wlan0 won't be populated unless i touch a value in networking.interfaces.wlan0
|
|
||||||
networking.wireless.enable = false;
|
|
||||||
|
|
||||||
# networking.firewall.enable = false;
|
|
||||||
networking.firewall.enable = true;
|
|
||||||
|
|
||||||
# this is needed to forward packets from the VPN to the host
|
|
||||||
boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
|
|
||||||
|
|
||||||
# unless we add interface-specific settings for each VPN, we have to define nameservers globally.
|
|
||||||
# networking.nameservers = [
|
|
||||||
# "1.1.1.1"
|
|
||||||
# "9.9.9.9"
|
|
||||||
# ];
|
|
||||||
|
|
||||||
# use systemd's stub resolver.
|
|
||||||
# /etc/resolv.conf isn't sophisticated enough to use different servers per net namespace (or link).
|
|
||||||
# instead, running the stub resolver on a known address in the root ns lets us rewrite packets
|
|
||||||
# in the ovnps namespace to use the provider's DNS resolvers.
|
|
||||||
# a weakness is we can only query 1 NS at a time (unless we were to clone the packets?)
|
|
||||||
# there also seems to be some cache somewhere that's shared between the two namespaces.
|
|
||||||
# i think this is a libc thing. might need to leverage proper cgroups to _really_ kill it.
|
|
||||||
# - getent ahostsv4 www.google.com
|
|
||||||
# - try fix: <https://serverfault.com/questions/765989/connect-to-3rd-party-vpn-server-but-dont-use-it-as-the-default-route/766290#766290>
|
|
||||||
services.resolved.enable = true;
|
|
||||||
networking.nameservers = [
|
|
||||||
# use systemd-resolved resolver
|
|
||||||
# full resolver (which understands /etc/hosts) lives on 127.0.0.53
|
|
||||||
# stub resolver (just forwards upstream) lives on 127.0.0.54
|
|
||||||
"127.0.0.53"
|
|
||||||
];
|
|
||||||
|
|
||||||
# nscd -- the Name Service Caching Daemon -- caches DNS query responses
|
|
||||||
# in a way that's unaware of my VPN routing, so routes are frequently poor against
|
|
||||||
# services which advertise different IPs based on geolocation.
|
|
||||||
# nscd claims to be usable without a cache, but in practice i can't get it to not cache!
|
|
||||||
# nsncd is the Name Service NON-Caching Daemon. it's a drop-in that doesn't cache;
|
|
||||||
# this is OK on the host -- because systemd-resolved caches. it's probably sub-optimal
|
|
||||||
# in the netns and we query upstream DNS more often than needed. hm.
|
|
||||||
# TODO: run a separate recursive resolver in each namespace.
|
|
||||||
services.nscd.enableNsncd = true;
|
|
||||||
|
|
||||||
# services.resolved.extraConfig = ''
|
|
||||||
# # docs: `man resolved.conf`
|
|
||||||
# # DNS servers to use via the `wg-ovpns` interface.
|
|
||||||
# # i hope that from the root ns, these aren't visible.
|
|
||||||
# DNS=46.227.67.134%wg-ovpns 192.165.9.158%wg-ovpns
|
|
||||||
# FallbackDNS=1.1.1.1 9.9.9.9
|
|
||||||
# '';
|
|
||||||
|
|
||||||
# OVPN CONFIG (https://www.ovpn.com):
|
|
||||||
# DOCS: https://nixos.wiki/wiki/WireGuard
|
|
||||||
# if you `systemctl restart wireguard-wg-ovpns`, make sure to also restart any other services in `NetworkNamespacePath = .../ovpns`.
|
|
||||||
# TODO: why not create the namespace as a seperate operation (nix config for that?)
|
|
||||||
networking.wireguard.enable = true;
|
|
||||||
networking.wireguard.interfaces.wg-ovpns = let
|
|
||||||
ip = "${pkgs.iproute2}/bin/ip";
|
|
||||||
in-ns = "${ip} netns exec ovpns";
|
|
||||||
iptables = "${pkgs.iptables}/bin/iptables";
|
|
||||||
veth-host-ip = "10.0.1.5";
|
|
||||||
veth-local-ip = "10.0.1.6";
|
|
||||||
vpn-ip = "185.157.162.178";
|
|
||||||
# DNS = 46.227.67.134, 192.165.9.158, 2a07:a880:4601:10f0:cd45::1, 2001:67c:750:1:cafe:cd45::1
|
|
||||||
vpn-dns = "46.227.67.134";
|
|
||||||
in {
|
|
||||||
privateKeyFile = config.sops.secrets.wg_ovpns_privkey.path;
|
|
||||||
# wg is active only in this namespace.
|
|
||||||
# run e.g. ip netns exec ovpns <some command like ping/curl/etc, it'll go through wg>
|
|
||||||
# sudo ip netns exec ovpns ping www.google.com
|
|
||||||
interfaceNamespace = "ovpns";
|
|
||||||
ips = [
|
|
||||||
"185.157.162.178/32"
|
|
||||||
];
|
|
||||||
peers = [
|
|
||||||
{
|
|
||||||
publicKey = "SkkEZDCBde22KTs/Hc7FWvDBfdOCQA4YtBEuC3n5KGs=";
|
|
||||||
endpoint = "185.157.162.10:9930";
|
|
||||||
# alternatively: use hostname, but that presents bootstrapping issues (e.g. if host net flakes)
|
|
||||||
# endpoint = "vpn36.prd.amsterdam.ovpn.com:9930";
|
|
||||||
allowedIPs = [ "0.0.0.0/0" ];
|
|
||||||
# nixOS says this is important for keeping NATs active
|
|
||||||
persistentKeepalive = 25;
|
|
||||||
# re-executes wg this often. docs hint that this might help wg notice DNS/hostname changes.
|
|
||||||
# so, maybe that helps if we specify endpoint as a domain name
|
|
||||||
# dynamicEndpointRefreshSeconds = 30;
|
|
||||||
# when refresh fails, try it again after this period instead.
|
|
||||||
# TODO: not avail until nixpkgs upgrade
|
|
||||||
# dynamicEndpointRefreshRestartSeconds = 5;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
preSetup = "" + ''
|
|
||||||
${ip} netns add ovpns || echo "ovpns already exists"
|
|
||||||
'';
|
|
||||||
postShutdown = "" + ''
|
|
||||||
${in-ns} ip link del ovpns-veth-b || echo "couldn't delete ovpns-veth-b"
|
|
||||||
${ip} link del ovpns-veth-a || echo "couldn't delete ovpns-veth-a"
|
|
||||||
${ip} netns delete ovpns || echo "couldn't delete ovpns"
|
|
||||||
# restore rules/routes
|
|
||||||
${ip} rule del from ${veth-host-ip} lookup ovpns pref 50 || echo "couldn't delete init -> ovpns rule"
|
|
||||||
${ip} route del default via ${veth-local-ip} dev ovpns-veth-a proto kernel src ${veth-host-ip} metric 1002 table ovpns || echo "couldn't delete init -> ovpns route"
|
|
||||||
${ip} rule add from all lookup local pref 0
|
|
||||||
${ip} rule del from all lookup local pref 100
|
|
||||||
'';
|
|
||||||
postSetup = "" + ''
|
|
||||||
# DOCS:
|
|
||||||
# - some of this approach is described here: <https://josephmuia.ca/2018-05-16-net-namespaces-veth-nat/>
|
|
||||||
# - iptables primer: <https://danielmiessler.com/study/iptables/>
|
|
||||||
# create veth pair
|
|
||||||
${ip} link add ovpns-veth-a type veth peer name ovpns-veth-b
|
|
||||||
${ip} addr add ${veth-host-ip}/24 dev ovpns-veth-a
|
|
||||||
${ip} link set ovpns-veth-a up
|
|
||||||
|
|
||||||
# mv veth-b into the ovpns namespace
|
|
||||||
${ip} link set ovpns-veth-b netns ovpns
|
|
||||||
${in-ns} ip addr add ${veth-local-ip}/24 dev ovpns-veth-b
|
|
||||||
${in-ns} ip link set ovpns-veth-b up
|
|
||||||
|
|
||||||
# make it so traffic originating from the host side of the veth
|
|
||||||
# is sent over the veth no matter its destination.
|
|
||||||
${ip} rule add from ${veth-host-ip} lookup ovpns pref 50
|
|
||||||
# for traffic originating at the host veth to the WAN, use the veth as our gateway
|
|
||||||
# not sure if the metric 1002 matters.
|
|
||||||
${ip} route add default via ${veth-local-ip} dev ovpns-veth-a proto kernel src ${veth-host-ip} metric 1002 table ovpns
|
|
||||||
# give the default route lower priority
|
|
||||||
${ip} rule add from all lookup local pref 100
|
|
||||||
${ip} rule del from all lookup local pref 0
|
|
||||||
|
|
||||||
# bridge HTTP traffic:
|
|
||||||
# any external port-80 request sent to the VPN addr will be forwarded to the rootns.
|
|
||||||
# this exists so LetsEncrypt can procure a cert for the MX over http.
|
|
||||||
# TODO: we could use _acme_challence.mx.uninsane.org CNAME to avoid this forwarding
|
|
||||||
# - <https://community.letsencrypt.org/t/where-does-letsencrypt-resolve-dns-from/37607/8>
|
|
||||||
${in-ns} ${iptables} -A PREROUTING -t nat -p tcp --dport 80 -m iprange --dst-range ${vpn-ip} \
|
|
||||||
-j DNAT --to-destination ${veth-host-ip}:80
|
|
||||||
|
|
||||||
# we also bridge DNS traffic
|
|
||||||
${in-ns} ${iptables} -A PREROUTING -t nat -p udp --dport 53 -m iprange --dst-range ${vpn-ip} \
|
|
||||||
-j DNAT --to-destination ${veth-host-ip}:53
|
|
||||||
${in-ns} ${iptables} -A PREROUTING -t nat -p tcp --dport 53 -m iprange --dst-range ${vpn-ip} \
|
|
||||||
-j DNAT --to-destination ${veth-host-ip}:53
|
|
||||||
|
|
||||||
# in order to access DNS in this netns, we need to route it to the VPN's nameservers
|
|
||||||
# - alternatively, we could fix DNS servers like 1.1.1.1.
|
|
||||||
${in-ns} ${iptables} -A OUTPUT -t nat -p udp --dport 53 -m iprange --dst-range 127.0.0.53 \
|
|
||||||
-j DNAT --to-destination ${vpn-dns}:53
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
# create a new routing table that we can use to proxy traffic out of the root namespace
|
|
||||||
# through the ovpns namespace, and to the WAN via VPN.
|
|
||||||
networking.iproute2.rttablesExtraConfig = ''
|
|
||||||
5 ovpns
|
|
||||||
'';
|
|
||||||
networking.iproute2.enable = true;
|
|
||||||
|
|
||||||
|
|
||||||
# HURRICANE ELECTRIC CONFIG:
|
|
||||||
# networking.sits = {
|
|
||||||
# hurricane = {
|
|
||||||
# remote = "216.218.226.238";
|
|
||||||
# local = "192.168.0.5";
|
|
||||||
# # local = "10.0.0.5";
|
|
||||||
# # remote = "10.0.0.1";
|
|
||||||
# # local = "10.0.0.22";
|
|
||||||
# dev = "eth0";
|
|
||||||
# ttl = 255;
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
# networking.interfaces."hurricane".ipv6 = {
|
|
||||||
# addresses = [
|
|
||||||
# # mx.uninsane.org (publically routed /64)
|
|
||||||
# {
|
|
||||||
# address = "2001:470:b:465::1";
|
|
||||||
# prefixLength = 128;
|
|
||||||
# }
|
|
||||||
# # client addr
|
|
||||||
# # {
|
|
||||||
# # address = "2001:470:a:466::2";
|
|
||||||
# # prefixLength = 64;
|
|
||||||
# # }
|
|
||||||
# ];
|
|
||||||
# routes = [
|
|
||||||
# {
|
|
||||||
# address = "::";
|
|
||||||
# prefixLength = 0;
|
|
||||||
# # via = "2001:470:a:466::1";
|
|
||||||
# }
|
|
||||||
# ];
|
|
||||||
# };
|
|
||||||
|
|
||||||
# # after configuration, we want the hurricane device to look like this:
|
|
||||||
# # hurricane: flags=209<UP,POINTOPOINT,RUNNING,NOARP> mtu 1480
|
|
||||||
# # inet6 2001:470:a:450::2 prefixlen 64 scopeid 0x0<global>
|
|
||||||
# # inet6 fe80::c0a8:16 prefixlen 64 scopeid 0x20<link>
|
|
||||||
# # sit txqueuelen 1000 (IPv6-in-IPv4)
|
|
||||||
# # test with:
|
|
||||||
# # curl --interface hurricane http://[2607:f8b0:400a:80b::2004]
|
|
||||||
# # ping 2607:f8b0:400a:80b::2004
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
{ ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
sops.secrets."ddns_afraid" = {
|
|
||||||
sopsFile = ../../../secrets/servo.yaml;
|
|
||||||
};
|
|
||||||
sops.secrets."ddns_he" = {
|
|
||||||
sopsFile = ../../../secrets/servo.yaml;
|
|
||||||
};
|
|
||||||
|
|
||||||
sops.secrets."dovecot_passwd" = {
|
|
||||||
sopsFile = ../../../secrets/servo.yaml;
|
|
||||||
};
|
|
||||||
|
|
||||||
sops.secrets."duplicity_passphrase" = {
|
|
||||||
sopsFile = ../../../secrets/servo.yaml;
|
|
||||||
};
|
|
||||||
|
|
||||||
sops.secrets."freshrss_passwd" = {
|
|
||||||
sopsFile = ../../../secrets/servo.yaml;
|
|
||||||
};
|
|
||||||
|
|
||||||
sops.secrets."matrix_synapse_secrets" = {
|
|
||||||
sopsFile = ../../../secrets/servo.yaml;
|
|
||||||
};
|
|
||||||
sops.secrets."mautrix_signal_env" = {
|
|
||||||
sopsFile = ../../../secrets/servo/mautrix_signal_env.bin;
|
|
||||||
};
|
|
||||||
|
|
||||||
sops.secrets."mediawiki_pw" = {
|
|
||||||
sopsFile = ../../../secrets/servo.yaml;
|
|
||||||
};
|
|
||||||
|
|
||||||
sops.secrets."pleroma_secrets" = {
|
|
||||||
sopsFile = ../../../secrets/servo.yaml;
|
|
||||||
};
|
|
||||||
|
|
||||||
sops.secrets."wg_ovpns_privkey" = {
|
|
||||||
sopsFile = ../../../secrets/servo.yaml;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
# using manual ddns now
|
|
||||||
lib.mkIf false
|
|
||||||
{
|
|
||||||
systemd.services.ddns-afraid = {
|
|
||||||
description = "update dynamic DNS entries for freedns.afraid.org";
|
|
||||||
serviceConfig = {
|
|
||||||
EnvironmentFile = config.sops.secrets.ddns_afraid.path;
|
|
||||||
# TODO: ProtectSystem = "strict";
|
|
||||||
# TODO: ProtectHome = "full";
|
|
||||||
# TODO: PrivateTmp = true;
|
|
||||||
};
|
|
||||||
script = let
|
|
||||||
curl = "${pkgs.curl}/bin/curl -4";
|
|
||||||
in ''
|
|
||||||
${curl} "https://freedns.afraid.org/dynamic/update.php?$AFRAID_KEY"
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
systemd.timers.ddns-afraid = {
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
timerConfig = {
|
|
||||||
OnStartupSec = "2min";
|
|
||||||
OnUnitActiveSec = "10min";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,395 +0,0 @@
|
|||||||
# docs:
|
|
||||||
# - <https://docs.ejabberd.im/admin/configuration/basic>
|
|
||||||
# example configs:
|
|
||||||
# - <https://github.com/vkleen/machines/blob/138a2586ce185d7cf201d4e1fe898c83c4af52eb/hosts/europium/ejabberd.nix>
|
|
||||||
# - <https://github.com/Mic92/stockholm/blob/675ef0088624c9de1cb531f318446316884a9d3d/tv/3modules/ejabberd/default.nix>
|
|
||||||
# - <https://github.com/buffet/tararice/blob/master/programs/ejabberd.nix>
|
|
||||||
# - enables STUN and TURN
|
|
||||||
# - only over UDP 3478, not firewall-forwarding any TURN port range
|
|
||||||
# - uses stun_disco module (but with no options)
|
|
||||||
# - <https://github.com/leo60228/dotfiles/blob/39b3abba3009bdc31413d4757ca2f882a33eec8b/files/ejabberd.yml>
|
|
||||||
# - <https://github.com/Mic92/dotfiles/blob/ddf0f4821f554f7667fc803344657367c55fb9e6/nixos/eve/modules/ejabberd.nix>
|
|
||||||
# - <nixpkgs:nixos/tests/xmpp/ejabberd.nix>
|
|
||||||
# - 2013: <https://github.com/processone/ejabberd/blob/master/ejabberd.yml.example>
|
|
||||||
#
|
|
||||||
# compliance tests:
|
|
||||||
# - <https://compliance.conversations.im/server/uninsane.org/#xep0352>
|
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
# XXX: avatar support works in MUCs but not DMs
|
|
||||||
# lib.mkIf false
|
|
||||||
{
|
|
||||||
sane.persist.sys.plaintext = [
|
|
||||||
{ user = "ejabberd"; group = "ejabberd"; directory = "/var/lib/ejabberd"; }
|
|
||||||
];
|
|
||||||
networking.firewall.allowedTCPPorts = [
|
|
||||||
3478 # STUN/TURN
|
|
||||||
5222 # XMPP client -> server
|
|
||||||
5223 # XMPPS client -> server (XMPP over TLS)
|
|
||||||
5269 # XMPP server -> server
|
|
||||||
5270 # XMPPS server -> server (XMPP over TLS)
|
|
||||||
5280 # bosh
|
|
||||||
5281 # bosh (https) ??
|
|
||||||
5349 # STUN/TURN (TLS)
|
|
||||||
5443 # web services (file uploads, websockets, admin)
|
|
||||||
];
|
|
||||||
networking.firewall.allowedUDPPorts = [
|
|
||||||
3478 # STUN/TURN
|
|
||||||
];
|
|
||||||
networking.firewall.allowedTCPPortRanges = [{
|
|
||||||
from = 49152; # TURN
|
|
||||||
to = 49408;
|
|
||||||
}];
|
|
||||||
networking.firewall.allowedUDPPortRanges = [{
|
|
||||||
from = 49152; # TURN
|
|
||||||
to = 49408;
|
|
||||||
}];
|
|
||||||
|
|
||||||
# provide access to certs
|
|
||||||
# TODO: this should just be `acme`. then we also add nginx to the `acme` group.
|
|
||||||
# why is /var/lib/acme/* owned by `nginx` group??
|
|
||||||
users.users.ejabberd.extraGroups = [ "nginx" ];
|
|
||||||
|
|
||||||
security.acme.certs."uninsane.org".extraDomainNames = [
|
|
||||||
"xmpp.uninsane.org"
|
|
||||||
"muc.xmpp.uninsane.org"
|
|
||||||
"pubsub.xmpp.uninsane.org"
|
|
||||||
"upload.xmpp.uninsane.org"
|
|
||||||
"vjid.xmpp.uninsane.org"
|
|
||||||
];
|
|
||||||
|
|
||||||
# exists so the XMPP server's cert can obtain altNames for all its resources
|
|
||||||
services.nginx.virtualHosts."xmpp.uninsane.org" = {
|
|
||||||
useACMEHost = "uninsane.org";
|
|
||||||
};
|
|
||||||
services.nginx.virtualHosts."muc.xmpp.uninsane.org" = {
|
|
||||||
useACMEHost = "uninsane.org";
|
|
||||||
};
|
|
||||||
services.nginx.virtualHosts."pubsub.xmpp.uninsane.org" = {
|
|
||||||
useACMEHost = "uninsane.org";
|
|
||||||
};
|
|
||||||
services.nginx.virtualHosts."upload.xmpp.uninsane.org" = {
|
|
||||||
useACMEHost = "uninsane.org";
|
|
||||||
};
|
|
||||||
services.nginx.virtualHosts."vjid.xmpp.uninsane.org" = {
|
|
||||||
useACMEHost = "uninsane.org";
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.services.trust-dns.zones."uninsane.org".inet = {
|
|
||||||
# XXX: SRV records have to point to something with a A/AAAA record; no CNAMEs
|
|
||||||
A."xmpp" = "%NATIVE%";
|
|
||||||
CNAME."muc.xmpp" = "xmpp";
|
|
||||||
CNAME."pubsub.xmpp" = "xmpp";
|
|
||||||
CNAME."upload.xmpp" = "xmpp";
|
|
||||||
CNAME."vjid.xmpp" = "xmpp";
|
|
||||||
|
|
||||||
# _Service._Proto.Name TTL Class SRV Priority Weight Port Target
|
|
||||||
# - <https://xmpp.org/extensions/xep-0368.html>
|
|
||||||
# something's requesting the SRV records for muc.xmpp, so let's include it
|
|
||||||
# nothing seems to request XMPP SRVs for the other records (except @)
|
|
||||||
# lower numerical priority field tells clients to prefer this method
|
|
||||||
SRV."_xmpps-client._tcp.muc.xmpp" = "3 50 5223 xmpp";
|
|
||||||
SRV."_xmpps-server._tcp.muc.xmpp" = "3 50 5270 xmpp";
|
|
||||||
SRV."_xmpp-client._tcp.muc.xmpp" = "5 50 5222 xmpp";
|
|
||||||
SRV."_xmpp-server._tcp.muc.xmpp" = "5 50 5269 xmpp";
|
|
||||||
|
|
||||||
SRV."_xmpps-client._tcp" = "3 50 5223 xmpp";
|
|
||||||
SRV."_xmpps-server._tcp" = "3 50 5270 xmpp";
|
|
||||||
SRV."_xmpp-client._tcp" = "5 50 5222 xmpp";
|
|
||||||
SRV."_xmpp-server._tcp" = "5 50 5269 xmpp";
|
|
||||||
|
|
||||||
SRV."_stun._udp" = "5 50 3478 xmpp";
|
|
||||||
SRV."_stun._tcp" = "5 50 3478 xmpp";
|
|
||||||
SRV."_stuns._tcp" = "5 50 5349 xmpp";
|
|
||||||
SRV."_turn._udp" = "5 50 3478 xmpp";
|
|
||||||
SRV."_turn._tcp" = "5 50 3478 xmpp";
|
|
||||||
SRV."_turns._tcp" = "5 50 5349 xmpp";
|
|
||||||
};
|
|
||||||
|
|
||||||
# TODO: allocate UIDs/GIDs ?
|
|
||||||
services.ejabberd.enable = true;
|
|
||||||
services.ejabberd.configFile = "/var/lib/ejabberd/ejabberd.yaml";
|
|
||||||
systemd.services.ejabberd.preStart = let
|
|
||||||
config-in = pkgs.writeTextFile {
|
|
||||||
name = "ejabberd.yaml.in";
|
|
||||||
text = ''
|
|
||||||
hosts:
|
|
||||||
- uninsane.org
|
|
||||||
|
|
||||||
# none | emergency | alert | critical | error | warning | notice | info | debug
|
|
||||||
loglevel: debug
|
|
||||||
# loglevel: info
|
|
||||||
# loglevel: notice
|
|
||||||
|
|
||||||
acme:
|
|
||||||
auto: false
|
|
||||||
certfiles:
|
|
||||||
- /var/lib/acme/uninsane.org/full.pem
|
|
||||||
# ca_file: ${pkgs.cacert.unbundled}/etc/ssl/certs/
|
|
||||||
# ca_file: ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt
|
|
||||||
|
|
||||||
pam_userinfotype: jid
|
|
||||||
|
|
||||||
acl:
|
|
||||||
admin:
|
|
||||||
user:
|
|
||||||
- "colin@uninsane.org"
|
|
||||||
local:
|
|
||||||
user_regexp: ""
|
|
||||||
loopback:
|
|
||||||
ip:
|
|
||||||
- 127.0.0.0/8
|
|
||||||
- ::1/128
|
|
||||||
|
|
||||||
access_rules:
|
|
||||||
local:
|
|
||||||
allow: local
|
|
||||||
c2s_access:
|
|
||||||
allow: all
|
|
||||||
announce:
|
|
||||||
allow: admin
|
|
||||||
configure:
|
|
||||||
allow: admin
|
|
||||||
muc_create:
|
|
||||||
allow: local
|
|
||||||
pubsub_createnode_access:
|
|
||||||
allow: all
|
|
||||||
trusted_network:
|
|
||||||
allow: loopback
|
|
||||||
|
|
||||||
# docs: <https://docs.ejabberd.im/admin/configuration/basic/#shaper-rules>
|
|
||||||
shaper_rules:
|
|
||||||
# setting this to above 1 may break outgoing messages
|
|
||||||
# - maybe some servers rate limit? or just don't understand simultaneous connections?
|
|
||||||
max_s2s_connections: 1
|
|
||||||
max_user_sessions: 10
|
|
||||||
max_user_offline_messages: 5000
|
|
||||||
c2s_shaper:
|
|
||||||
fast: all
|
|
||||||
s2s_shaper:
|
|
||||||
med: all
|
|
||||||
|
|
||||||
# docs: <https://docs.ejabberd.im/admin/configuration/basic/#shapers>
|
|
||||||
# this limits the bytes/sec.
|
|
||||||
# for example, burst: 3_000_000 and rate: 100_000 means:
|
|
||||||
# - each client has a BW budget that accumulates 100kB/sec and is capped at 3 MB
|
|
||||||
shaper:
|
|
||||||
fast: 1000000
|
|
||||||
med: 500000
|
|
||||||
# fast:
|
|
||||||
# - rate: 1000000
|
|
||||||
# - burst_size: 10000000
|
|
||||||
# med:
|
|
||||||
# - rate: 500000
|
|
||||||
# - burst_size: 5000000
|
|
||||||
|
|
||||||
# see: <https://docs.ejabberd.im/admin/configuration/listen/>
|
|
||||||
# s2s_use_starttls: true
|
|
||||||
s2s_use_starttls: optional
|
|
||||||
# lessens 504: remote-server-timeout errors
|
|
||||||
# see: <https://github.com/processone/ejabberd/issues/3105#issuecomment-562182967>
|
|
||||||
negotiation_timeout: 60
|
|
||||||
|
|
||||||
listen:
|
|
||||||
-
|
|
||||||
port: 5222
|
|
||||||
module: ejabberd_c2s
|
|
||||||
shaper: c2s_shaper
|
|
||||||
starttls: true
|
|
||||||
access: c2s_access
|
|
||||||
-
|
|
||||||
port: 5223
|
|
||||||
module: ejabberd_c2s
|
|
||||||
shaper: c2s_shaper
|
|
||||||
tls: true
|
|
||||||
access: c2s_access
|
|
||||||
-
|
|
||||||
port: 5269
|
|
||||||
module: ejabberd_s2s_in
|
|
||||||
shaper: s2s_shaper
|
|
||||||
-
|
|
||||||
port: 5270
|
|
||||||
module: ejabberd_s2s_in
|
|
||||||
shaper: s2s_shaper
|
|
||||||
tls: true
|
|
||||||
-
|
|
||||||
port: 5443
|
|
||||||
module: ejabberd_http
|
|
||||||
tls: true
|
|
||||||
request_handlers:
|
|
||||||
/admin: ejabberd_web_admin # TODO: ensure this actually works
|
|
||||||
/api: mod_http_api # ejabberd API endpoint (to control server)
|
|
||||||
/bosh: mod_bosh
|
|
||||||
/upload: mod_http_upload
|
|
||||||
/ws: ejabberd_http_ws
|
|
||||||
# /.well-known/host-meta: mod_host_meta
|
|
||||||
# /.well-known/host-meta.json: mod_host_meta
|
|
||||||
-
|
|
||||||
# STUN+TURN TCP
|
|
||||||
# note that the full port range should be forwarded ("not NAT'd")
|
|
||||||
# `use_turn=true` enables both TURN *and* STUN
|
|
||||||
port: 3478
|
|
||||||
module: ejabberd_stun
|
|
||||||
transport: tcp
|
|
||||||
use_turn: true
|
|
||||||
turn_min_port: 49152
|
|
||||||
turn_max_port: 65535
|
|
||||||
turn_ipv4_address: %NATIVE%
|
|
||||||
-
|
|
||||||
# STUN+TURN UDP
|
|
||||||
port: 3478
|
|
||||||
module: ejabberd_stun
|
|
||||||
transport: udp
|
|
||||||
use_turn: true
|
|
||||||
turn_min_port: 49152
|
|
||||||
turn_max_port: 65535
|
|
||||||
turn_ipv4_address: %NATIVE%
|
|
||||||
-
|
|
||||||
# STUN+TURN TLS over TCP
|
|
||||||
port: 5349
|
|
||||||
module: ejabberd_stun
|
|
||||||
transport: tcp
|
|
||||||
tls: true
|
|
||||||
certfile: /var/lib/acme/uninsane.org/full.pem
|
|
||||||
use_turn: true
|
|
||||||
turn_min_port: 49152
|
|
||||||
turn_max_port: 65535
|
|
||||||
turn_ipv4_address: %NATIVE%
|
|
||||||
|
|
||||||
# TODO: enable mod_fail2ban
|
|
||||||
# TODO(low): look into mod_http_fileserver for serving macros?
|
|
||||||
modules:
|
|
||||||
# mod_adhoc: {}
|
|
||||||
# mod_announce:
|
|
||||||
# access: admin
|
|
||||||
# allows users to set avatars in vCard
|
|
||||||
# - <https://docs.ejabberd.im/admin/configuration/modules/#mod-avatar>
|
|
||||||
mod_avatar: {}
|
|
||||||
mod_caps: {} # for mod_pubsub
|
|
||||||
mod_carboncopy: {} # allows multiple clients to receive a user's message
|
|
||||||
# queues messages when recipient is offline, including PEP and presence messages.
|
|
||||||
# compliance test suggests this be enabled
|
|
||||||
mod_client_state: {}
|
|
||||||
# mod_conversejs: TODO: enable once on 21.12
|
|
||||||
# allows clients like Dino to discover where to upload files
|
|
||||||
mod_disco:
|
|
||||||
server_info:
|
|
||||||
-
|
|
||||||
modules: all
|
|
||||||
name: abuse-addresses
|
|
||||||
urls:
|
|
||||||
- "mailto:admin.xmpp@uninsane.org"
|
|
||||||
- "xmpp:colin@uninsane.org"
|
|
||||||
-
|
|
||||||
modules: all
|
|
||||||
name: admin-addresses
|
|
||||||
urls:
|
|
||||||
- "mailto:admin.xmpp@uninsane.org"
|
|
||||||
- "xmpp:colin@uninsane.org"
|
|
||||||
mod_http_upload:
|
|
||||||
host: upload.xmpp.uninsane.org
|
|
||||||
hosts:
|
|
||||||
- upload.xmpp.uninsane.org
|
|
||||||
put_url: "https://@HOST@:5443/upload"
|
|
||||||
dir_mode: "0750"
|
|
||||||
file_mode: "0750"
|
|
||||||
rm_on_unregister: false
|
|
||||||
# allow discoverability of BOSH and websocket endpoints
|
|
||||||
# TODO: enable once on ejabberd 22.05 (presently 21.04)
|
|
||||||
# mod_host_meta: {}
|
|
||||||
mod_jidprep: {} # probably not needed: lets clients normalize jids
|
|
||||||
mod_last: {} # allow other users to know when i was last online
|
|
||||||
mod_mam:
|
|
||||||
# Mnesia is limited to 2GB, better to use an SQL backend
|
|
||||||
# For small servers SQLite is a good fit and is very easy
|
|
||||||
# to configure. Uncomment this when you have SQL configured:
|
|
||||||
# db_type: sql
|
|
||||||
assume_mam_usage: true
|
|
||||||
default: always
|
|
||||||
mod_muc:
|
|
||||||
access:
|
|
||||||
- allow
|
|
||||||
access_admin:
|
|
||||||
- allow: admin
|
|
||||||
access_create: muc_create
|
|
||||||
access_persistent: muc_create
|
|
||||||
access_mam:
|
|
||||||
- allow
|
|
||||||
history_size: 100 # messages to show new participants
|
|
||||||
host: muc.xmpp.uninsane.org
|
|
||||||
hosts:
|
|
||||||
- muc.xmpp.uninsane.org
|
|
||||||
default_room_options:
|
|
||||||
anonymous: false
|
|
||||||
lang: en
|
|
||||||
persistent: true
|
|
||||||
mam: true
|
|
||||||
mod_muc_admin: {}
|
|
||||||
mod_offline: # store messages for a user when they're offline (TODO: understand multi-client workflow?)
|
|
||||||
access_max_user_messages: max_user_offline_messages
|
|
||||||
store_groupchat: true
|
|
||||||
mod_ping: {}
|
|
||||||
mod_privacy: {} # deprecated, but required for `ejabberctl export_piefxis`
|
|
||||||
mod_private: {} # allow local clients to persist arbitrary data on my server
|
|
||||||
# push notifications to services integrated with e.g. Apple/Android.
|
|
||||||
# default is for a maximum amount of PII to be withheld, since these push notifs
|
|
||||||
# generally traverse 3rd party services. can opt to include message body, etc, though.
|
|
||||||
mod_push: {}
|
|
||||||
# i don't fully understand what this does, but it seems aimed at making push notifs more reliable.
|
|
||||||
mod_push_keepalive: {}
|
|
||||||
mod_roster:
|
|
||||||
versioning: true
|
|
||||||
# docs: <https://docs.ejabberd.im/admin/configuration/modules/#mod-s2s-dialback>
|
|
||||||
# s2s dialback to verify inbound messages
|
|
||||||
# unclear to what degree the XMPP network requires this
|
|
||||||
mod_s2s_dialback: {}
|
|
||||||
mod_shared_roster: {} # creates groups for @all, @online, and anything manually administered?
|
|
||||||
mod_stream_mgmt:
|
|
||||||
resend_on_timeout: if_offline # resend undelivered messages if the origin client is offline
|
|
||||||
# fallback for when DNS-based STUN discovery is unsupported.
|
|
||||||
# - see: <https://xmpp.org/extensions/xep-0215.html>
|
|
||||||
# docs: <https://docs.ejabberd.im/admin/configuration/modules/#mod-stun-disco>
|
|
||||||
# people say to just keep this defaulted (i guess ejabberd knows to return its `host` option of uninsane.org?)
|
|
||||||
mod_stun_disco: {}
|
|
||||||
# docs: <https://docs.ejabberd.im/admin/configuration/modules/#mod-vcard>
|
|
||||||
mod_vcard:
|
|
||||||
allow_return_all: true # all users are discoverable (?)
|
|
||||||
host: vjid.xmpp.uninsane.org
|
|
||||||
hosts:
|
|
||||||
- vjid.xmpp.uninsane.org
|
|
||||||
search: true
|
|
||||||
mod_vcard_xupdate: {} # needed for avatars
|
|
||||||
# docs: <https://docs.ejabberd.im/admin/configuration/modules/#mod-pubsub>
|
|
||||||
mod_pubsub: # needed for avatars
|
|
||||||
access_createnode: pubsub_createnode_access
|
|
||||||
host: pubsub.xmpp.uninsane.org
|
|
||||||
hosts:
|
|
||||||
- pubsub.xmpp.uninsane.org
|
|
||||||
ignore_pep_from_offline: false
|
|
||||||
last_item_cache: true
|
|
||||||
plugins:
|
|
||||||
- pep
|
|
||||||
- flat
|
|
||||||
force_node_config:
|
|
||||||
# ensure client bookmarks are private
|
|
||||||
storage:bookmarks:
|
|
||||||
access_model: whitelist
|
|
||||||
urn:xmpp:avatar:data:
|
|
||||||
access_model: open
|
|
||||||
urn:xmpp:avatar:metadata:
|
|
||||||
access_model: open
|
|
||||||
mod_version: {}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
sed = "${pkgs.gnused}/bin/sed";
|
|
||||||
in ''
|
|
||||||
ip=$(cat '${config.sane.services.dyn-dns.ipPath}')
|
|
||||||
# config is 444 (not 644), so we want to write out-of-place and then atomically move
|
|
||||||
# TODO: factor this out into `sane-woop` helper?
|
|
||||||
rm -f /var/lib/ejabberd/ejabberd.yaml.new
|
|
||||||
${sed} "s/%NATIVE%/$ip/" ${config-in} > /var/lib/ejabberd/ejabberd.yaml.new
|
|
||||||
mv /var/lib/ejabberd/ejabberd.yaml{.new,}
|
|
||||||
'';
|
|
||||||
|
|
||||||
sane.services.dyn-dns.restartOnChange = [ "ejabberd.service" ];
|
|
||||||
}
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
# import feeds with e.g.
|
|
||||||
# ```console
|
|
||||||
# $ nix build '.#nixpkgs.freshrss'
|
|
||||||
# $ sudo -u freshrss -g freshrss FRESHRSS_DATA_PATH=/var/lib/freshrss ./result/cli/import-for-user.php --user admin --filename /home/colin/.config/newsflashFeeds.opml
|
|
||||||
# ```
|
|
||||||
#
|
|
||||||
# export feeds with
|
|
||||||
# ```console
|
|
||||||
# $ sudo -u freshrss -g freshrss FRESHRSS_DATA_PATH=/var/lib/freshrss ./result/cli/export-opml-for-user.php --user admin
|
|
||||||
# ```
|
|
||||||
|
|
||||||
{ config, lib, pkgs, sane-lib, ... }:
|
|
||||||
{
|
|
||||||
sops.secrets."freshrss_passwd" = {
|
|
||||||
owner = config.users.users.freshrss.name;
|
|
||||||
mode = "0400";
|
|
||||||
};
|
|
||||||
sane.persist.sys.plaintext = [
|
|
||||||
{ user = "freshrss"; group = "freshrss"; directory = "/var/lib/freshrss"; }
|
|
||||||
];
|
|
||||||
|
|
||||||
services.freshrss.enable = true;
|
|
||||||
services.freshrss.baseUrl = "https://rss.uninsane.org";
|
|
||||||
services.freshrss.virtualHost = "rss.uninsane.org";
|
|
||||||
services.freshrss.passwordFile = config.sops.secrets.freshrss_passwd.path;
|
|
||||||
|
|
||||||
systemd.services.freshrss-import-feeds =
|
|
||||||
let
|
|
||||||
feeds = sane-lib.feeds;
|
|
||||||
fresh = config.systemd.services.freshrss-config;
|
|
||||||
all-feeds = config.sane.feeds;
|
|
||||||
wanted-feeds = feeds.filterByFormat ["text" "image"] all-feeds;
|
|
||||||
opml = pkgs.writeText "sane-freshrss.opml" (feeds.feedsToOpml wanted-feeds);
|
|
||||||
in {
|
|
||||||
inherit (fresh) wantedBy environment;
|
|
||||||
serviceConfig = {
|
|
||||||
inherit (fresh.serviceConfig) Type User Group StateDirectory WorkingDirectory
|
|
||||||
# hardening options
|
|
||||||
CapabilityBoundingSet DeviceAllow LockPersonality NoNewPrivileges PrivateDevices PrivateTmp PrivateUsers ProcSubset ProtectClock ProtectControlGroups ProtectHome ProtectHostname ProtectKernelLogs ProtectKernelModules ProtectKernelTunables ProtectProc ProtectSystem RemoveIPC RestrictNamespaces RestrictRealtime RestrictSUIDSGID SystemCallArchitectures SystemCallFilter UMask;
|
|
||||||
};
|
|
||||||
description = "import sane RSS feed list";
|
|
||||||
after = [ "freshrss-config.service" ];
|
|
||||||
script = ''
|
|
||||||
# easiest way to preserve feeds: delete the user, recreate it, import feeds
|
|
||||||
${pkgs.freshrss}/cli/delete-user.php --user colin || true
|
|
||||||
${pkgs.freshrss}/cli/create-user.php --user colin --password "$(cat ${config.services.freshrss.passwordFile})" || true
|
|
||||||
${pkgs.freshrss}/cli/import-for-user.php --user colin --filename ${opml}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
# the default ("*:0/5") is to run every 5 minutes.
|
|
||||||
# `systemctl list-timers` to show
|
|
||||||
systemd.services.freshrss-updater.startAt = lib.mkForce "*:3/30";
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."rss.uninsane.org" = {
|
|
||||||
addSSL = true;
|
|
||||||
enableACME = true;
|
|
||||||
# inherit kTLS;
|
|
||||||
# the routing is handled by services.freshrss.virtualHost
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.services.trust-dns.zones."uninsane.org".inet.CNAME."rss" = "native";
|
|
||||||
}
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
{ pkgs, ... }:
|
|
||||||
{
|
|
||||||
# based on <https://bytes.fyi/real-time-goaccess-reports-with-nginx/>
|
|
||||||
# log-format setting can be derived with this tool if custom:
|
|
||||||
# - <https://github.com/stockrt/nginx2goaccess>
|
|
||||||
# config options:
|
|
||||||
# - <https://github.com/allinurl/goaccess/blob/master/config/goaccess.conf>
|
|
||||||
|
|
||||||
systemd.services.goaccess = {
|
|
||||||
description = "GoAccess server monitoring";
|
|
||||||
serviceConfig = {
|
|
||||||
ExecStart = ''
|
|
||||||
${pkgs.goaccess}/bin/goaccess \
|
|
||||||
-f /var/log/nginx/public.log \
|
|
||||||
--log-format=VCOMBINED \
|
|
||||||
--real-time-html \
|
|
||||||
--html-refresh=30 \
|
|
||||||
--no-query-string \
|
|
||||||
--anonymize-ip \
|
|
||||||
--ignore-panel=HOSTS \
|
|
||||||
--ws-url=wss://sink.uninsane.org:443/ws \
|
|
||||||
--port=7890 \
|
|
||||||
-o /var/lib/uninsane/sink/index.html
|
|
||||||
'';
|
|
||||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
|
||||||
Type = "simple";
|
|
||||||
Restart = "on-failure";
|
|
||||||
RestartSec = "10s";
|
|
||||||
|
|
||||||
# hardening
|
|
||||||
WorkingDirectory = "/tmp";
|
|
||||||
NoNewPrivileges = true;
|
|
||||||
PrivateTmp = true;
|
|
||||||
ProtectHome = "read-only";
|
|
||||||
ProtectSystem = "strict";
|
|
||||||
SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @privileged @reboot @resources @setuid @swap @raw-io";
|
|
||||||
ReadOnlyPaths = "/";
|
|
||||||
ReadWritePaths = [ "/proc/self" "/var/lib/uninsane/sink" ];
|
|
||||||
PrivateDevices = "yes";
|
|
||||||
ProtectKernelModules = "yes";
|
|
||||||
ProtectKernelTunables = "yes";
|
|
||||||
};
|
|
||||||
after = [ "network.target" ];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
# server statistics
|
|
||||||
services.nginx.virtualHosts."sink.uninsane.org" = {
|
|
||||||
addSSL = true;
|
|
||||||
enableACME = true;
|
|
||||||
# inherit kTLS;
|
|
||||||
root = "/var/lib/uninsane/sink";
|
|
||||||
|
|
||||||
locations."/ws" = {
|
|
||||||
proxyPass = "http://127.0.0.1:7890";
|
|
||||||
# XXX not sure how much of this is necessary
|
|
||||||
extraConfig = ''
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
|
||||||
proxy_set_header Connection $connection_upgrade;
|
|
||||||
proxy_buffering off;
|
|
||||||
proxy_read_timeout 7d;
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.services.trust-dns.zones."uninsane.org".inet.CNAME."sink" = "native";
|
|
||||||
}
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
{ config, lib, ... }:
|
|
||||||
|
|
||||||
# TODO: re-enable after migrating media dir to /var/lib/uninsane/media
|
|
||||||
# else it's too spammy
|
|
||||||
lib.mkIf false
|
|
||||||
{
|
|
||||||
networking.firewall.allowedUDPPorts = [
|
|
||||||
1900 7359 # DLNA: https://jellyfin.org/docs/general/networking/index.html
|
|
||||||
];
|
|
||||||
sane.persist.sys.plaintext = [
|
|
||||||
# TODO: mode? could be more granular
|
|
||||||
{ user = "jellyfin"; group = "jellyfin"; directory = "/var/lib/jellyfin"; }
|
|
||||||
];
|
|
||||||
|
|
||||||
# Jellyfin multimedia server
|
|
||||||
# this is mostly taken from the official jellfin.org docs
|
|
||||||
services.nginx.virtualHosts."jelly.uninsane.org" = {
|
|
||||||
addSSL = true;
|
|
||||||
enableACME = true;
|
|
||||||
# inherit kTLS;
|
|
||||||
|
|
||||||
locations."/" = {
|
|
||||||
proxyPass = "http://127.0.0.1:8096";
|
|
||||||
extraConfig = ''
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
proxy_set_header X-Forwarded-Protocol $scheme;
|
|
||||||
proxy_set_header X-Forwarded-Host $http_host;
|
|
||||||
|
|
||||||
# Disable buffering when the nginx proxy gets very resource heavy upon streaming
|
|
||||||
proxy_buffering off;
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
# locations."/web/" = {
|
|
||||||
# proxyPass = "http://127.0.0.1:8096/web/index.html";
|
|
||||||
# extraConfig = ''
|
|
||||||
# proxy_set_header Host $host;
|
|
||||||
# proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
# proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
# proxy_set_header X-Forwarded-Protocol $scheme;
|
|
||||||
# proxy_set_header X-Forwarded-Host $http_host;
|
|
||||||
# '';
|
|
||||||
# };
|
|
||||||
locations."/socket" = {
|
|
||||||
proxyPass = "http://127.0.0.1:8096";
|
|
||||||
extraConfig = ''
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
|
||||||
proxy_set_header Connection "upgrade";
|
|
||||||
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
proxy_set_header X-Forwarded-Protocol $scheme;
|
|
||||||
proxy_set_header X-Forwarded-Host $http_host;
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.services.trust-dns.zones."uninsane.org".inet.CNAME."jelly" = "native";
|
|
||||||
|
|
||||||
services.jellyfin.enable = true;
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
{ ... }:
|
|
||||||
{
|
|
||||||
sane.services.kiwix-serve = {
|
|
||||||
enable = true;
|
|
||||||
port = 8013;
|
|
||||||
zimPaths = [ "/var/lib/uninsane/www-archive/wikipedia_en_all_maxi_2022-05.zim" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."w.uninsane.org" = {
|
|
||||||
forceSSL = true;
|
|
||||||
enableACME = true;
|
|
||||||
# inherit kTLS;
|
|
||||||
locations."/".proxyPass = "http://127.0.0.1:8013";
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.services.trust-dns.zones."uninsane.org".inet.CNAME."w" = "native";
|
|
||||||
}
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
# config options:
|
|
||||||
# - <https://github.com/mautrix/signal/blob/master/mautrix_signal/example-config.yaml>
|
|
||||||
{ config, pkgs, ... }:
|
|
||||||
{
|
|
||||||
sane.persist.sys.plaintext = [
|
|
||||||
{ user = "mautrix-signal"; group = "mautrix-signal"; directory = "/var/lib/mautrix-signal"; }
|
|
||||||
{ user = "signald"; group = "signald"; directory = "/var/lib/signald"; }
|
|
||||||
];
|
|
||||||
|
|
||||||
services.signald.enable = true;
|
|
||||||
services.mautrix-signal.enable = true;
|
|
||||||
services.mautrix-signal.environmentFile =
|
|
||||||
config.sops.secrets.mautrix_signal_env.path;
|
|
||||||
|
|
||||||
services.mautrix-signal.settings.signal.socket_path = "/run/signald/signald.sock";
|
|
||||||
services.mautrix-signal.settings.homeserver.domain = "uninsane.org";
|
|
||||||
services.mautrix-signal.settings.bridge.permissions."@colin:uninsane.org" = "admin";
|
|
||||||
services.matrix-synapse.settings.app_service_config_files = [
|
|
||||||
# auto-created by mautrix-signal service
|
|
||||||
"/var/lib/mautrix-signal/signal-registration.yaml"
|
|
||||||
];
|
|
||||||
|
|
||||||
systemd.services.mautrix-signal.serviceConfig = {
|
|
||||||
# allow communication to signald
|
|
||||||
SupplementaryGroups = [ "signald" ];
|
|
||||||
ReadWritePaths = [ "/run/signald" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
sops.secrets."mautrix_signal_env" = {
|
|
||||||
format = "binary";
|
|
||||||
mode = "0440";
|
|
||||||
owner = config.users.users.mautrix-signal.name;
|
|
||||||
group = config.users.users.matrix-synapse.name;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
{ lib, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
sane.persist.sys.plaintext = [
|
|
||||||
{ user = "navidrome"; group = "navidrome"; directory = "/var/lib/navidrome"; }
|
|
||||||
];
|
|
||||||
services.navidrome.enable = true;
|
|
||||||
services.navidrome.settings = {
|
|
||||||
# docs: https://www.navidrome.org/docs/usage/configuration-options/
|
|
||||||
Address = "127.0.0.1";
|
|
||||||
Port = 4533;
|
|
||||||
MusicFolder = "/var/lib/uninsane/media/Music";
|
|
||||||
CovertArtPriority = "*.jpg, *.JPG, *.png, *.PNG, embedded";
|
|
||||||
AutoImportPlaylists = false;
|
|
||||||
ScanSchedule = "@every 1h";
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services.navidrome.serviceConfig = {
|
|
||||||
# fix to use a normal user so we can configure perms correctly
|
|
||||||
DynamicUser = lib.mkForce false;
|
|
||||||
User = "navidrome";
|
|
||||||
Group = "navidrome";
|
|
||||||
};
|
|
||||||
|
|
||||||
users.groups.navidrome = {};
|
|
||||||
|
|
||||||
users.users.navidrome = {
|
|
||||||
group = "navidrome";
|
|
||||||
isSystemUser = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."music.uninsane.org" = {
|
|
||||||
forceSSL = true;
|
|
||||||
enableACME = true;
|
|
||||||
# inherit kTLS;
|
|
||||||
locations."/".proxyPass = "http://127.0.0.1:4533";
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.services.trust-dns.zones."uninsane.org".inet.CNAME."music" = "native";
|
|
||||||
}
|
|
||||||
@@ -1,166 +0,0 @@
|
|||||||
# docs: https://nixos.wiki/wiki/Nginx
|
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
# make the logs for this host "public" so that they show up in e.g. metrics
|
|
||||||
publog = vhost: lib.attrsets.unionOfDisjoint vhost {
|
|
||||||
extraConfig = (vhost.extraConfig or "") + ''
|
|
||||||
access_log /var/log/nginx/public.log vcombined;
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
# kTLS = true; # in-kernel TLS for better perf
|
|
||||||
in
|
|
||||||
{
|
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 80 443 ];
|
|
||||||
|
|
||||||
services.nginx.enable = true;
|
|
||||||
services.nginx.appendConfig = ''
|
|
||||||
# use 1 process per core.
|
|
||||||
# may want to increase worker_connections too, but `ulimit -n` must be increased first.
|
|
||||||
worker_processes auto;
|
|
||||||
'';
|
|
||||||
|
|
||||||
# this is the standard `combined` log format, with the addition of $host
|
|
||||||
# so that we have the virtualHost in the log.
|
|
||||||
# KEEP IN SYNC WITH GOACCESS
|
|
||||||
# goaccess calls this VCOMBINED:
|
|
||||||
# - <https://gist.github.com/jyap808/10570005>
|
|
||||||
services.nginx.commonHttpConfig = ''
|
|
||||||
log_format vcombined '$host:$server_port $remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referrer" "$http_user_agent"';
|
|
||||||
access_log /var/log/nginx/private.log vcombined;
|
|
||||||
'';
|
|
||||||
# sets gzip_comp_level = 5
|
|
||||||
services.nginx.recommendedGzipSettings = true;
|
|
||||||
# enables OCSP stapling (so clients don't need contact the OCSP server -- i do instead)
|
|
||||||
# - doesn't seem to, actually: <https://www.ssllabs.com/ssltest/analyze.html?d=uninsane.org>
|
|
||||||
# caches TLS sessions for 10m
|
|
||||||
services.nginx.recommendedTlsSettings = true;
|
|
||||||
# enables sendfile, tcp_nopush, tcp_nodelay, keepalive_timeout 65
|
|
||||||
services.nginx.recommendedOptimisation = true;
|
|
||||||
|
|
||||||
# web blog/personal site
|
|
||||||
services.nginx.virtualHosts."uninsane.org" = publog {
|
|
||||||
root = "${pkgs.uninsane-dot-org}/share/uninsane-dot-org";
|
|
||||||
# a lot of places hardcode https://uninsane.org,
|
|
||||||
# and then when we mix http + non-https, we get CORS violations
|
|
||||||
# and things don't look right. so force SSL.
|
|
||||||
forceSSL = true;
|
|
||||||
enableACME = true;
|
|
||||||
# inherit kTLS;
|
|
||||||
# for OCSP stapling
|
|
||||||
sslTrustedCertificate = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
|
||||||
|
|
||||||
# uninsane.org/share/foo => /var/lib/uninsane/root/share/foo.
|
|
||||||
# yes, nginx does not strip the prefix when evaluating against the root.
|
|
||||||
locations."/share".root = "/var/lib/uninsane/root";
|
|
||||||
|
|
||||||
# allow matrix users to discover that @user:uninsane.org is reachable via matrix.uninsane.org
|
|
||||||
locations."= /.well-known/matrix/server".extraConfig =
|
|
||||||
let
|
|
||||||
# use 443 instead of the default 8448 port to unite
|
|
||||||
# the client-server and server-server port for simplicity
|
|
||||||
server = { "m.server" = "matrix.uninsane.org:443"; };
|
|
||||||
in ''
|
|
||||||
add_header Content-Type application/json;
|
|
||||||
return 200 '${builtins.toJSON server}';
|
|
||||||
'';
|
|
||||||
locations."= /.well-known/matrix/client".extraConfig =
|
|
||||||
let
|
|
||||||
client = {
|
|
||||||
"m.homeserver" = { "base_url" = "https://matrix.uninsane.org"; };
|
|
||||||
"m.identity_server" = { "base_url" = "https://vector.im"; };
|
|
||||||
};
|
|
||||||
# ACAO required to allow element-web on any URL to request this json file
|
|
||||||
in ''
|
|
||||||
add_header Content-Type application/json;
|
|
||||||
add_header Access-Control-Allow-Origin *;
|
|
||||||
return 200 '${builtins.toJSON client}';
|
|
||||||
'';
|
|
||||||
|
|
||||||
# static URLs might not be aware of .well-known (e.g. registration confirmation URLs),
|
|
||||||
# so hack around that.
|
|
||||||
locations."/_matrix" = {
|
|
||||||
proxyPass = "http://127.0.0.1:8008";
|
|
||||||
};
|
|
||||||
locations."/_synapse" = {
|
|
||||||
proxyPass = "http://127.0.0.1:8008";
|
|
||||||
};
|
|
||||||
|
|
||||||
# allow ActivityPub clients to discover how to reach @user@uninsane.org
|
|
||||||
# TODO: waiting on https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3361/
|
|
||||||
# locations."/.well-known/nodeinfo" = {
|
|
||||||
# proxyPass = "http://127.0.0.1:4000";
|
|
||||||
# extraConfig = pleromaExtraConfig;
|
|
||||||
# };
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
# serve any site not listed above, if it's static.
|
|
||||||
# because we define it dynamically, SSL isn't trivial. support only http
|
|
||||||
# documented <https://nginx.org/en/docs/http/ngx_http_core_module.html#server_name>
|
|
||||||
services.nginx.virtualHosts."~^(?<domain>.+)$" = {
|
|
||||||
default = true;
|
|
||||||
addSSL = true;
|
|
||||||
enableACME = false;
|
|
||||||
sslCertificate = "/var/www/certs/wildcard/cert.pem";
|
|
||||||
sslCertificateKey = "/var/www/certs/wildcard/key.pem";
|
|
||||||
# sslCertificate = "/var/lib/acme/.minica/cert.pem";
|
|
||||||
# sslCertificateKey = "/var/lib/acme/.minica/key.pem";
|
|
||||||
# serverName = null;
|
|
||||||
locations."/" = {
|
|
||||||
# somehow this doesn't escape -- i get error 400 if i:
|
|
||||||
# curl 'http://..' --resolve '..:80:127.0.0.1'
|
|
||||||
root = "/var/www/sites/$domain";
|
|
||||||
# tryFiles = "$domain/$uri $domain/$uri/ =404";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
security.acme.acceptTerms = true;
|
|
||||||
security.acme.defaults.email = "admin.acme@uninsane.org";
|
|
||||||
|
|
||||||
sane.persist.sys.plaintext = [
|
|
||||||
# TODO: mode?
|
|
||||||
{ user = "acme"; group = "acme"; directory = "/var/lib/acme"; }
|
|
||||||
{ user = "colin"; group = "users"; directory = "/var/www/sites"; }
|
|
||||||
];
|
|
||||||
|
|
||||||
# let's encrypt default chain looks like:
|
|
||||||
# - End-entity certificate ← R3 ← ISRG Root X1 ← DST Root CA X3
|
|
||||||
# - <https://community.letsencrypt.org/t/production-chain-changes/150739>
|
|
||||||
# DST Root CA X3 expired in 2021 (?)
|
|
||||||
# the alternative chain is:
|
|
||||||
# - End-entity certificate ← R3 ← ISRG Root X1 (self-signed)
|
|
||||||
# using this alternative chain grants more compatibility for services like ejabberd
|
|
||||||
# but might decrease compatibility with very old clients that don't get updates (e.g. old android, iphone <= 4).
|
|
||||||
# security.acme.defaults.extraLegoFlags = [
|
|
||||||
security.acme.certs."uninsane.org" = rec {
|
|
||||||
# ISRG Root X1 results in lets encrypt sending the same chain as default,
|
|
||||||
# just without the final ISRG Root X1 ← DST Root CA X3 link.
|
|
||||||
# i.e. we could alternative clip the last item and achieve the exact same thing.
|
|
||||||
extraLegoRunFlags = [
|
|
||||||
"--preferred-chain" "ISRG Root X1"
|
|
||||||
];
|
|
||||||
extraLegoRenewFlags = extraLegoRunFlags;
|
|
||||||
};
|
|
||||||
# TODO: alternatively, we could clip the last cert IF it's expired,
|
|
||||||
# optionally outputting that to a new cert file.
|
|
||||||
# security.acme.defaults.postRun = "";
|
|
||||||
|
|
||||||
# create a self-signed SSL certificate for use with literally any domain.
|
|
||||||
# browsers will reject this, but proxies and local testing tools can be configured
|
|
||||||
# to accept it.
|
|
||||||
system.activationScripts.generate-x509-self-signed.text = ''
|
|
||||||
mkdir -p /var/www/certs/wildcard
|
|
||||||
test -f /var/www/certs/wildcard/key.pem || ${pkgs.openssl}/bin/openssl \
|
|
||||||
req -x509 -newkey rsa:4096 \
|
|
||||||
-keyout /var/www/certs/wildcard/key.pem \
|
|
||||||
-out /var/www/certs/wildcard/cert.pem \
|
|
||||||
-sha256 -nodes -days 3650 \
|
|
||||||
-addext 'subjectAltName=DNS:*' \
|
|
||||||
-subj '/CN=self-signed'
|
|
||||||
chmod 640 /var/www/certs/wildcard/{key,cert}.pem
|
|
||||||
chown root:nginx /var/www/certs/wildcard /var/www/certs/wildcard/{key,cert}.pem
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
{ config, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
services.nginx.virtualHosts."nixcache.uninsane.org" = {
|
|
||||||
addSSL = true;
|
|
||||||
enableACME = true;
|
|
||||||
# inherit kTLS;
|
|
||||||
# serverAliases = [ "nixcache" ];
|
|
||||||
locations."/".extraConfig = ''
|
|
||||||
proxy_pass http://localhost:${toString config.services.nix-serve.port};
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.services.trust-dns.zones."uninsane.org".inet.CNAME."nixcache" = "native";
|
|
||||||
|
|
||||||
sane.services.nixserve.enable = true;
|
|
||||||
sane.services.nixserve.sopsFile = ../../../../secrets/servo.yaml;
|
|
||||||
}
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
# example configs:
|
|
||||||
# - <https://github.com/kittywitch/nixfiles/blob/main/services/prosody.nix>
|
|
||||||
# create users with:
|
|
||||||
# - `sudo -u prosody prosodyctl adduser colin@uninsane.org`
|
|
||||||
|
|
||||||
{ lib, ... }:
|
|
||||||
|
|
||||||
# XXX disabled: doesn't send messages to nixnet.social (only receives them).
|
|
||||||
# nixnet runs ejabberd, so revisiting that.
|
|
||||||
lib.mkIf false
|
|
||||||
{
|
|
||||||
sane.persist.sys.plaintext = [
|
|
||||||
{ user = "prosody"; group = "prosody"; directory = "/var/lib/prosody"; }
|
|
||||||
];
|
|
||||||
networking.firewall.allowedTCPPorts = [
|
|
||||||
5222 # XMPP client -> server
|
|
||||||
5269 # XMPP server -> server
|
|
||||||
5280 # bosh
|
|
||||||
5281 # Prosody HTTPS port (necessary?)
|
|
||||||
];
|
|
||||||
|
|
||||||
# provide access to certs
|
|
||||||
users.users.prosody.extraGroups = [ "nginx" ];
|
|
||||||
|
|
||||||
security.acme.certs."uninsane.org".extraDomainNames = [
|
|
||||||
"conference.xmpp.uninsane.org"
|
|
||||||
"upload.xmpp.uninsane.org"
|
|
||||||
];
|
|
||||||
|
|
||||||
services.prosody = {
|
|
||||||
enable = true;
|
|
||||||
admins = [ "colin@uninsane.org" ];
|
|
||||||
# allowRegistration = false;
|
|
||||||
# extraConfig = ''
|
|
||||||
# s2s_require_encryption = true
|
|
||||||
# c2s_require_encryption = true
|
|
||||||
# '';
|
|
||||||
|
|
||||||
extraModules = [ "private" "vcard" "privacy" "compression" "component" "muc" "pep" "adhoc" "lastactivity" "admin_adhoc" "blocklist"];
|
|
||||||
|
|
||||||
ssl.cert = "/var/lib/acme/uninsane.org/fullchain.pem";
|
|
||||||
ssl.key = "/var/lib/acme/uninsane.org/key.pem";
|
|
||||||
|
|
||||||
muc = [
|
|
||||||
{
|
|
||||||
domain = "conference.xmpp.uninsane.org";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
uploadHttp.domain = "upload.xmpp.uninsane.org";
|
|
||||||
|
|
||||||
virtualHosts = {
|
|
||||||
localhost = {
|
|
||||||
domain = "localhost";
|
|
||||||
enabled = true;
|
|
||||||
};
|
|
||||||
"xmpp.uninsane.org" = {
|
|
||||||
domain = "uninsane.org";
|
|
||||||
enabled = true;
|
|
||||||
ssl.cert = "/var/lib/acme/uninsane.org/fullchain.pem";
|
|
||||||
ssl.key = "/var/lib/acme/uninsane.org/key.pem";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
sane.services.trust-dns.enable = true;
|
|
||||||
|
|
||||||
sane.services.trust-dns.listenAddrsIPv4 = [
|
|
||||||
# specify each address explicitly, instead of using "*".
|
|
||||||
# this ensures responses are sent from the address at which the request was received.
|
|
||||||
config.sane.hosts.by-name."servo".lan-ip
|
|
||||||
"10.0.1.5"
|
|
||||||
];
|
|
||||||
sane.services.trust-dns.quiet = true;
|
|
||||||
|
|
||||||
sane.services.trust-dns.zones."uninsane.org".TTL = 900;
|
|
||||||
|
|
||||||
# SOA record structure: <https://en.wikipedia.org/wiki/SOA_record#Structure>
|
|
||||||
# SOA MNAME RNAME (... rest)
|
|
||||||
# MNAME = Master name server for this zone. this is where update requests should be sent.
|
|
||||||
# RNAME = admin contact (encoded email address)
|
|
||||||
# Serial = YYYYMMDDNN, where N is incremented every time this file changes, to trigger secondary NS to re-fetch it.
|
|
||||||
# Refresh = how frequently secondary NS should query master
|
|
||||||
# Retry = how long secondary NS should wait until re-querying master after a failure (must be < Refresh)
|
|
||||||
# Expire = how long secondary NS should continue to reply to queries after master fails (> Refresh + Retry)
|
|
||||||
sane.services.trust-dns.zones."uninsane.org".inet = {
|
|
||||||
SOA."@" = ''
|
|
||||||
ns1.uninsane.org. admin-dns.uninsane.org. (
|
|
||||||
2022122101 ; Serial
|
|
||||||
4h ; Refresh
|
|
||||||
30m ; Retry
|
|
||||||
7d ; Expire
|
|
||||||
5m) ; Negative response TTL
|
|
||||||
'';
|
|
||||||
TXT."rev" = "2022122101";
|
|
||||||
|
|
||||||
# XXX NS records must also not be CNAME
|
|
||||||
# it's best that we keep this identical, or a superset of, what org. lists as our NS.
|
|
||||||
# so, org. can specify ns2/ns3 as being to the VPN, with no mention of ns1. we provide ns1 here.
|
|
||||||
A."ns1" = "%NATIVE%";
|
|
||||||
A."ns2" = "185.157.162.178";
|
|
||||||
A."ns3" = "185.157.162.178";
|
|
||||||
A."ovpns" = "185.157.162.178";
|
|
||||||
A."native" = "%NATIVE%";
|
|
||||||
A."@" = "%NATIVE%";
|
|
||||||
NS."@" = [
|
|
||||||
"ns1.uninsane.org."
|
|
||||||
"ns2.uninsane.org."
|
|
||||||
"ns3.uninsane.org."
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.services.trust-dns.zones."uninsane.org".file =
|
|
||||||
"/var/lib/trust-dns/uninsane.org.zone";
|
|
||||||
|
|
||||||
systemd.services.trust-dns.preStart = let
|
|
||||||
sed = "${pkgs.gnused}/bin/sed";
|
|
||||||
zone-dir = "/var/lib/trust-dns";
|
|
||||||
zone-out = "${zone-dir}/uninsane.org.zone";
|
|
||||||
zone-template = pkgs.writeText "uninsane.org.zone.in" config.sane.services.trust-dns.generatedZones."uninsane.org";
|
|
||||||
in ''
|
|
||||||
# make WAN records available to trust-dns
|
|
||||||
mkdir -p ${zone-dir}
|
|
||||||
ip=$(cat '${config.sane.services.dyn-dns.ipPath}')
|
|
||||||
${sed} s/%NATIVE%/$ip/ ${zone-template} > ${zone-out}
|
|
||||||
'';
|
|
||||||
|
|
||||||
sane.services.dyn-dns.restartOnChange = [ "trust-dns.service" ];
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
# docs: <https://nixos.wiki/wiki/MediaWiki>
|
|
||||||
{ config, lib, ... }:
|
|
||||||
|
|
||||||
# XXX: working to host wikipedia with kiwix instead of mediawiki
|
|
||||||
# mediawiki does more than i need and isn't obviously superior in any way
|
|
||||||
# except that the dumps are more frequent/up-to-date.
|
|
||||||
lib.mkIf false
|
|
||||||
{
|
|
||||||
sops.secrets."mediawiki_pw" = {
|
|
||||||
owner = config.users.users.mediawiki.name;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.mediawiki.enable = true;
|
|
||||||
services.mediawiki.name = "Uninsane Wiki";
|
|
||||||
services.mediawiki.passwordFile = config.sops.secrets.mediawiki_pw.path;
|
|
||||||
services.mediawiki.extraConfig = ''
|
|
||||||
# Disable anonymous editing
|
|
||||||
$wgGroupPermissions['*']['edit'] = false;
|
|
||||||
'';
|
|
||||||
services.mediawiki.virtualHost.listen = [
|
|
||||||
{
|
|
||||||
ip = "127.0.0.1";
|
|
||||||
port = 8013;
|
|
||||||
ssl = false;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
services.mediawiki.virtualHost.hostName = "w.uninsane.org";
|
|
||||||
services.mediawiki.virtualHost.adminAddr = "admin+mediawiki@uninsane.org";
|
|
||||||
# services.mediawiki.extensions = TODO: wikipedia sync extension?
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,22 +0,0 @@
|
|||||||
diff --git a/setup.py b/setup.py
|
|
||||||
index 2b9d240e..770bc5e7 100755
|
|
||||||
--- a/setup.py
|
|
||||||
+++ b/setup.py
|
|
||||||
@@ -1092,11 +1092,12 @@ def c(base_path: str, **kw: object) -> None:
|
|
||||||
|
|
||||||
|
|
||||||
def create_linux_bundle_gunk(ddir: str, libdir_name: str) -> None:
|
|
||||||
- if not os.path.exists('docs/_build/html'):
|
|
||||||
- make = 'gmake' if is_freebsd else 'make'
|
|
||||||
- run_tool([make, 'docs'])
|
|
||||||
- copy_man_pages(ddir)
|
|
||||||
- copy_html_docs(ddir)
|
|
||||||
+ if not os.getenv('KITTY_NO_DOCS'):
|
|
||||||
+ if not os.path.exists('docs/_build/html'):
|
|
||||||
+ make = 'gmake' if is_freebsd else 'make'
|
|
||||||
+ run_tool([make, 'docs'])
|
|
||||||
+ copy_man_pages(ddir)
|
|
||||||
+ copy_html_docs(ddir)
|
|
||||||
for (icdir, ext) in {'256x256': 'png', 'scalable': 'svg'}.items():
|
|
||||||
icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', icdir, 'apps')
|
|
||||||
safe_makedirs(icdir)
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
{ lib, pkgs, ... }:
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./cross
|
|
||||||
./feeds.nix
|
|
||||||
./fs.nix
|
|
||||||
./hardware.nix
|
|
||||||
./home
|
|
||||||
./i2p.nix
|
|
||||||
./ids.nix
|
|
||||||
./machine-id.nix
|
|
||||||
./net.nix
|
|
||||||
./persist.nix
|
|
||||||
./programs.nix
|
|
||||||
./secrets.nix
|
|
||||||
./ssh.nix
|
|
||||||
./users.nix
|
|
||||||
./vpn.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
sane.nixcache.enable-trusted-keys = true;
|
|
||||||
sane.nixcache.enable = lib.mkDefault true;
|
|
||||||
sane.programs.sysadminUtils.enableFor.system = lib.mkDefault true;
|
|
||||||
sane.programs.consoleUtils.enableFor.user.colin = lib.mkDefault true;
|
|
||||||
|
|
||||||
# some services which use private directories error if the parent (/var/lib/private) isn't 700.
|
|
||||||
sane.fs."/var/lib/private".dir.acl.mode = "0700";
|
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
|
|
||||||
# time.timeZone = "America/Los_Angeles";
|
|
||||||
time.timeZone = "Etc/UTC"; # DST is too confusing for me => use a stable timezone
|
|
||||||
|
|
||||||
# allow `nix flake ...` command
|
|
||||||
nix.extraOptions = ''
|
|
||||||
experimental-features = nix-command flakes
|
|
||||||
'';
|
|
||||||
# allow `nix-shell` (and probably nix-index?) to locate our patched and custom packages
|
|
||||||
nix.nixPath = [
|
|
||||||
"nixpkgs=${pkgs.path}"
|
|
||||||
"nixpkgs-overlays=${../..}/overlays"
|
|
||||||
];
|
|
||||||
|
|
||||||
fonts = {
|
|
||||||
enableDefaultFonts = true;
|
|
||||||
fonts = with pkgs; [ font-awesome noto-fonts-emoji hack-font ];
|
|
||||||
fontconfig.enable = true;
|
|
||||||
fontconfig.defaultFonts = {
|
|
||||||
emoji = [ "Font Awesome 6 Free" "Noto Color Emoji" ];
|
|
||||||
monospace = [ "Hack" ];
|
|
||||||
serif = [ "DejaVu Serif" ];
|
|
||||||
sansSerif = [ "DejaVu Sans" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# XXX: twitter-color-emoji doesn't cross-compile; but not-fonts-emoji does
|
|
||||||
# fonts = {
|
|
||||||
# enableDefaultFonts = true;
|
|
||||||
# fonts = with pkgs; [ font-awesome twitter-color-emoji hack-font ];
|
|
||||||
# fontconfig.enable = true;
|
|
||||||
# fontconfig.defaultFonts = {
|
|
||||||
# emoji = [ "Font Awesome 6 Free" "Twitter Color Emoji" ];
|
|
||||||
# monospace = [ "Hack" ];
|
|
||||||
# serif = [ "DejaVu Serif" ];
|
|
||||||
# sansSerif = [ "DejaVu Sans" ];
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
|
|
||||||
# disable non-required packages like nano, perl, rsync, strace
|
|
||||||
environment.defaultPackages = [];
|
|
||||||
|
|
||||||
# programs.vim.defaultEditor = true;
|
|
||||||
environment.variables = {
|
|
||||||
EDITOR = "vim";
|
|
||||||
# git claims it should use EDITOR, but it doesn't!
|
|
||||||
GIT_EDITOR = "vim";
|
|
||||||
# TODO: these should be moved to `home.sessionVariables` (home-manager)
|
|
||||||
# Electron apps should use native wayland backend:
|
|
||||||
# https://nixos.wiki/wiki/Slack#Wayland
|
|
||||||
# Discord under sway crashes with this.
|
|
||||||
# NIXOS_OZONE_WL = "1";
|
|
||||||
# LIBGL_ALWAYS_SOFTWARE = "1";
|
|
||||||
};
|
|
||||||
|
|
||||||
# dconf docs: <https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/desktop_migration_and_administration_guide/profiles>
|
|
||||||
# find keys/values with `dconf dump /`
|
|
||||||
programs.dconf.enable = true;
|
|
||||||
programs.dconf.packages = [
|
|
||||||
(pkgs.writeTextFile {
|
|
||||||
name = "dconf-user-profile";
|
|
||||||
destination = "/etc/dconf/profile/user";
|
|
||||||
text = ''
|
|
||||||
user-db:user
|
|
||||||
system-db:site
|
|
||||||
'';
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
# link debug symbols into /run/current-system/sw/lib/debug
|
|
||||||
# hopefully picked up by gdb automatically?
|
|
||||||
environment.enableDebugInfo = true;
|
|
||||||
}
|
|
||||||
@@ -1,203 +0,0 @@
|
|||||||
{ lib, sane-data, ... }:
|
|
||||||
let
|
|
||||||
hourly = { freq = "hourly"; };
|
|
||||||
daily = { freq = "daily"; };
|
|
||||||
weekly = { freq = "weekly"; };
|
|
||||||
infrequent = { freq = "infrequent"; };
|
|
||||||
|
|
||||||
art = { cat = "art"; };
|
|
||||||
humor = { cat = "humor"; };
|
|
||||||
pol = { cat = "pol"; }; # or maybe just "social"
|
|
||||||
rat = { cat = "rat"; };
|
|
||||||
tech = { cat = "tech"; };
|
|
||||||
uncat = { cat = "uncat"; };
|
|
||||||
|
|
||||||
text = { format = "text"; };
|
|
||||||
img = { format = "image"; };
|
|
||||||
|
|
||||||
mkRss = format: url: { inherit url format; } // uncat // infrequent;
|
|
||||||
# format-specific helpers
|
|
||||||
mkText = mkRss "text";
|
|
||||||
mkImg = mkRss "image";
|
|
||||||
mkPod = mkRss "podcast";
|
|
||||||
|
|
||||||
# host-specific helpers
|
|
||||||
mkSubstack = subdomain: { substack = subdomain; };
|
|
||||||
|
|
||||||
fromDb = name:
|
|
||||||
let
|
|
||||||
raw = sane-data.feeds."${name}";
|
|
||||||
in {
|
|
||||||
url = raw.url;
|
|
||||||
# not sure the exact mapping with velocity here: entries per day?
|
|
||||||
freq = lib.mkIf (raw.velocity or 0 != 0) (lib.mkDefault (
|
|
||||||
if raw.velocity > 2 then
|
|
||||||
"hourly"
|
|
||||||
else if raw.velocity > 0.5 then
|
|
||||||
"daily"
|
|
||||||
else if raw.velocity > 0.1 then
|
|
||||||
"weekly"
|
|
||||||
else
|
|
||||||
"infrequent"
|
|
||||||
));
|
|
||||||
} // lib.optionalAttrs (raw.is_podcast or false) {
|
|
||||||
format = "podcast";
|
|
||||||
} // lib.optionalAttrs (raw.title or "" != "") {
|
|
||||||
title = lib.mkDefault raw.title;
|
|
||||||
};
|
|
||||||
|
|
||||||
podcasts = [
|
|
||||||
(fromDb "lexfridman.com/podcast" // rat)
|
|
||||||
## Astral Codex Ten
|
|
||||||
(fromDb "sscpodcast.libsyn.com" // rat)
|
|
||||||
## Econ Talk
|
|
||||||
(fromDb "feeds.simplecast.com/wgl4xEgL" // rat)
|
|
||||||
## Cory Doctorow -- both podcast & text entries
|
|
||||||
(fromDb "craphound.com" // pol)
|
|
||||||
(fromDb "congressionaldish.libsyn.com" // pol)
|
|
||||||
## Civboot -- https://anchor.fm/civboot
|
|
||||||
(fromDb "anchor.fm/s/34c7232c/podcast/rss" // tech)
|
|
||||||
## Emerge: making sense of what's next -- <https://www.whatisemerging.com/emergepodcast>
|
|
||||||
(mkPod "https://anchor.fm/s/21bc734/podcast/rss" // pol // infrequent)
|
|
||||||
(fromDb "feeds.feedburner.com/80000HoursPodcast" // rat)
|
|
||||||
(fromDb "allinchamathjason.libsyn.com" // pol)
|
|
||||||
(fromDb "acquired.libsyn.com" // tech)
|
|
||||||
# The Intercept - Deconstructed; also available: <rss.acast.com/deconstructed>
|
|
||||||
(fromDb "rss.prod.firstlook.media/deconstructed/podcast.rss" // pol)
|
|
||||||
## The Daily
|
|
||||||
(mkPod "https://feeds.simplecast.com/54nAGcIl" // pol // daily)
|
|
||||||
# The Intercept - Intercepted; also available: <https://rss.acast.com/intercepted-with-jeremy-scahill>
|
|
||||||
(fromDb "rss.prod.firstlook.media/intercepted/podcast.rss" // pol)
|
|
||||||
(fromDb "podcast.posttv.com/itunes/post-reports.xml" // pol)
|
|
||||||
## Eric Weinstein
|
|
||||||
(fromDb "rss.art19.com/the-portal" // rat)
|
|
||||||
(fromDb "darknetdiaries.com" // tech)
|
|
||||||
## Radiolab -- also available here, but ONLY OVER HTTP: <http://feeds.wnyc.org/radiolab>
|
|
||||||
(fromDb "feeds.feedburner.com/radiolab" // pol)
|
|
||||||
## Sam Harris
|
|
||||||
(fromDb "wakingup.libsyn.com" // pol)
|
|
||||||
## 99% Invisible -- also available here: <https://feeds.simplecast.com/BqbsxVfO>
|
|
||||||
(fromDb "feeds.99percentinvisible.org/99percentinvisible" // pol)
|
|
||||||
(fromDb "rss.acast.com/ft-tech-tonic" // tech)
|
|
||||||
(fromDb "feeds.feedburner.com/dancarlin/history" // rat)
|
|
||||||
(fromDb "rss.art19.com/60-minutes" // pol)
|
|
||||||
## The Verge - Decoder
|
|
||||||
(fromDb "feeds.megaphone.fm/recodedecode" // tech)
|
|
||||||
## Matrix (chat) Live
|
|
||||||
(fromDb "feed.podbean.com/matrixlive/feed.xml" // tech)
|
|
||||||
## Michael Malice - Your Welcome -- also available here: <https://origin.podcastone.com/podcast?categoryID2=2232>
|
|
||||||
(fromDb "rss.art19.com/your-welcome" // pol)
|
|
||||||
(fromDb "seattlenice.buzzsprout.com" // pol)
|
|
||||||
## Sci-Fi? has Peter Watts; author of No Moods, Ads or Cutesy Fucking Icons (rifters.com)
|
|
||||||
(fromDb "talesfromthebridge.buzzsprout.com" // tech)
|
|
||||||
];
|
|
||||||
|
|
||||||
texts = [
|
|
||||||
# AGGREGATORS (> 1 post/day)
|
|
||||||
(fromDb "lwn.net" // tech)
|
|
||||||
(fromDb "lesswrong.com" // rat)
|
|
||||||
(fromDb "econlib.org" // pol)
|
|
||||||
|
|
||||||
# AGGREGATORS (< 1 post/day)
|
|
||||||
(fromDb "palladiummag.com" // uncat)
|
|
||||||
(fromDb "profectusmag.com" // uncat)
|
|
||||||
(fromDb "semiaccurate.com" // tech)
|
|
||||||
(mkText "https://linuxphoneapps.org/blog/atom.xml" // tech // infrequent)
|
|
||||||
(fromDb "spectrum.ieee.org" // tech)
|
|
||||||
## n.b.: quality RSS list here: <https://forum.merveilles.town/thread/57/share-your-rss-feeds%21-6/>
|
|
||||||
(mkText "https://forum.merveilles.town/rss.xml" // pol // infrequent)
|
|
||||||
|
|
||||||
## No Moods, Ads or Cutesy Fucking Icons
|
|
||||||
(fromDb "rifters.com/crawl" // uncat)
|
|
||||||
|
|
||||||
# DEVELOPERS
|
|
||||||
(fromDb "uninsane.org" // tech)
|
|
||||||
(fromDb "mg.lol" // tech)
|
|
||||||
(fromDb "drewdevault.com" // tech)
|
|
||||||
## Ken Shirriff
|
|
||||||
(fromDb "righto.com" // tech)
|
|
||||||
## shared blog by a few NixOS devs, notably onny
|
|
||||||
(fromDb "project-insanity.org" // tech)
|
|
||||||
## Vitalik Buterin
|
|
||||||
(fromDb "vitalik.ca" // tech)
|
|
||||||
## ian (Sanctuary)
|
|
||||||
(fromDb "sagacioussuricata.com" // tech)
|
|
||||||
## Bunnie Juang
|
|
||||||
(fromDb "bunniestudios.com" // tech)
|
|
||||||
(fromDb "blog.danieljanus.pl" // tech)
|
|
||||||
(fromDb "ianthehenry.com" // tech)
|
|
||||||
(fromDb "bitbashing.io" // tech)
|
|
||||||
(fromDb "idiomdrottning.org" // uncat)
|
|
||||||
(mkText "https://anish.lakhwara.com/home.html" // tech // weekly)
|
|
||||||
(fromDb "jefftk.com" // tech)
|
|
||||||
(fromDb "pomeroyb.com" // tech)
|
|
||||||
|
|
||||||
# (TECH; POL) COMMENTATORS
|
|
||||||
## Matt Webb -- engineering-ish, but dreamy
|
|
||||||
(fromDb "interconnected.org/home/feed" // rat)
|
|
||||||
(fromDb "edwardsnowden.substack.com" // pol // text)
|
|
||||||
## Julia Evans
|
|
||||||
(mkText "https://jvns.ca/atom.xml" // tech // weekly)
|
|
||||||
(mkText "http://benjaminrosshoffman.com/feed" // pol // weekly)
|
|
||||||
## Ben Thompson
|
|
||||||
(mkText "https://www.stratechery.com/rss" // pol // weekly)
|
|
||||||
## Balaji
|
|
||||||
(fromDb "balajis.com" // pol)
|
|
||||||
(fromDb "ben-evans.com/benedictevans" // pol)
|
|
||||||
(fromDb "lynalden.com" // pol)
|
|
||||||
(fromDb "austinvernon.site" // tech)
|
|
||||||
(mkSubstack "oversharing" // pol // daily)
|
|
||||||
(mkSubstack "doomberg" // tech // weekly)
|
|
||||||
## David Rosenthal
|
|
||||||
(fromDb "blog.dshr.org" // pol)
|
|
||||||
## Matt Levine
|
|
||||||
(mkText "https://www.bloomberg.com/opinion/authors/ARbTQlRLRjE/matthew-s-levine.rss" // pol // weekly)
|
|
||||||
(fromDb "stpeter.im/atom.xml" // pol)
|
|
||||||
## Peter Saint-Andre -- side project of stpeter.im
|
|
||||||
(fromDb "philosopher.coach" // rat)
|
|
||||||
|
|
||||||
# RATIONALITY/PHILOSOPHY/ETC
|
|
||||||
(mkSubstack "samkriss" // humor // infrequent)
|
|
||||||
(fromDb "unintendedconsequenc.es" // rat)
|
|
||||||
(fromDb "applieddivinitystudies.com" // rat)
|
|
||||||
(fromDb "slimemoldtimemold.com" // rat)
|
|
||||||
(fromDb "richardcarrier.info" // rat)
|
|
||||||
(fromDb "gwern.net" // rat)
|
|
||||||
## Jason Crawford
|
|
||||||
(fromDb "rootsofprogress.org" // rat)
|
|
||||||
## Robin Hanson
|
|
||||||
(fromDb "overcomingbias.com" // rat)
|
|
||||||
## Scott Alexander
|
|
||||||
(mkSubstack "astralcodexten" // rat // daily)
|
|
||||||
## Paul Christiano
|
|
||||||
(fromDb "sideways-view.com" // rat)
|
|
||||||
## Sean Carroll
|
|
||||||
(fromDb "preposterousuniverse.com" // rat)
|
|
||||||
|
|
||||||
## mostly dating topics. not advice, or humor, but looking through a social lens
|
|
||||||
(fromDb "putanumonit.com" // rat)
|
|
||||||
|
|
||||||
# CODE
|
|
||||||
# (mkText "https://github.com/Kaiteki-Fedi/Kaiteki/commits/master.atom" // tech // infrequent)
|
|
||||||
];
|
|
||||||
|
|
||||||
images = [
|
|
||||||
(fromDb "smbc-comics.com" // img // humor)
|
|
||||||
(fromDb "xkcd.com" // img // humor)
|
|
||||||
(fromDb "pbfcomics.com" // img // humor)
|
|
||||||
# (mkImg "http://dilbert.com/feed" // humor // daily)
|
|
||||||
|
|
||||||
# ART
|
|
||||||
(fromDb "miniature-calendar.com" // img // art // daily)
|
|
||||||
];
|
|
||||||
in
|
|
||||||
{
|
|
||||||
sane.feeds = texts ++ images ++ podcasts;
|
|
||||||
|
|
||||||
assertions = builtins.map
|
|
||||||
(p: {
|
|
||||||
assertion = p.format or "unknown" == "podcast";
|
|
||||||
message = ''${p.url} is not a podcast: ${p.format or "unknown"}'';
|
|
||||||
})
|
|
||||||
podcasts;
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
# Terminal UI mail client
|
|
||||||
{ config, sane-lib, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
sops.secrets."aerc_accounts" = {
|
|
||||||
owner = config.users.users.colin.name;
|
|
||||||
sopsFile = ../../../secrets/universal/aerc_accounts.conf;
|
|
||||||
format = "binary";
|
|
||||||
};
|
|
||||||
sane.user.fs.".config/aerc/accounts.conf" = sane-lib.fs.wantedSymlinkTo config.sops.secrets.aerc_accounts.path;
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
{ ... }:
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./aerc.nix
|
|
||||||
./firefox.nix
|
|
||||||
./gfeeds.nix
|
|
||||||
./git.nix
|
|
||||||
./gpodder.nix
|
|
||||||
./keyring.nix
|
|
||||||
./kitty.nix
|
|
||||||
./libreoffice.nix
|
|
||||||
./mime.nix
|
|
||||||
./mpv.nix
|
|
||||||
./neovim.nix
|
|
||||||
./newsflash.nix
|
|
||||||
./offlineimap.nix
|
|
||||||
./ripgrep.nix
|
|
||||||
./splatmoji.nix
|
|
||||||
./ssh.nix
|
|
||||||
./sublime-music.nix
|
|
||||||
./vlc.nix
|
|
||||||
./xdg-dirs.nix
|
|
||||||
./zsh
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,203 +0,0 @@
|
|||||||
# common settings to toggle (at runtime, in about:config):
|
|
||||||
# > security.ssl.require_safe_negotiation
|
|
||||||
|
|
||||||
# librewolf is a forked firefox which patches firefox to allow more things
|
|
||||||
# (like default search engines) to be configurable at runtime.
|
|
||||||
# many of the settings below won't have effect without those patches.
|
|
||||||
# see: https://gitlab.com/librewolf-community/settings/-/blob/master/distribution/policies.json
|
|
||||||
|
|
||||||
{ config, lib, pkgs, sane-lib, ...}:
|
|
||||||
with lib;
|
|
||||||
let
|
|
||||||
cfg = config.sane.web-browser;
|
|
||||||
# allow easy switching between firefox and librewolf with `defaultSettings`, below
|
|
||||||
librewolfSettings = {
|
|
||||||
browser = pkgs.librewolf-unwrapped;
|
|
||||||
# browser = pkgs.librewolf-unwrapped.overrideAttrs (drv: {
|
|
||||||
# # this allows side-loading unsigned addons
|
|
||||||
# MOZ_REQUIRE_SIGNING = false;
|
|
||||||
# });
|
|
||||||
libName = "librewolf";
|
|
||||||
dotDir = ".librewolf";
|
|
||||||
cacheDir = ".cache/librewolf"; # TODO: is it?
|
|
||||||
desktop = "librewolf.desktop";
|
|
||||||
};
|
|
||||||
firefoxSettings = {
|
|
||||||
browser = pkgs.firefox-esr-unwrapped;
|
|
||||||
libName = "firefox";
|
|
||||||
dotDir = ".mozilla/firefox";
|
|
||||||
cacheDir = ".cache/mozilla";
|
|
||||||
desktop = "firefox.desktop";
|
|
||||||
};
|
|
||||||
defaultSettings = firefoxSettings;
|
|
||||||
# defaultSettings = librewolfSettings;
|
|
||||||
|
|
||||||
addon = name: extid: hash: pkgs.fetchFirefoxAddon {
|
|
||||||
inherit name hash;
|
|
||||||
url = "https://addons.mozilla.org/firefox/downloads/latest/${name}/latest.xpi";
|
|
||||||
# extid can be found by unar'ing the above xpi, and copying browser_specific_settings.gecko.id field
|
|
||||||
fixedExtid = extid;
|
|
||||||
};
|
|
||||||
localAddon = pkg: pkgs.fetchFirefoxAddon {
|
|
||||||
inherit (pkg) name;
|
|
||||||
src = "${pkg}/share/mozilla/extensions/\\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\\}/${pkg.extid}.xpi";
|
|
||||||
fixedExtid = pkg.extid;
|
|
||||||
};
|
|
||||||
|
|
||||||
package = pkgs.wrapFirefox cfg.browser.browser {
|
|
||||||
# inherit the default librewolf.cfg
|
|
||||||
# it can be further customized via ~/.librewolf/librewolf.overrides.cfg
|
|
||||||
inherit (pkgs.librewolf-unwrapped) extraPrefsFiles;
|
|
||||||
inherit (cfg.browser) libName;
|
|
||||||
|
|
||||||
extraNativeMessagingHosts = [ pkgs.browserpass ];
|
|
||||||
# extraNativeMessagingHosts = [ pkgs.gopass-native-messaging-host ];
|
|
||||||
|
|
||||||
nixExtensions = concatMap (ext: optional ext.enable ext.package) (attrValues cfg.addons);
|
|
||||||
|
|
||||||
extraPolicies = {
|
|
||||||
NoDefaultBookmarks = true;
|
|
||||||
SearchEngines = {
|
|
||||||
Default = "DuckDuckGo";
|
|
||||||
};
|
|
||||||
AppUpdateURL = "https://localhost";
|
|
||||||
DisableAppUpdate = true;
|
|
||||||
OverrideFirstRunPage = "";
|
|
||||||
OverridePostUpdatePage = "";
|
|
||||||
DisableSystemAddonUpdate = true;
|
|
||||||
DisableFirefoxStudies = true;
|
|
||||||
DisableTelemetry = true;
|
|
||||||
DisableFeedbackCommands = true;
|
|
||||||
DisablePocket = true;
|
|
||||||
DisableSetDesktopBackground = false;
|
|
||||||
|
|
||||||
# remove many default search providers
|
|
||||||
# XXX this seems to prevent the `nixExtensions` from taking effect
|
|
||||||
# Extensions.Uninstall = [
|
|
||||||
# "google@search.mozilla.org"
|
|
||||||
# "bing@search.mozilla.org"
|
|
||||||
# "amazondotcom@search.mozilla.org"
|
|
||||||
# "ebay@search.mozilla.org"
|
|
||||||
# "twitter@search.mozilla.org"
|
|
||||||
# ];
|
|
||||||
# XXX doesn't seem to have any effect...
|
|
||||||
# docs: https://github.com/mozilla/policy-templates#homepage
|
|
||||||
# Homepage = {
|
|
||||||
# HomepageURL = "https://uninsane.org/";
|
|
||||||
# StartPage = "homepage";
|
|
||||||
# };
|
|
||||||
# NewTabPage = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
addonOpts = types.submodule {
|
|
||||||
options = {
|
|
||||||
package = mkOption {
|
|
||||||
type = types.package;
|
|
||||||
};
|
|
||||||
enable = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options = {
|
|
||||||
sane.web-browser.browser = mkOption {
|
|
||||||
default = defaultSettings;
|
|
||||||
type = types.attrs;
|
|
||||||
};
|
|
||||||
sane.web-browser.persistData = mkOption {
|
|
||||||
description = "optional store name to which persist browsing data (like history)";
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
sane.web-browser.persistCache = mkOption {
|
|
||||||
description = "optional store name to which persist browser cache";
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
default = "cryptClearOnBoot";
|
|
||||||
};
|
|
||||||
sane.web-browser.addons = mkOption {
|
|
||||||
type = types.attrsOf addonOpts;
|
|
||||||
default = {
|
|
||||||
# get names from:
|
|
||||||
# - ~/ref/nix-community/nur-combined/repos/rycee/pkgs/firefox-addons/generated-firefox-addons.nix
|
|
||||||
# `wget ...xpi`; `unar ...xpi`; `cat */manifest.json | jq '.browser_specific_settings.gecko.id'`
|
|
||||||
# browserpass-ce.package = addon "browserpass-ce" "browserpass@maximbaz.com" "sha256-sXgUBbRvMnRpeIW1MTkmTcoqtW/8RDXAkxAq1evFkpc=";
|
|
||||||
browserpass-extension.package = localAddon pkgs.browserpass-extension;
|
|
||||||
# TODO: build bypass-paywalls from source? it's mysteriously disappeared from the Mozilla store.
|
|
||||||
# bypass-paywalls-clean.package = addon "bypass-paywalls-clean" "{d133e097-46d9-4ecc-9903-fa6a722a6e0e}" "sha256-oUwdqdAwV3DezaTtOMx7A/s4lzIws+t2f08mwk+324k=";
|
|
||||||
ether-metamask.package = addon "ether-metamask" "webextension@metamask.io" "sha256-G+MwJDOcsaxYSUXjahHJmkWnjLeQ0Wven8DU/lGeMzA=";
|
|
||||||
i2p-in-private-browsing.package = addon "i2p-in-private-browsing" "i2ppb@eyedeekay.github.io" "sha256-dJcJ3jxeAeAkRvhODeIVrCflvX+S4E0wT/PyYzQBQWs=";
|
|
||||||
sidebery.package = addon "sidebery" "{3c078156-979c-498b-8990-85f7987dd929}" "sha256-YONfK/rIjlsrTgRHIt3km07Q7KnpIW89Z9r92ZSCc6w=";
|
|
||||||
sponsorblock.package = addon "sponsorblock" "sponsorBlocker@ajay.app" "sha256-hRsvLaAsVm3dALsTrJqHTNgRFAQcU7XSaGhr5G6+mFs=";
|
|
||||||
ublacklist.package = addon "ublacklist" "@ublacklist" "sha256-RqY5iHzbL2qizth7aguyOKWPyINXmrwOlf/OsfqAS48=";
|
|
||||||
ublock-origin.package = addon "ublock-origin" "uBlock0@raymondhill.net" "sha256-52lYqMjrS3GVTaybDrH1p6VF90YVkifguCGxobI/fNQ=";
|
|
||||||
|
|
||||||
browserpass-extension.enable = lib.mkDefault true;
|
|
||||||
# bypass-paywalls-clean.enable = lib.mkDefault true;
|
|
||||||
ether-metamask.enable = lib.mkDefault true;
|
|
||||||
i2p-in-private-browsing.enable = lib.mkDefault config.services.i2p.enable;
|
|
||||||
sidebery.enable = lib.mkDefault true;
|
|
||||||
sponsorblock.enable = lib.mkDefault true;
|
|
||||||
ublacklist.enable = lib.mkDefault true;
|
|
||||||
ublock-origin.enable = lib.mkDefault true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = {
|
|
||||||
sane.programs.web-browser = {
|
|
||||||
inherit package;
|
|
||||||
# TODO: define the persistence & fs config here
|
|
||||||
};
|
|
||||||
sane.programs.guiApps.suggestedPrograms = [ "web-browser" ];
|
|
||||||
|
|
||||||
# uBlock filter list configuration.
|
|
||||||
# specifically, enable the GDPR cookie prompt blocker.
|
|
||||||
# data.toOverwrite.filterLists is additive (i.e. it supplements the default filters)
|
|
||||||
# this configuration method is documented here:
|
|
||||||
# - <https://github.com/gorhill/uBlock/issues/2986#issuecomment-364035002>
|
|
||||||
# the specific attribute path is found via scraping ublock code here:
|
|
||||||
# - <https://github.com/gorhill/uBlock/blob/master/src/js/storage.js>
|
|
||||||
# - <https://github.com/gorhill/uBlock/blob/master/assets/assets.json>
|
|
||||||
sane.user.fs."${cfg.browser.dotDir}/managed-storage/uBlock0@raymondhill.net.json" = sane-lib.fs.wantedText ''
|
|
||||||
{
|
|
||||||
"name": "uBlock0@raymondhill.net",
|
|
||||||
"description": "ignored",
|
|
||||||
"type": "storage",
|
|
||||||
"data": {
|
|
||||||
"toOverwrite": "{\"filterLists\": [\"fanboy-cookiemonster\"]}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
sane.user.fs."${cfg.browser.dotDir}/${cfg.browser.libName}.overrides.cfg" = sane-lib.fs.wantedText ''
|
|
||||||
// if we can't query the revocation status of a SSL cert because the issuer is offline,
|
|
||||||
// treat it as unrevoked.
|
|
||||||
// see: <https://librewolf.net/docs/faq/#im-getting-sec_error_ocsp_server_error-what-can-i-do>
|
|
||||||
defaultPref("security.OCSP.require", false);
|
|
||||||
'';
|
|
||||||
# flush the cache to disk to avoid it taking up too much tmp
|
|
||||||
sane.user.persist.byPath."${cfg.browser.cacheDir}" = lib.mkIf (cfg.persistCache != null) {
|
|
||||||
store = cfg.persistCache;
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.user.persist.byPath."${cfg.browser.dotDir}/default" = lib.mkIf (cfg.persistData != null) {
|
|
||||||
store = cfg.persistData;
|
|
||||||
};
|
|
||||||
sane.user.fs."${cfg.browser.dotDir}/default" = sane-lib.fs.wantedDir;
|
|
||||||
# instruct Firefox to put the profile in a predictable directory (so we can do things like persist just it).
|
|
||||||
# XXX: the directory *must* exist, even if empty; Firefox will not create the directory itself.
|
|
||||||
sane.user.fs."${cfg.browser.dotDir}/profiles.ini" = sane-lib.fs.wantedText ''
|
|
||||||
[Profile0]
|
|
||||||
Name=default
|
|
||||||
IsRelative=1
|
|
||||||
Path=default
|
|
||||||
Default=1
|
|
||||||
|
|
||||||
[General]
|
|
||||||
StartWithLastProfile=1
|
|
||||||
'';
|
|
||||||
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
# gnome feeds RSS viewer
|
|
||||||
{ config, lib, sane-lib, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
feeds = sane-lib.feeds;
|
|
||||||
all-feeds = config.sane.feeds;
|
|
||||||
wanted-feeds = feeds.filterByFormat ["text" "image"] all-feeds;
|
|
||||||
in {
|
|
||||||
sane.user.fs.".config/org.gabmus.gfeeds.json" = sane-lib.fs.wantedText (
|
|
||||||
builtins.toJSON {
|
|
||||||
# feed format is a map from URL to a dict,
|
|
||||||
# with dict["tags"] a list of string tags.
|
|
||||||
feeds = sane-lib.mapToAttrs (feed: {
|
|
||||||
name = feed.url;
|
|
||||||
value.tags = [ feed.cat feed.freq ];
|
|
||||||
}) wanted-feeds;
|
|
||||||
dark_reader = false;
|
|
||||||
new_first = true;
|
|
||||||
# windowsize = {
|
|
||||||
# width = 350;
|
|
||||||
# height = 650;
|
|
||||||
# };
|
|
||||||
max_article_age_days = 90;
|
|
||||||
enable_js = false;
|
|
||||||
max_refresh_threads = 3;
|
|
||||||
# saved_items = {};
|
|
||||||
# read_items = [];
|
|
||||||
show_read_items = true;
|
|
||||||
full_article_title = true;
|
|
||||||
# views: "webview", "reader", "rsscont"
|
|
||||||
default_view = "rsscont";
|
|
||||||
open_links_externally = true;
|
|
||||||
full_feed_name = false;
|
|
||||||
refresh_on_startup = true;
|
|
||||||
tags = lib.unique (
|
|
||||||
(builtins.catAttrs "cat" wanted-feeds) ++ (builtins.catAttrs "freq" wanted-feeds)
|
|
||||||
);
|
|
||||||
open_youtube_externally = false;
|
|
||||||
media_player = "vlc"; # default: mpv
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
{ lib, pkgs, sane-lib, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
mkCfg = lib.generators.toINI { };
|
|
||||||
in
|
|
||||||
{
|
|
||||||
sane.user.fs.".config/git/config" = sane-lib.fs.wantedText (mkCfg {
|
|
||||||
user.name = "Colin";
|
|
||||||
user.email = "colin@uninsane.org";
|
|
||||||
alias.co = "checkout";
|
|
||||||
# difftastic docs:
|
|
||||||
# - <https://difftastic.wilfred.me.uk/git.html>
|
|
||||||
diff.tool = "difftastic";
|
|
||||||
difftool.prompt = false;
|
|
||||||
"difftool \"difftastic\"".cmd = ''${pkgs.difftastic}/bin/difft "$LOCAL" "$REMOTE"'';
|
|
||||||
# now run `git difftool` to use difftastic git
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
# gnome feeds RSS viewer
|
|
||||||
{ config, sane-lib, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
feeds = sane-lib.feeds;
|
|
||||||
all-feeds = config.sane.feeds;
|
|
||||||
wanted-feeds = feeds.filterByFormat ["podcast"] all-feeds;
|
|
||||||
in {
|
|
||||||
sane.user.fs.".config/gpodderFeeds.opml" = sane-lib.fs.wantedText (
|
|
||||||
feeds.feedsToOpml wanted-feeds
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
{ config, sane-lib, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
sane.user.persist.private = [ ".local/share/keyrings" ];
|
|
||||||
|
|
||||||
sane.user.fs."private/.local/share/keyrings/default" = {
|
|
||||||
generated.script.script = builtins.readFile ../../../scripts/init-keyring;
|
|
||||||
# TODO: is this `wantedBy` needed? can we inherit it?
|
|
||||||
wantedBy = [ config.sane.fs."/home/colin/private".unit ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
{ pkgs, sane-lib, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
sane.user.fs.".config/kitty/kitty.conf" = sane-lib.fs.wantedText ''
|
|
||||||
# docs: https://sw.kovidgoyal.net/kitty/conf/
|
|
||||||
# disable terminal bell (when e.g. you backspace too many times)
|
|
||||||
enable_audio_bell no
|
|
||||||
|
|
||||||
map ctrl+n new_os_window_with_cwd
|
|
||||||
|
|
||||||
include ${pkgs.kitty-themes}/themes/PaperColor_dark.conf
|
|
||||||
'';
|
|
||||||
# THEME CHOICES:
|
|
||||||
# docs: https://github.com/kovidgoyal/kitty-themes
|
|
||||||
# theme = "1984 Light"; # dislike: awful, harsh blues/teals
|
|
||||||
# theme = "Adventure Time"; # dislike: harsh (dark)
|
|
||||||
# theme = "Atom One Light"; # GOOD: light theme. all color combos readable. not a huge fan of the blue.
|
|
||||||
# theme = "Belafonte Day"; # dislike: too low contrast for text colors
|
|
||||||
# theme = "Belafonte Night"; # better: dark theme that's easy on the eyes. all combos readable. low contrast.
|
|
||||||
# theme = "Catppuccin"; # dislike: a bit pale/low-contrast (dark)
|
|
||||||
# theme = "Desert"; # mediocre: colors are harsh
|
|
||||||
# theme = "Earthsong"; # BEST: dark theme. readable, good contrast. unique, but decent colors.
|
|
||||||
# theme = "Espresso Libre"; # better: dark theme. readable, but meh colors
|
|
||||||
# theme = "Forest Night"; # decent: very pastel. it's workable, but unconventional and muted/flat.
|
|
||||||
# theme = "Gruvbox Material Light Hard"; # mediocre light theme.
|
|
||||||
# theme = "kanagawabones"; # better: dark theme. colors are too background-y
|
|
||||||
# theme = "Kaolin Dark"; # dislike: too dark
|
|
||||||
# theme = "Kaolin Breeze"; # mediocre: not-too-harsh light theme, but some parts are poor contrast
|
|
||||||
# theme = "Later This Evening"; # mediocre: not-too-harsh dark theme, but cursor is poor contrast
|
|
||||||
# theme = "Material"; # decent: light theme, few colors.
|
|
||||||
# theme = "Mayukai"; # decent: not-too-harsh dark theme. the teal is a bit straining
|
|
||||||
# theme = "Nord"; # mediocre: pale background, low contrast
|
|
||||||
# theme = "One Half Light"; # better: not-too-harsh light theme. contrast could be better
|
|
||||||
# theme = "PaperColor Dark"; # BEST: dark theme, very readable still the colors are background-y
|
|
||||||
# theme = "Parasio Dark"; # dislike: too low contrast
|
|
||||||
# theme = "Pencil Light"; # better: not-too-harsh light theme. decent contrast.
|
|
||||||
# theme = "Pnevma"; # dislike: too low contrast
|
|
||||||
# theme = "Piatto Light"; # better: readable light theme. pleasing colors. powerline prompt is hard to read.
|
|
||||||
# theme = "Rosé Pine Dawn"; # GOOD: light theme. all color combinations are readable. it is very mild -- may need to manually tweak contrast. tasteful colors
|
|
||||||
# theme = "Rosé Pine Moon"; # GOOD: dark theme. tasteful colors. but background is a bit intense
|
|
||||||
# theme = "Sea Shells"; # mediocre. not all color combos are readable
|
|
||||||
# theme = "Solarized Light"; # mediocre: not-too-harsh light theme; GREAT background; but some colors are low contrast
|
|
||||||
# theme = "Solarized Dark Higher Contrast"; # better: dark theme, decent colors
|
|
||||||
# theme = "Sourcerer"; # mediocre: ugly colors
|
|
||||||
# theme = "Space Gray"; # mediocre: too muted
|
|
||||||
# theme = "Space Gray Eighties"; # better: all readable, decent colors
|
|
||||||
# theme = "Spacemacs"; # mediocre: too muted
|
|
||||||
# theme = "Spring"; # mediocre: readable light theme, but the teal is ugly.
|
|
||||||
# theme = "Srcery"; # better: highly readable. colors are ehhh
|
|
||||||
# theme = "Substrata"; # decent: nice colors, but a bit flat.
|
|
||||||
# theme = "Sundried"; # mediocre: the solar text makes me squint
|
|
||||||
# theme = "Symfonic"; # mediocre: the dark purple has low contrast to the black bg.
|
|
||||||
# theme = "Tango Light"; # dislike: teal is too grating
|
|
||||||
# theme = "Tokyo Night Day"; # medicore: too muted
|
|
||||||
# theme = "Tokyo Night"; # better: tasteful. a bit flat
|
|
||||||
# theme = "Tomorrow"; # GOOD: all color combinations are readable. contrast is slightly better than Rose. on the blander side
|
|
||||||
# theme = "Treehouse"; # dislike: the orange is harsh on my eyes.
|
|
||||||
# theme = "Urple"; # dislike: weird palette
|
|
||||||
# theme = "Warm Neon"; # decent: not-too-harsh dark theme. the green is a bit unattractive
|
|
||||||
# theme = "Wild Cherry"; # GOOD: dark theme: nice colors. a bit flat
|
|
||||||
# theme = "Xcodedark"; # dislike: bad palette
|
|
||||||
# theme = "citylights"; # decent: dark theme. some parts have just a bit low contrast
|
|
||||||
# theme = "neobones_light"; # better light theme. the background is maybe too muted
|
|
||||||
# theme = "vimbones";
|
|
||||||
# theme = "zenbones_dark"; # mediocre: readable, but meh colors
|
|
||||||
# theme = "zenbones_light"; # decent: light theme. all colors are readable. contrast is passable but not excellent. highlight color is BAD
|
|
||||||
# theme = "zenwritten_dark"; # mediocre: looks same as zenbones_dark
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
{ sane-lib, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
# libreoffice: disable first-run stuff
|
|
||||||
sane.user.fs.".config/libreoffice/4/user/registrymodifications.xcu" = sane-lib.fs.wantedText ''
|
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
|
||||||
<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="FirstRun" oor:op="fuse"><value>false</value></prop></item>
|
|
||||||
<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="ShowTipOfTheDay" oor:op="fuse"><value>false</value></prop></item>
|
|
||||||
</oor:items>
|
|
||||||
'';
|
|
||||||
# <item oor:path="/org.openoffice.Setup/Product"><prop oor:name="LastTimeDonateShown" oor:op="fuse"><value>1667693880</value></prop></item>
|
|
||||||
# <item oor:path="/org.openoffice.Setup/Product"><prop oor:name="LastTimeGetInvolvedShown" oor:op="fuse"><value>1667693880</value></prop></item>
|
|
||||||
}
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
{ config, sane-lib, ...}:
|
|
||||||
|
|
||||||
let
|
|
||||||
www = config.sane.web-browser.browser.desktop;
|
|
||||||
pdf = "org.gnome.Evince.desktop";
|
|
||||||
md = "obsidian.desktop";
|
|
||||||
thumb = "org.gnome.gThumb.desktop";
|
|
||||||
video = "vlc.desktop";
|
|
||||||
# audio = "mpv.desktop";
|
|
||||||
audio = "vlc.desktop";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
|
|
||||||
# the xdg mime type for a file can be found with:
|
|
||||||
# - `xdg-mime query filetype path/to/thing.ext`
|
|
||||||
# we can have single associations or a list of associations.
|
|
||||||
# there's also options to *remove* [non-default] associations from specific apps
|
|
||||||
xdg.mime.enable = true;
|
|
||||||
xdg.mime.defaultApplications = {
|
|
||||||
# AUDIO
|
|
||||||
"audio/flac" = audio;
|
|
||||||
"audio/mpeg" = audio;
|
|
||||||
"audio/x-vorbis+ogg" = audio;
|
|
||||||
# IMAGES
|
|
||||||
"image/heif" = thumb; # apple codec
|
|
||||||
"image/png" = thumb;
|
|
||||||
"image/jpeg" = thumb;
|
|
||||||
# VIDEO
|
|
||||||
"video/mp4" = video;
|
|
||||||
"video/quicktime" = video;
|
|
||||||
"video/x-matroska" = video;
|
|
||||||
# HTML
|
|
||||||
"text/html" = www;
|
|
||||||
"x-scheme-handler/http" = www;
|
|
||||||
"x-scheme-handler/https" = www;
|
|
||||||
"x-scheme-handler/about" = www;
|
|
||||||
"x-scheme-handler/unknown" = www;
|
|
||||||
# RICH-TEXT DOCUMENTS
|
|
||||||
"application/pdf" = pdf;
|
|
||||||
"text/markdown" = md;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
{ sane-lib, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
# format is <key>=%<length>%<value>
|
|
||||||
sane.user.fs.".config/mpv/mpv.conf" = sane-lib.fs.wantedText ''
|
|
||||||
save-position-on-quit=%3%yes
|
|
||||||
keep-open=%3%yes
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,129 +0,0 @@
|
|||||||
{ lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
inherit (builtins) map;
|
|
||||||
inherit (lib) concatMapStrings optionalString;
|
|
||||||
# this structure roughly mirrors home-manager's `programs.neovim.plugins` option
|
|
||||||
plugins = with pkgs.vimPlugins; [
|
|
||||||
# docs: surround-nvim: https://github.com/ur4ltz/surround.nvim/
|
|
||||||
# docs: vim-surround: https://github.com/tpope/vim-surround
|
|
||||||
{ plugin = vim-surround; }
|
|
||||||
# docs: fzf-vim (fuzzy finder): https://github.com/junegunn/fzf.vim
|
|
||||||
{ plugin = fzf-vim; }
|
|
||||||
({
|
|
||||||
# docs: tex-conceal-vim: https://github.com/KeitaNakamura/tex-conceal.vim/
|
|
||||||
plugin = tex-conceal-vim;
|
|
||||||
type = "viml";
|
|
||||||
config = ''
|
|
||||||
" present prettier fractions
|
|
||||||
let g:tex_conceal_frac=1
|
|
||||||
'';
|
|
||||||
})
|
|
||||||
({
|
|
||||||
plugin = vim-SyntaxRange;
|
|
||||||
type = "viml";
|
|
||||||
config = ''
|
|
||||||
" enable markdown-style codeblock highlighting for tex code
|
|
||||||
autocmd BufEnter * call SyntaxRange#Include('```tex', '```', 'tex', 'NonText')
|
|
||||||
" autocmd Syntax tex set conceallevel=2
|
|
||||||
'';
|
|
||||||
})
|
|
||||||
({
|
|
||||||
# treesitter syntax highlighting: https://nixos.wiki/wiki/Tree_sitters
|
|
||||||
# docs: https://github.com/nvim-treesitter/nvim-treesitter
|
|
||||||
# config taken from: https://github.com/i077/system/blob/master/modules/home/neovim/default.nix
|
|
||||||
# this is required for tree-sitter to even highlight
|
|
||||||
plugin = nvim-treesitter.withAllGrammars;
|
|
||||||
type = "lua";
|
|
||||||
config = ''
|
|
||||||
require'nvim-treesitter.configs'.setup {
|
|
||||||
highlight = {
|
|
||||||
enable = true,
|
|
||||||
-- disable treesitter on Rust so that we can use SyntaxRange
|
|
||||||
-- and leverage TeX rendering in rust projects
|
|
||||||
disable = { "rust", "tex", "latex" },
|
|
||||||
-- disable = { "tex", "latex" },
|
|
||||||
-- true to also use builtin vim syntax highlighting when treesitter fails
|
|
||||||
additional_vim_regex_highlighting = false
|
|
||||||
},
|
|
||||||
incremental_selection = {
|
|
||||||
enable = true,
|
|
||||||
keymaps = {
|
|
||||||
init_selection = "gnn",
|
|
||||||
node_incremental = "grn",
|
|
||||||
mcope_incremental = "grc",
|
|
||||||
node_decremental = "grm"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
indent = {
|
|
||||||
enable = true,
|
|
||||||
disable = {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
vim.o.foldmethod = 'expr'
|
|
||||||
vim.o.foldexpr = 'nvim_treesitter#foldexpr()'
|
|
||||||
'';
|
|
||||||
})
|
|
||||||
];
|
|
||||||
plugin-packages = map (p: p.plugin) plugins;
|
|
||||||
plugin-config-tex = concatMapStrings (p: optionalString (p.type or "" == "viml") p.config) plugins;
|
|
||||||
plugin-config-lua = concatMapStrings (p: optionalString (p.type or "" == "lua") p.config) plugins;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
# private because there could be sensitive things in the swap
|
|
||||||
sane.user.persist.private = [ ".cache/vim-swap" ];
|
|
||||||
|
|
||||||
programs.neovim = {
|
|
||||||
# neovim: https://github.com/neovim/neovim
|
|
||||||
enable = true;
|
|
||||||
viAlias = true;
|
|
||||||
vimAlias = true;
|
|
||||||
configure = {
|
|
||||||
packages.myVimPackage = {
|
|
||||||
start = plugin-packages;
|
|
||||||
};
|
|
||||||
customRC = ''
|
|
||||||
" let the terminal handle mouse events, that way i get OS-level ctrl+shift+c/etc
|
|
||||||
" this used to be default, until <https://github.com/neovim/neovim/pull/19290>
|
|
||||||
set mouse=
|
|
||||||
|
|
||||||
" copy/paste to system clipboard
|
|
||||||
set clipboard=unnamedplus
|
|
||||||
|
|
||||||
" screw tabs; always expand them into spaces
|
|
||||||
set expandtab
|
|
||||||
|
|
||||||
" at least don't open files with sections folded by default
|
|
||||||
set nofoldenable
|
|
||||||
|
|
||||||
" allow text substitutions for certain glyphs.
|
|
||||||
" higher number = more aggressive substitution (0, 1, 2, 3)
|
|
||||||
" i only make use of this for tex, but it's unclear how to
|
|
||||||
" apply that *just* to tex and retain the SyntaxRange stuff.
|
|
||||||
set conceallevel=2
|
|
||||||
|
|
||||||
" horizontal rule under the active line
|
|
||||||
" set cursorline
|
|
||||||
|
|
||||||
" highlight trailing space & related syntax errors (doesn't seem to work??)
|
|
||||||
" let c_space_errors=1
|
|
||||||
" let python_space_errors=1
|
|
||||||
|
|
||||||
" enable highlighting of leading/trailing spaces,
|
|
||||||
" and especially tabs
|
|
||||||
" source: https://www.reddit.com/r/neovim/comments/chlmfk/highlight_trailing_whitespaces_in_neovim/
|
|
||||||
set list
|
|
||||||
set listchars=tab:▷\·,trail:·,extends:◣,precedes:◢,nbsp:○
|
|
||||||
|
|
||||||
""""" PLUGIN CONFIG (tex)
|
|
||||||
${plugin-config-tex}
|
|
||||||
|
|
||||||
""""" PLUGIN CONFIG (lua)
|
|
||||||
lua <<EOF
|
|
||||||
${plugin-config-lua}
|
|
||||||
EOF
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
# news-flash RSS viewer
|
|
||||||
{ config, sane-lib, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
feeds = sane-lib.feeds;
|
|
||||||
all-feeds = config.sane.feeds;
|
|
||||||
wanted-feeds = feeds.filterByFormat ["text" "image"] all-feeds;
|
|
||||||
in {
|
|
||||||
sane.user.fs.".config/newsflashFeeds.opml" = sane-lib.fs.wantedText (
|
|
||||||
feeds.feedsToOpml wanted-feeds
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
# mail archiving/synchronization tool.
|
|
||||||
#
|
|
||||||
# manually download all emails for an account with
|
|
||||||
# - `offlineimap -a <accountname>`
|
|
||||||
#
|
|
||||||
# view account names inside the secrets file, listed below.
|
|
||||||
{ config, sane-lib, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
sops.secrets."offlineimaprc" = {
|
|
||||||
owner = config.users.users.colin.name;
|
|
||||||
sopsFile = ../../../secrets/universal/offlineimaprc.bin;
|
|
||||||
format = "binary";
|
|
||||||
};
|
|
||||||
sane.user.fs.".config/offlineimap/config" = sane-lib.fs.wantedSymlinkTo config.sops.secrets.offlineimaprc.path;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
{ sane-lib, ... }:
|
|
||||||
{
|
|
||||||
# .ignore file is read by ripgrep (rg), silver searcher (ag), maybe others.
|
|
||||||
# ignore translation files by default when searching, as they tend to have
|
|
||||||
# a LOT of duplicate text.
|
|
||||||
sane.user.fs.".ignore" = sane-lib.fs.wantedText ''
|
|
||||||
po/
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
# borrows from:
|
|
||||||
# - default config: <https://github.com/cspeterson/splatmoji/blob/master/splatmoji.config>
|
|
||||||
# - wayland: <https://github.com/cspeterson/splatmoji/issues/32#issuecomment-830862566>
|
|
||||||
{ pkgs, sane-lib, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
sane.user.persist.plaintext = [ ".local/state/splatmoji" ];
|
|
||||||
sane.user.fs.".config/splatmoji/splatmoji.config" = sane-lib.fs.wantedText ''
|
|
||||||
history_file=~/.local/state/splatmoji/history
|
|
||||||
history_length=5
|
|
||||||
# TODO: wayland equiv
|
|
||||||
paste_command=xdotool key ctrl+v
|
|
||||||
# rofi_command=${pkgs.wofi}/bin/wofi --dmenu --insensitive --cache-file /dev/null
|
|
||||||
rofi_command=${pkgs.fuzzel}/bin/fuzzel -d -i -w 60
|
|
||||||
xdotool_command=${pkgs.wtype}/bin/wtype
|
|
||||||
# TODO: wayland equiv
|
|
||||||
xsel_command=xsel -b -i
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
{ config, lib, sane-lib, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
let
|
|
||||||
host = config.networking.hostName;
|
|
||||||
user-pubkey = config.sane.ssh.pubkeys."colin@${host}".asUserKey;
|
|
||||||
host-keys = filter (k: k.user == "root") (attrValues config.sane.ssh.pubkeys);
|
|
||||||
known-hosts-text = concatStringsSep
|
|
||||||
"\n"
|
|
||||||
(map (k: k.asHostKey) host-keys)
|
|
||||||
;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
# ssh key is stored in private storage
|
|
||||||
sane.user.persist.private = [ ".ssh/id_ed25519" ];
|
|
||||||
sane.user.fs.".ssh/id_ed25519.pub" = sane-lib.fs.wantedText user-pubkey;
|
|
||||||
sane.user.fs.".ssh/known_hosts" = sane-lib.fs.wantedText known-hosts-text;
|
|
||||||
|
|
||||||
users.users.colin.openssh.authorizedKeys.keys =
|
|
||||||
let
|
|
||||||
user-keys = filter (k: k.user == "colin") (attrValues config.sane.ssh.pubkeys);
|
|
||||||
in
|
|
||||||
map (k: k.asUserKey) user-keys;
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
{ config, sane-lib, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
# TODO: this should only be shipped on gui platforms
|
|
||||||
sops.secrets."sublime_music_config" = {
|
|
||||||
owner = config.users.users.colin.name;
|
|
||||||
sopsFile = ../../../secrets/universal/sublime_music_config.json.bin;
|
|
||||||
format = "binary";
|
|
||||||
};
|
|
||||||
sane.user.fs.".config/sublime-music/config.json" = sane-lib.fs.wantedSymlinkTo config.sops.secrets.sublime_music_config.path;
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
{ config, lib, sane-lib, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
feeds = sane-lib.feeds;
|
|
||||||
all-feeds = config.sane.feeds;
|
|
||||||
wanted-feeds = feeds.filterByFormat ["podcast"] all-feeds;
|
|
||||||
podcast-urls = lib.concatStringsSep "|" (
|
|
||||||
builtins.map (feed: feed.url) wanted-feeds
|
|
||||||
);
|
|
||||||
in
|
|
||||||
{
|
|
||||||
sane.user.fs.".config/vlc/vlcrc" = sane-lib.fs.wantedText ''
|
|
||||||
[podcast]
|
|
||||||
podcast-urls=${podcast-urls}
|
|
||||||
[core]
|
|
||||||
metadata-network-access=0
|
|
||||||
[qt]
|
|
||||||
qt-privacy-ask=0
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
{ lib, sane-lib, ...}:
|
|
||||||
|
|
||||||
{
|
|
||||||
# XDG defines things like ~/Desktop, ~/Downloads, etc.
|
|
||||||
# these clutter the home, so i mostly don't use them.
|
|
||||||
sane.user.fs.".config/user-dirs.dirs" = sane-lib.fs.wantedText ''
|
|
||||||
XDG_DESKTOP_DIR="$HOME/.xdg/Desktop"
|
|
||||||
XDG_DOCUMENTS_DIR="$HOME/dev"
|
|
||||||
XDG_DOWNLOAD_DIR="$HOME/tmp"
|
|
||||||
XDG_MUSIC_DIR="$HOME/Music"
|
|
||||||
XDG_PICTURES_DIR="$HOME/Pictures"
|
|
||||||
XDG_PUBLICSHARE_DIR="$HOME/.xdg/Public"
|
|
||||||
XDG_TEMPLATES_DIR="$HOME/.xdg/Templates"
|
|
||||||
XDG_VIDEOS_DIR="$HOME/Videos"
|
|
||||||
'';
|
|
||||||
|
|
||||||
# prevent `xdg-user-dirs-update` from overriding/updating our config
|
|
||||||
# see <https://manpages.ubuntu.com/manpages/bionic/man5/user-dirs.conf.5.html>
|
|
||||||
sane.user.fs.".config/user-dirs.conf" = sane-lib.fs.wantedText "enabled=False";
|
|
||||||
}
|
|
||||||
@@ -1,148 +0,0 @@
|
|||||||
{ pkgs, sane-lib, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
# powerlevel10k prompt config
|
|
||||||
# p10k.zsh is the auto-generated config, and i overwrite those defaults here, below.
|
|
||||||
p10k-overrides = ''
|
|
||||||
# powerlevel10k launches a gitstatusd daemon to accelerate git prompt queries.
|
|
||||||
# this keeps open file handles for any git repo i touch for 60 minutes (by default).
|
|
||||||
# that prevents unmounting whatever device the git repo is on -- particularly problematic for ~/private.
|
|
||||||
# i can disable gitstatusd and get slower fallback git queries:
|
|
||||||
# - either universally
|
|
||||||
# - or selectively by path
|
|
||||||
# see: <https://github.com/romkatv/powerlevel10k/issues/246>
|
|
||||||
typeset -g POWERLEVEL9K_VCS_DISABLED_DIR_PATTERN='(/home/colin/private/*|/home/colin/knowledge/*)'
|
|
||||||
# typeset -g POWERLEVEL9K_DISABLE_GITSTATUS=true
|
|
||||||
|
|
||||||
# show user@host also when logged into the current machine.
|
|
||||||
# default behavior is to show it only over ssh.
|
|
||||||
typeset -g POWERLEVEL9K_CONTEXT_{DEFAULT,SUDO}_CONTENT_EXPANSION='$P9K_CONTENT'
|
|
||||||
'';
|
|
||||||
|
|
||||||
prezto-init = ''
|
|
||||||
source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
|
|
||||||
source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
|
||||||
source ${pkgs.zsh-prezto}/share/zsh-prezto/init.zsh
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
|
||||||
sane.user.persist.plaintext = [
|
|
||||||
# we don't need to full zsh dir -- just the history file --
|
|
||||||
# but zsh will sometimes backup the history file and we get fewer errors if we do proper mounts instead of symlinks.
|
|
||||||
# TODO: should be private?
|
|
||||||
".local/share/zsh"
|
|
||||||
# cache gitstatus otherwise p10k fetched it from the net EVERY BOOT
|
|
||||||
".cache/gitstatus"
|
|
||||||
];
|
|
||||||
|
|
||||||
# zsh/prezto complains if zshrc doesn't exist; but it does allow an "empty" file.
|
|
||||||
sane.user.fs.".config/zsh/.zshrc" = sane-lib.fs.wantedText "# ";
|
|
||||||
|
|
||||||
# enable zsh completions
|
|
||||||
environment.pathsToLink = [ "/share/zsh" ];
|
|
||||||
|
|
||||||
programs.zsh = {
|
|
||||||
enable = true;
|
|
||||||
histFile = "$HOME/.local/share/zsh/history";
|
|
||||||
shellAliases = {
|
|
||||||
":q" = "exit";
|
|
||||||
# common typos
|
|
||||||
"cd.." = "cd ..";
|
|
||||||
"cd../" = "cd ../";
|
|
||||||
};
|
|
||||||
setOptions = [
|
|
||||||
# defaults:
|
|
||||||
"HIST_IGNORE_DUPS"
|
|
||||||
"SHARE_HISTORY"
|
|
||||||
"HIST_FCNTL_LOCK"
|
|
||||||
# disable `rm *` confirmations
|
|
||||||
"rmstarsilent"
|
|
||||||
];
|
|
||||||
|
|
||||||
# .zshenv config:
|
|
||||||
shellInit = ''
|
|
||||||
ZDOTDIR=$HOME/.config/zsh
|
|
||||||
'';
|
|
||||||
|
|
||||||
# .zshrc config:
|
|
||||||
interactiveShellInit =
|
|
||||||
(builtins.readFile ./p10k.zsh)
|
|
||||||
+ p10k-overrides
|
|
||||||
+ prezto-init
|
|
||||||
+ ''
|
|
||||||
# zmv is a way to do rich moves/renames, with pattern matching/substitution.
|
|
||||||
# see for an example: <https://filipe.kiss.ink/zmv-zsh-rename/>
|
|
||||||
autoload -Uz zmv
|
|
||||||
|
|
||||||
HISTORY_IGNORE='(sane-shutdown *|sane-reboot *|rm *)'
|
|
||||||
|
|
||||||
# extra aliases
|
|
||||||
# TODO: move to `shellAliases` config?
|
|
||||||
function nd() {
|
|
||||||
mkdir -p "$1";
|
|
||||||
pushd "$1";
|
|
||||||
}
|
|
||||||
|
|
||||||
expiration=$(date -d "6 Mar" +%s)
|
|
||||||
today=$(date +%s)
|
|
||||||
days_until=$(( ($expiration - $today) / (24*60*60) ))
|
|
||||||
echo "You have $days_until days to renew your driver's license"
|
|
||||||
|
|
||||||
# auto-cd into any of these dirs by typing them and pressing 'enter':
|
|
||||||
hash -d 3rd="/home/colin/dev/3rd"
|
|
||||||
hash -d dev="/home/colin/dev"
|
|
||||||
hash -d knowledge="/home/colin/knowledge"
|
|
||||||
hash -d nixos="/home/colin/nixos"
|
|
||||||
hash -d nixpkgs="/home/colin/dev/3rd/nixpkgs"
|
|
||||||
hash -d ref="/home/colin/ref"
|
|
||||||
hash -d secrets="/home/colin/knowledge/secrets"
|
|
||||||
hash -d tmp="/home/colin/tmp"
|
|
||||||
hash -d uninsane="/home/colin/dev/uninsane"
|
|
||||||
hash -d Videos="/home/colin/Videos"
|
|
||||||
'';
|
|
||||||
|
|
||||||
syntaxHighlighting.enable = true;
|
|
||||||
vteIntegration = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# enable a command-not-found hook to show nix packages that might provide the binary typed.
|
|
||||||
programs.nix-index.enable = true;
|
|
||||||
programs.command-not-found.enable = false; #< mutually exclusive with nix-index
|
|
||||||
|
|
||||||
# prezto = oh-my-zsh fork; controls prompt, auto-completion, etc.
|
|
||||||
# see: https://github.com/sorin-ionescu/prezto
|
|
||||||
# i believe this file is auto-sourced by the prezto init.zsh script.
|
|
||||||
sane.user.fs.".config/zsh/.zpreztorc" = sane-lib.fs.wantedText ''
|
|
||||||
zstyle ':prezto:*:*' color 'yes'
|
|
||||||
|
|
||||||
# modules (they ship with prezto):
|
|
||||||
# ENVIRONMENT: configures jobs to persist after shell exit; other basic niceties
|
|
||||||
# TERMINAL: auto-titles terminal (e.g. based on cwd)
|
|
||||||
# EDITOR: configures shortcuts like Ctrl+U=undo, Ctrl+L=clear
|
|
||||||
# HISTORY: `history-stat` alias, setopts for good history defaults
|
|
||||||
# DIRECTORY: sets AUTO_CD, adds `d` alias to list directory stack, and `1`-`9` to cd that far back the stack
|
|
||||||
# SPECTRUM: helpers for term colors and styling. used by prompts? might be unnecessary
|
|
||||||
# UTILITY: configures aliases like `ll`, `la`, disables globbing for things like rsync
|
|
||||||
# adds aliases like `get` to fetch a file. also adds `http-serve` alias??
|
|
||||||
# COMPLETION: tab completion. requires `utility` module prior to loading
|
|
||||||
# TODO: enable AUTO_PARAM_SLASH
|
|
||||||
zstyle ':prezto:load' pmodule \
|
|
||||||
'environment' \
|
|
||||||
'terminal' \
|
|
||||||
'editor' \
|
|
||||||
'history' \
|
|
||||||
'directory' \
|
|
||||||
'spectrum' \
|
|
||||||
'utility' \
|
|
||||||
'completion' \
|
|
||||||
'prompt'
|
|
||||||
|
|
||||||
# default keymap. try also `vicmd` (vim normal mode, AKA "cmd mode") or `vi`.
|
|
||||||
zstyle ':prezto:module:editor' key-bindings 'emacs'
|
|
||||||
|
|
||||||
zstyle ':prezto:module:prompt' theme 'powerlevel10k'
|
|
||||||
|
|
||||||
# disable `mv` confirmation (and `rm`, too, unfortunately)
|
|
||||||
zstyle ':prezto:module:utility' safe-ops 'no'
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,4 +0,0 @@
|
|||||||
{ ... }:
|
|
||||||
{
|
|
||||||
# services.i2p.enable = true;
|
|
||||||
}
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
# TODO: migrate to nixpkgs `config.ids.uids`
|
|
||||||
# - note that nixpkgs' `config.ids.uids` is strictly a database: it doesn't set anything by default
|
|
||||||
# whereas our impl sets the gid/uid of the user/group specified if they exist.
|
|
||||||
{ ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
# legacy servo users, some are inconvenient to migrate
|
|
||||||
sane.ids.dhcpcd.gid = 991;
|
|
||||||
sane.ids.dhcpcd.uid = 992;
|
|
||||||
sane.ids.gitea.gid = 993;
|
|
||||||
sane.ids.git.uid = 994;
|
|
||||||
sane.ids.jellyfin.gid = 994;
|
|
||||||
sane.ids.pleroma.gid = 995;
|
|
||||||
sane.ids.jellyfin.uid = 996;
|
|
||||||
sane.ids.acme.gid = 996;
|
|
||||||
sane.ids.pleroma.uid = 997;
|
|
||||||
sane.ids.acme.uid = 998;
|
|
||||||
|
|
||||||
# greetd (used by sway)
|
|
||||||
sane.ids.greeter.uid = 999;
|
|
||||||
sane.ids.greeter.gid = 999;
|
|
||||||
|
|
||||||
# new servo users
|
|
||||||
sane.ids.freshrss.uid = 2401;
|
|
||||||
sane.ids.freshrss.gid = 2401;
|
|
||||||
sane.ids.mediawiki.uid = 2402;
|
|
||||||
sane.ids.signald.uid = 2403;
|
|
||||||
sane.ids.signald.gid = 2403;
|
|
||||||
sane.ids.mautrix-signal.uid = 2404;
|
|
||||||
sane.ids.mautrix-signal.gid = 2404;
|
|
||||||
sane.ids.navidrome.uid = 2405;
|
|
||||||
sane.ids.navidrome.gid = 2405;
|
|
||||||
|
|
||||||
sane.ids.colin.uid = 1000;
|
|
||||||
sane.ids.guest.uid = 1100;
|
|
||||||
|
|
||||||
# found on all hosts
|
|
||||||
sane.ids.sshd.uid = 2001; # 997
|
|
||||||
sane.ids.sshd.gid = 2001; # 997
|
|
||||||
sane.ids.polkituser.gid = 2002; # 998
|
|
||||||
# sane.ids.systemd-coredump.gid = 2003; # 996 # 2023/02/12: upstream now specifies this as 151
|
|
||||||
sane.ids.nscd.uid = 2004;
|
|
||||||
sane.ids.nscd.gid = 2004;
|
|
||||||
sane.ids.systemd-oom.uid = 2005;
|
|
||||||
sane.ids.systemd-oom.gid = 2005;
|
|
||||||
|
|
||||||
# found on graphical hosts
|
|
||||||
sane.ids.nm-iodine.uid = 2101; # desko/moby/lappy
|
|
||||||
|
|
||||||
# found on desko host
|
|
||||||
# from services.usbmuxd
|
|
||||||
sane.ids.usbmux.uid = 2204;
|
|
||||||
sane.ids.usbmux.gid = 2204;
|
|
||||||
|
|
||||||
|
|
||||||
# originally found on moby host
|
|
||||||
# gnome core-shell
|
|
||||||
sane.ids.avahi.uid = 2304;
|
|
||||||
sane.ids.avahi.gid = 2304;
|
|
||||||
sane.ids.colord.uid = 2305;
|
|
||||||
sane.ids.colord.gid = 2305;
|
|
||||||
sane.ids.geoclue.uid = 2306;
|
|
||||||
sane.ids.geoclue.gid = 2306;
|
|
||||||
# gnome core-os-services
|
|
||||||
sane.ids.rtkit.uid = 2307;
|
|
||||||
sane.ids.rtkit.gid = 2307;
|
|
||||||
# phosh
|
|
||||||
sane.ids.feedbackd.gid = 2308;
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
{ ... }:
|
|
||||||
{
|
|
||||||
# /etc/machine-id is a globally unique identifier used for:
|
|
||||||
# - systemd-networkd: DHCP lease renewal (instead of keying by the MAC address)
|
|
||||||
# - systemd-journald: to filter logs by host
|
|
||||||
# - chromium (potentially to track re-installations)
|
|
||||||
# - gdbus; system services that might upgrade to AF_LOCAL if both services can confirm they're on the same machine
|
|
||||||
# because of e.g. the chromium use, we *don't want* to persist this.
|
|
||||||
# however, `journalctl` won't show logs from previous boots unless the machine-ids match.
|
|
||||||
# so for now, generate something unique from the host ssh key.
|
|
||||||
# TODO: move this into modules?
|
|
||||||
system.activationScripts.machine-id = {
|
|
||||||
deps = [ "etc" ];
|
|
||||||
text = "sha256sum /etc/ssh/host_keys/ssh_host_ed25519_key | cut -c 1-32 > /etc/machine-id";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
# the default backend is "wpa_supplicant".
|
|
||||||
# wpa_supplicant reliably picks weak APs to connect to.
|
|
||||||
# see: <https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/474>
|
|
||||||
# iwd is an alternative that shouldn't have this problem
|
|
||||||
# docs:
|
|
||||||
# - <https://nixos.wiki/wiki/Iwd>
|
|
||||||
# - <https://iwd.wiki.kernel.org/networkmanager>
|
|
||||||
# - `man iwd.config` for global config
|
|
||||||
# - `man iwd.network` for per-SSID config
|
|
||||||
# use `iwctl` to control
|
|
||||||
networking.networkmanager.wifi.backend = "iwd";
|
|
||||||
networking.wireless.iwd.enable = true;
|
|
||||||
networking.wireless.iwd.settings = {
|
|
||||||
# auto-connect to a stronger network if signal drops below this value
|
|
||||||
# bedroom -> bedroom connection is -35 to -40 dBm
|
|
||||||
# bedroom -> living room connection is -60 dBm
|
|
||||||
General.RoamThreshold = "-52"; # default -70
|
|
||||||
General.RoamThreshold5G = "-52"; # default -76
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
{ ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
sane.persist.stores.private.origin = "/home/colin/private";
|
|
||||||
# store /home/colin/a/b in /home/private/a/b instead of /home/private/home/colin/a/b
|
|
||||||
sane.persist.stores.private.prefix = "/home/colin";
|
|
||||||
|
|
||||||
sane.persist.sys.plaintext = [
|
|
||||||
"/var/log"
|
|
||||||
"/var/backup" # for e.g. postgres dumps
|
|
||||||
# TODO: move elsewhere
|
|
||||||
"/var/lib/alsa" # preserve output levels, default devices
|
|
||||||
"/var/lib/colord" # preserve color calibrations (?)
|
|
||||||
"/var/lib/machines" # maybe not needed, but would be painful to add a VM and forget.
|
|
||||||
"/var/lib/systemd/backlight" # backlight brightness
|
|
||||||
"/var/lib/systemd/coredump"
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,378 +0,0 @@
|
|||||||
{ lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
inherit (builtins) attrNames concatLists;
|
|
||||||
inherit (lib) mapAttrs mapAttrsToList mkDefault mkMerge optional;
|
|
||||||
|
|
||||||
flattenedPkgs = pkgs // (with pkgs; {
|
|
||||||
# XXX can't `inherit` a nested attr, so we move them to the toplevel
|
|
||||||
"cacert.unbundled" = pkgs.cacert.unbundled;
|
|
||||||
"gnome.cheese" = gnome.cheese;
|
|
||||||
"gnome.dconf-editor" = gnome.dconf-editor;
|
|
||||||
"gnome.file-roller" = gnome.file-roller;
|
|
||||||
"gnome.gnome-disk-utility" = gnome.gnome-disk-utility;
|
|
||||||
"gnome.gnome-maps" = gnome.gnome-maps;
|
|
||||||
"gnome.nautilus" = gnome.nautilus;
|
|
||||||
"gnome.gnome-system-monitor" = gnome.gnome-system-monitor;
|
|
||||||
"gnome.gnome-terminal" = gnome.gnome-terminal;
|
|
||||||
"gnome.gnome-weather" = gnome.gnome-weather;
|
|
||||||
"libsForQt5.plasmatube" = libsForQt5.plasmatube;
|
|
||||||
});
|
|
||||||
|
|
||||||
sysadminPkgs = {
|
|
||||||
inherit (flattenedPkgs)
|
|
||||||
btrfs-progs
|
|
||||||
"cacert.unbundled" # some services require unbundled /etc/ssl/certs
|
|
||||||
cryptsetup
|
|
||||||
dig
|
|
||||||
efibootmgr
|
|
||||||
fatresize
|
|
||||||
fd
|
|
||||||
file
|
|
||||||
gawk
|
|
||||||
git
|
|
||||||
gptfdisk
|
|
||||||
hdparm
|
|
||||||
htop
|
|
||||||
iftop
|
|
||||||
inetutils # for telnet
|
|
||||||
iotop
|
|
||||||
iptables
|
|
||||||
jq
|
|
||||||
killall
|
|
||||||
lsof
|
|
||||||
nano
|
|
||||||
netcat
|
|
||||||
nethogs
|
|
||||||
nmap
|
|
||||||
openssl
|
|
||||||
parted
|
|
||||||
pciutils
|
|
||||||
powertop
|
|
||||||
pstree
|
|
||||||
ripgrep
|
|
||||||
screen
|
|
||||||
smartmontools
|
|
||||||
socat
|
|
||||||
strace
|
|
||||||
subversion
|
|
||||||
tcpdump
|
|
||||||
tree
|
|
||||||
usbutils
|
|
||||||
wget
|
|
||||||
;
|
|
||||||
};
|
|
||||||
sysadminExtraPkgs = {
|
|
||||||
# application-specific packages
|
|
||||||
inherit (pkgs)
|
|
||||||
backblaze-b2
|
|
||||||
duplicity
|
|
||||||
sqlite # to debug sqlite3 databases
|
|
||||||
;
|
|
||||||
};
|
|
||||||
|
|
||||||
iphonePkgs = {
|
|
||||||
inherit (pkgs)
|
|
||||||
ifuse
|
|
||||||
ipfs
|
|
||||||
libimobiledevice
|
|
||||||
;
|
|
||||||
};
|
|
||||||
|
|
||||||
tuiPkgs = {
|
|
||||||
inherit (pkgs)
|
|
||||||
aerc # email client
|
|
||||||
offlineimap # email mailox sync
|
|
||||||
visidata # TUI spreadsheet viewer/editor
|
|
||||||
w3m
|
|
||||||
;
|
|
||||||
};
|
|
||||||
|
|
||||||
# TODO: split these into smaller groups.
|
|
||||||
# - transcoders (ffmpeg, imagemagick) only wanted on desko/lappy ("powerutils"?)
|
|
||||||
consolePkgs = {
|
|
||||||
inherit (pkgs)
|
|
||||||
cdrtools
|
|
||||||
dmidecode
|
|
||||||
efivar
|
|
||||||
flashrom
|
|
||||||
fwupd
|
|
||||||
ghostscript # TODO: imagemagick wrapper should add gs to PATH
|
|
||||||
gnupg
|
|
||||||
gocryptfs
|
|
||||||
gopass
|
|
||||||
gopass-jsonapi
|
|
||||||
imagemagick
|
|
||||||
kitty # TODO: move to GUI, but `ssh servo` from kitty sets `TERM=xterm-kitty` in the remove and breaks things
|
|
||||||
libsecret # for managing user keyrings
|
|
||||||
lm_sensors # for sensors-detect
|
|
||||||
lshw
|
|
||||||
ffmpeg
|
|
||||||
memtester
|
|
||||||
# networkmanager
|
|
||||||
nixpkgs-review
|
|
||||||
# nixos-generators
|
|
||||||
# nettools
|
|
||||||
nmon
|
|
||||||
oathToolkit # for oathtool
|
|
||||||
# ponymix
|
|
||||||
pulsemixer
|
|
||||||
python3
|
|
||||||
rsync
|
|
||||||
# python3Packages.eyeD3 # music tagging
|
|
||||||
sane-scripts
|
|
||||||
sequoia
|
|
||||||
snapper
|
|
||||||
sops
|
|
||||||
sox
|
|
||||||
speedtest-cli
|
|
||||||
ssh-to-age
|
|
||||||
sudo
|
|
||||||
# tageditor # music tagging
|
|
||||||
unar
|
|
||||||
wireguard-tools
|
|
||||||
xdg-utils # for xdg-open
|
|
||||||
# youtube-dl
|
|
||||||
yt-dlp
|
|
||||||
;
|
|
||||||
};
|
|
||||||
|
|
||||||
guiPkgs = {
|
|
||||||
inherit (flattenedPkgs)
|
|
||||||
celluloid # mpv frontend
|
|
||||||
clinfo
|
|
||||||
emote
|
|
||||||
evince # works on phosh
|
|
||||||
|
|
||||||
# { pkg = fluffychat-moby; dir = [ ".local/share/chat.fluffy.fluffychat" ]; } # TODO: ship normal fluffychat on non-moby?
|
|
||||||
|
|
||||||
# foliate # e-book reader
|
|
||||||
|
|
||||||
# XXX by default fractal stores its state in ~/.local/share/<UUID>.
|
|
||||||
# after logging in, manually change ~/.local/share/keyrings/... to point it to some predictable subdir.
|
|
||||||
# then reboot (so that libsecret daemon re-loads the keyring...?)
|
|
||||||
# { pkg = fractal-latest; private = [ ".local/share/fractal" ]; }
|
|
||||||
# { pkg = fractal-next; private = [ ".local/share/fractal" ]; }
|
|
||||||
|
|
||||||
# "gnome.cheese"
|
|
||||||
"gnome.dconf-editor"
|
|
||||||
gnome-feeds # RSS reader (with claimed mobile support)
|
|
||||||
"gnome.file-roller"
|
|
||||||
# "gnome.gnome-maps" # works on phosh
|
|
||||||
"gnome.nautilus"
|
|
||||||
# gnome-podcasts
|
|
||||||
"gnome.gnome-system-monitor"
|
|
||||||
"gnome.gnome-terminal" # works on phosh
|
|
||||||
"gnome.gnome-weather"
|
|
||||||
gpodder-configured
|
|
||||||
gthumb
|
|
||||||
# lollypop
|
|
||||||
mpv
|
|
||||||
networkmanagerapplet
|
|
||||||
# newsflash
|
|
||||||
nheko
|
|
||||||
pavucontrol
|
|
||||||
# picard # music tagging
|
|
||||||
playerctl
|
|
||||||
# "libsForQt5.plasmatube" # Youtube player
|
|
||||||
soundconverter
|
|
||||||
# sublime music persists any downloaded albums here.
|
|
||||||
# it doesn't obey a conventional ~/Music/{Artist}/{Album}/{Track} notation, so no symlinking
|
|
||||||
# config (e.g. server connection details) is persisted in ~/.config/sublime-music/config.json
|
|
||||||
# possible to pass config as a CLI arg (sublime-music -c config.json)
|
|
||||||
# { pkg = sublime-music; dir = [ ".local/share/sublime-music" ]; }
|
|
||||||
sublime-music-mobile
|
|
||||||
# tdesktop # broken on phosh
|
|
||||||
# tokodon
|
|
||||||
vlc
|
|
||||||
# pleroma client (Electron). input is broken on phosh. TODO(2023/02/02): fix electron19 input (insecure)
|
|
||||||
# whalebird
|
|
||||||
xterm # broken on phosh
|
|
||||||
;
|
|
||||||
};
|
|
||||||
desktopGuiPkgs = {
|
|
||||||
inherit (flattenedPkgs)
|
|
||||||
audacity
|
|
||||||
chromium
|
|
||||||
dino
|
|
||||||
electrum
|
|
||||||
element-desktop
|
|
||||||
font-manager
|
|
||||||
gajim # XMPP client
|
|
||||||
gimp # broken on phosh
|
|
||||||
"gnome.gnome-disk-utility"
|
|
||||||
handbrake
|
|
||||||
inkscape
|
|
||||||
kdenlive
|
|
||||||
kid3 # audio tagging
|
|
||||||
krita
|
|
||||||
libreoffice-fresh # XXX colin: maybe don't want this on mobile
|
|
||||||
obsidian
|
|
||||||
;
|
|
||||||
};
|
|
||||||
x86GuiPkgs = {
|
|
||||||
inherit (pkgs)
|
|
||||||
discord
|
|
||||||
|
|
||||||
# kaiteki # Pleroma client
|
|
||||||
# gnome.zenity # for kaiteki (it will use qarma, kdialog, or zenity)
|
|
||||||
# gpt2tc # XXX: unreliable mirror
|
|
||||||
|
|
||||||
logseq
|
|
||||||
losslesscut-bin
|
|
||||||
makemkv
|
|
||||||
monero-gui
|
|
||||||
signal-desktop
|
|
||||||
spotify
|
|
||||||
tor-browser-bundle-bin
|
|
||||||
zecwallet-lite
|
|
||||||
;
|
|
||||||
};
|
|
||||||
|
|
||||||
# packages not part of any package set
|
|
||||||
otherPkgs = {
|
|
||||||
inherit (pkgs)
|
|
||||||
stepmania
|
|
||||||
;
|
|
||||||
};
|
|
||||||
|
|
||||||
# define -- but don't enable -- the packages in some attrset.
|
|
||||||
# use `mkDefault` for the package here so we can customize some of them further down this file
|
|
||||||
declarePkgs = pkgsAsAttrs: mapAttrs (_n: p: {
|
|
||||||
package = mkDefault p;
|
|
||||||
}) pkgsAsAttrs;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
config = {
|
|
||||||
sane.programs = mkMerge [
|
|
||||||
(declarePkgs consolePkgs)
|
|
||||||
(declarePkgs desktopGuiPkgs)
|
|
||||||
(declarePkgs guiPkgs)
|
|
||||||
(declarePkgs iphonePkgs)
|
|
||||||
(declarePkgs sysadminPkgs)
|
|
||||||
(declarePkgs sysadminExtraPkgs)
|
|
||||||
(declarePkgs tuiPkgs)
|
|
||||||
(declarePkgs x86GuiPkgs)
|
|
||||||
(declarePkgs otherPkgs)
|
|
||||||
{
|
|
||||||
# link the various package sets into their own meta packages
|
|
||||||
consoleUtils = {
|
|
||||||
package = null;
|
|
||||||
suggestedPrograms = attrNames consolePkgs;
|
|
||||||
};
|
|
||||||
desktopGuiApps = {
|
|
||||||
package = null;
|
|
||||||
suggestedPrograms = attrNames desktopGuiPkgs;
|
|
||||||
};
|
|
||||||
guiApps = {
|
|
||||||
package = null;
|
|
||||||
suggestedPrograms = (attrNames guiPkgs)
|
|
||||||
++ [ "tuiApps" ]
|
|
||||||
++ optional (pkgs.system == "x86_64-linux") "x86GuiApps";
|
|
||||||
};
|
|
||||||
iphoneUtils = {
|
|
||||||
package = null;
|
|
||||||
suggestedPrograms = attrNames iphonePkgs;
|
|
||||||
};
|
|
||||||
sysadminUtils = {
|
|
||||||
package = null;
|
|
||||||
suggestedPrograms = attrNames sysadminPkgs;
|
|
||||||
};
|
|
||||||
sysadminExtraUtils = {
|
|
||||||
package = null;
|
|
||||||
suggestedPrograms = attrNames sysadminExtraPkgs;
|
|
||||||
};
|
|
||||||
tuiApps = {
|
|
||||||
package = null;
|
|
||||||
suggestedPrograms = attrNames tuiPkgs;
|
|
||||||
};
|
|
||||||
x86GuiApps = {
|
|
||||||
package = null;
|
|
||||||
suggestedPrograms = attrNames x86GuiPkgs;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
# nontrivial package definitions
|
|
||||||
imagemagick.package = pkgs.imagemagick.override {
|
|
||||||
ghostscriptSupport = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
dino.private = [ ".local/share/dino" ];
|
|
||||||
|
|
||||||
# creds, but also 200 MB of node modules, etc
|
|
||||||
discord = {
|
|
||||||
package = pkgs.discord.override {
|
|
||||||
# XXX 2022-07-31: fix to allow links to open in default web-browser:
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/78961
|
|
||||||
nss = pkgs.nss_latest;
|
|
||||||
};
|
|
||||||
private = [ ".config/discord" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
# creds/session keys, etc
|
|
||||||
element-desktop.private = [ ".config/Element" ];
|
|
||||||
|
|
||||||
# `emote` will show a first-run dialog based on what's in this directory.
|
|
||||||
# mostly, it just keeps a LRU of previously-used emotes to optimize display order.
|
|
||||||
# TODO: package [smile](https://github.com/mijorus/smile) for probably a better mobile experience.
|
|
||||||
emote.dir = [ ".local/share/Emote" ];
|
|
||||||
|
|
||||||
# XXX: we preserve the whole thing because if we only preserve gPodder/Downloads
|
|
||||||
# then startup is SLOW during feed import, and we might end up with zombie eps in the dl dir.
|
|
||||||
gpodder-configured.dir = [ "gPodder" ];
|
|
||||||
|
|
||||||
# actual monero blockchain (not wallet/etc; safe to delete, just slow to regenerate)
|
|
||||||
# XXX: is it really safe to persist this? it doesn't have info that could de-anonymize if captured?
|
|
||||||
monero-gui.dir = [ ".bitmonero" ];
|
|
||||||
|
|
||||||
mpv.dir = [ ".config/mpv/watch_later" ];
|
|
||||||
|
|
||||||
# not strictly necessary, but allows caching articles; offline use, etc.
|
|
||||||
newsflash.dir = [ ".local/share/news-flash" ];
|
|
||||||
nheko.private = [
|
|
||||||
".config/nheko" # config file (including client token)
|
|
||||||
".cache/nheko" # media cache
|
|
||||||
".local/share/nheko" # per-account state database
|
|
||||||
];
|
|
||||||
|
|
||||||
# settings (electron app)
|
|
||||||
obsidian.dir = [ ".config/obsidian" ];
|
|
||||||
|
|
||||||
# creds, media
|
|
||||||
signal-desktop.private = [ ".config/Signal" ];
|
|
||||||
|
|
||||||
|
|
||||||
# creds, widevine .so download. TODO: could easily manage these statically.
|
|
||||||
spotify.dir = [ ".config/spotify" ];
|
|
||||||
|
|
||||||
# sublime music persists any downloaded albums here.
|
|
||||||
# it doesn't obey a conventional ~/Music/{Artist}/{Album}/{Track} notation, so no symlinking
|
|
||||||
# config (e.g. server connection details) is persisted in ~/.config/sublime-music/config.json
|
|
||||||
# possible to pass config as a CLI arg (sublime-music -c config.json)
|
|
||||||
# { pkg = sublime-music; dir = [ ".local/share/sublime-music" ]; }
|
|
||||||
sublime-music-mobile.dir = [ ".local/share/sublime-music" ];
|
|
||||||
|
|
||||||
tdesktop.private = [ ".local/share/TelegramDesktop" ];
|
|
||||||
|
|
||||||
tokodon.private = [ ".cache/KDE/tokodon" ];
|
|
||||||
|
|
||||||
# hardenedMalloc solves a crash at startup
|
|
||||||
# TODO 2023/02/02: is this safe to remove yet?
|
|
||||||
tor-browser-bundle-bin.package = pkgs.tor-browser-bundle-bin.override {
|
|
||||||
useHardenedMalloc = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
# vlc remembers play position in ~/.config/vlc/vlc-qt-interface.conf
|
|
||||||
vlc.dir = [ ".config/vlc" ];
|
|
||||||
|
|
||||||
whalebird.private = [ ".config/Whalebird" ];
|
|
||||||
|
|
||||||
# zcash coins. safe to delete, just slow to regenerate (10-60 minutes)
|
|
||||||
zecwallet-lite.private = [ ".zcash" ];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
# XXX: this might not be necessary. try removing this and cacert.unbundled (servo)?
|
|
||||||
environment.etc."ssl/certs".source = "${pkgs.cacert.unbundled}/etc/ssl/certs/*";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,132 +0,0 @@
|
|||||||
{ config, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
# SOPS configuration:
|
|
||||||
# docs: https://github.com/Mic92/sops-nix
|
|
||||||
#
|
|
||||||
# for each new user you want to edit sops files:
|
|
||||||
# create a private age key from ssh key:
|
|
||||||
# $ mkdir -p ~/.config/sops/age; ssh-to-age -private-key -i ~/.ssh/id_ed25519 > ~/.config/sops/age/keys.txt; chmod 600 ~/.config/sops/age/keys.txt
|
|
||||||
# if the private key was password protected, then first decrypt it:
|
|
||||||
# $ cp ~/.ssh/id_ed25519 /tmp/id_ed25519
|
|
||||||
# $ ssh-keygen -p -N "" -f /tmp/id_ed25519
|
|
||||||
#
|
|
||||||
# for each user you want to decrypt secrets:
|
|
||||||
# $ cat ~/.ssh/id_ed25519.pub | ssh-to-age
|
|
||||||
# add the result to .sops.yaml
|
|
||||||
# since we specify ssh pubkeys in the nix config, you can just grep for `ssh-ed25519` here and use those instead
|
|
||||||
#
|
|
||||||
# for each host you want to decrypt secrets:
|
|
||||||
# $ cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age
|
|
||||||
# add the result to .sops.yaml
|
|
||||||
# $ sops updatekeys secrets/example.yaml
|
|
||||||
#
|
|
||||||
# to create a new secret:
|
|
||||||
# $ sops secrets/example.yaml
|
|
||||||
# control access below (sops.secret.<x>.owner = ...)
|
|
||||||
#
|
|
||||||
# to read a secret:
|
|
||||||
# $ cat /run/secrets/example_key
|
|
||||||
|
|
||||||
# sops.age.sshKeyPaths = [ "/home/colin/.ssh/id_ed25519_dec" ];
|
|
||||||
# This will add secrets.yaml to the nix store
|
|
||||||
# You can avoid this by adding a string to the full path instead, i.e.
|
|
||||||
# sops.defaultSopsFile = "/root/.sops/secrets/example.yaml";
|
|
||||||
sops.defaultSopsFile = ../../secrets/universal.yaml;
|
|
||||||
sops.gnupg.sshKeyPaths = []; # disable RSA key import
|
|
||||||
# This is using an age key that is expected to already be in the filesystem
|
|
||||||
# sops.age.keyFile = "/home/colin/.ssh/age.pub";
|
|
||||||
# sops.age.keyFile = "/var/lib/sops-nix/key.txt";
|
|
||||||
# This will generate a new key if the key specified above does not exist
|
|
||||||
# sops.age.generateKey = true;
|
|
||||||
# This is the actual specification of the secrets.
|
|
||||||
# sops.secrets.example_key = {
|
|
||||||
# owner = config.users.users.colin.name;
|
|
||||||
# };
|
|
||||||
# sops.secrets."myservice/my_subdir/my_secret" = {};
|
|
||||||
|
|
||||||
## universal secrets
|
|
||||||
# TODO: glob these?
|
|
||||||
|
|
||||||
sops.secrets."jackett_apikey" = {
|
|
||||||
sopsFile = ../../secrets/universal.yaml;
|
|
||||||
owner = config.users.users.colin.name;
|
|
||||||
};
|
|
||||||
sops.secrets."router_passwd" = {
|
|
||||||
sopsFile = ../../secrets/universal.yaml;
|
|
||||||
};
|
|
||||||
sops.secrets."wg_ovpnd_us_privkey" = {
|
|
||||||
sopsFile = ../../secrets/universal.yaml;
|
|
||||||
};
|
|
||||||
sops.secrets."wg_ovpnd_us-atl_privkey" = {
|
|
||||||
sopsFile = ../../secrets/universal.yaml;
|
|
||||||
};
|
|
||||||
sops.secrets."wg_ovpnd_us-mi_privkey" = {
|
|
||||||
sopsFile = ../../secrets/universal.yaml;
|
|
||||||
};
|
|
||||||
sops.secrets."wg_ovpnd_ukr_privkey" = {
|
|
||||||
sopsFile = ../../secrets/universal.yaml;
|
|
||||||
};
|
|
||||||
|
|
||||||
sops.secrets."snippets" = {
|
|
||||||
sopsFile = ../../secrets/universal/snippets.bin;
|
|
||||||
format = "binary";
|
|
||||||
owner = config.users.users.colin.name;
|
|
||||||
};
|
|
||||||
|
|
||||||
sops.secrets."bt/car" = {
|
|
||||||
sopsFile = ../../secrets/universal/bt/car.bin;
|
|
||||||
format = "binary";
|
|
||||||
};
|
|
||||||
sops.secrets."bt/earbuds" = {
|
|
||||||
sopsFile = ../../secrets/universal/bt/earbuds.bin;
|
|
||||||
format = "binary";
|
|
||||||
};
|
|
||||||
sops.secrets."bt/portable-speaker" = {
|
|
||||||
sopsFile = ../../secrets/universal/bt/portable-speaker.bin;
|
|
||||||
format = "binary";
|
|
||||||
};
|
|
||||||
|
|
||||||
sops.secrets."iwd/community-university.psk" = {
|
|
||||||
sopsFile = ../../secrets/universal/net/community-university.psk.bin;
|
|
||||||
format = "binary";
|
|
||||||
};
|
|
||||||
sops.secrets."iwd/friend-libertarian-dod.psk" = {
|
|
||||||
sopsFile = ../../secrets/universal/net/friend-libertarian-dod.psk.bin;
|
|
||||||
format = "binary";
|
|
||||||
};
|
|
||||||
sops.secrets."iwd/friend-rationalist-empathist.psk" = {
|
|
||||||
sopsFile = ../../secrets/universal/net/friend-rationalist-empathist.psk.bin;
|
|
||||||
format = "binary";
|
|
||||||
};
|
|
||||||
sops.secrets."iwd/home-shared.psk" = {
|
|
||||||
sopsFile = ../../secrets/universal/net/home-shared.psk.bin;
|
|
||||||
format = "binary";
|
|
||||||
};
|
|
||||||
sops.secrets."iwd/makespace-south.psk" = {
|
|
||||||
sopsFile = ../../secrets/universal/net/makespace-south.psk.bin;
|
|
||||||
format = "binary";
|
|
||||||
};
|
|
||||||
sops.secrets."iwd/archive-2023-02-home-bedroom.psk" = {
|
|
||||||
sopsFile = ../../secrets/universal/net/archive/2023-02-home-bedroom.psk.bin;
|
|
||||||
format = "binary";
|
|
||||||
};
|
|
||||||
sops.secrets."iwd/archive-2023-02-home-shared-24G.psk" = {
|
|
||||||
sopsFile = ../../secrets/universal/net/archive/2023-02-home-shared-24G.psk.bin;
|
|
||||||
format = "binary";
|
|
||||||
};
|
|
||||||
sops.secrets."iwd/archive-2023-02-home-shared.psk" = {
|
|
||||||
sopsFile = ../../secrets/universal/net/archive/2023-02-home-shared.psk.bin;
|
|
||||||
format = "binary";
|
|
||||||
};
|
|
||||||
sops.secrets."iwd/iphone" = {
|
|
||||||
sopsFile = ../../secrets/universal/net/iphone.psk.bin;
|
|
||||||
format = "binary";
|
|
||||||
};
|
|
||||||
sops.secrets."iwd/parents" = {
|
|
||||||
sopsFile = ../../secrets/universal/net/parents.psk.bin;
|
|
||||||
format = "binary";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
{ config, lib, sane-data, sane-lib, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
inherit (builtins) head map mapAttrs tail;
|
|
||||||
inherit (lib) concatStringsSep mkMerge reverseList;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
sane.ssh.pubkeys =
|
|
||||||
let
|
|
||||||
# path is a DNS-style path like [ "org" "uninsane" "root" ]
|
|
||||||
keyNameForPath = path:
|
|
||||||
let
|
|
||||||
rev = reverseList path;
|
|
||||||
name = head rev;
|
|
||||||
host = concatStringsSep "." (tail rev);
|
|
||||||
in
|
|
||||||
"${name}@${host}";
|
|
||||||
|
|
||||||
# [{ path :: [String], value :: String }] for the keys we want to install
|
|
||||||
globalKeys = sane-lib.flattenAttrs sane-data.keys;
|
|
||||||
domainKeys = sane-lib.flattenAttrs (
|
|
||||||
mapAttrs (host: cfg: {
|
|
||||||
colin = cfg.ssh.user_pubkey;
|
|
||||||
root = cfg.ssh.host_pubkey;
|
|
||||||
}) config.sane.hosts.by-name
|
|
||||||
);
|
|
||||||
in mkMerge (map
|
|
||||||
({ path, value }: {
|
|
||||||
"${keyNameForPath path}" = lib.mkIf (value != null) value;
|
|
||||||
})
|
|
||||||
(globalKeys ++ domainKeys)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,136 +0,0 @@
|
|||||||
{ config, pkgs, lib, sane-lib, ... }:
|
|
||||||
|
|
||||||
# installer docs: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/profiles/installation-device.nix
|
|
||||||
with lib;
|
|
||||||
let
|
|
||||||
cfg = config.sane.guest;
|
|
||||||
fs = sane-lib.fs;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options = {
|
|
||||||
sane.guest.enable = mkOption {
|
|
||||||
default = false;
|
|
||||||
type = types.bool;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = {
|
|
||||||
# Users are exactly these specified here;
|
|
||||||
# old ones will be deleted (from /etc/passwd, etc) upon upgrade.
|
|
||||||
users.mutableUsers = false;
|
|
||||||
|
|
||||||
# docs: https://nixpkgs-manual-sphinx-markedown-example.netlify.app/generated/options-db.xml.html#users-users
|
|
||||||
users.users.colin = {
|
|
||||||
# sets group to "users" (?)
|
|
||||||
isNormalUser = true;
|
|
||||||
home = "/home/colin";
|
|
||||||
createHome = true;
|
|
||||||
homeMode = "0700";
|
|
||||||
# i don't get exactly what this is, but nixos defaults to this non-deterministically
|
|
||||||
# in /var/lib/nixos/auto-subuid-map and i don't want that.
|
|
||||||
subUidRanges = [
|
|
||||||
{ startUid=100000; count=1; }
|
|
||||||
];
|
|
||||||
group = "users";
|
|
||||||
extraGroups = [
|
|
||||||
"wheel"
|
|
||||||
"nixbuild"
|
|
||||||
"networkmanager"
|
|
||||||
# phosh/mobile. XXX colin: unsure if necessary
|
|
||||||
"video"
|
|
||||||
"feedbackd"
|
|
||||||
"dialout" # required for modem access
|
|
||||||
];
|
|
||||||
|
|
||||||
# initial password is empty, in case anything goes wrong.
|
|
||||||
# if `colin-passwd` (a password hash) is successfully found/decrypted, that becomes the password at boot.
|
|
||||||
initialPassword = lib.mkDefault "";
|
|
||||||
passwordFile = lib.mkIf (config.sops.secrets ? "colin-passwd") config.sops.secrets.colin-passwd.path;
|
|
||||||
|
|
||||||
shell = pkgs.zsh;
|
|
||||||
|
|
||||||
# mount encrypted stuff at login
|
|
||||||
# some other nix pam users:
|
|
||||||
# - <https://github.com/g00pix/nixconf/blob/32c04f6fa843fed97639dd3f09e157668d3eea1f/profiles/sshfs.nix>
|
|
||||||
# - <https://github.com/lourkeur/distro/blob/11173454c6bb50f7ccab28cc2c757dca21446d1d/nixos/profiles/users/louis-full.nix>
|
|
||||||
# - <https://github.com/dnr/sample-nix-code/blob/03494480c1fae550c033aa54fd96aeb3827761c5/nixos/laptop.nix>
|
|
||||||
pamMount = let
|
|
||||||
priv = config.fileSystems."/home/colin/private";
|
|
||||||
in {
|
|
||||||
fstype = priv.fsType;
|
|
||||||
path = priv.device;
|
|
||||||
mountpoint = priv.mountPoint;
|
|
||||||
options = builtins.concatStringsSep "," priv.options;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
security.pam.mount.enable = true;
|
|
||||||
|
|
||||||
sane.users.colin.default = true;
|
|
||||||
# ensure ~ perms are known to sane.fs module.
|
|
||||||
# TODO: this is generic enough to be lifted up into sane.fs itself.
|
|
||||||
sane.fs."/home/colin".dir.acl = {
|
|
||||||
user = "colin";
|
|
||||||
group = config.users.users.colin.group;
|
|
||||||
mode = config.users.users.colin.homeMode;
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.user.persist.plaintext = [
|
|
||||||
"archive"
|
|
||||||
"dev"
|
|
||||||
# TODO: records should be private
|
|
||||||
"records"
|
|
||||||
"ref"
|
|
||||||
"tmp"
|
|
||||||
"use"
|
|
||||||
"Music"
|
|
||||||
"Pictures"
|
|
||||||
"Videos"
|
|
||||||
|
|
||||||
".cache/nix"
|
|
||||||
".cache/nix-index"
|
|
||||||
|
|
||||||
# ".cargo"
|
|
||||||
# ".rustup"
|
|
||||||
];
|
|
||||||
|
|
||||||
# convenience
|
|
||||||
sane.user.fs."knowledge" = fs.wantedSymlinkTo "private/knowledge";
|
|
||||||
sane.user.fs."nixos" = fs.wantedSymlinkTo "dev/nixos";
|
|
||||||
sane.user.fs."Videos/servo" = fs.wantedSymlinkTo "/mnt/servo-media/Videos";
|
|
||||||
sane.user.fs."Videos/servo-incomplete" = fs.wantedSymlinkTo "/mnt/servo-media/incomplete";
|
|
||||||
sane.user.fs."Music/servo" = fs.wantedSymlinkTo "/mnt/servo-media/Music";
|
|
||||||
|
|
||||||
# used by password managers, e.g. unix `pass`
|
|
||||||
sane.user.fs.".password-store" = fs.wantedSymlinkTo "knowledge/secrets/accounts";
|
|
||||||
|
|
||||||
sane.persist.sys.plaintext = mkIf cfg.enable [
|
|
||||||
# intentionally allow other users to write to the guest folder
|
|
||||||
{ directory = "/home/guest"; user = "guest"; group = "users"; mode = "0775"; }
|
|
||||||
];
|
|
||||||
users.users.guest = mkIf cfg.enable {
|
|
||||||
isNormalUser = true;
|
|
||||||
home = "/home/guest";
|
|
||||||
subUidRanges = [
|
|
||||||
{ startUid=200000; count=1; }
|
|
||||||
];
|
|
||||||
group = "users";
|
|
||||||
initialPassword = lib.mkDefault "";
|
|
||||||
shell = pkgs.zsh;
|
|
||||||
openssh.authorizedKeys.keys = [
|
|
||||||
# TODO: insert pubkeys that should be allowed in
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
security.sudo = {
|
|
||||||
enable = true;
|
|
||||||
wheelNeedsPassword = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.openssh = {
|
|
||||||
enable = true;
|
|
||||||
settings.PermitRootLogin = "no";
|
|
||||||
settings.PasswordAuthentication = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
{ config, lib, ... }:
|
|
||||||
|
|
||||||
# to add a new OVPN VPN:
|
|
||||||
# - generate a privkey `wg genkey`
|
|
||||||
# - add this key to `sops secrets/universal.yaml`
|
|
||||||
# - upload pubkey to OVPN.com
|
|
||||||
# - generate config @ OVPN.com
|
|
||||||
# - copy the Address, PublicKey, Endpoint from OVPN's config
|
|
||||||
# N.B.: maximum interface name in Linux is 15 characters.
|
|
||||||
let
|
|
||||||
def-ovpn = name: { endpoint, publicKey, address }: {
|
|
||||||
networking.wg-quick.interfaces."ovpnd-${name}" = {
|
|
||||||
inherit address;
|
|
||||||
privateKeyFile = config.sops.secrets."wg_ovpnd_${name}_privkey".path;
|
|
||||||
dns = [
|
|
||||||
"46.227.67.134"
|
|
||||||
"192.165.9.158"
|
|
||||||
];
|
|
||||||
peers = [
|
|
||||||
{
|
|
||||||
allowedIPs = [
|
|
||||||
"0.0.0.0/0"
|
|
||||||
"::/0"
|
|
||||||
];
|
|
||||||
inherit endpoint publicKey;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
# to start: `systemctl start wg-quick-ovpnd-${name}`
|
|
||||||
autostart = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in lib.mkMerge [
|
|
||||||
(def-ovpn "us" {
|
|
||||||
endpoint = "vpn31.prd.losangeles.ovpn.com:9929";
|
|
||||||
publicKey = "VW6bEWMOlOneta1bf6YFE25N/oMGh1E1UFBCfyggd0k=";
|
|
||||||
address = [
|
|
||||||
"172.27.237.218/32"
|
|
||||||
"fd00:0000:1337:cafe:1111:1111:ab00:4c8f/128"
|
|
||||||
];
|
|
||||||
})
|
|
||||||
# NB: us-* share the same wg key and link-local addrs, but distinct public addresses
|
|
||||||
(def-ovpn "us-atl" {
|
|
||||||
endpoint = "vpn18.prd.atlanta.ovpn.com:9929";
|
|
||||||
publicKey = "Dpg/4v5s9u0YbrXukfrMpkA+XQqKIFpf8ZFgyw0IkE0=";
|
|
||||||
address = [
|
|
||||||
"172.21.182.178/32"
|
|
||||||
"fd00:0000:1337:cafe:1111:1111:cfcb:27e3/128"
|
|
||||||
];
|
|
||||||
})
|
|
||||||
(def-ovpn "us-mi" {
|
|
||||||
endpoint = "vpn34.prd.miami.ovpn.com:9929";
|
|
||||||
publicKey = "VtJz2irbu8mdkIQvzlsYhU+k9d55or9mx4A2a14t0V0=";
|
|
||||||
address = [
|
|
||||||
"172.21.182.178/32"
|
|
||||||
"fd00:0000:1337:cafe:1111:1111:cfcb:27e3/128"
|
|
||||||
];
|
|
||||||
})
|
|
||||||
(def-ovpn "ukr" {
|
|
||||||
endpoint = "vpn96.prd.kyiv.ovpn.com:9929";
|
|
||||||
publicKey = "CjZcXDxaaKpW8b5As1EcNbI6+42A6BjWahwXDCwfVFg=";
|
|
||||||
address = [
|
|
||||||
"172.18.180.159/32"
|
|
||||||
"fd00:0000:1337:cafe:1111:1111:ec5c:add3/128"
|
|
||||||
];
|
|
||||||
})
|
|
||||||
]
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
# trampoline from flake.nix into the specific host definition, while doing a tiny bit of common setup
|
|
||||||
|
|
||||||
# args from flake-level `import`
|
|
||||||
{ hostName, localSystem }:
|
|
||||||
|
|
||||||
# module args
|
|
||||||
{ config, lib, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./by-name/${hostName}
|
|
||||||
./common
|
|
||||||
./modules
|
|
||||||
];
|
|
||||||
|
|
||||||
networking.hostName = hostName;
|
|
||||||
nixpkgs.buildPlatform = lib.mkIf (localSystem != null) localSystem;
|
|
||||||
sane.cross.enablePatches = localSystem != null;
|
|
||||||
|
|
||||||
# nixpkgs.overlays = [
|
|
||||||
# (next: prev: {
|
|
||||||
# # for local != target we by default just emulate the target while building.
|
|
||||||
# # provide a `pkgs.cross.<pkg>` alias that consumers can use instead of `pkgs.<foo>`
|
|
||||||
# # to explicitly opt into non-emulated cross compilation for any specific package.
|
|
||||||
# # this is most beneficial for large packages with few pre-requisites -- like Linux.
|
|
||||||
# cross = prev.crossFrom."${localSystem}";
|
|
||||||
# })
|
|
||||||
# ];
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
{ ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./derived-secrets.nix
|
|
||||||
./gui
|
|
||||||
./hardware
|
|
||||||
./hostnames.nix
|
|
||||||
./hosts.nix
|
|
||||||
./nixcache.nix
|
|
||||||
./roles
|
|
||||||
./services
|
|
||||||
./wg-home.nix
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
{ config, lib, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
inherit (builtins) toString;
|
|
||||||
inherit (lib) mapAttrs mkOption types;
|
|
||||||
cfg = config.sane.derived-secrets;
|
|
||||||
secret = types.submodule {
|
|
||||||
options = {
|
|
||||||
len = mkOption {
|
|
||||||
type = types.int;
|
|
||||||
};
|
|
||||||
encoding = mkOption {
|
|
||||||
type = types.enum [ "base64" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options = {
|
|
||||||
sane.derived-secrets = mkOption {
|
|
||||||
type = types.attrsOf secret;
|
|
||||||
default = {};
|
|
||||||
description = ''
|
|
||||||
fs path => secret options.
|
|
||||||
for each entry, we create an item at the given path whose value is deterministic,
|
|
||||||
but also pseudo-random and not predictable by anyone without root access to the machine.
|
|
||||||
as PRNG source we use the host ssh key, and derived secrets are salted based on the destination path.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = {
|
|
||||||
sane.fs = mapAttrs (path: c: {
|
|
||||||
generated.script.script = ''
|
|
||||||
echo "$1" | cat /dev/stdin /etc/ssh/host_keys/ssh_host_ed25519_key \
|
|
||||||
| sha512sum \
|
|
||||||
| cut -c 1-${toString (c.len * 2)} \
|
|
||||||
| tr a-z A-Z \
|
|
||||||
| basenc -d --base16 \
|
|
||||||
| basenc --${c.encoding} \
|
|
||||||
> "$1"
|
|
||||||
'';
|
|
||||||
generated.script.scriptArgs = [ path ];
|
|
||||||
generated.acl.mode = "0600";
|
|
||||||
}) cfg;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
{ lib, config, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
inherit (lib) mkDefault mkIf mkOption types;
|
|
||||||
cfg = config.sane.gui;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./gnome.nix
|
|
||||||
./phosh.nix
|
|
||||||
./plasma.nix
|
|
||||||
./plasma-mobile.nix
|
|
||||||
./sway.nix
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,160 +0,0 @@
|
|||||||
{ lib, config, pkgs, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
let
|
|
||||||
cfg = config.sane.gui.phosh;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options = {
|
|
||||||
sane.gui.phosh.enable = mkOption {
|
|
||||||
default = false;
|
|
||||||
type = types.bool;
|
|
||||||
};
|
|
||||||
sane.gui.phosh.useGreeter = mkOption {
|
|
||||||
description = ''
|
|
||||||
launch phosh via a greeter (like lightdm-mobile-greeter).
|
|
||||||
phosh is usable without a greeter, but skipping the greeter means no PAM session.
|
|
||||||
'';
|
|
||||||
default = true;
|
|
||||||
type = types.bool;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkMerge [
|
|
||||||
{
|
|
||||||
sane.programs.phoshApps = {
|
|
||||||
package = null;
|
|
||||||
suggestedPrograms = [
|
|
||||||
"guiApps"
|
|
||||||
# TODO: see about removing gnome-bluetooth if the in-built gnome-settings bluetooth manager can work
|
|
||||||
"gnome.gnome-bluetooth"
|
|
||||||
"phosh-mobile-settings"
|
|
||||||
# "plasma5Packages.konsole" # more reliable terminal
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
sane.programs = {
|
|
||||||
inherit (pkgs // {
|
|
||||||
"gnome.gnome-bluetooth" = pkgs.gnome.gnome-bluetooth;
|
|
||||||
"plasma5Packages.konsole" = pkgs.plasma5Packages.konsole;
|
|
||||||
})
|
|
||||||
phosh-mobile-settings
|
|
||||||
"plasma5Packages.konsole"
|
|
||||||
# "gnome.gnome-bluetooth"
|
|
||||||
;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
(mkIf cfg.enable {
|
|
||||||
sane.programs.phoshApps.enableFor.user.colin = true;
|
|
||||||
|
|
||||||
# TODO(2023/02/28): remove this qt.style = "gtk2" override.
|
|
||||||
# gnome by default tells qt to stylize its apps similar to gnome.
|
|
||||||
# but the package needed for that doesn't cross-compile, hence i disable that here.
|
|
||||||
# qt.platformTheme = "gtk2";
|
|
||||||
# qt.style = "gtk2";
|
|
||||||
|
|
||||||
# docs: https://github.com/NixOS/nixpkgs/blob/nixos-22.05/nixos/modules/services/x11/desktop-managers/phosh.nix
|
|
||||||
services.xserver.desktopManager.phosh = {
|
|
||||||
enable = true;
|
|
||||||
user = "colin";
|
|
||||||
group = "users";
|
|
||||||
phocConfig = {
|
|
||||||
# xwayland = "true";
|
|
||||||
# find default outputs by catting /etc/phosh/phoc.ini
|
|
||||||
outputs.DSI-1 = {
|
|
||||||
scale = 1.5;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# phosh enables `services.gnome.{core-os-services, core-shell}`
|
|
||||||
# and this in turn enables some default apps we don't really care about.
|
|
||||||
# see <nixos/modules/services/x11/desktop-managers/gnome.nix>
|
|
||||||
environment.gnome.excludePackages = with pkgs; [
|
|
||||||
# gnome.gnome-menus # unused outside gnome classic, but probably harmless
|
|
||||||
gnome-tour
|
|
||||||
];
|
|
||||||
services.dleyna-renderer.enable = false;
|
|
||||||
services.dleyna-server.enable = false;
|
|
||||||
services.gnome.gnome-browser-connector.enable = false;
|
|
||||||
services.gnome.gnome-initial-setup.enable = false;
|
|
||||||
services.gnome.gnome-online-accounts.enable = false;
|
|
||||||
services.gnome.gnome-remote-desktop.enable = false;
|
|
||||||
services.gnome.gnome-user-share.enable = false;
|
|
||||||
services.gnome.rygel.enable = false;
|
|
||||||
|
|
||||||
# gnome doesn't use mkDefault for these -- unclear why not
|
|
||||||
services.gnome.evolution-data-server.enable = mkForce false;
|
|
||||||
services.gnome.gnome-online-miners.enable = mkForce false;
|
|
||||||
|
|
||||||
# XXX: phosh enables networkmanager by default; can probably disable these lines
|
|
||||||
networking.useDHCP = false;
|
|
||||||
networking.networkmanager.enable = true;
|
|
||||||
networking.wireless.enable = lib.mkForce false;
|
|
||||||
|
|
||||||
# XXX: not clear if these are actually needed?
|
|
||||||
hardware.bluetooth.enable = true;
|
|
||||||
services.blueman.enable = true;
|
|
||||||
|
|
||||||
hardware.opengl.enable = true;
|
|
||||||
hardware.opengl.driSupport = true;
|
|
||||||
|
|
||||||
environment.variables = {
|
|
||||||
# Qt apps won't always start unless this env var is set
|
|
||||||
QT_QPA_PLATFORM = "wayland";
|
|
||||||
# electron apps (e.g. Element) should use the wayland backend
|
|
||||||
# toggle this to have electron apps (e.g. Element) use the wayland backend.
|
|
||||||
# phocConfig.xwayland should be disabled if you do this
|
|
||||||
NIXOS_OZONE_WL = "1";
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.dconf.packages = [
|
|
||||||
# org.kde.konsole.desktop
|
|
||||||
(pkgs.writeTextFile {
|
|
||||||
name = "dconf-phosh-settings";
|
|
||||||
destination = "/etc/dconf/db/site.d/00_phosh_settings";
|
|
||||||
text = ''
|
|
||||||
[org/gnome/desktop/interface]
|
|
||||||
show-battery-percentage=true
|
|
||||||
|
|
||||||
[org/gnome/settings-daemon/plugins/power]
|
|
||||||
sleep-inactive-ac-timeout=5400
|
|
||||||
sleep-inactive-battery-timeout=5400
|
|
||||||
|
|
||||||
[sm/puri/phosh]
|
|
||||||
favorites=['gpodder.desktop', 'nheko.desktop', 'sublime-music.desktop', 'firefox.desktop', 'org.gnome.Terminal.desktop']
|
|
||||||
'';
|
|
||||||
})
|
|
||||||
];
|
|
||||||
})
|
|
||||||
|
|
||||||
(mkIf (cfg.enable && cfg.useGreeter) {
|
|
||||||
services.xserver.enable = true;
|
|
||||||
# NB: setting defaultSession has the critical side-effect that it lets org.freedesktop.AccountsService
|
|
||||||
# know that our user exists. this ensures lightdm succeeds when calling /org/freedesktop/AccountsServices ListCachedUsers
|
|
||||||
# lightdm greeters get the login users from lightdm which gets it from org.freedesktop.Accounts.ListCachedUsers.
|
|
||||||
# this requires the user we want to login as to be cached.
|
|
||||||
services.xserver.displayManager.job.preStart = ''
|
|
||||||
${pkgs.systemd}/bin/busctl call org.freedesktop.Accounts /org/freedesktop/Accounts org.freedesktop.Accounts CacheUser s colin
|
|
||||||
'';
|
|
||||||
# services.xserver.displayManager.defaultSession = "sm.puri.Phosh"; # XXX: not sure why this doesn't propagate correctly.
|
|
||||||
services.xserver.displayManager.lightdm.extraSeatDefaults = ''
|
|
||||||
user-session = phosh
|
|
||||||
'';
|
|
||||||
# services.xserver.displayManager.lightdm.greeters.gtk.enable = false; # gtk greeter overrides our own?
|
|
||||||
# services.xserver.displayManager.lightdm.greeter = {
|
|
||||||
# enable = true;
|
|
||||||
# package = pkgs.lightdm-mobile-greeter.xgreeters;
|
|
||||||
# name = "lightdm-mobile-greeter";
|
|
||||||
# };
|
|
||||||
# # services.xserver.displayManager.lightdm.enable = true;
|
|
||||||
|
|
||||||
services.xserver.displayManager.lightdm.enable = true;
|
|
||||||
services.xserver.displayManager.lightdm.greeters.mobile.enable = true;
|
|
||||||
|
|
||||||
systemd.services.phosh.wantedBy = lib.mkForce []; # disable auto-start
|
|
||||||
})
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
{ lib, config, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
let
|
|
||||||
cfg = config.sane.gui.plasma;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options = {
|
|
||||||
sane.gui.plasma.enable = mkOption {
|
|
||||||
default = false;
|
|
||||||
type = types.bool;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
sane.programs.guiApps.enableFor.user.colin = true;
|
|
||||||
|
|
||||||
# start plasma on boot
|
|
||||||
services.xserver.enable = true;
|
|
||||||
services.xserver.desktopManager.plasma5.enable = true;
|
|
||||||
services.xserver.displayManager.sddm.enable = true;
|
|
||||||
|
|
||||||
# gnome does networking stuff with networkmanager
|
|
||||||
networking.useDHCP = false;
|
|
||||||
networking.networkmanager.enable = true;
|
|
||||||
networking.wireless.enable = lib.mkForce false;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
https://search.nixos.org/options?channel=unstable&query=
|
|
||||||
https://search.nixos.org/packages?channel=unstable&query=
|
|
||||||
https://nixos.wiki/index.php?go=Go&search=
|
|
||||||
https://nixos.org/manual/nix/stable/language/builtins.html
|
|
||||||
https://github.com/nixos/nixpkgs/pulls?q=
|
|
||||||
https://nur.nix-community.org/
|
|
||||||
https://nix-community.github.io/home-manager/options.html
|
|
||||||
https://w.uninsane.org/viewer#search?books.name=wikipedia_en_all_maxi_2022-05&pattern=
|
|
||||||
https://jackett.uninsane.org/UI/Dashboard#search=
|
|
||||||
https://fed.uninsane.org
|
|
||||||
https://bt.uninsane.org
|
|
||||||
https://sci-hub.se
|
|
||||||
https://news.ycombinator.com
|
|
||||||
@@ -1,665 +0,0 @@
|
|||||||
{ config, lib, pkgs, sane-lib, ... }:
|
|
||||||
|
|
||||||
# docs: https://nixos.wiki/wiki/Sway
|
|
||||||
with lib;
|
|
||||||
let
|
|
||||||
cfg = config.sane.gui.sway;
|
|
||||||
# docs: https://github.com/Alexays/Waybar/wiki/Configuration
|
|
||||||
# format specifiers: https://fmt.dev/latest/syntax.html#syntax
|
|
||||||
waybar-config = [
|
|
||||||
{ # TOP BAR
|
|
||||||
layer = "top";
|
|
||||||
height = 40;
|
|
||||||
modules-left = ["sway/workspaces" "sway/mode"];
|
|
||||||
modules-center = ["sway/window"];
|
|
||||||
modules-right = ["custom/mediaplayer" "clock" "battery" "cpu" "network"];
|
|
||||||
"sway/window" = {
|
|
||||||
max-length = 50;
|
|
||||||
};
|
|
||||||
# include song artist/title. source: https://www.reddit.com/r/swaywm/comments/ni0vso/waybar_spotify_tracktitle/
|
|
||||||
"custom/mediaplayer" = {
|
|
||||||
exec = pkgs.writeShellScript "waybar-mediaplayer" ''
|
|
||||||
player_status=$(${pkgs.playerctl}/bin/playerctl status 2> /dev/null)
|
|
||||||
if [ "$player_status" = "Playing" ]; then
|
|
||||||
echo "$(${pkgs.playerctl}/bin/playerctl metadata artist) - $(${pkgs.playerctl}/bin/playerctl metadata title)"
|
|
||||||
elif [ "$player_status" = "Paused" ]; then
|
|
||||||
echo " $(${pkgs.playerctl}/bin/playerctl metadata artist) - $(${pkgs.playerctl}/bin/playerctl metadata title)"
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
interval = 2;
|
|
||||||
format = "{} ";
|
|
||||||
# return-type = "json";
|
|
||||||
on-click = "${pkgs.playerctl}/bin/playerctl play-pause";
|
|
||||||
on-scroll-up = "${pkgs.playerctl}/bin/playerctl next";
|
|
||||||
on-scroll-down = "${pkgs.playerctl}/bin/playerctl previous";
|
|
||||||
};
|
|
||||||
network = {
|
|
||||||
# docs: https://github.com/Alexays/Waybar/blob/master/man/waybar-network.5.scd
|
|
||||||
interval = 2;
|
|
||||||
max-length = 40;
|
|
||||||
# custom :> format specifier explained here: https://github.com/Alexays/Waybar/pull/472
|
|
||||||
format-ethernet = " {bandwidthUpBits:>}▲ {bandwidthDownBits:>}▼";
|
|
||||||
tooltip-format-ethernet = "{ifname} {bandwidthUpBits:>}▲ {bandwidthDownBits:>}▼";
|
|
||||||
|
|
||||||
format-wifi = "{ifname} ({signalStrength}%) {bandwidthUpBits:>}▲ {bandwidthDownBits:>}▼";
|
|
||||||
tooltip-format-wifi = "{essid} ({signalStrength}%) {bandwidthUpBits:>}▲ {bandwidthDownBits:>}▼";
|
|
||||||
|
|
||||||
format-disconnected = "";
|
|
||||||
};
|
|
||||||
cpu = {
|
|
||||||
format = " {usage:2}%";
|
|
||||||
tooltip = false;
|
|
||||||
};
|
|
||||||
battery = {
|
|
||||||
states = {
|
|
||||||
good = 95;
|
|
||||||
warning = 30;
|
|
||||||
critical = 10;
|
|
||||||
};
|
|
||||||
format = "{icon} {capacity}%";
|
|
||||||
format-icons = [
|
|
||||||
""
|
|
||||||
""
|
|
||||||
""
|
|
||||||
""
|
|
||||||
""
|
|
||||||
];
|
|
||||||
};
|
|
||||||
clock = {
|
|
||||||
format-alt = "{:%a, %d. %b %H:%M}";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
|
||||||
# waybar-config-text = lib.generators.toJSON {} waybar-config;
|
|
||||||
waybar-config-text = (pkgs.formats.json {}).generate "waybar-config.json" waybar-config;
|
|
||||||
|
|
||||||
# bare sway launcher
|
|
||||||
sway-launcher = pkgs.writeShellScriptBin "sway-launcher" ''
|
|
||||||
${pkgs.sway}/bin/sway --debug > /tmp/sway.log 2>&1
|
|
||||||
'';
|
|
||||||
# start sway and have it construct the gtkgreeter
|
|
||||||
sway-as-greeter = pkgs.writeShellScriptBin "sway-as-greeter" ''
|
|
||||||
${pkgs.sway}/bin/sway --debug --config ${sway-config-into-gtkgreet} > /tmp/sway-as-greeter.log 2>&1
|
|
||||||
'';
|
|
||||||
# (config file for the above)
|
|
||||||
sway-config-into-gtkgreet = pkgs.writeText "greetd-sway-config" ''
|
|
||||||
exec "${gtkgreet-launcher}"
|
|
||||||
'';
|
|
||||||
# gtkgreet which launches a layered sway instance
|
|
||||||
gtkgreet-launcher = pkgs.writeShellScript "gtkgreet-launcher" ''
|
|
||||||
# NB: the "command" field here is run in the user's shell.
|
|
||||||
# so that command must exist on the specific user's path who is logging in. it doesn't need to exist system-wide.
|
|
||||||
${pkgs.greetd.gtkgreet}/bin/gtkgreet --layer-shell --command sway-launcher
|
|
||||||
'';
|
|
||||||
greeter-session = {
|
|
||||||
# greeter session config
|
|
||||||
command = "${sway-as-greeter}/bin/sway-as-greeter";
|
|
||||||
# alternatives:
|
|
||||||
# - TTY: `command = "${pkgs.greetd.greetd}/bin/agreety --cmd ${pkgs.sway}/bin/sway";`
|
|
||||||
# - autologin: `command = "${pkgs.sway}/bin/sway"; user = "colin";`
|
|
||||||
# - Dumb Login (doesn't work)": `command = "${pkgs.greetd.dlm}/bin/dlm";`
|
|
||||||
};
|
|
||||||
greeterless-session = {
|
|
||||||
# no greeter
|
|
||||||
command = "${sway-launcher}/bin/sway-launcher";
|
|
||||||
user = "colin";
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options = {
|
|
||||||
sane.gui.sway.enable = mkOption {
|
|
||||||
default = false;
|
|
||||||
type = types.bool;
|
|
||||||
};
|
|
||||||
sane.gui.sway.useGreeter = mkOption {
|
|
||||||
description = ''
|
|
||||||
launch sway via a greeter (like greetd's gtkgreet).
|
|
||||||
sway is usable without a greeter, but skipping the greeter means no PAM session.
|
|
||||||
'';
|
|
||||||
default = true;
|
|
||||||
type = types.bool;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
config = mkMerge [
|
|
||||||
{
|
|
||||||
sane.programs.swayApps = {
|
|
||||||
package = null;
|
|
||||||
suggestedPrograms = [
|
|
||||||
"guiApps"
|
|
||||||
"swaylock"
|
|
||||||
"swayidle"
|
|
||||||
"wl-clipboard"
|
|
||||||
"mako" # notification daemon
|
|
||||||
# # "pavucontrol"
|
|
||||||
"gnome.gnome-bluetooth"
|
|
||||||
"gnome.gnome-control-center"
|
|
||||||
"sway-contrib.grimshot"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
sane.programs = {
|
|
||||||
inherit (pkgs // {
|
|
||||||
"gnome.gnome-bluetooth" = pkgs.gnome.gnome-bluetooth;
|
|
||||||
"gnome.gnome-control-center" = pkgs.gnome.gnome-control-center;
|
|
||||||
"sway-contrib.grimshot" = pkgs.sway-contrib.grimshot;
|
|
||||||
})
|
|
||||||
swaylock
|
|
||||||
swayidle
|
|
||||||
wl-clipboard
|
|
||||||
mako
|
|
||||||
"gnome.gnome-bluetooth"
|
|
||||||
"gnome.gnome-control-center"
|
|
||||||
"sway-contrib.grimshot"
|
|
||||||
;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
(mkIf cfg.enable {
|
|
||||||
sane.programs.swayApps.enableFor.user.colin = true;
|
|
||||||
|
|
||||||
# swap in these lines to use SDDM instead of `services.greetd`.
|
|
||||||
# services.xserver.displayManager.sddm.enable = true;
|
|
||||||
# services.xserver.enable = true;
|
|
||||||
services.greetd = {
|
|
||||||
# greetd source/docs:
|
|
||||||
# - <https://git.sr.ht/~kennylevinsen/greetd>
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
default_session = if cfg.useGreeter then greeter-session else greeterless-session;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
# we need the greeter's command to be on our PATH
|
|
||||||
users.users.colin.packages = [ sway-launcher ];
|
|
||||||
|
|
||||||
# some programs (e.g. fractal) **require** a "Secret Service Provider"
|
|
||||||
services.gnome.gnome-keyring.enable = true;
|
|
||||||
|
|
||||||
# unlike other DEs, sway configures no audio stack
|
|
||||||
# administer with pw-cli, pw-mon, pw-top commands
|
|
||||||
services.pipewire = {
|
|
||||||
enable = true;
|
|
||||||
alsa.enable = true;
|
|
||||||
alsa.support32Bit = true; # ??
|
|
||||||
pulse.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.useDHCP = false;
|
|
||||||
networking.networkmanager.enable = true;
|
|
||||||
networking.wireless.enable = lib.mkForce false;
|
|
||||||
|
|
||||||
hardware.bluetooth.enable = true;
|
|
||||||
services.blueman.enable = true;
|
|
||||||
# gsd provides Rfkill, which is required for the bluetooth pane in gnome-control-center to work
|
|
||||||
services.gnome.gnome-settings-daemon.enable = true;
|
|
||||||
# start the components of gsd we need at login
|
|
||||||
systemd.user.targets."org.gnome.SettingsDaemon.Rfkill".wantedBy = [ "graphical-session.target" ];
|
|
||||||
# go ahead and `systemctl --user cat gnome-session-initialized.target`. i dare you.
|
|
||||||
# the only way i can figure out how to get Rfkill to actually load is to just disable all the shit it depends on.
|
|
||||||
# it doesn't actually seem to need ANY of them in the first place T_T
|
|
||||||
systemd.user.targets."gnome-session-initialized".enable = false;
|
|
||||||
# bluez can't connect to audio devices unless pipewire is running.
|
|
||||||
# a system service can't depend on a user service, so just launch it at graphical-session
|
|
||||||
systemd.user.services."pipewire".wantedBy = [ "graphical-session.target" ];
|
|
||||||
|
|
||||||
programs.sway = {
|
|
||||||
enable = true;
|
|
||||||
wrapperFeatures.gtk = true;
|
|
||||||
};
|
|
||||||
sane.user.fs.".config/sway/config" =
|
|
||||||
let
|
|
||||||
fuzzel = "${pkgs.fuzzel}/bin/fuzzel";
|
|
||||||
sed = "${pkgs.gnused}/bin/sed";
|
|
||||||
wtype = "${pkgs.wtype}/bin/wtype";
|
|
||||||
kitty = "${pkgs.kitty}/bin/kitty";
|
|
||||||
launcher-cmd = fuzzel;
|
|
||||||
terminal-cmd = kitty;
|
|
||||||
lock-cmd = "${pkgs.swaylock}/bin/swaylock --indicator-idle-visible --indicator-radius 100 --indicator-thickness 30";
|
|
||||||
vol-up-cmd = "${pkgs.pulsemixer}/bin/pulsemixer --change-volume +5";
|
|
||||||
vol-down-cmd = "${pkgs.pulsemixer}/bin/pulsemixer --change-volume -5";
|
|
||||||
mute-cmd = "${pkgs.pulsemixer}/bin/pulsemixer --toggle-mute";
|
|
||||||
brightness-up-cmd = "${pkgs.brightnessctl}/bin/brightnessctl set +2%";
|
|
||||||
brightness-down-cmd = "${pkgs.brightnessctl}/bin/brightnessctl set 2%-";
|
|
||||||
screenshot-cmd = "${pkgs.sway-contrib.grimshot}/bin/grimshot copy area";
|
|
||||||
# "bookmarking"/snippets inspired by Luke Smith:
|
|
||||||
# - <https://www.youtube.com/watch?v=d_11QaTlf1I>
|
|
||||||
snip-file = ./snippets.txt;
|
|
||||||
# TODO: querying sops here breaks encapsulation
|
|
||||||
list-snips = "cat ${snip-file} ${config.sops.secrets.snippets.path}";
|
|
||||||
strip-comments = "${sed} 's/ #.*$//'";
|
|
||||||
snip-cmd = "${wtype} $(${list-snips} | ${fuzzel} -d -i -w 60 | ${strip-comments})";
|
|
||||||
# TODO: next splatmoji release should allow `-s none` to disable skin tones
|
|
||||||
emoji-cmd = "${pkgs.splatmoji}/bin/splatmoji -s medium-light type";
|
|
||||||
in sane-lib.fs.wantedText ''
|
|
||||||
### default font
|
|
||||||
font pango:monospace 8
|
|
||||||
|
|
||||||
### pixel boundary between windows
|
|
||||||
default_border pixel 3
|
|
||||||
default_floating_border pixel 2
|
|
||||||
hide_edge_borders smart
|
|
||||||
|
|
||||||
### defaults
|
|
||||||
focus_wrapping no
|
|
||||||
focus_follows_mouse yes
|
|
||||||
focus_on_window_activation smart
|
|
||||||
mouse_warping output
|
|
||||||
workspace_layout default
|
|
||||||
workspace_auto_back_and_forth no
|
|
||||||
|
|
||||||
### default colors (#border #background #text #indicator #childBorder)
|
|
||||||
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
|
|
||||||
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
|
|
||||||
client.unfocused #333333 #222222 #888888 #292d2e #222222
|
|
||||||
client.urgent #2f343a #900000 #ffffff #900000 #900000
|
|
||||||
client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
|
|
||||||
client.background #ffffff
|
|
||||||
|
|
||||||
### key bindings
|
|
||||||
floating_modifier Mod1
|
|
||||||
## media keys
|
|
||||||
bindsym XF86AudioRaiseVolume exec ${vol-up-cmd}
|
|
||||||
bindsym XF86AudioLowerVolume exec ${vol-down-cmd}
|
|
||||||
bindsym Mod1+Page_Up exec ${vol-up-cmd}
|
|
||||||
bindsym Mod1+Page_Down exec ${vol-down-cmd}
|
|
||||||
bindsym XF86AudioMute exec ${mute-cmd}
|
|
||||||
bindsym XF86MonBrightnessUp exec ${brightness-up-cmd}
|
|
||||||
bindsym XF86MonBrightnessDown exec ${brightness-down-cmd}
|
|
||||||
## special functions
|
|
||||||
bindsym Mod1+Print exec ${screenshot-cmd}
|
|
||||||
bindsym Mod1+l exec ${lock-cmd}
|
|
||||||
bindsym Mod1+s exec ${snip-cmd}
|
|
||||||
bindsym Mod1+slash exec ${emoji-cmd}
|
|
||||||
bindsym Mod1+d exec ${launcher-cmd}
|
|
||||||
bindsym Mod1+Return exec ${terminal-cmd}
|
|
||||||
bindsym Mod1+Shift+q kill
|
|
||||||
bindsym Mod1+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
|
|
||||||
bindsym Mod1+Shift+c reload
|
|
||||||
## layout
|
|
||||||
bindsym Mod1+b splith
|
|
||||||
bindsym Mod1+v splitv
|
|
||||||
bindsym Mod1+f fullscreen toggle
|
|
||||||
bindsym Mod1+a focus parent
|
|
||||||
bindsym Mod1+w layout tabbed
|
|
||||||
bindsym Mod1+e layout toggle split
|
|
||||||
bindsym Mod1+Shift+space floating toggle
|
|
||||||
bindsym Mod1+space focus mode_toggle
|
|
||||||
bindsym Mod1+r mode resize
|
|
||||||
## movement
|
|
||||||
bindsym Mod1+Up focus up
|
|
||||||
bindsym Mod1+Down focus down
|
|
||||||
bindsym Mod1+Left focus left
|
|
||||||
bindsym Mod1+Right focus right
|
|
||||||
bindsym Mod1+Shift+Up move up
|
|
||||||
bindsym Mod1+Shift+Down move down
|
|
||||||
bindsym Mod1+Shift+Left move left
|
|
||||||
bindsym Mod1+Shift+Right move right
|
|
||||||
## workspaces
|
|
||||||
bindsym Mod1+1 workspace number 1
|
|
||||||
bindsym Mod1+2 workspace number 2
|
|
||||||
bindsym Mod1+3 workspace number 3
|
|
||||||
bindsym Mod1+4 workspace number 4
|
|
||||||
bindsym Mod1+5 workspace number 5
|
|
||||||
bindsym Mod1+6 workspace number 6
|
|
||||||
bindsym Mod1+7 workspace number 7
|
|
||||||
bindsym Mod1+8 workspace number 8
|
|
||||||
bindsym Mod1+9 workspace number 9
|
|
||||||
bindsym Mod1+Shift+1 move container to workspace number 1
|
|
||||||
bindsym Mod1+Shift+2 move container to workspace number 2
|
|
||||||
bindsym Mod1+Shift+3 move container to workspace number 3
|
|
||||||
bindsym Mod1+Shift+4 move container to workspace number 4
|
|
||||||
bindsym Mod1+Shift+5 move container to workspace number 5
|
|
||||||
bindsym Mod1+Shift+6 move container to workspace number 6
|
|
||||||
bindsym Mod1+Shift+7 move container to workspace number 7
|
|
||||||
bindsym Mod1+Shift+8 move container to workspace number 8
|
|
||||||
bindsym Mod1+Shift+9 move container to workspace number 9
|
|
||||||
## "scratchpad" = ??
|
|
||||||
bindsym Mod1+Shift+minus move scratchpad
|
|
||||||
bindsym Mod1+minus scratchpad show
|
|
||||||
|
|
||||||
### defaults
|
|
||||||
mode "resize" {
|
|
||||||
bindsym Down resize grow height 10 px
|
|
||||||
bindsym Escape mode default
|
|
||||||
bindsym Left resize shrink width 10 px
|
|
||||||
bindsym Return mode default
|
|
||||||
bindsym Right resize grow width 10 px
|
|
||||||
bindsym Up resize shrink height 10 px
|
|
||||||
bindsym h resize shrink width 10 px
|
|
||||||
bindsym j resize grow height 10 px
|
|
||||||
bindsym k resize shrink height 10 px
|
|
||||||
bindsym l resize grow width 10 px
|
|
||||||
}
|
|
||||||
|
|
||||||
### lightly modified bars
|
|
||||||
bar {
|
|
||||||
# TODO: fonts was:
|
|
||||||
# config.fonts.fontconfig.defaultFonts; (monospace ++ emoji)
|
|
||||||
font pango:Hack, Font Awesome 6 Free, Twitter Color Emoji 24.000000
|
|
||||||
mode dock
|
|
||||||
hidden_state hide
|
|
||||||
position top
|
|
||||||
status_command ${pkgs.i3status}/bin/i3status
|
|
||||||
swaybar_command ${pkgs.waybar}/bin/waybar
|
|
||||||
workspace_buttons yes
|
|
||||||
strip_workspace_numbers no
|
|
||||||
tray_output primary
|
|
||||||
colors {
|
|
||||||
background #000000
|
|
||||||
statusline #ffffff
|
|
||||||
separator #666666
|
|
||||||
# #border #background #text
|
|
||||||
focused_workspace #4c7899 #285577 #ffffff
|
|
||||||
active_workspace #333333 #5f676a #ffffff
|
|
||||||
inactive_workspace #333333 #222222 #888888
|
|
||||||
urgent_workspace #2f343a #900000 #ffffff
|
|
||||||
binding_mode #2f343a #900000 #ffffff
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
### displays
|
|
||||||
## DESKTOP
|
|
||||||
output "Samsung Electric Company S22C300 0x00007F35" {
|
|
||||||
pos 0,0
|
|
||||||
res 1920x1080
|
|
||||||
}
|
|
||||||
output "Goldstar Company Ltd LG ULTRAWIDE 0x00004E94" {
|
|
||||||
pos 1920,0
|
|
||||||
res 3440x1440
|
|
||||||
}
|
|
||||||
|
|
||||||
## LAPTOP
|
|
||||||
# sh/en TV
|
|
||||||
output "Pioneer Electronic Corporation VSX-524 0x00000101" {
|
|
||||||
pos 0,0
|
|
||||||
res 1920x1080
|
|
||||||
}
|
|
||||||
# internal display
|
|
||||||
output "Unknown 0x0637 0x00000000" {
|
|
||||||
pos 1920,0
|
|
||||||
res 1920x1080
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
|
|
||||||
sane.user.fs.".config/waybar/config" = sane-lib.fs.wantedSymlinkTo waybar-config-text;
|
|
||||||
|
|
||||||
# style docs: https://github.com/Alexays/Waybar/wiki/Styling
|
|
||||||
sane.user.fs.".config/waybar/style.css" = sane-lib.fs.wantedText ''
|
|
||||||
* {
|
|
||||||
font-family: monospace;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* defaults below: https://github.com/Alexays/Waybar/blob/master/resources/style.css */
|
|
||||||
window#waybar {
|
|
||||||
background-color: rgba(43, 48, 59, 0.5);
|
|
||||||
border-bottom: 3px solid rgba(100, 114, 125, 0.5);
|
|
||||||
color: #ffffff;
|
|
||||||
transition-property: background-color;
|
|
||||||
transition-duration: .5s;
|
|
||||||
}
|
|
||||||
|
|
||||||
window#waybar.hidden {
|
|
||||||
opacity: 0.2;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
window#waybar.empty {
|
|
||||||
background-color: transparent;
|
|
||||||
}
|
|
||||||
window#waybar.solo {
|
|
||||||
background-color: #FFFFFF;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
window#waybar.termite {
|
|
||||||
background-color: #3F3F3F;
|
|
||||||
}
|
|
||||||
|
|
||||||
window#waybar.chromium {
|
|
||||||
background-color: #000000;
|
|
||||||
border: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button {
|
|
||||||
padding: 0 5px;
|
|
||||||
background-color: transparent;
|
|
||||||
color: #ffffff;
|
|
||||||
/* Use box-shadow instead of border so the text isn't offset */
|
|
||||||
box-shadow: inset 0 -3px transparent;
|
|
||||||
/* Avoid rounded borders under each workspace name */
|
|
||||||
border: none;
|
|
||||||
border-radius: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
|
|
||||||
#workspaces button:hover {
|
|
||||||
background: rgba(0, 0, 0, 0.2);
|
|
||||||
box-shadow: inset 0 -3px #ffffff;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.focused {
|
|
||||||
background-color: #64727D;
|
|
||||||
box-shadow: inset 0 -3px #ffffff;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.urgent {
|
|
||||||
background-color: #eb4d4b;
|
|
||||||
}
|
|
||||||
|
|
||||||
#mode {
|
|
||||||
background-color: #64727D;
|
|
||||||
border-bottom: 3px solid #ffffff;
|
|
||||||
}
|
|
||||||
|
|
||||||
#clock,
|
|
||||||
#battery,
|
|
||||||
#cpu,
|
|
||||||
#memory,
|
|
||||||
#disk,
|
|
||||||
#temperature,
|
|
||||||
#backlight,
|
|
||||||
#network,
|
|
||||||
#pulseaudio,
|
|
||||||
#custom-media,
|
|
||||||
#tray,
|
|
||||||
#mode,
|
|
||||||
#idle_inhibitor,
|
|
||||||
#mpd {
|
|
||||||
padding: 0 10px;
|
|
||||||
color: #ffffff;
|
|
||||||
}
|
|
||||||
|
|
||||||
#window,
|
|
||||||
#workspaces {
|
|
||||||
margin: 0 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* If workspaces is the leftmost module, omit left margin */
|
|
||||||
.modules-left > widget:first-child > #workspaces {
|
|
||||||
margin-left: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* If workspaces is the rightmost module, omit right margin */
|
|
||||||
.modules-right > widget:last-child > #workspaces {
|
|
||||||
margin-right: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#clock {
|
|
||||||
background-color: #64727D;
|
|
||||||
}
|
|
||||||
|
|
||||||
#battery {
|
|
||||||
background-color: #ffffff;
|
|
||||||
color: #000000;
|
|
||||||
}
|
|
||||||
|
|
||||||
#battery.charging, #battery.plugged {
|
|
||||||
color: #ffffff;
|
|
||||||
background-color: #26A65B;
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes blink {
|
|
||||||
to {
|
|
||||||
background-color: #ffffff;
|
|
||||||
color: #000000;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#battery.critical:not(.charging) {
|
|
||||||
background-color: #f53c3c;
|
|
||||||
color: #ffffff;
|
|
||||||
animation-name: blink;
|
|
||||||
animation-duration: 0.5s;
|
|
||||||
animation-timing-function: linear;
|
|
||||||
animation-iteration-count: infinite;
|
|
||||||
animation-direction: alternate;
|
|
||||||
}
|
|
||||||
|
|
||||||
label:focus {
|
|
||||||
background-color: #000000;
|
|
||||||
}
|
|
||||||
|
|
||||||
#cpu {
|
|
||||||
background-color: #2ecc71;
|
|
||||||
color: #000000;
|
|
||||||
}
|
|
||||||
|
|
||||||
#memory {
|
|
||||||
background-color: #9b59b6;
|
|
||||||
}
|
|
||||||
|
|
||||||
#disk {
|
|
||||||
background-color: #964B00;
|
|
||||||
}
|
|
||||||
|
|
||||||
#backlight {
|
|
||||||
background-color: #90b1b1;
|
|
||||||
}
|
|
||||||
|
|
||||||
#network {
|
|
||||||
background-color: #2980b9;
|
|
||||||
}
|
|
||||||
|
|
||||||
#network.disconnected {
|
|
||||||
background-color: #f53c3c;
|
|
||||||
}
|
|
||||||
|
|
||||||
#pulseaudio {
|
|
||||||
background-color: #f1c40f;
|
|
||||||
color: #000000;
|
|
||||||
}
|
|
||||||
|
|
||||||
#pulseaudio.muted {
|
|
||||||
background-color: #90b1b1;
|
|
||||||
color: #2a5c45;
|
|
||||||
}
|
|
||||||
|
|
||||||
#custom-media {
|
|
||||||
background-color: #66cc99;
|
|
||||||
color: #2a5c45;
|
|
||||||
min-width: 100px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#custom-media.custom-spotify {
|
|
||||||
background-color: #66cc99;
|
|
||||||
}
|
|
||||||
|
|
||||||
#custom-media.custom-vlc {
|
|
||||||
background-color: #ffa000;
|
|
||||||
}
|
|
||||||
|
|
||||||
#temperature {
|
|
||||||
background-color: #f0932b;
|
|
||||||
}
|
|
||||||
|
|
||||||
#temperature.critical {
|
|
||||||
background-color: #eb4d4b;
|
|
||||||
}
|
|
||||||
|
|
||||||
#tray {
|
|
||||||
background-color: #2980b9;
|
|
||||||
}
|
|
||||||
|
|
||||||
#tray > .passive {
|
|
||||||
-gtk-icon-effect: dim;
|
|
||||||
}
|
|
||||||
|
|
||||||
#tray > .needs-attention {
|
|
||||||
-gtk-icon-effect: highlight;
|
|
||||||
background-color: #eb4d4b;
|
|
||||||
}
|
|
||||||
|
|
||||||
#idle_inhibitor {
|
|
||||||
background-color: #2d3436;
|
|
||||||
}
|
|
||||||
|
|
||||||
#idle_inhibitor.activated {
|
|
||||||
background-color: #ecf0f1;
|
|
||||||
color: #2d3436;
|
|
||||||
}
|
|
||||||
|
|
||||||
#mpd {
|
|
||||||
background-color: #66cc99;
|
|
||||||
color: #2a5c45;
|
|
||||||
}
|
|
||||||
|
|
||||||
#mpd.disconnected {
|
|
||||||
background-color: #f53c3c;
|
|
||||||
}
|
|
||||||
|
|
||||||
#mpd.stopped {
|
|
||||||
background-color: #90b1b1;
|
|
||||||
}
|
|
||||||
|
|
||||||
#mpd.paused {
|
|
||||||
background-color: #51a37a;
|
|
||||||
}
|
|
||||||
|
|
||||||
#language {
|
|
||||||
background: #00b093;
|
|
||||||
color: #740864;
|
|
||||||
padding: 0 5px;
|
|
||||||
margin: 0 5px;
|
|
||||||
min-width: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#keyboard-state {
|
|
||||||
background: #97e1ad;
|
|
||||||
color: #000000;
|
|
||||||
padding: 0 0px;
|
|
||||||
margin: 0 5px;
|
|
||||||
min-width: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#keyboard-state > label {
|
|
||||||
padding: 0 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#keyboard-state > label.locked {
|
|
||||||
background: rgba(0, 0, 0, 0.2);
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
# style = ''
|
|
||||||
# * {
|
|
||||||
# border: none;
|
|
||||||
# border-radius: 0;
|
|
||||||
# font-family: Source Code Pro;
|
|
||||||
# }
|
|
||||||
# window#waybar {
|
|
||||||
# background: #16191C;
|
|
||||||
# color: #AAB2BF;
|
|
||||||
# }
|
|
||||||
# #workspaces button {
|
|
||||||
# padding: 0 5px;
|
|
||||||
# }
|
|
||||||
# .custom-spotify {
|
|
||||||
# padding: 0 10px;
|
|
||||||
# margin: 0 4px;
|
|
||||||
# background-color: #1DB954;
|
|
||||||
# color: black;
|
|
||||||
# }
|
|
||||||
# '';
|
|
||||||
})
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
{ config, lib, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
# give each host a shortname that all the other hosts know, to allow easy comms.
|
|
||||||
networking.hosts = lib.mkMerge [
|
|
||||||
(lib.mapAttrs' (host: cfg: {
|
|
||||||
# bare-name for LAN addresses
|
|
||||||
# if using router's DNS, these mappings will already exist.
|
|
||||||
# if using a different DNS provider (which servo does), then we need to explicity provide them.
|
|
||||||
# ugly hack. would be better to get servo to somehow use the router's DNS
|
|
||||||
name = cfg.lan-ip;
|
|
||||||
value = [ host ];
|
|
||||||
}) config.sane.hosts.by-name)
|
|
||||||
(lib.mapAttrs' (host: cfg: {
|
|
||||||
# -hn suffixed name for communication over my wg-home VPN.
|
|
||||||
# hn = "home network"
|
|
||||||
name = cfg.wg-home.ip;
|
|
||||||
value = [ "${host}-hn" ];
|
|
||||||
}) config.sane.hosts.by-name)
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,100 +0,0 @@
|
|||||||
{ config, lib, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
inherit (lib) attrValues filterAttrs mkMerge mkOption types;
|
|
||||||
cfg = config.sane.hosts;
|
|
||||||
|
|
||||||
host = types.submodule ({ config, ... }: {
|
|
||||||
options = {
|
|
||||||
ssh.user_pubkey = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
description = ''
|
|
||||||
ssh pubkey that the primary user of this machine will use when connecting to other machines.
|
|
||||||
e.g. "ssh-ed25519 AAAA<base64>".
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
ssh.host_pubkey = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
description = ''
|
|
||||||
ssh pubkey which this host will present to connections initiated against it.
|
|
||||||
e.g. "ssh-ed25519 AAAA<base64>".
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
wg-home.pubkey = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
default = null;
|
|
||||||
description = ''
|
|
||||||
wireguard public key for the wg-home VPN.
|
|
||||||
e.g. "pWtnKW7f7sNIZQ2M83uJ7cHg3IL1tebE3IoVkCgjkXM=".
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
wg-home.ip = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
default = null;
|
|
||||||
description = ''
|
|
||||||
IP address to use on the wg-home VPN.
|
|
||||||
e.g. "10.0.10.5";
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
wg-home.endpoint = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
lan-ip = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
description = ''
|
|
||||||
ip address when on the lan.
|
|
||||||
e.g. "192.168.0.5";
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
});
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options = {
|
|
||||||
sane.hosts.by-name = mkOption {
|
|
||||||
type = types.attrsOf host;
|
|
||||||
default = {};
|
|
||||||
description = ''
|
|
||||||
map of hostname => attrset of information specific to that host,
|
|
||||||
like its ssh pubkey, etc.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = {
|
|
||||||
# TODO: this should be populated per-host
|
|
||||||
sane.hosts.by-name."desko" = {
|
|
||||||
ssh.user_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPU5GlsSfbaarMvDA20bxpSZGWviEzXGD8gtrIowc1pX";
|
|
||||||
ssh.host_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFw9NoRaYrM6LbDd3aFBc4yyBlxGQn8HjeHd/dZ3CfHk";
|
|
||||||
wg-home.pubkey = "17PMZssYi0D4t2d0vbmhjBKe1sGsE8kT8/dod0Q2CXc=";
|
|
||||||
wg-home.ip = "10.0.10.22";
|
|
||||||
lan-ip = "192.168.15.16";
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.hosts.by-name."lappy" = {
|
|
||||||
ssh.user_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDpmFdNSVPRol5hkbbCivRhyeENzb9HVyf9KutGLP2Zu";
|
|
||||||
ssh.host_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILSJnqmVl9/SYQ0btvGb0REwwWY8wkdkGXQZfn/1geEc";
|
|
||||||
wg-home.pubkey = "FTUWGw2p4/cEcrrIE86PWVnqctbv8OYpw8Gt3+dC/lk=";
|
|
||||||
wg-home.ip = "10.0.10.20";
|
|
||||||
lan-ip = "192.168.15.11";
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.hosts.by-name."moby" = {
|
|
||||||
ssh.user_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICrR+gePnl0nV/vy7I5BzrGeyVL+9eOuXHU1yNE3uCwU";
|
|
||||||
ssh.host_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1N/IT3nQYUD+dBlU1sTEEVMxfOyMkrrDeyHcYgnJvw";
|
|
||||||
wg-home.pubkey = "I7XIR1hm8bIzAtcAvbhWOwIAabGkuEvbWH/3kyIB1yA=";
|
|
||||||
wg-home.ip = "10.0.10.48";
|
|
||||||
lan-ip = "192.168.15.17";
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.hosts.by-name."servo" = {
|
|
||||||
ssh.user_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPS1qFzKurAdB9blkWomq8gI1g0T3sTs9LsmFOj5VtqX";
|
|
||||||
ssh.host_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOfdSmFkrVT6DhpgvFeQKm3Fh9VKZ9DbLYOPOJWYQ0E8";
|
|
||||||
wg-home.pubkey = "roAw+IUFVtdpCcqa4khB385Qcv9l5JAB//730tyK4Wk=";
|
|
||||||
wg-home.ip = "10.0.10.5";
|
|
||||||
wg-home.endpoint = "uninsane.org:51820";
|
|
||||||
lan-ip = "192.168.15.28";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
# speed up builds from e.g. moby or lappy by having them query desko and servo first.
|
|
||||||
# if one of these hosts is offline, instead manually specify just cachix:
|
|
||||||
# - `nixos-rebuild --option substituters https://cache.nixos.org/`
|
|
||||||
#
|
|
||||||
# future improvements:
|
|
||||||
# - apply for community arm build box:
|
|
||||||
# - <https://github.com/nix-community/aarch64-build-box>
|
|
||||||
# - don't require all substituters to be online:
|
|
||||||
# - <https://github.com/NixOS/nix/pull/7188>
|
|
||||||
|
|
||||||
{ lib, config, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
let
|
|
||||||
cfg = config.sane.nixcache;
|
|
||||||
hostName = config.networking.hostName;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options = {
|
|
||||||
sane.nixcache.enable = mkOption {
|
|
||||||
default = false;
|
|
||||||
type = types.bool;
|
|
||||||
};
|
|
||||||
sane.nixcache.enable-trusted-keys = mkOption {
|
|
||||||
default = config.sane.nixcache.enable;
|
|
||||||
type = types.bool;
|
|
||||||
};
|
|
||||||
sane.nixcache.substituters = mkOption {
|
|
||||||
type = types.listOf types.string;
|
|
||||||
default =
|
|
||||||
(lib.optional (hostName != "servo") "https://nixcache.uninsane.org")
|
|
||||||
++ (lib.optional (hostName != "desko") "http://desko:5000")
|
|
||||||
++ [
|
|
||||||
"https://nix-community.cachix.org"
|
|
||||||
"https://cache.nixos.org/"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = {
|
|
||||||
# use our own binary cache
|
|
||||||
# to explicitly build from a specific cache (in case others are down):
|
|
||||||
# - `nixos-rebuild ... --option substituters https://cache.nixos.org`
|
|
||||||
# - `nix build ... --substituters http://desko:5000`
|
|
||||||
nix.settings.substituters = mkIf cfg.enable cfg.substituters;
|
|
||||||
# always trust our keys (so one can explicitly use a substituter even if it's not the default
|
|
||||||
nix.settings.trusted-public-keys = mkIf cfg.enable-trusted-keys [
|
|
||||||
"nixcache.uninsane.org:r3WILM6+QrkmsLgqVQcEdibFD7Q/4gyzD9dGT33GP70="
|
|
||||||
"desko:Q7mjjqoBMgNQ5P0e63sLur65A+D4f3Sv4QiycDIKxiI="
|
|
||||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
{ config, lib, sane-lib, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
inherit (lib) mkIf mkMerge mkOption types;
|
|
||||||
inherit (config.programs.ccache) cacheDir;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options.sane.roles.build-machine = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkMerge [
|
|
||||||
{
|
|
||||||
# programs.ccache.cacheDir = "/var/cache/ccache"; # nixos default
|
|
||||||
# programs.ccache.cacheDir = "/homeless-shelter/.ccache"; # ccache default (~/.ccache)
|
|
||||||
|
|
||||||
# if the cache doesn't reside at ~/.ccache, then CCACHE_DIR has to be set.
|
|
||||||
# we can do that manually as commented out below, or let nixos do it for us by telling it to use ccache on a dummy package:
|
|
||||||
programs.ccache.packageNames = [ "dummy-pkg-to-force-ccache-config" ];
|
|
||||||
# nixpkgs.overlays = [
|
|
||||||
# (self: super: {
|
|
||||||
# # XXX: if the cache resides not at ~/.ccache (i.e. /homeless-shelter/.ccache)
|
|
||||||
# # then we need to explicitly tell ccache where that is.
|
|
||||||
# ccacheWrapper = super.ccacheWrapper.override {
|
|
||||||
# extraConfig = ''
|
|
||||||
# export CCACHE_DIR="${cacheDir}"
|
|
||||||
# '';
|
|
||||||
# };
|
|
||||||
# })
|
|
||||||
# ];
|
|
||||||
}
|
|
||||||
(mkIf config.sane.roles.build-machine {
|
|
||||||
# serve packages to other machines that ask for them
|
|
||||||
sane.services.nixserve.enable = true;
|
|
||||||
|
|
||||||
# enable cross compilation
|
|
||||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
|
||||||
# nixpkgs.config.allowUnsupportedSystem = true;
|
|
||||||
|
|
||||||
# granular compilation cache
|
|
||||||
# docs: <https://nixos.wiki/wiki/CCache>
|
|
||||||
# investigate the cache with:
|
|
||||||
# - `nix-ccache --show-stats`
|
|
||||||
# - `build '.#ccache'
|
|
||||||
# - `sudo CCACHE_DIR=/var/cache/ccache ./result/bin/ccache --show-stats -v`
|
|
||||||
# TODO: whitelist `--verbose` in <nixpkgs:nixos/modules/programs/ccache.nix>
|
|
||||||
# TODO: configure without compression (leverage fs-level compression), and enable file-clone (i.e. hardlinks)
|
|
||||||
programs.ccache.enable = true;
|
|
||||||
nix.settings.extra-sandbox-paths = [ cacheDir ];
|
|
||||||
sane.persist.sys.plaintext = [
|
|
||||||
{ group = "nixbld"; mode = "0775"; directory = config.programs.ccache.cacheDir; }
|
|
||||||
];
|
|
||||||
sane.fs."${cacheDir}/ccache.conf" = sane-lib.fs.wantedText ''
|
|
||||||
max_size = 50G
|
|
||||||
'';
|
|
||||||
})
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
config = lib.mkIf config.sane.roles.client {
|
|
||||||
# persist external pairings by default
|
|
||||||
sane.persist.sys.plaintext = [ "/var/lib/bluetooth" ];
|
|
||||||
|
|
||||||
sane.fs."/var/lib/bluetooth".generated.acl.mode = "0700";
|
|
||||||
sane.fs."/var/lib/bluetooth/.secrets.stamp" = {
|
|
||||||
wantedBeforeBy = [ "bluetooth.service" ];
|
|
||||||
# XXX: install-bluetooth uses sed, but that's part of the default systemd unit path, it seems
|
|
||||||
generated.script.script = builtins.readFile ../../../../scripts/install-bluetooth + ''
|
|
||||||
touch "/var/lib/bluetooth/.secrets.stamp"
|
|
||||||
'';
|
|
||||||
generated.script.scriptArgs = [ "/run/secrets/bt" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
{ config, lib, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
inherit (lib) mkIf mkOption types;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./bluetooth-pairings.nix
|
|
||||||
./wifi-pairings.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
# option is consumed by the other imports in this dir
|
|
||||||
options.sane.roles.client = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
config = lib.mkIf config.sane.roles.client {
|
|
||||||
sane.fs."/var/lib/iwd/.secrets.psk.stamp" = {
|
|
||||||
wantedBeforeBy = [ "iwd.service" ];
|
|
||||||
generated.acl.mode = "0600";
|
|
||||||
# XXX: install-iwd uses sed, but that's part of the default systemd unit path, it seems
|
|
||||||
generated.script.script = builtins.readFile ../../../../scripts/install-iwd + ''
|
|
||||||
touch "/var/lib/iwd/.secrets.psk.stamp"
|
|
||||||
'';
|
|
||||||
generated.script.scriptArgs = [ "/run/secrets/iwd" "/var/lib/iwd" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
{ ... }:
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./build-machine.nix
|
|
||||||
./client
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
{ ... }:
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./duplicity.nix
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
# docs: https://search.nixos.org/options?channel=21.11&query=duplicity
|
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
let
|
|
||||||
cfg = config.sane.services.duplicity;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options = {
|
|
||||||
sane.services.duplicity.enable = mkOption {
|
|
||||||
default = false;
|
|
||||||
type = types.bool;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
# we need this mostly because of the size of duplicity's cache
|
|
||||||
# TODO: move to cryptClearOnBoot and update perms
|
|
||||||
sane.persist.sys.plaintext = [ "/var/lib/duplicity" ];
|
|
||||||
|
|
||||||
services.duplicity.enable = true;
|
|
||||||
services.duplicity.targetUrl = "$DUPLICITY_URL";
|
|
||||||
# format: PASSPHRASE=<cleartext> \n DUPLICITY_URL=b2://...
|
|
||||||
# two sisters
|
|
||||||
# PASSPHRASE: remote backups will be encrypted using this passphrase (using gpg)
|
|
||||||
# DUPLICITY_URL: b2://$key_id:$app_key@$bucket
|
|
||||||
# create key with: backblaze-b2 create-key --bucket uninsane-host-duplicity uninsane-host-duplicity-safe listBuckets,listFiles,readBuckets,readFiles,writeFiles
|
|
||||||
# ^ run this until you get a key with no forward slashes :upside_down:
|
|
||||||
# web-created keys are allowed to delete files, which you probably don't want for an incremental backup program
|
|
||||||
# you need to create a new application key from the web in order to first get a key which can create new keys (use env vars in the above command)
|
|
||||||
# TODO: s/duplicity_passphrase/duplicity_env/
|
|
||||||
services.duplicity.secretFile = config.sops.secrets.duplicity_passphrase.path;
|
|
||||||
# NB: manually trigger with `systemctl start duplicity`
|
|
||||||
services.duplicity.frequency = "daily";
|
|
||||||
|
|
||||||
services.duplicity.extraFlags = [
|
|
||||||
# without --allow-source-mismatch, duplicity will abort if you change the hostname between backups
|
|
||||||
"--allow-source-mismatch"
|
|
||||||
|
|
||||||
# includes/exclude ordering matters, so we explicitly control it here.
|
|
||||||
# the first match decides a file's treatment. so here:
|
|
||||||
# - /nix/persist/home/colin/tmp is excluded
|
|
||||||
# - *other* /nix/persist/ files are included by default
|
|
||||||
# - anything else under `/` are excluded by default
|
|
||||||
"--exclude" "/nix/persist/home/colin/dev/home-logic/coremem/out" # this can reach > 1 TB
|
|
||||||
"--exclude" "/nix/persist/home/colin/use/iso" # might want to re-enable... but not critical
|
|
||||||
"--exclude" "/nix/persist/home/colin/.local/share/sublime-music" # music cache. better to just keep the HQ sources
|
|
||||||
"--exclude" "/nix/persist/home/colin/.local/share/Steam" # can just re-download games
|
|
||||||
"--exclude" "/nix/persist/home/colin/.bitmonero/lmdb" # monero blockchain
|
|
||||||
"--exclude" "/nix/persist/home/colin/.rustup"
|
|
||||||
"--exclude" "/nix/persist/home/colin/ref" # publicly available data: no point in duplicating it
|
|
||||||
"--exclude" "/nix/persist/home/colin/tmp"
|
|
||||||
"--exclude" "/nix/persist/home/colin/Videos"
|
|
||||||
"--exclude" "/nix/persist/var/lib/duplicity" # don't back up our own backup state!
|
|
||||||
"--include" "/nix/persist"
|
|
||||||
"--exclude" "/"
|
|
||||||
];
|
|
||||||
|
|
||||||
# set this for the FIRST backup, then remove it to enable incremental backups
|
|
||||||
# (that the first backup *isn't* full i think is a defect)
|
|
||||||
# services.duplicity.fullIfOlderThan = "always";
|
|
||||||
|
|
||||||
systemd.services.duplicity.serviceConfig = {
|
|
||||||
# rate-limit the read bandwidth in an effort to thereby prevent net upload saturation
|
|
||||||
# this could perhaps be done better by adding a duplicity config option to replace the binary with `trickle`
|
|
||||||
IOReadBandwidthMax = [
|
|
||||||
"/dev/sda1 5M"
|
|
||||||
"/dev/nvme0n1 5M"
|
|
||||||
"/dev/mmc0 5M"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# based on <nixpkgs:nixos/modules/services/backup/duplicity.nix> with changes:
|
|
||||||
# - remove the cleanup step: API key doesn't have delete perms
|
|
||||||
# - don't escape the targetUrl: it comes from an env var set in the secret file
|
|
||||||
systemd.services.duplicity.script = let
|
|
||||||
cfg = config.services.duplicity;
|
|
||||||
target = cfg.targetUrl;
|
|
||||||
extra = escapeShellArgs ([ "--archive-dir" "/var/lib/duplicity" ] ++ cfg.extraFlags);
|
|
||||||
dup = "${pkgs.duplicity}/bin/duplicity";
|
|
||||||
in lib.mkForce ''
|
|
||||||
set -x
|
|
||||||
# ${dup} cleanup ${target} --force ${extra}
|
|
||||||
# ${lib.optionalString (cfg.cleanup.maxAge != null) "${dup} remove-older-than ${lib.escapeShellArg cfg.cleanup.maxAge} ${target} --force ${extra}"}
|
|
||||||
# ${lib.optionalString (cfg.cleanup.maxFull != null) "${dup} remove-all-but-n-full ${builtins.toString cfg.cleanup.maxFull} ${target} --force ${extra}"}
|
|
||||||
# ${lib.optionalString (cfg.cleanup.maxIncr != null) "${dup} remove-all-inc-of-but-n-full ${toString cfg.cleanup.maxIncr} ${target} --force ${extra}"}
|
|
||||||
exec ${dup} ${if cfg.fullIfOlderThan == "always" then "full" else "incr"} ${lib.escapeShellArg cfg.root} ${target} ${lib.escapeShellArgs ([]
|
|
||||||
++ concatMap (p: [ "--include" p ]) cfg.include
|
|
||||||
++ concatMap (p: [ "--exclude" p ]) cfg.exclude
|
|
||||||
++ (lib.optionals (cfg.fullIfOlderThan != "never" && cfg.fullIfOlderThan != "always") [ "--full-if-older-than" cfg.fullIfOlderThan ])
|
|
||||||
)} ${extra}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,80 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
inherit (builtins) filter map;
|
|
||||||
inherit (lib) concatMap mapAttrsToList mkIf mkMerge mkOption optionalAttrs types;
|
|
||||||
cfg = config.sane.services.wg-home;
|
|
||||||
server-cfg = config.sane.hosts.by-name."servo".wg-home;
|
|
||||||
mkPeer = { ips, pubkey, endpoint }: {
|
|
||||||
publicKey = pubkey;
|
|
||||||
allowedIPs = map (k: "${k}/32") ips;
|
|
||||||
} // (optionalAttrs (endpoint != null) {
|
|
||||||
inherit endpoint;
|
|
||||||
# send keepalives every 25 seconds to keep NAT routes live.
|
|
||||||
# only need to do this from client -> server though, i think.
|
|
||||||
persistentKeepalive = 25;
|
|
||||||
# allows wireguard to notice DNS/hostname changes, with this much effective TTL.
|
|
||||||
dynamicEndpointRefreshSeconds = 600;
|
|
||||||
});
|
|
||||||
# make separate peers to route each given host
|
|
||||||
mkClientPeers = hosts: map (p: mkPeer {
|
|
||||||
inherit (p) pubkey endpoint;
|
|
||||||
ips = [ p.ip ];
|
|
||||||
}) hosts;
|
|
||||||
# make a single peer which routes all the given hosts
|
|
||||||
mkServerPeer = hosts: mkPeer {
|
|
||||||
inherit (server-cfg) pubkey endpoint;
|
|
||||||
ips = map (h: h.ip) hosts;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options = {
|
|
||||||
sane.services.wg-home.enable = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
sane.services.wg-home.ip = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
# generate a (deterministic) wireguard private key
|
|
||||||
sane.derived-secrets."/run/wg-home.priv" = {
|
|
||||||
len = 32;
|
|
||||||
encoding = "base64";
|
|
||||||
};
|
|
||||||
|
|
||||||
# wireguard VPN which allows everything on my domain to speak to each other even when
|
|
||||||
# not behind a shared LAN.
|
|
||||||
# this config defines both the endpoint (server) and client configs
|
|
||||||
|
|
||||||
# for convenience, have both the server and client use the same port for their wireguard connections.
|
|
||||||
networking.firewall.allowedUDPPorts = [ 51820 ];
|
|
||||||
networking.wireguard.interfaces.wg-home = {
|
|
||||||
listenPort = 51820;
|
|
||||||
privateKeyFile = "/run/wg-home.priv";
|
|
||||||
preSetup =
|
|
||||||
let
|
|
||||||
gen-key = config.sane.fs."/run/wg-home.priv".unit;
|
|
||||||
in
|
|
||||||
"${pkgs.systemd}/bin/systemctl start '${gen-key}'";
|
|
||||||
|
|
||||||
ips = [
|
|
||||||
"${cfg.ip}/24"
|
|
||||||
];
|
|
||||||
|
|
||||||
peers =
|
|
||||||
let
|
|
||||||
all-peers = mapAttrsToList (_: hostcfg: hostcfg.wg-home) config.sane.hosts.by-name;
|
|
||||||
peer-list = filter (p: p.ip != null && p.ip != cfg.ip && p.pubkey != null) all-peers;
|
|
||||||
in
|
|
||||||
if cfg.ip == server-cfg.ip then
|
|
||||||
# if we're the server, then we maintain the entire client list
|
|
||||||
mkClientPeers peer-list
|
|
||||||
else
|
|
||||||
# but if we're a client, we maintain a single peer -- the server -- which does the actual routing
|
|
||||||
[ (mkServerPeer peer-list) ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -4,32 +4,19 @@
|
|||||||
./fs.nix
|
./fs.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
sane.roles.build-machine = true;
|
|
||||||
sane.roles.client = true;
|
|
||||||
sane.services.wg-home.enable = true;
|
|
||||||
sane.services.wg-home.ip = config.sane.hosts.by-name."desko".wg-home.ip;
|
|
||||||
sane.services.duplicity.enable = true;
|
|
||||||
sane.services.nixserve.sopsFile = ../../../secrets/desko.yaml;
|
|
||||||
sane.persist.enable = true;
|
|
||||||
|
|
||||||
sane.gui.sway.enable = true;
|
sane.gui.sway.enable = true;
|
||||||
sane.programs.iphoneUtils.enableFor.user.colin = true;
|
sane.services.duplicity.enable = true;
|
||||||
|
sane.services.nixserve.enable = true;
|
||||||
sane.programs.guiApps.suggestedPrograms = [ "desktopGuiApps" ];
|
sane.services.nixserve.sopsFile = ../../secrets/desko.yaml;
|
||||||
|
sane.impermanence.enable = true;
|
||||||
|
|
||||||
boot.loader.efi.canTouchEfiVariables = false;
|
boot.loader.efi.canTouchEfiVariables = false;
|
||||||
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
|
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
|
||||||
|
|
||||||
# needed to use libimobiledevice/ifuse, for iphone sync
|
# needed to use libimobiledevice/ifuse, for iphone sync
|
||||||
services.usbmuxd.enable = true;
|
services.usbmuxd.enable = true;
|
||||||
|
users.users.usbmux.uid = config.sane.allocations.usbmux-uid;
|
||||||
sops.secrets.colin-passwd = {
|
users.groups.usbmux.gid = config.sane.allocations.usbmux-gid;
|
||||||
sopsFile = ../../../secrets/desko.yaml;
|
|
||||||
neededForUsers = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# don't enable wifi by default: it messes with connectivity.
|
|
||||||
systemd.services.iwd.enable = false;
|
|
||||||
|
|
||||||
# default config: https://man.archlinux.org/man/snapper-configs.5
|
# default config: https://man.archlinux.org/man/snapper-configs.5
|
||||||
# defaults to something like:
|
# defaults to something like:
|
||||||
@@ -46,7 +33,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
sops.secrets.duplicity_passphrase = {
|
sops.secrets.duplicity_passphrase = {
|
||||||
sopsFile = ../../../secrets/desko.yaml;
|
sopsFile = ../../secrets/desko.yaml;
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.steam = {
|
programs.steam = {
|
||||||
@@ -55,7 +42,7 @@
|
|||||||
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
||||||
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
|
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
|
||||||
};
|
};
|
||||||
sane.user.persist.plaintext = [
|
sane.impermanence.home-dirs = [
|
||||||
".steam"
|
".steam"
|
||||||
".local/share/Steam"
|
".local/share/Steam"
|
||||||
];
|
];
|
||||||
@@ -1,7 +1,16 @@
|
|||||||
{ ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
sane.persist.root-on-tmpfs = true;
|
# root is a tmpfs so that we have an ephemeral system ("impermanence" handles the state)
|
||||||
|
fileSystems."/" = {
|
||||||
|
device = "none";
|
||||||
|
fsType = "tmpfs";
|
||||||
|
options = [
|
||||||
|
"mode=755"
|
||||||
|
"size=1G"
|
||||||
|
"defaults"
|
||||||
|
];
|
||||||
|
};
|
||||||
# we need a /tmp for building large nix things.
|
# we need a /tmp for building large nix things.
|
||||||
# a cross-compiled kernel, particularly, will easily use 30+GB of tmp
|
# a cross-compiled kernel, particularly, will easily use 30+GB of tmp
|
||||||
fileSystems."/tmp" = {
|
fileSystems."/tmp" = {
|
||||||
@@ -1,29 +1,16 @@
|
|||||||
{ config, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./fs.nix
|
./fs.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
sane.roles.client = true;
|
# sane.users.guest.enable = true;
|
||||||
sane.services.wg-home.enable = true;
|
|
||||||
sane.services.wg-home.ip = config.sane.hosts.by-name."lappy".wg-home.ip;
|
|
||||||
|
|
||||||
# sane.guest.enable = true;
|
|
||||||
sane.gui.sway.enable = true;
|
sane.gui.sway.enable = true;
|
||||||
sane.persist.enable = true;
|
sane.impermanence.enable = true;
|
||||||
|
sane.nixcache.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = false;
|
boot.loader.efi.canTouchEfiVariables = false;
|
||||||
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
|
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
|
||||||
|
|
||||||
sane.programs.guiApps.suggestedPrograms = [
|
|
||||||
"desktopGuiApps"
|
|
||||||
"stepmania"
|
|
||||||
];
|
|
||||||
|
|
||||||
sops.secrets.colin-passwd = {
|
|
||||||
sopsFile = ../../../secrets/lappy.yaml;
|
|
||||||
neededForUsers = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# default config: https://man.archlinux.org/man/snapper-configs.5
|
# default config: https://man.archlinux.org/man/snapper-configs.5
|
||||||
# defaults to something like:
|
# defaults to something like:
|
||||||
# - hourly snapshots
|
# - hourly snapshots
|
||||||
@@ -1,7 +1,16 @@
|
|||||||
{ ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
sane.persist.root-on-tmpfs = true;
|
# root is a tmpfs so that we have an ephemeral system ("impermanence" handles the state)
|
||||||
|
fileSystems."/" = {
|
||||||
|
device = "none";
|
||||||
|
fsType = "tmpfs";
|
||||||
|
options = [
|
||||||
|
"mode=755"
|
||||||
|
"size=1G"
|
||||||
|
"defaults"
|
||||||
|
];
|
||||||
|
};
|
||||||
# we need a /tmp of default size (half RAM) for building large nix things
|
# we need a /tmp of default size (half RAM) for building large nix things
|
||||||
fileSystems."/tmp" = {
|
fileSystems."/tmp" = {
|
||||||
device = "none";
|
device = "none";
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, mobile-nixos, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./firmware.nix
|
./firmware.nix
|
||||||
@@ -6,45 +6,34 @@
|
|||||||
./kernel.nix
|
./kernel.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
sane.roles.client = true;
|
# cross-compiled documentation is *slow*.
|
||||||
sane.services.wg-home.enable = true;
|
# no obvious way to natively compile docs (2022/09/29).
|
||||||
sane.services.wg-home.ip = config.sane.hosts.by-name."moby".wg-home.ip;
|
# entrypoint is nixos/modules/misc/documentation.nix
|
||||||
|
# doc building happens in nixos/doc/manual/default.nix
|
||||||
|
# TODO: we could *maybe* inject pkgs.buildPackages.xyz = cross.buildPackages.xyz?
|
||||||
|
documentation.nixos.enable = false;
|
||||||
|
|
||||||
# XXX colin: phosh doesn't work well with passwordless login,
|
# XXX colin: phosh doesn't work well with passwordless login
|
||||||
# so set this more reliable default password should anything go wrong
|
|
||||||
users.users.colin.initialPassword = "147147";
|
users.users.colin.initialPassword = "147147";
|
||||||
services.getty.autologinUser = "root"; # allows for emergency maintenance?
|
services.getty.autologinUser = "root"; # allows for emergency maintenance?
|
||||||
|
|
||||||
sops.secrets.colin-passwd = {
|
# usability compromises
|
||||||
sopsFile = ../../../secrets/moby.yaml;
|
sane.impermanence.home-dirs = [
|
||||||
neededForUsers = true;
|
".librewolf"
|
||||||
};
|
|
||||||
|
|
||||||
sane.web-browser = {
|
|
||||||
# compromise impermanence for the sake of usability
|
|
||||||
persistCache = "private";
|
|
||||||
persistData = "private";
|
|
||||||
|
|
||||||
# i don't do crypto stuff on moby
|
|
||||||
addons.ether-metamask.enable = false;
|
|
||||||
# addons.sideberry.enable = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.user.persist.plaintext = [
|
|
||||||
".config/pulse" # persist pulseaudio volume
|
|
||||||
];
|
];
|
||||||
|
|
||||||
sane.persist.enable = true;
|
# sane.home-packages.enableGuiPkgs = false; # XXX faster builds/imaging for debugging
|
||||||
|
sane.home-manager.extraPackages = [
|
||||||
|
pkgs.plasma5Packages.konsole # terminal
|
||||||
|
];
|
||||||
|
|
||||||
|
sane.nixcache.enable = true;
|
||||||
|
sane.impermanence.enable = true;
|
||||||
sane.gui.phosh.enable = true;
|
sane.gui.phosh.enable = true;
|
||||||
# sane.programs.consoleUtils.enableFor.user.colin = false;
|
|
||||||
# sane.programs.guiApps.enableFor.user.colin = false;
|
|
||||||
sane.programs.sequoia.enableFor.user.colin = false;
|
|
||||||
|
|
||||||
boot.loader.efi.canTouchEfiVariables = false;
|
boot.loader.efi.canTouchEfiVariables = false;
|
||||||
# /boot space is at a premium. default was 20.
|
# /boot space is at a premium. default was 20.
|
||||||
# even 10 can be too much
|
boot.loader.generic-extlinux-compatible.configurationLimit = 10;
|
||||||
# TODO: compress moby kernels!
|
|
||||||
boot.loader.generic-extlinux-compatible.configurationLimit = 8;
|
|
||||||
# mobile.bootloader.enable = false;
|
# mobile.bootloader.enable = false;
|
||||||
# mobile.boot.stage-1.enable = false;
|
# mobile.boot.stage-1.enable = false;
|
||||||
# boot.initrd.systemd.enable = false;
|
# boot.initrd.systemd.enable = false;
|
||||||
@@ -55,10 +44,9 @@
|
|||||||
|
|
||||||
# without this some GUI apps fail: `DRM_IOCTL_MODE_CREATE_DUMB failed: Cannot allocate memory`
|
# without this some GUI apps fail: `DRM_IOCTL_MODE_CREATE_DUMB failed: Cannot allocate memory`
|
||||||
# this is because they can't allocate enough video ram.
|
# this is because they can't allocate enough video ram.
|
||||||
# the default CMA seems to be 32M.
|
# the default CMA seems to be 32M. we could probably get by with as little as 64M, and safely with 128M.
|
||||||
# i was running fine with 256MB from 2022/07-ish through 2022/12-ish, but then the phone quit reliably coming back from sleep: maybe a memory leak?
|
|
||||||
# `cat /proc/meminfo` to see CmaTotal/CmaFree if interested in tuning this.
|
# `cat /proc/meminfo` to see CmaTotal/CmaFree if interested in tuning this.
|
||||||
boot.kernelParams = [ "cma=512M" ];
|
boot.kernelParams = [ "cma=256M" ];
|
||||||
|
|
||||||
# mobile-nixos' /lib/firmware includes:
|
# mobile-nixos' /lib/firmware includes:
|
||||||
# rtl_bt (bluetooth)
|
# rtl_bt (bluetooth)
|
||||||
@@ -87,5 +75,7 @@
|
|||||||
environment.variables.ALSA_CONFIG_UCM2 = "${./ucm2}";
|
environment.variables.ALSA_CONFIG_UCM2 = "${./ucm2}";
|
||||||
systemd.services.pulseaudio.environment.ALSA_CONFIG_UCM2 = "${./ucm2}";
|
systemd.services.pulseaudio.environment.ALSA_CONFIG_UCM2 = "${./ucm2}";
|
||||||
|
|
||||||
|
users.groups.feedbackd.gid = config.sane.allocations.feedbackd-gid;
|
||||||
|
|
||||||
hardware.opengl.driSupport = true;
|
hardware.opengl.driSupport = true;
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,17 @@
|
|||||||
{ ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
sane.persist.root-on-tmpfs = true;
|
# root is a tmpfs so that we have an ephemeral system ("impermanence" handles the state)
|
||||||
|
fileSystems."/" = {
|
||||||
|
device = "none";
|
||||||
|
fsType = "tmpfs";
|
||||||
|
options = [
|
||||||
|
"mode=755"
|
||||||
|
"size=1G"
|
||||||
|
"defaults"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
fileSystems."/nix" = {
|
fileSystems."/nix" = {
|
||||||
device = "/dev/disk/by-uuid/1f1271f8-53ce-4081-8a29-60a4a6b5d6f9";
|
device = "/dev/disk/by-uuid/1f1271f8-53ce-4081-8a29-60a4a6b5d6f9";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
@@ -114,7 +114,7 @@ in
|
|||||||
# - phone rotation sensor is off by 90 degrees
|
# - phone rotation sensor is off by 90 degrees
|
||||||
# - ambient light sensor causes screen brightness to be shakey
|
# - ambient light sensor causes screen brightness to be shakey
|
||||||
# - phosh greeter may not appear after wake from sleep
|
# - phosh greeter may not appear after wake from sleep
|
||||||
boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux-megous;
|
boot.kernelPackages = pkgs.cross.linuxPackagesFor pkgs.cross.linux-megous;
|
||||||
|
|
||||||
boot.kernelPatches = [
|
boot.kernelPatches = [
|
||||||
(patchDefconfig (kernelConfig //
|
(patchDefconfig (kernelConfig //
|
||||||
@@ -125,9 +125,6 @@ in
|
|||||||
# aarch64-unknown-linux-gnu-gcc: error: unrecognized command line option '-mfpu=neon'
|
# aarch64-unknown-linux-gnu-gcc: error: unrecognized command line option '-mfpu=neon'
|
||||||
# make[3]: *** [../scripts/Makefile.build:289: drivers/video/fbdev/sun5i-eink-neon.o] Error 1
|
# make[3]: *** [../scripts/Makefile.build:289: drivers/video/fbdev/sun5i-eink-neon.o] Error 1
|
||||||
FB_SUN5I_EINK = no;
|
FB_SUN5I_EINK = no;
|
||||||
# used by the pinephone pro, but fails to compile with:
|
|
||||||
# ../drivers/media/i2c/ov8858.c:1834:27: error: implicit declaration of function 'compat_ptr'
|
|
||||||
VIDEO_OV8858 = no;
|
|
||||||
})
|
})
|
||||||
))
|
))
|
||||||
];
|
];
|
||||||
@@ -7,7 +7,9 @@
|
|||||||
boot.loader.generic-extlinux-compatible.enable = true;
|
boot.loader.generic-extlinux-compatible.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = false;
|
boot.loader.efi.canTouchEfiVariables = false;
|
||||||
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
|
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
|
||||||
sane.nixcache.enable = false; # don't want to be calling out to dead machines that we're *trying* to rescue
|
|
||||||
|
users.users.dhcpcd.uid = config.sane.allocations.dhcpcd-uid;
|
||||||
|
users.groups.dhcpcd.gid = config.sane.allocations.dhcpcd-gid;
|
||||||
|
|
||||||
# docs: https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion
|
# docs: https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion
|
||||||
system.stateVersion = "21.05";
|
system.stateVersion = "21.05";
|
||||||
45
machines/servo/default.nix
Normal file
45
machines/servo/default.nix
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./fs.nix
|
||||||
|
./hardware.nix
|
||||||
|
./net.nix
|
||||||
|
./users.nix
|
||||||
|
./services
|
||||||
|
];
|
||||||
|
|
||||||
|
sane.home-manager.enable = true;
|
||||||
|
sane.home-manager.extraPackages = [
|
||||||
|
# for administering matrix
|
||||||
|
pkgs.matrix-synapse
|
||||||
|
];
|
||||||
|
sane.impermanence.enable = true;
|
||||||
|
sane.services.duplicity.enable = true;
|
||||||
|
sane.services.nixserve.enable = true;
|
||||||
|
|
||||||
|
# TODO: look into the EFI stuff
|
||||||
|
boot.loader.grub.enable = false;
|
||||||
|
boot.loader.generic-extlinux-compatible.enable = true;
|
||||||
|
boot.loader.efi.canTouchEfiVariables = false;
|
||||||
|
sane.image.extraBootFiles = [ pkgs.bootpart-u-boot-rpi-aarch64 ];
|
||||||
|
|
||||||
|
sops.secrets.duplicity_passphrase = {
|
||||||
|
sopsFile = ../../secrets/servo.yaml;
|
||||||
|
};
|
||||||
|
|
||||||
|
# both transmission and ipfs try to set different net defaults.
|
||||||
|
# we just use the most aggressive of the two here:
|
||||||
|
boot.kernel.sysctl = {
|
||||||
|
"net.core.rmem_max" = "4194304"; # 4MB
|
||||||
|
};
|
||||||
|
|
||||||
|
# This value determines the NixOS release from which the default
|
||||||
|
# settings for stateful data, like file locations and database versions
|
||||||
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
# this value at the release version of the first install of this system.
|
||||||
|
# Before changing this value read the documentation for this option
|
||||||
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
|
system.stateVersion = "21.11"; # Did you read the comment?
|
||||||
|
}
|
||||||
|
|
||||||
69
machines/servo/fs.nix
Normal file
69
machines/servo/fs.nix
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
{ ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
# root is a tmpfs so that we have an ephemeral system ("impermanence" handles the state)
|
||||||
|
fileSystems."/" = {
|
||||||
|
device = "none";
|
||||||
|
fsType = "tmpfs";
|
||||||
|
options = [
|
||||||
|
"mode=755"
|
||||||
|
"size=1G"
|
||||||
|
"defaults"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
# we need a /tmp for building large nix things
|
||||||
|
fileSystems."/tmp" = {
|
||||||
|
device = "none";
|
||||||
|
fsType = "tmpfs";
|
||||||
|
options = [
|
||||||
|
"size=40G"
|
||||||
|
"mode=777"
|
||||||
|
"defaults"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/nix" = {
|
||||||
|
device = "/dev/disk/by-uuid/aa272cff-0fcc-498e-a4cb-0d95fb60631b";
|
||||||
|
fsType = "btrfs";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/boot" = {
|
||||||
|
device = "/dev/disk/by-uuid/31D3-40CB";
|
||||||
|
fsType = "vfat";
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
# fileSystems."/var/lib/pleroma" = {
|
||||||
|
# device = "/opt/pleroma";
|
||||||
|
# options = [ "bind" ];
|
||||||
|
# };
|
||||||
|
|
||||||
|
# in-memory compressed RAM (seems to be dynamically sized)
|
||||||
|
zramSwap = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# btrfs doesn't easily support swapfiles
|
||||||
|
# swapDevices = [
|
||||||
|
# { device = "/nix/persist/swapfile"; size = 4096; }
|
||||||
|
# ];
|
||||||
|
|
||||||
|
# this can be a partition. create with:
|
||||||
|
# fdisk <dev>
|
||||||
|
# n
|
||||||
|
# <default partno>
|
||||||
|
# <start>
|
||||||
|
# <end>
|
||||||
|
# t
|
||||||
|
# <partno>
|
||||||
|
# 19 # set part type to Linux swap
|
||||||
|
# w # write changes
|
||||||
|
# mkswap -L swap <part>
|
||||||
|
swapDevices = [
|
||||||
|
{
|
||||||
|
label = "swap";
|
||||||
|
# TODO: randomEncryption.enable = true;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
75
machines/servo/hardware.nix
Normal file
75
machines/servo/hardware.nix
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
# this file originates from ‘nixos-generate-config’
|
||||||
|
# but has been heavily modified
|
||||||
|
{ pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
# i changed this becuse linux 5.10 didn't have rpi-400 device tree blob.
|
||||||
|
# nixos-22.05 linux 5.15 DOES have these now.
|
||||||
|
# it should be possible to remove this if desired, but i'm not sure how the rpi-specific kernel differs.
|
||||||
|
# see: https://github.com/raspberrypi/linux
|
||||||
|
boot.kernelPackages = pkgs.linuxPackages_rpi4;
|
||||||
|
|
||||||
|
# raspberryPi boot loader creates extlinux.conf.
|
||||||
|
# otherwise, enable the generic-extlinux-compatible loader below.
|
||||||
|
# note: THESE ARE MUTUALLY EXCLUSIVE. generic-extlinux-compatible causes uboot to not be built
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [
|
||||||
|
"bcm2711_thermal"
|
||||||
|
"bcm_phy_lib"
|
||||||
|
"brcmfmac"
|
||||||
|
"brcmutil"
|
||||||
|
"broadcom"
|
||||||
|
"clk_raspberrypi"
|
||||||
|
"drm" # Direct Render Manager
|
||||||
|
"enclosure" # SCSI ?
|
||||||
|
"fuse"
|
||||||
|
"mdio_bcm_unimac"
|
||||||
|
"pcie_brcmstb"
|
||||||
|
"raspberrypi_cpufreq"
|
||||||
|
"raspberrypi_hwmon"
|
||||||
|
"ses" # SCSI Enclosure Services
|
||||||
|
"uas" # USB attached storage
|
||||||
|
"uio" # userspace IO
|
||||||
|
"uio_pdrv_genirq"
|
||||||
|
"xhci_pci"
|
||||||
|
"xhci_pci_renesas"
|
||||||
|
];
|
||||||
|
# boot.initrd.compressor = "gzip"; # defaults to zstd
|
||||||
|
|
||||||
|
# ondemand power scaling keeps the cpu at low frequency when idle, and sets to max frequency
|
||||||
|
# when load is detected. (v.s. the "performance" default, which always uses the max frequency)
|
||||||
|
powerManagement.cpuFreqGovernor = "ondemand";
|
||||||
|
|
||||||
|
# XXX colin: this allows one to `systemctl halt` and then not remove power until the HDD has spun down.
|
||||||
|
# however, it doesn't work with reboot because systemd will spin the drive up again to read its reboot bin.
|
||||||
|
# a better solution would be to put the drive behind a powered USB hub (or get a SSD).
|
||||||
|
# systemd.services.diskguard = {
|
||||||
|
# description = "Safely power off spinning media";
|
||||||
|
# before = [ "shutdown.target" ];
|
||||||
|
# wantedBy = [ "sysinit.target" ];
|
||||||
|
# # old (creates dep loop, but works)
|
||||||
|
# # before = [ "systemd-remount-fs.service" "shutdown.target" ];
|
||||||
|
# # wantedBy = [ "systemd-remount-fs.service" ];
|
||||||
|
# serviceConfig = {
|
||||||
|
# Type = "oneshot";
|
||||||
|
# RemainAfterExit = true;
|
||||||
|
# ExecStart = "${pkgs.coreutils}/bin/true";
|
||||||
|
# ExecStop = with pkgs; writeScript "diskguard" ''
|
||||||
|
# #!${bash}/bin/bash
|
||||||
|
# if ${procps}/bin/pgrep nixos-rebuild ;
|
||||||
|
# then
|
||||||
|
# exit 0 # don't halt drives unless we're actually shutting down. maybe better way to do this (check script args?)
|
||||||
|
# fi
|
||||||
|
# # ${coreutils}/bin/sync
|
||||||
|
# # ${util-linux}/bin/mount -o remount,ro /nix/store
|
||||||
|
# # ${util-linux}/bin/mount -o remount,ro /
|
||||||
|
# # -S 1 retracts the spindle after 5 seconds of idle
|
||||||
|
# # -B 1 spins down the drive after <vendor specific duration>
|
||||||
|
# ${hdparm}/sbin/hdparm -S 1 -B 1 /dev/sda
|
||||||
|
# # TODO: monitor smartmonctl until disk is idle? or try hdparm -Y
|
||||||
|
# # ${coreutils}/bin/sleep 20
|
||||||
|
# # exec ${util-linux}/bin/umount --all -t ext4,vfat,ext2
|
||||||
|
# '';
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
}
|
||||||
139
machines/servo/net.nix
Normal file
139
machines/servo/net.nix
Normal file
@@ -0,0 +1,139 @@
|
|||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
networking.domain = "uninsane.org";
|
||||||
|
|
||||||
|
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
|
||||||
|
# Per-interface useDHCP will be mandatory in the future, so this generated config
|
||||||
|
# replicates the default behaviour.
|
||||||
|
networking.useDHCP = false;
|
||||||
|
networking.interfaces.eth0.useDHCP = true;
|
||||||
|
# XXX colin: probably don't need this. wlan0 won't be populated unless i touch a value in networking.interfaces.wlan0
|
||||||
|
networking.wireless.enable = false;
|
||||||
|
|
||||||
|
# networking.firewall.enable = false;
|
||||||
|
networking.firewall.enable = true;
|
||||||
|
networking.firewall.allowedTCPPorts = [
|
||||||
|
25 # SMTP
|
||||||
|
80 # HTTP
|
||||||
|
143 # IMAP
|
||||||
|
443 # HTTPS
|
||||||
|
465 # SMTPS
|
||||||
|
587 # SMTPS/submission
|
||||||
|
993 # IMAPS
|
||||||
|
4001 # IPFS
|
||||||
|
];
|
||||||
|
networking.firewall.allowedUDPPorts = [
|
||||||
|
1900 7359 # DLNA: https://jellyfin.org/docs/general/networking/index.html
|
||||||
|
4001 # IPFS
|
||||||
|
];
|
||||||
|
|
||||||
|
# we need to use externally-visible nameservers in order for VPNs to be able to resolve hosts.
|
||||||
|
networking.nameservers = [
|
||||||
|
"1.1.1.1"
|
||||||
|
"9.9.9.9"
|
||||||
|
];
|
||||||
|
|
||||||
|
# OVPN CONFIG (https://www.ovpn.com):
|
||||||
|
# DOCS: https://nixos.wiki/wiki/WireGuard
|
||||||
|
networking.wireguard.enable = true;
|
||||||
|
networking.wireguard.interfaces.wg0 = {
|
||||||
|
privateKeyFile = config.sops.secrets.wg_ovpns_privkey.path;
|
||||||
|
# wg is active only in this namespace.
|
||||||
|
# run e.g. ip netns exec ovpns <some command like ping/curl/etc, it'll go through wg>
|
||||||
|
# sudo ip netns exec ovpns ping www.google.com
|
||||||
|
# note: without the namespace, you'll need to add a specific route through eth0 for the peer (185.157.162.178/32)
|
||||||
|
interfaceNamespace = "ovpns";
|
||||||
|
preSetup = "${pkgs.iproute2}/bin/ip netns add ovpns || true";
|
||||||
|
postShutdown = "${pkgs.iproute2}/bin/ip netns delete ovpns";
|
||||||
|
ips = [
|
||||||
|
"185.157.162.178/32"
|
||||||
|
];
|
||||||
|
peers = [
|
||||||
|
{
|
||||||
|
publicKey = "SkkEZDCBde22KTs/Hc7FWvDBfdOCQA4YtBEuC3n5KGs=";
|
||||||
|
endpoint = "vpn36.prd.amsterdam.ovpn.com:9930";
|
||||||
|
allowedIPs = [ "0.0.0.0/0" ];
|
||||||
|
# nixOS says this is important for keeping NATs active
|
||||||
|
persistentKeepalive = 25;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.services.wg0veth = {
|
||||||
|
description = "veth pair to allow communication between host and wg0 netns";
|
||||||
|
after = [ "wireguard-wg0.service" ];
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
RemainAfterExit = true;
|
||||||
|
|
||||||
|
ExecStart = with pkgs; writeScript "wg0veth-start" ''
|
||||||
|
#!${bash}/bin/bash
|
||||||
|
# create veth pair
|
||||||
|
${iproute2}/bin/ip link add ovpns-veth-a type veth peer name ovpns-veth-b
|
||||||
|
${iproute2}/bin/ip addr add 10.0.1.5/24 dev ovpns-veth-a
|
||||||
|
${iproute2}/bin/ip link set ovpns-veth-a up
|
||||||
|
# mv veth-b into the ovpns namespace
|
||||||
|
${iproute2}/bin/ip link set ovpns-veth-b netns ovpns
|
||||||
|
${iproute2}/bin/ip -n ovpns addr add 10.0.1.6/24 dev ovpns-veth-b
|
||||||
|
${iproute2}/bin/ip -n ovpns link set ovpns-veth-b up
|
||||||
|
# forward HTTP traffic, which we need for letsencrypt to work
|
||||||
|
${iproute2}/bin/ip netns exec ovpns ${socat}/bin/socat TCP4-LISTEN:80,reuseaddr,fork,su=nobody TCP4:10.0.1.5:80 &
|
||||||
|
'';
|
||||||
|
|
||||||
|
ExecStop = with pkgs; writeScript "wg0veth-stop" ''
|
||||||
|
#!${bash}/bin/bash
|
||||||
|
${iproute2}/bin/ip -n wg0 link del ovpns-veth-b
|
||||||
|
${iproute2}/bin/ip link del ovpns-veth-a
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
sops.secrets."wg_ovpns_privkey" = {
|
||||||
|
sopsFile = ../../secrets/servo.yaml;
|
||||||
|
};
|
||||||
|
|
||||||
|
# HURRICANE ELECTRIC CONFIG:
|
||||||
|
# networking.sits = {
|
||||||
|
# hurricane = {
|
||||||
|
# remote = "216.218.226.238";
|
||||||
|
# local = "192.168.0.5";
|
||||||
|
# # local = "10.0.0.5";
|
||||||
|
# # remote = "10.0.0.1";
|
||||||
|
# # local = "10.0.0.22";
|
||||||
|
# dev = "eth0";
|
||||||
|
# ttl = 255;
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
# networking.interfaces."hurricane".ipv6 = {
|
||||||
|
# addresses = [
|
||||||
|
# # mx.uninsane.org (publically routed /64)
|
||||||
|
# {
|
||||||
|
# address = "2001:470:b:465::1";
|
||||||
|
# prefixLength = 128;
|
||||||
|
# }
|
||||||
|
# # client addr
|
||||||
|
# # {
|
||||||
|
# # address = "2001:470:a:466::2";
|
||||||
|
# # prefixLength = 64;
|
||||||
|
# # }
|
||||||
|
# ];
|
||||||
|
# routes = [
|
||||||
|
# {
|
||||||
|
# address = "::";
|
||||||
|
# prefixLength = 0;
|
||||||
|
# # via = "2001:470:a:466::1";
|
||||||
|
# }
|
||||||
|
# ];
|
||||||
|
# };
|
||||||
|
|
||||||
|
# # after configuration, we want the hurricane device to look like this:
|
||||||
|
# # hurricane: flags=209<UP,POINTOPOINT,RUNNING,NOARP> mtu 1480
|
||||||
|
# # inet6 2001:470:a:450::2 prefixlen 64 scopeid 0x0<global>
|
||||||
|
# # inet6 fe80::c0a8:16 prefixlen 64 scopeid 0x20<link>
|
||||||
|
# # sit txqueuelen 1000 (IPv6-in-IPv4)
|
||||||
|
# # test with:
|
||||||
|
# # curl --interface hurricane http://[2607:f8b0:400a:80b::2004]
|
||||||
|
# # ping 2607:f8b0:400a:80b::2004
|
||||||
|
}
|
||||||
@@ -1,7 +1,5 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
# we use manual DDNS now
|
|
||||||
lib.mkIf false
|
|
||||||
{
|
{
|
||||||
systemd.services.ddns-he = {
|
systemd.services.ddns-he = {
|
||||||
description = "update dynamic DNS entries for HurricaneElectric";
|
description = "update dynamic DNS entries for HurricaneElectric";
|
||||||
@@ -27,4 +25,8 @@ lib.mkIf false
|
|||||||
OnUnitActiveSec = "10min";
|
OnUnitActiveSec = "10min";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
sops.secrets."ddns_he" = {
|
||||||
|
sopsFile = ../../../secrets/servo.yaml;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@@ -1,26 +1,17 @@
|
|||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./ddns-afraid.nix
|
|
||||||
./ddns-he.nix
|
./ddns-he.nix
|
||||||
./ejabberd.nix
|
|
||||||
./freshrss.nix
|
|
||||||
./gitea.nix
|
./gitea.nix
|
||||||
./goaccess.nix
|
|
||||||
./ipfs.nix
|
./ipfs.nix
|
||||||
./jackett.nix
|
./jackett.nix
|
||||||
./jellyfin.nix
|
./jellyfin.nix
|
||||||
./kiwix-serve.nix
|
|
||||||
./matrix
|
./matrix
|
||||||
./navidrome.nix
|
./navidrome.nix
|
||||||
./nixserve.nix
|
|
||||||
./nginx.nix
|
./nginx.nix
|
||||||
./pleroma.nix
|
./pleroma.nix
|
||||||
./postfix.nix
|
./postfix.nix
|
||||||
./postgres.nix
|
./postgres.nix
|
||||||
./prosody.nix
|
|
||||||
./transmission.nix
|
./transmission.nix
|
||||||
./trust-dns.nix
|
|
||||||
./wikipedia.nix
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
sane.persist.sys.plaintext = [
|
sane.impermanence.service-dirs = [
|
||||||
# TODO: mode? could be more granular
|
# TODO: mode? could be more granular
|
||||||
{ user = "git"; group = "gitea"; directory = "/var/lib/gitea"; }
|
{ user = "git"; group = "gitea"; directory = "/var/lib/gitea"; }
|
||||||
];
|
];
|
||||||
|
users.groups.gitea.gid = config.sane.allocations.gitea-gid;
|
||||||
services.gitea.enable = true;
|
services.gitea.enable = true;
|
||||||
services.gitea.user = "git"; # default is 'gitea'
|
services.gitea.user = "git"; # default is 'gitea'
|
||||||
services.gitea.database.type = "postgres";
|
services.gitea.database.type = "postgres";
|
||||||
@@ -15,17 +16,6 @@
|
|||||||
services.gitea.settings.session.COOKIE_SECURE = true;
|
services.gitea.settings.session.COOKIE_SECURE = true;
|
||||||
# services.gitea.disableRegistration = true;
|
# services.gitea.disableRegistration = true;
|
||||||
|
|
||||||
# gitea doesn't create the git user
|
|
||||||
users.users.git = {
|
|
||||||
description = "Gitea Service";
|
|
||||||
home = "/var/lib/gitea";
|
|
||||||
useDefaultShell = true;
|
|
||||||
group = "gitea";
|
|
||||||
isSystemUser = true;
|
|
||||||
# sendmail access (not 100% sure if this is necessary)
|
|
||||||
extraGroups = [ "postdrop" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
services.gitea.settings = {
|
services.gitea.settings = {
|
||||||
server = {
|
server = {
|
||||||
# options: "home", "explore", "organizations", "login" or URL fragment (or full URL)
|
# options: "home", "explore", "organizations", "login" or URL fragment (or full URL)
|
||||||
@@ -82,18 +72,4 @@
|
|||||||
"/var/lib/gitea"
|
"/var/lib/gitea"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# hosted git (web view and for `git <cmd>` use
|
|
||||||
# TODO: enable publog?
|
|
||||||
services.nginx.virtualHosts."git.uninsane.org" = {
|
|
||||||
forceSSL = true; # gitea complains if served over a different protocol than its config file says
|
|
||||||
enableACME = true;
|
|
||||||
# inherit kTLS;
|
|
||||||
|
|
||||||
locations."/" = {
|
|
||||||
proxyPass = "http://127.0.0.1:3000";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.services.trust-dns.zones."uninsane.org".inet.CNAME."git" = "native";
|
|
||||||
}
|
}
|
||||||
@@ -6,50 +6,26 @@
|
|||||||
# - number of open peer connections:
|
# - number of open peer connections:
|
||||||
# - sudo -u ipfs -g ipfs ipfs -c /var/lib/ipfs/ swarm peers | wc -l
|
# - sudo -u ipfs -g ipfs ipfs -c /var/lib/ipfs/ swarm peers | wc -l
|
||||||
|
|
||||||
{ lib, ... }:
|
{ ... }:
|
||||||
|
|
||||||
lib.mkIf false # i don't actively use ipfs anymore
|
|
||||||
{
|
{
|
||||||
sane.persist.sys.plaintext = [
|
sane.impermanence.service-dirs = [
|
||||||
# TODO: mode? could be more granular
|
# TODO: mode? could be more granular
|
||||||
{ user = "261"; group = "261"; directory = "/var/lib/ipfs"; }
|
{ user = "261"; group = "261"; directory = "/var/lib/ipfs"; }
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 4001 ];
|
|
||||||
networking.firewall.allowedUDPPorts = [ 4001 ];
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."ipfs.uninsane.org" = {
|
|
||||||
# don't default to ssl upgrades, since this may be dnslink'd from a different domain.
|
|
||||||
# ideally we'd disable ssl entirely, but some places assume it?
|
|
||||||
addSSL = true;
|
|
||||||
enableACME = true;
|
|
||||||
# inherit kTLS;
|
|
||||||
|
|
||||||
locations."/" = {
|
|
||||||
proxyPass = "http://127.0.0.1:8080";
|
|
||||||
extraConfig = ''
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Ipfs-Gateway-Prefix "";
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.services.trust-dns.zones."uninsane.org".inet.CNAME."ipfs" = "native";
|
|
||||||
|
|
||||||
# services.ipfs.enable = true;
|
# services.ipfs.enable = true;
|
||||||
services.kubo.localDiscovery = true;
|
services.kubo.localDiscovery = true;
|
||||||
services.kubo.settings = {
|
services.kubo.swarmAddress = [
|
||||||
|
# "/dns4/ipfs.uninsane.org/tcp/4001"
|
||||||
|
# "/ip4/0.0.0.0/tcp/4001"
|
||||||
|
"/dns4/ipfs.uninsane.org/udp/4001/quic"
|
||||||
|
"/ip4/0.0.0.0/udp/4001/quic"
|
||||||
|
];
|
||||||
|
services.kubo.extraConfig = {
|
||||||
Addresses = {
|
Addresses = {
|
||||||
Announce = [
|
Announce = [
|
||||||
# "/dns4/ipfs.uninsane.org/tcp/4001"
|
# "/dns4/ipfs.uninsane.org/tcp/4001"
|
||||||
"/dns4/ipfs.uninsane.org/udp/4001/quic"
|
"/dns4/ipfs.uninsane.org/udp/4001/quic"
|
||||||
];
|
];
|
||||||
Swarm = [
|
|
||||||
# "/dns4/ipfs.uninsane.org/tcp/4001"
|
|
||||||
# "/ip4/0.0.0.0/tcp/4001"
|
|
||||||
"/dns4/ipfs.uninsane.org/udp/4001/quic"
|
|
||||||
"/ip4/0.0.0.0/udp/4001/quic"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
Gateway = {
|
Gateway = {
|
||||||
# the gateway can only be used to serve content already replicated on this host
|
# the gateway can only be used to serve content already replicated on this host
|
||||||
@@ -1,32 +1,18 @@
|
|||||||
{ ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
sane.persist.sys.plaintext = [
|
sane.impermanence.service-dirs = [
|
||||||
# TODO: mode? we only need this to save Indexer creds ==> migrate to config?
|
# TODO: mode? we only need this to save Indexer creds ==> migrate to config?
|
||||||
{ user = "root"; group = "root"; directory = "/var/lib/jackett"; }
|
{ user = "root"; group = "root"; directory = "/var/lib/jackett"; }
|
||||||
];
|
];
|
||||||
services.jackett.enable = true;
|
services.jackett.enable = true;
|
||||||
|
|
||||||
systemd.services.jackett.after = [ "wireguard-wg-ovpns.service" ];
|
systemd.services.jackett.after = ["wg0veth.service"];
|
||||||
systemd.services.jackett.partOf = [ "wireguard-wg-ovpns.service" ];
|
|
||||||
systemd.services.jackett.serviceConfig = {
|
systemd.services.jackett.serviceConfig = {
|
||||||
# run this behind the OVPN static VPN
|
# run this behind the OVPN static VPN
|
||||||
NetworkNamespacePath = "/run/netns/ovpns";
|
NetworkNamespacePath = "/run/netns/ovpns";
|
||||||
# patch jackett to listen on the public interfaces
|
# patch jackett to listen on the public interfaces
|
||||||
# ExecStart = lib.mkForce "${pkgs.jackett}/bin/Jackett --NoUpdates --DataFolder /var/lib/jackett/.config/Jackett --ListenPublic";
|
# ExecStart = lib.mkForce "${pkgs.jackett}/bin/Jackett --NoUpdates --DataFolder /var/lib/jackett/.config/Jackett --ListenPublic";
|
||||||
};
|
};
|
||||||
|
|
||||||
# jackett torrent search
|
|
||||||
services.nginx.virtualHosts."jackett.uninsane.org" = {
|
|
||||||
forceSSL = true;
|
|
||||||
enableACME = true;
|
|
||||||
# inherit kTLS;
|
|
||||||
locations."/" = {
|
|
||||||
# proxyPass = "http://ovpns.uninsane.org:9117";
|
|
||||||
proxyPass = "http://10.0.1.6:9117";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
sane.services.trust-dns.zones."uninsane.org".inet.CNAME."jackett" = "native";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user