parent
c06b0a6e9d
commit
8de70fe92c
9 changed files with 92 additions and 10 deletions
23
flake.lock
generated
23
flake.lock
generated
|
@ -474,7 +474,28 @@
|
|||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"nvim-kitty-navigator": "nvim-kitty-navigator",
|
||||
"openwrt-imagebuilder": "openwrt-imagebuilder",
|
||||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
"seven-modules": "seven-modules"
|
||||
}
|
||||
},
|
||||
"seven-modules": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749209568,
|
||||
"narHash": "sha256-D8EN+fjyhYGhQQoY5WfGlX7arc+C7OyDk66CJuscpGo=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "520d5c291ca0d059fc38f42f503bb704d72b22f4",
|
||||
"revCount": 3,
|
||||
"type": "git",
|
||||
"url": "ssh://git@felschr.com:2222/felschr/seven-modules"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "ssh://git@felschr.com:2222/felschr/seven-modules"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
|
|
|
@ -77,6 +77,10 @@ rec {
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
seven-modules = {
|
||||
url = "git+ssh://git@felschr.com:2222/felschr/seven-modules";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
|
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ inputs, pkgs, ... }:
|
||||
|
||||
with pkgs;
|
||||
{
|
||||
|
@ -18,6 +13,7 @@ with pkgs;
|
|||
./browsers
|
||||
./planck.nix
|
||||
./services/easyeffects.nix
|
||||
inputs.seven-modules.homeModules.seven
|
||||
];
|
||||
|
||||
programs.gpg.enable = true;
|
||||
|
@ -77,5 +73,7 @@ with pkgs;
|
|||
emblem
|
||||
];
|
||||
|
||||
seven.enable = true;
|
||||
|
||||
home.stateVersion = "25.05";
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, pkgs, ... }:
|
||||
{ inputs, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
|
@ -15,6 +15,7 @@
|
|||
./ausweisapp.nix
|
||||
./gaming
|
||||
./services/easyeffects.nix
|
||||
inputs.seven-modules.homeModules.seven
|
||||
];
|
||||
|
||||
programs.gpg.enable = true;
|
||||
|
@ -90,5 +91,7 @@
|
|||
emblem
|
||||
];
|
||||
|
||||
seven.enable = true;
|
||||
|
||||
home.stateVersion = "25.05";
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, ... }:
|
||||
{ inputs, config, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
|
@ -13,8 +13,14 @@
|
|||
../../virtualisation/podman.nix
|
||||
../../virtualisation/libvirt.nix
|
||||
../../modules/systemdNotify.nix
|
||||
inputs.seven-modules.nixosModules.seven
|
||||
];
|
||||
|
||||
age.secrets.wireguard-seven-cmdframe-key = {
|
||||
file = ../../secrets/wireguard/seven/cmdframe.key.age;
|
||||
owner = "systemd-network";
|
||||
};
|
||||
|
||||
services.fprintd.enable = true;
|
||||
|
||||
programs.zsh.enable = true;
|
||||
|
@ -33,6 +39,17 @@
|
|||
"--operator=felschr"
|
||||
];
|
||||
|
||||
seven = {
|
||||
enable = true;
|
||||
wireguard = {
|
||||
addresses = [
|
||||
"198.18.1.241/15"
|
||||
"fd00:5ec::1f1/48"
|
||||
];
|
||||
privateKeyFile = config.age.secrets.wireguard-seven-cmdframe-key.path;
|
||||
};
|
||||
};
|
||||
|
||||
systemd.notify.enable = true;
|
||||
systemd.notify.method = "libnotify";
|
||||
systemd.notify.libnotify.user = "felschr";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, ... }:
|
||||
{ inputs, config, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
|
@ -20,8 +20,14 @@
|
|||
../../services/restic/home-pc.nix
|
||||
../../services/pcscd.nix
|
||||
../../services/open-webui.nix
|
||||
inputs.seven-modules.nixosModules.seven
|
||||
];
|
||||
|
||||
age.secrets.wireguard-seven-home-pc-key = {
|
||||
file = ../../secrets/wireguard/seven/home-pc.key.age;
|
||||
owner = "systemd-network";
|
||||
};
|
||||
|
||||
boot.loader.systemd-boot.memtest86.enable = true;
|
||||
|
||||
# running binaries for other architectures
|
||||
|
@ -54,6 +60,17 @@
|
|||
"87.98.162.88" = [ "portcheck.transmissionbt.com" ];
|
||||
};
|
||||
|
||||
seven = {
|
||||
enable = true;
|
||||
wireguard = {
|
||||
addresses = [
|
||||
"198.18.1.239/15"
|
||||
"fd00:5ec::1ef/48"
|
||||
];
|
||||
privateKeyFile = config.age.secrets.wireguard-seven-home-pc-key.path;
|
||||
};
|
||||
};
|
||||
|
||||
systemd.notify.enable = true;
|
||||
systemd.notify.method = "libnotify";
|
||||
systemd.notify.libnotify.user = "felschr";
|
||||
|
|
|
@ -14,6 +14,14 @@ let
|
|||
];
|
||||
in
|
||||
{
|
||||
"wireguard/seven/home-pc.key.age".publicKeys = [
|
||||
felschr
|
||||
home-pc
|
||||
];
|
||||
"wireguard/seven/cmdframe.key.age".publicKeys = [
|
||||
felschr
|
||||
cmdframe
|
||||
];
|
||||
"restic/b2.age".publicKeys = [
|
||||
felschr
|
||||
home-pc
|
||||
|
|
7
secrets/wireguard/seven/cmdframe.key.age
Normal file
7
secrets/wireguard/seven/cmdframe.key.age
Normal file
|
@ -0,0 +1,7 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 OAZQhA FfKFQDfxUjN7GOUnkkfChufgJubjr58U73ZPf7NYVk4
|
||||
yhnJ8a/rWjo3d0zv26K1RWjSZ1cIodrfZM3/GkrUWYc
|
||||
-> ssh-ed25519 4e2jfw cbNujNcFJlIUmdiju+vKa+/nGl7nktktp/qdCRABEVA
|
||||
6JKFvoJUOx/oOoF2FBIGQtrqeDelgTXkz5jT7NKNfgE
|
||||
--- NclMQArY2fMEnOMEBnm/4hD8v7F1gZcuZU2QBjH4HzU
|
||||
ïRðÒ4ÑE°'q÷¶‡Á¥AEh¶Z–µÙ<C2B5>$6éF4BˆÆÁûÂ'_Ky—î
uªè‘ú¼)…~ƒ§Y÷éߎ#€*É`ž<>ÙßUs3h:3
|
7
secrets/wireguard/seven/home-pc.key.age
Normal file
7
secrets/wireguard/seven/home-pc.key.age
Normal file
|
@ -0,0 +1,7 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 OAZQhA KeGvnhp8qfU1yhvjVOa0r6yX6O+kVPt6OsVLZ7O/Hws
|
||||
enisg9tJchYm3vn2ybB11mIV797QiREfBbr/eboPPxg
|
||||
-> ssh-ed25519 lJaKnA xckO8hkJshSnzUjQNcFpdlQtc+UcW+MY7D2NN5M/qlI
|
||||
GDRoXlQNvZU4zvbdLuw3CfxP6BDx3BKzWGjAqYP44d4
|
||||
--- 7Epn11NgBId/XxQRbi3RuRnDfvzL9fEzDMAvKM6rkOY
|
||||
³<EFBFBD>…<EFBFBD>)yh Ð¥g^°þÿsújÔwC8èM@ŸÑS±X&Hoèmëåp¬1›
?9!¦ÍƧkí¼ÛÃVöøW*:qàÙeçuÑ<75>
|
Loading…
Add table
Add a link
Reference in a new issue