Compare commits
6 Commits
feature/ad
...
feature/ov
Author | SHA1 | Date | |
---|---|---|---|
47f389100a | |||
8e5f616596 | |||
f0b8725935 | |||
819cf39acc | |||
e24e45a947 | |||
c4c06d2337 |
10
.vscode/settings.json
vendored
10
.vscode/settings.json
vendored
@ -8,7 +8,6 @@
|
|||||||
"acpid",
|
"acpid",
|
||||||
"adbusers",
|
"adbusers",
|
||||||
"ahci",
|
"ahci",
|
||||||
"aioesphomeapi",
|
|
||||||
"alicehuston",
|
"alicehuston",
|
||||||
"alsa",
|
"alsa",
|
||||||
"amdgpu",
|
"amdgpu",
|
||||||
@ -67,7 +66,6 @@
|
|||||||
"enableemail",
|
"enableemail",
|
||||||
"errorlens",
|
"errorlens",
|
||||||
"esbenp",
|
"esbenp",
|
||||||
"esphome",
|
|
||||||
"extest",
|
"extest",
|
||||||
"fastforwardteam",
|
"fastforwardteam",
|
||||||
"FASTFOX",
|
"FASTFOX",
|
||||||
@ -92,7 +90,6 @@
|
|||||||
"gamescope",
|
"gamescope",
|
||||||
"globalprivacycontrol",
|
"globalprivacycontrol",
|
||||||
"gparted",
|
"gparted",
|
||||||
"gtts",
|
|
||||||
"healthreport",
|
"healthreport",
|
||||||
"hexeditor",
|
"hexeditor",
|
||||||
"hicolor",
|
"hicolor",
|
||||||
@ -107,9 +104,7 @@
|
|||||||
"hyprland",
|
"hyprland",
|
||||||
"hyprwm",
|
"hyprwm",
|
||||||
"INITDB",
|
"INITDB",
|
||||||
"ioit",
|
|
||||||
"iperf",
|
"iperf",
|
||||||
"isal",
|
|
||||||
"jmgilman",
|
"jmgilman",
|
||||||
"jnoortheen",
|
"jnoortheen",
|
||||||
"jobset",
|
"jobset",
|
||||||
@ -170,7 +165,6 @@
|
|||||||
"optimumwifi",
|
"optimumwifi",
|
||||||
"optoutstudies",
|
"optoutstudies",
|
||||||
"overscroll",
|
"overscroll",
|
||||||
"overseerr",
|
|
||||||
"oxalica",
|
"oxalica",
|
||||||
"pavucontrol",
|
"pavucontrol",
|
||||||
"pbmode",
|
"pbmode",
|
||||||
@ -188,13 +182,11 @@
|
|||||||
"PRIVOXY",
|
"PRIVOXY",
|
||||||
"prowlarr",
|
"prowlarr",
|
||||||
"proxychains",
|
"proxychains",
|
||||||
"prusa",
|
|
||||||
"psycopg",
|
"psycopg",
|
||||||
"PUID",
|
"PUID",
|
||||||
"pulseaudio",
|
"pulseaudio",
|
||||||
"punycode",
|
"punycode",
|
||||||
"pylance",
|
"pylance",
|
||||||
"pymetno",
|
|
||||||
"qbit",
|
"qbit",
|
||||||
"qbittorrent",
|
"qbittorrent",
|
||||||
"qbittorrentvpn",
|
"qbittorrentvpn",
|
||||||
@ -232,7 +224,6 @@
|
|||||||
"sponsorblock",
|
"sponsorblock",
|
||||||
"spotifyd",
|
"spotifyd",
|
||||||
"sqltools",
|
"sqltools",
|
||||||
"ssdp",
|
|
||||||
"sshconfig",
|
"sshconfig",
|
||||||
"stdenv",
|
"stdenv",
|
||||||
"subresource",
|
"subresource",
|
||||||
@ -279,7 +270,6 @@
|
|||||||
"xhci",
|
"xhci",
|
||||||
"xwayland",
|
"xwayland",
|
||||||
"yzhang",
|
"yzhang",
|
||||||
"zeroconf",
|
|
||||||
"zerotier",
|
"zerotier",
|
||||||
"zerotierone",
|
"zerotierone",
|
||||||
"zhaofengli",
|
"zhaofengli",
|
||||||
|
324
flake.lock
generated
324
flake.lock
generated
@ -1,5 +1,27 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
|
"arch_mirror": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"poetry2nix": "poetry2nix"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1722708775,
|
||||||
|
"narHash": "sha256-z+8+fB0/8G9ScnDmgHKzR6BMxuTiK8mu0HDdp2y0dqQ=",
|
||||||
|
"owner": "RichieCahill",
|
||||||
|
"repo": "arch_mirror",
|
||||||
|
"rev": "ce97f5f7e7382f6cb36e464c0f18a3177396990d",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "RichieCahill",
|
||||||
|
"repo": "arch_mirror",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"attic": {
|
"attic": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"crane": "crane",
|
"crane": "crane",
|
||||||
@ -51,6 +73,27 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"fenix": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"rust-analyzer-src": "rust-analyzer-src"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1722925878,
|
||||||
|
"narHash": "sha256-/wuVEbsqQnaNAYKqe/7CXm8cQXMAfsQYg9Mtkm2Aetg=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "fenix",
|
||||||
|
"rev": "aefb786b6a2924f684ba9ecd8fcad4628b214ffe",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "fenix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"firefox-addons": {
|
"firefox-addons": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": [
|
"flake-utils": [
|
||||||
@ -109,6 +152,24 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1710146030,
|
||||||
|
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-utils_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": [
|
"systems": [
|
||||||
"systems"
|
"systems"
|
||||||
@ -189,10 +250,82 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"libgit2": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1715853528,
|
||||||
|
"narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=",
|
||||||
|
"owner": "libgit2",
|
||||||
|
"repo": "libgit2",
|
||||||
|
"rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "libgit2",
|
||||||
|
"ref": "v1.8.1",
|
||||||
|
"repo": "libgit2",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nix": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": [
|
||||||
|
"flake-compat"
|
||||||
|
],
|
||||||
|
"flake-parts": [
|
||||||
|
"flake-parts"
|
||||||
|
],
|
||||||
|
"git-hooks-nix": [
|
||||||
|
"pre-commit-hooks"
|
||||||
|
],
|
||||||
|
"libgit2": "libgit2",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"nixpkgs-23-11": "nixpkgs-23-11",
|
||||||
|
"nixpkgs-regression": "nixpkgs-regression"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1722501671,
|
||||||
|
"narHash": "sha256-3yFEvUDPB7GlCMI9I5VV+HXMVOT38h3lnw01nIXU2F4=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nix",
|
||||||
|
"rev": "0a167ffd1f57864ce042d83f9d1f17ef5126c442",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "latest-release",
|
||||||
|
"repo": "nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nix-github-actions": {
|
"nix-github-actions": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"system_tools",
|
"arch_mirror",
|
||||||
|
"poetry2nix",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1703863825,
|
||||||
|
"narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nix-github-actions",
|
||||||
|
"rev": "5163432afc817cf8bd1f031418d1869e4c9d5547",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nix-github-actions",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nix-github-actions_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"server_tools",
|
||||||
"poetry2nix",
|
"poetry2nix",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
@ -322,6 +455,22 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-23-11": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1717159533,
|
||||||
|
"narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722555339,
|
"lastModified": 1722555339,
|
||||||
@ -334,6 +483,22 @@
|
|||||||
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-regression": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1643052045,
|
||||||
|
"narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722869614,
|
"lastModified": 1722869614,
|
||||||
@ -353,23 +518,51 @@
|
|||||||
"poetry2nix": {
|
"poetry2nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": [
|
"flake-utils": [
|
||||||
"system_tools",
|
"arch_mirror",
|
||||||
"flake-utils"
|
"flake-utils"
|
||||||
],
|
],
|
||||||
"nix-github-actions": "nix-github-actions",
|
"nix-github-actions": "nix-github-actions",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"system_tools",
|
"arch_mirror",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"systems": "systems",
|
"systems": "systems_2",
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723343306,
|
"lastModified": 1722515463,
|
||||||
"narHash": "sha256-/6sRkPq7/5weX2y0V8sQ29Sz35nt8kyj+BsFtkhgbJE=",
|
"narHash": "sha256-6FVPz1WzHak65xJQg8tRjVyFEWMesGxfskKaCxDUnRk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "poetry2nix",
|
"repo": "poetry2nix",
|
||||||
"rev": "4a1c112ff0c67f496573dc345bd0b2247818fc29",
|
"rev": "8c25e871bba3f472e1569bbf6c0f52dcc34bf2a4",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "poetry2nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"poetry2nix_2": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": [
|
||||||
|
"server_tools",
|
||||||
|
"flake-utils"
|
||||||
|
],
|
||||||
|
"nix-github-actions": "nix-github-actions_2",
|
||||||
|
"nixpkgs": [
|
||||||
|
"server_tools",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"systems": "systems_3",
|
||||||
|
"treefmt-nix": "treefmt-nix_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1721039874,
|
||||||
|
"narHash": "sha256-XANsG9GYHip8pxZpbqKf/YGv8tIa0xTh289Y+WNBNfw=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "poetry2nix",
|
||||||
|
"rev": "d11c01e58587e5f21037ed6477465a7f26a32e27",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -407,13 +600,16 @@
|
|||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"arch_mirror": "arch_mirror",
|
||||||
"attic": "attic",
|
"attic": "attic",
|
||||||
|
"fenix": "fenix",
|
||||||
"firefox-addons": "firefox-addons",
|
"firefox-addons": "firefox-addons",
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils_2",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"hyprland-contrib": "hyprland-contrib",
|
"hyprland-contrib": "hyprland-contrib",
|
||||||
|
"nix": "nix",
|
||||||
"nix-index-database": "nix-index-database",
|
"nix-index-database": "nix-index-database",
|
||||||
"nixos-generators": "nixos-generators",
|
"nixos-generators": "nixos-generators",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
@ -422,12 +618,29 @@
|
|||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
"pre-commit-hooks": "pre-commit-hooks",
|
"pre-commit-hooks": "pre-commit-hooks",
|
||||||
"rust-overlay": "rust-overlay",
|
"rust-overlay": "rust-overlay",
|
||||||
|
"server_tools": "server_tools",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"system_tools": "system_tools",
|
"systems": "systems_4",
|
||||||
"systems": "systems_2",
|
|
||||||
"wired-notify": "wired-notify"
|
"wired-notify": "wired-notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"rust-analyzer-src": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1722868550,
|
||||||
|
"narHash": "sha256-Z708uZsfcP6IprVtw1AwjN0zjUX5+6lbneYiin58umc=",
|
||||||
|
"owner": "rust-lang",
|
||||||
|
"repo": "rust-analyzer",
|
||||||
|
"rev": "4a99d795d06970accb46bd594f473999818b2fa8",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "rust-lang",
|
||||||
|
"ref": "nightly",
|
||||||
|
"repo": "rust-analyzer",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@ -473,6 +686,30 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"server_tools": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": [
|
||||||
|
"flake-utils"
|
||||||
|
],
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"poetry2nix": "poetry2nix_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1722726877,
|
||||||
|
"narHash": "sha256-VEfypyflLdxL3hjtURbpfRv9dyc3Z/CvvZ76bAad8l8=",
|
||||||
|
"owner": "RAD-Development",
|
||||||
|
"repo": "server_tools",
|
||||||
|
"rev": "16f24eddcb117c5560582c42c120ba84360c7f1f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "RAD-Development",
|
||||||
|
"repo": "server_tools",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"sops-nix": {
|
"sops-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@ -496,31 +733,22 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"system_tools": {
|
"systems": {
|
||||||
"inputs": {
|
|
||||||
"flake-utils": [
|
|
||||||
"flake-utils"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"poetry2nix": "poetry2nix"
|
|
||||||
},
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723392261,
|
"lastModified": 1681028828,
|
||||||
"narHash": "sha256-Csa4yuYWcB3aLf7VP14v+Mp0lRzOOCCt9BdmAeeQcYU=",
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
"owner": "RAD-Development",
|
"owner": "nix-systems",
|
||||||
"repo": "system_tools",
|
"repo": "default",
|
||||||
"rev": "51bcc923b2b3cfb832b05687a01805c5a905b0c9",
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "RAD-Development",
|
"owner": "nix-systems",
|
||||||
"repo": "system_tools",
|
"repo": "default",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1681028828,
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
@ -534,7 +762,21 @@
|
|||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_2": {
|
"systems_3": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"id": "systems",
|
||||||
|
"type": "indirect"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"systems_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1681028828,
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
@ -552,7 +794,29 @@
|
|||||||
"treefmt-nix": {
|
"treefmt-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"system_tools",
|
"arch_mirror",
|
||||||
|
"poetry2nix",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1719749022,
|
||||||
|
"narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"treefmt-nix_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"server_tools",
|
||||||
"poetry2nix",
|
"poetry2nix",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
|
25
flake.nix
25
flake.nix
@ -29,6 +29,11 @@
|
|||||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
|
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||||
systems.url = "github:nix-systems/default";
|
systems.url = "github:nix-systems/default";
|
||||||
|
|
||||||
|
arch_mirror = {
|
||||||
|
url = "github:RichieCahill/arch_mirror";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
attic = {
|
attic = {
|
||||||
url = "github:zhaofengli/attic";
|
url = "github:zhaofengli/attic";
|
||||||
inputs = {
|
inputs = {
|
||||||
@ -39,6 +44,11 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fenix = {
|
||||||
|
url = "github:nix-community/fenix";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
firefox-addons = {
|
firefox-addons = {
|
||||||
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
|
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
|
||||||
inputs = {
|
inputs = {
|
||||||
@ -62,11 +72,20 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nix = {
|
||||||
|
url = "github:NixOS/nix/latest-release";
|
||||||
|
inputs = {
|
||||||
|
nixpkgs.follows = "nixpkgs";
|
||||||
|
flake-compat.follows = "flake-compat";
|
||||||
|
flake-parts.follows = "flake-parts";
|
||||||
|
git-hooks-nix.follows = "pre-commit-hooks";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
nix-index-database = {
|
nix-index-database = {
|
||||||
url = "github:Mic92/nix-index-database";
|
url = "github:Mic92/nix-index-database";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
nixos-generators = {
|
nixos-generators = {
|
||||||
url = "github:nix-community/nixos-generators";
|
url = "github:nix-community/nixos-generators";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@ -104,8 +123,8 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
system_tools = {
|
server_tools = {
|
||||||
url = "github:RAD-Development/system_tools";
|
url = "github:RAD-Development/server_tools";
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.follows = "nixpkgs";
|
nixpkgs.follows = "nixpkgs";
|
||||||
flake-utils.follows = "flake-utils";
|
flake-utils.follows = "flake-utils";
|
||||||
|
@ -1,24 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
cfg = config.services.rad-dev.yubikey;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options = {
|
|
||||||
services.rad-dev.yubikey = {
|
|
||||||
enable = lib.mkEnableOption "enable yubikey defaults";
|
|
||||||
enable-desktop-app = lib.mkEnableOption "installs desktop application";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
# enable the smart card daemon for certain yubikey operations
|
|
||||||
services.pcscd.enable = true;
|
|
||||||
|
|
||||||
environment.systemPackages = lib.optionals cfg.enable-desktop-app [ pkgs.yubioath-flutter ];
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,4 +1,4 @@
|
|||||||
disabled = ["empty_pattern"]
|
disabled = ["empty_pattern"]
|
||||||
nix_version = '2.23'
|
nix_version = '2.4'
|
||||||
ignore = ['.direnv']
|
ignore = ['.direnv']
|
||||||
|
|
||||||
|
@ -84,10 +84,6 @@
|
|||||||
};
|
};
|
||||||
#systemd.services.spotifyd.serviceConfig = systemd.services.spotifyd.
|
#systemd.services.spotifyd.serviceConfig = systemd.services.spotifyd.
|
||||||
};
|
};
|
||||||
rad-dev.yubikey = {
|
|
||||||
enable = true;
|
|
||||||
enable-desktop-app = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
users.users.alice.extraGroups = [ "calibre-web" ];
|
users.users.alice.extraGroups = [ "calibre-web" ];
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
calibre
|
calibre
|
||||||
# calibre dedrm?
|
# calibre dedrm?
|
||||||
candy-icons
|
candy-icons
|
||||||
nemo-with-extensions
|
cinnamon.nemo-with-extensions
|
||||||
croc
|
croc
|
||||||
deadnix
|
deadnix
|
||||||
direnv
|
direnv
|
||||||
@ -93,6 +93,7 @@
|
|||||||
wget
|
wget
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
xboxdrv
|
xboxdrv
|
||||||
|
yubioath-flutter
|
||||||
zoom-us
|
zoom-us
|
||||||
zoxide
|
zoxide
|
||||||
zoom
|
zoom
|
||||||
|
@ -9,6 +9,7 @@ in
|
|||||||
"${../../users/richie/global/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/"
|
"${../../users/richie/global/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/"
|
||||||
"${vars.main_mirror}:/data"
|
"${vars.main_mirror}:/data"
|
||||||
];
|
];
|
||||||
|
ports = [ "800:80" ];
|
||||||
extraOptions = [ "--network=web" ];
|
extraOptions = [ "--network=web" ];
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
};
|
};
|
||||||
@ -22,7 +23,7 @@ in
|
|||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Environment = "MIRROR_DIR=${vars.main_mirror}/archlinux/";
|
Environment = "MIRROR_DIR=${vars.main_mirror}/archlinux/";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/sync_mirror";
|
ExecStart = "${inputs.arch_mirror.packages.x86_64-linux.default}/bin/sync_mirror";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -2,29 +2,50 @@
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../users/richie/global/ssh.nix
|
../../users/richie/global/ssh.nix
|
||||||
|
../../users/richie/global/zerotier.nix
|
||||||
./arch_mirror.nix
|
./arch_mirror.nix
|
||||||
./docker
|
./docker
|
||||||
./home_assistant.nix
|
./home_assistant.nix
|
||||||
./networking.nix
|
|
||||||
./services.nix
|
./services.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
networking = {
|
||||||
|
hostId = "1beb3026";
|
||||||
|
firewall.enable = false;
|
||||||
|
};
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
zfs.extraPools = [ "Main" ];
|
zfs.extraPools = [ "Main" ];
|
||||||
filesystem = "zfs";
|
filesystem = "zfs";
|
||||||
useSystemdBoot = true;
|
useSystemdBoot = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [ docker-compose ];
|
environment = {
|
||||||
|
systemPackages = with pkgs; [ docker-compose ];
|
||||||
|
etc = {
|
||||||
|
# Creates /etc/lynis/custom.prf
|
||||||
|
"lynis/custom.prf" = {
|
||||||
|
text = ''
|
||||||
|
skip-test=BANN-7126
|
||||||
|
skip-test=BANN-7130
|
||||||
|
skip-test=DEB-0520
|
||||||
|
skip-test=DEB-0810
|
||||||
|
skip-test=FIRE-4513
|
||||||
|
skip-test=HRDN-7222
|
||||||
|
skip-test=KRNL-5820
|
||||||
|
skip-test=LOGG-2190
|
||||||
|
skip-test=LYNIS
|
||||||
|
skip-test=TOOL-5002
|
||||||
|
'';
|
||||||
|
mode = "0440";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
openssh = {
|
nfs.server.enable = true;
|
||||||
ports = [ 352 ];
|
|
||||||
listenAddresses = [
|
openssh.ports = [ 352 ];
|
||||||
{ addr = "192.168.95.35"; }
|
|
||||||
{ addr = "192.168.90.35"; }
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
smartd.enable = true;
|
smartd.enable = true;
|
||||||
|
|
||||||
|
@ -26,11 +26,9 @@ frontend ContentSwitching
|
|||||||
# tmmworkshop.com
|
# tmmworkshop.com
|
||||||
acl host_mirror hdr(host) -i mirror.tmmworkshop.com jeeves
|
acl host_mirror hdr(host) -i mirror.tmmworkshop.com jeeves
|
||||||
acl host_uptime_kuma hdr(host) -i uptimekuma-jeevesjr.tmmworkshop.com
|
acl host_uptime_kuma hdr(host) -i uptimekuma-jeevesjr.tmmworkshop.com
|
||||||
acl host_homeassistant hdr(host) -i homeassistant.tmmworkshop.com
|
|
||||||
|
|
||||||
use_backend mirror_nodes if host_mirror
|
use_backend mirror_nodes if host_mirror
|
||||||
use_backend uptime_kuma_nodes if host_uptime_kuma
|
use_backend uptime_kuma_nodes if host_uptime_kuma
|
||||||
use_backend home_asistant_nodes if host_homeassistant
|
|
||||||
|
|
||||||
# tmmworkshop.com
|
# tmmworkshop.com
|
||||||
backend mirror_nodes
|
backend mirror_nodes
|
||||||
@ -40,7 +38,3 @@ backend mirror_nodes
|
|||||||
backend uptime_kuma_nodes
|
backend uptime_kuma_nodes
|
||||||
mode http
|
mode http
|
||||||
server server uptime_kuma:3001
|
server server uptime_kuma:3001
|
||||||
|
|
||||||
backend home_asistant_nodes
|
|
||||||
mode http
|
|
||||||
server server 192.168.95.35:8123
|
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
networking.useDHCP = lib.mkDefault true;
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
swapDevices = [ { device = "/dev/disk/by-uuid/9d4ef549-d426-489d-8332-0a49589c6aed"; } ];
|
swapDevices = [ { device = "/dev/disk/by-uuid/9d4ef549-d426-489d-8332-0a49589c6aed"; } ];
|
||||||
boot = {
|
boot = {
|
||||||
|
@ -3,47 +3,15 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
config = {
|
config = {
|
||||||
http = {
|
|
||||||
server_port = 8123;
|
server_port = 8123;
|
||||||
server_host = [
|
|
||||||
"192.168.95.35"
|
|
||||||
"192.168.90.35"
|
|
||||||
"192.168.98.4"
|
|
||||||
];
|
|
||||||
use_x_forwarded_for = true;
|
|
||||||
trusted_proxies = "172.100.0.4";
|
|
||||||
};
|
|
||||||
homeassistant = {
|
homeassistant = {
|
||||||
time_zone = "America/New_York";
|
time_zone = "America/New_York";
|
||||||
unit_system = "imperial";
|
unit_system = "imperial";
|
||||||
temperature_unit = "F";
|
temperature_unit = "F";
|
||||||
|
longitude = 40.74;
|
||||||
|
latitude = 74.03;
|
||||||
};
|
};
|
||||||
assist_pipeline = { };
|
|
||||||
backup = { };
|
|
||||||
bluetooth = { };
|
|
||||||
config = { };
|
|
||||||
dhcp = { };
|
|
||||||
energy = { };
|
|
||||||
history = { };
|
|
||||||
homeassistant_alerts = { };
|
|
||||||
image_upload = { };
|
|
||||||
logbook = { };
|
|
||||||
media_source = { };
|
|
||||||
mobile_app = { };
|
|
||||||
ssdp = { };
|
|
||||||
sun = { };
|
|
||||||
webhook = { };
|
|
||||||
zeroconf = { };
|
|
||||||
};
|
};
|
||||||
extraPackages =
|
extraPackages = python3Packages: with python3Packages; [ psycopg2 ];
|
||||||
python3Packages: with python3Packages; [
|
|
||||||
psycopg2
|
|
||||||
gtts
|
|
||||||
aioesphomeapi
|
|
||||||
esphome-dashboard-api
|
|
||||||
bleak-esphome
|
|
||||||
pymetno
|
|
||||||
];
|
|
||||||
extraComponents = [ "isal" ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,43 +0,0 @@
|
|||||||
{
|
|
||||||
networking = {
|
|
||||||
hostId = "1beb3026";
|
|
||||||
firewall.enable = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.network = {
|
|
||||||
enable = true;
|
|
||||||
|
|
||||||
netdevs = {
|
|
||||||
"20-ioit-vlan" = {
|
|
||||||
netdevConfig = {
|
|
||||||
Kind = "vlan";
|
|
||||||
Name = "ioit-vlan";
|
|
||||||
};
|
|
||||||
vlanConfig.Id = 20;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
networks = {
|
|
||||||
"10-lan" = {
|
|
||||||
matchConfig.Name = "enp4s0";
|
|
||||||
DHCP = "yes";
|
|
||||||
vlan = [ "ioit-vlan" ];
|
|
||||||
linkConfig.RequiredForOnline = "routable";
|
|
||||||
};
|
|
||||||
"40-ioit-vlan" = {
|
|
||||||
matchConfig.Name = "ioit-vlan";
|
|
||||||
DHCP = "yes";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.zerotierone = {
|
|
||||||
enable = true;
|
|
||||||
joinNetworks = [ "e4da7455b2ae64ca" ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
# 22/tcp open ssh
|
|
||||||
# 800/tcp open mdbs_daemon
|
|
||||||
# 5355/tcp open llmnr
|
|
||||||
# 8123/tcp open polipo
|
|
||||||
# 9993/tcp open palace-2
|
|
@ -15,7 +15,7 @@
|
|||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
EnvironmentFile = config.sops.secrets."server-validation/webhook".path;
|
EnvironmentFile = config.sops.secrets."server-validation/webhook".path;
|
||||||
ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_jeevesjr";
|
ExecStart = "${inputs.server_tools.packages.x86_64-linux.default}/bin/validate_jeevesjr";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
timers.startup_validation = {
|
timers.startup_validation = {
|
||||||
|
@ -23,7 +23,7 @@ in
|
|||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Environment = "MIRROR_DIR=${vars.media_mirror}/archlinux/";
|
Environment = "MIRROR_DIR=${vars.media_mirror}/archlinux/";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/sync_mirror";
|
ExecStart = "${inputs.arch_mirror.packages.x86_64-linux.default}/bin/sync_mirror";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -6,13 +6,18 @@ in
|
|||||||
imports = [
|
imports = [
|
||||||
../../users/richie/global/ssh.nix
|
../../users/richie/global/ssh.nix
|
||||||
../../users/richie/global/syncthing_base.nix
|
../../users/richie/global/syncthing_base.nix
|
||||||
|
../../users/richie/global/zerotier.nix
|
||||||
./arch_mirror.nix
|
./arch_mirror.nix
|
||||||
./docker
|
./docker
|
||||||
./networking.nix
|
|
||||||
./programs.nix
|
./programs.nix
|
||||||
./services.nix
|
./services.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
networking = {
|
||||||
|
hostId = "1beb3027";
|
||||||
|
firewall.enable = false;
|
||||||
|
};
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
zfs.extraPools = [
|
zfs.extraPools = [
|
||||||
"media"
|
"media"
|
||||||
|
@ -30,14 +30,12 @@ frontend ContentSwitching
|
|||||||
acl host_grafana hdr(host) -i grafana.tmmworkshop.com
|
acl host_grafana hdr(host) -i grafana.tmmworkshop.com
|
||||||
acl host_filebrowser hdr(host) -i filebrowser.tmmworkshop.com
|
acl host_filebrowser hdr(host) -i filebrowser.tmmworkshop.com
|
||||||
acl host_uptime_kuma hdr(host) -i uptimekuma-jeeves.tmmworkshop.com
|
acl host_uptime_kuma hdr(host) -i uptimekuma-jeeves.tmmworkshop.com
|
||||||
acl host_overseerr hdr(host) -i overseerr.tmmworkshop.com
|
|
||||||
|
|
||||||
use_backend mirror_nodes if host_mirror
|
use_backend mirror_nodes if host_mirror
|
||||||
use_backend dndrules_nodes if host_dndrules
|
use_backend dndrules_nodes if host_dndrules
|
||||||
use_backend grafana_nodes if host_grafana
|
use_backend grafana_nodes if host_grafana
|
||||||
use_backend filebrowser_nodes if host_filebrowser
|
use_backend filebrowser_nodes if host_filebrowser
|
||||||
use_backend uptime_kuma_nodes if host_uptime_kuma
|
use_backend uptime_kuma_nodes if host_uptime_kuma
|
||||||
use_backend overseerr_nodes if host_overseerr
|
|
||||||
|
|
||||||
backend mirror_nodes
|
backend mirror_nodes
|
||||||
mode http
|
mode http
|
||||||
@ -62,7 +60,3 @@ backend filebrowser_nodes
|
|||||||
backend uptime_kuma_nodes
|
backend uptime_kuma_nodes
|
||||||
mode http
|
mode http
|
||||||
server server uptime_kuma:3001
|
server server uptime_kuma:3001
|
||||||
|
|
||||||
backend overseerr_nodes
|
|
||||||
mode http
|
|
||||||
server server overseerr:5055
|
|
||||||
|
@ -112,33 +112,6 @@ in
|
|||||||
];
|
];
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
};
|
};
|
||||||
overseerr = {
|
|
||||||
image = "ghcr.io/linuxserver/overseerr:latest";
|
|
||||||
environment = {
|
|
||||||
PUID = "600";
|
|
||||||
PGID = "100";
|
|
||||||
TZ = "America/New_York";
|
|
||||||
};
|
|
||||||
volumes = [ "${vars.media_docker_configs}/overseerr:/config" ];
|
|
||||||
dependsOn = [
|
|
||||||
"radarr"
|
|
||||||
"sonarr"
|
|
||||||
];
|
|
||||||
extraOptions = [ "--network=web" ];
|
|
||||||
autoStart = true;
|
|
||||||
};
|
|
||||||
unpackerr = {
|
|
||||||
image = "golift/unpackerr:latest";
|
|
||||||
user = "600:100";
|
|
||||||
environment = {
|
|
||||||
TZ = "America/New_York";
|
|
||||||
};
|
|
||||||
volumes = [
|
|
||||||
"${vars.torrenting_qbit}:/data"
|
|
||||||
"${config.sops.secrets.unpackerr_conf}:/etc/unpackerr/unpackerr.conf"
|
|
||||||
];
|
|
||||||
autoStart = true;
|
|
||||||
};
|
|
||||||
whisper = {
|
whisper = {
|
||||||
image = "ghcr.io/linuxserver/faster-whisper:latest";
|
image = "ghcr.io/linuxserver/faster-whisper:latest";
|
||||||
ports = [ "10300:10300" ];
|
ports = [ "10300:10300" ];
|
||||||
|
@ -35,7 +35,6 @@ in
|
|||||||
"dnd_file_server"
|
"dnd_file_server"
|
||||||
"filebrowser"
|
"filebrowser"
|
||||||
"grafana"
|
"grafana"
|
||||||
"overseerr"
|
|
||||||
"uptime_kuma"
|
"uptime_kuma"
|
||||||
];
|
];
|
||||||
extraOptions = [ "--network=web" ];
|
extraOptions = [ "--network=web" ];
|
||||||
@ -53,6 +52,23 @@ in
|
|||||||
extraOptions = [ "--network=web" ];
|
extraOptions = [ "--network=web" ];
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
};
|
};
|
||||||
|
overseerr = {
|
||||||
|
image = "lscr.io/linuxserver/overseerr";
|
||||||
|
environment = {
|
||||||
|
PUID = "600";
|
||||||
|
PGID = "100";
|
||||||
|
TZ = "America/New_York";
|
||||||
|
};
|
||||||
|
volumes = [ "${vars.media_docker_configs}/overseerr:/config" ];
|
||||||
|
# TODO: remove ports later since this is going through web
|
||||||
|
ports = [ "5055:5055" ]; # Web UI port
|
||||||
|
dependsOn = [
|
||||||
|
"radarr"
|
||||||
|
"sonarr"
|
||||||
|
];
|
||||||
|
extraOptions = [ "--network=web" ];
|
||||||
|
autoStart = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
sops = {
|
sops = {
|
||||||
|
@ -40,6 +40,17 @@
|
|||||||
|
|
||||||
swapDevices = [ { device = "/dev/disk/by-uuid/4c797a94-be32-43d3-89ac-7f02912c7cf5"; } ];
|
swapDevices = [ { device = "/dev/disk/by-uuid/4c797a94-be32-43d3-89ac-7f02912c7cf5"; } ];
|
||||||
|
|
||||||
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.enp38s0f3u2u2c2.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.enp97s0f0np0.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.enp97s0f1np1.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.enp98s0f0.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.enp98s0f1.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
}
|
}
|
||||||
|
@ -1,40 +0,0 @@
|
|||||||
{
|
|
||||||
networking = {
|
|
||||||
hostId = "1beb3027";
|
|
||||||
firewall.enable = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.network = {
|
|
||||||
enable = true;
|
|
||||||
networks = {
|
|
||||||
"10-1GB_Primary" = {
|
|
||||||
matchConfig.Name = "enp98s0f0";
|
|
||||||
DHCP = "yes";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
networks = {
|
|
||||||
"10-1GB_Secondary" = {
|
|
||||||
matchConfig.Name = "enp98s0f1";
|
|
||||||
DHCP = "yes";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
networks = {
|
|
||||||
"10-10GB_Primary" = {
|
|
||||||
matchConfig.Name = "enp97s0f0np0";
|
|
||||||
DHCP = "yes";
|
|
||||||
linkConfig.RequiredForOnline = "routable";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
networks = {
|
|
||||||
"10-10GB_Secondary" = {
|
|
||||||
matchConfig.Name = "enp97s0f1np1";
|
|
||||||
DHCP = "yes";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.zerotierone = {
|
|
||||||
enable = true;
|
|
||||||
joinNetworks = [ "e4da7455b2ae64ca" ];
|
|
||||||
};
|
|
||||||
}
|
|
@ -23,7 +23,7 @@
|
|||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
EnvironmentFile = config.sops.secrets."server-validation/webhook".path;
|
EnvironmentFile = config.sops.secrets."server-validation/webhook".path;
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_jeeves";
|
ExecStart = "${inputs.server_tools.packages.x86_64-linux.default}/bin/validate_jeeves";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
EnvironmentFile = config.sops.secrets."server-validation/webhook".path;
|
EnvironmentFile = config.sops.secrets."server-validation/webhook".path;
|
||||||
ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_palatine_hill";
|
ExecStart = "${inputs.server_tools.packages.x86_64-linux.default}/bin/validate_palatine_hill";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
timers.startup_validation = {
|
timers.startup_validation = {
|
||||||
|
@ -8,8 +8,8 @@
|
|||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
beeper
|
beeper
|
||||||
candy-icons
|
candy-icons
|
||||||
nemo
|
cinnamon.nemo
|
||||||
nemo-fileroller
|
cinnamon.nemo-fileroller
|
||||||
discord-canary
|
discord-canary
|
||||||
gimp
|
gimp
|
||||||
gparted
|
gparted
|
||||||
@ -21,6 +21,5 @@
|
|||||||
util-linux
|
util-linux
|
||||||
vlc
|
vlc
|
||||||
zoom-us
|
zoom-us
|
||||||
prusa-slicer
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -50,6 +50,9 @@
|
|||||||
|
|
||||||
// force the use of rust-analyzer from dev shell
|
// force the use of rust-analyzer from dev shell
|
||||||
"rust-analyzer.server.path": "rust-analyzer",
|
"rust-analyzer.server.path": "rust-analyzer",
|
||||||
|
|
||||||
|
// other
|
||||||
|
"python.analysis.typeCheckingMode": "basic",
|
||||||
"redhat.telemetry.enabled": true,
|
"redhat.telemetry.enabled": true,
|
||||||
"gitlens.plusFeatures.enabled": false,
|
"gitlens.plusFeatures.enabled": false,
|
||||||
// new
|
// new
|
||||||
|
@ -43,6 +43,7 @@
|
|||||||
nix-prefetch
|
nix-prefetch
|
||||||
nix-tree
|
nix-tree
|
||||||
nixpkgs-fmt
|
nixpkgs-fmt
|
||||||
inputs.system_tools.packages.x86_64-linux.default
|
inputs.server_tools.packages.x86_64-linux.default
|
||||||
|
inputs.arch_mirror.packages.x86_64-linux.default
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -30,12 +30,6 @@
|
|||||||
identityFile = "~/.ssh/id_ed25519";
|
identityFile = "~/.ssh/id_ed25519";
|
||||||
port = 922;
|
port = 922;
|
||||||
};
|
};
|
||||||
palatine-hill = {
|
|
||||||
hostname = "192.168.76.2";
|
|
||||||
user = "richie";
|
|
||||||
identityFile = "~/.ssh/id_ed25519";
|
|
||||||
port = 666;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user