Compare commits
24 Commits
feature/on
...
feature/ad
| Author | SHA1 | Date | |
|---|---|---|---|
| c05d782180 | |||
| 44839aece5 | |||
| 9f722be8c9 | |||
| 0bbb592ff5 | |||
| 4c1465811a | |||
| 69f9a5a820 | |||
| b514504178 | |||
| 73448e7949 | |||
| a5dfa34fa4 | |||
| d3d397f930 | |||
| db9c636678 | |||
| b25f3c2f32 | |||
| 95547074ef | |||
| bc44ead6f3 | |||
| 622317ca46 | |||
| fde746b94d | |||
| 2bfc7e6320 | |||
| 9e0591a695 | |||
| 74d814147a | |||
| a772dcba03 | |||
| 1be01f2f9d | |||
| 2581d0162f | |||
| ba20cdffe3 | |||
| 50d8a60b50 |
10
.vscode/settings.json
vendored
10
.vscode/settings.json
vendored
@ -8,6 +8,7 @@
|
||||
"acpid",
|
||||
"adbusers",
|
||||
"ahci",
|
||||
"aioesphomeapi",
|
||||
"alicehuston",
|
||||
"alsa",
|
||||
"amdgpu",
|
||||
@ -66,6 +67,7 @@
|
||||
"enableemail",
|
||||
"errorlens",
|
||||
"esbenp",
|
||||
"esphome",
|
||||
"extest",
|
||||
"fastforwardteam",
|
||||
"FASTFOX",
|
||||
@ -90,6 +92,7 @@
|
||||
"gamescope",
|
||||
"globalprivacycontrol",
|
||||
"gparted",
|
||||
"gtts",
|
||||
"healthreport",
|
||||
"hexeditor",
|
||||
"hicolor",
|
||||
@ -104,7 +107,9 @@
|
||||
"hyprland",
|
||||
"hyprwm",
|
||||
"INITDB",
|
||||
"ioit",
|
||||
"iperf",
|
||||
"isal",
|
||||
"jmgilman",
|
||||
"jnoortheen",
|
||||
"jobset",
|
||||
@ -165,6 +170,7 @@
|
||||
"optimumwifi",
|
||||
"optoutstudies",
|
||||
"overscroll",
|
||||
"overseerr",
|
||||
"oxalica",
|
||||
"pavucontrol",
|
||||
"pbmode",
|
||||
@ -182,11 +188,13 @@
|
||||
"PRIVOXY",
|
||||
"prowlarr",
|
||||
"proxychains",
|
||||
"prusa",
|
||||
"psycopg",
|
||||
"PUID",
|
||||
"pulseaudio",
|
||||
"punycode",
|
||||
"pylance",
|
||||
"pymetno",
|
||||
"qbit",
|
||||
"qbittorrent",
|
||||
"qbittorrentvpn",
|
||||
@ -224,6 +232,7 @@
|
||||
"sponsorblock",
|
||||
"spotifyd",
|
||||
"sqltools",
|
||||
"ssdp",
|
||||
"sshconfig",
|
||||
"stdenv",
|
||||
"subresource",
|
||||
@ -270,6 +279,7 @@
|
||||
"xhci",
|
||||
"xwayland",
|
||||
"yzhang",
|
||||
"zeroconf",
|
||||
"zerotier",
|
||||
"zerotierone",
|
||||
"zhaofengli",
|
||||
|
||||
338
flake.lock
generated
338
flake.lock
generated
@ -1,27 +1,5 @@
|
||||
{
|
||||
"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": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
@ -73,27 +51,6 @@
|
||||
"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": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
@ -152,24 +109,6 @@
|
||||
}
|
||||
},
|
||||
"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": {
|
||||
"systems": [
|
||||
"systems"
|
||||
@ -250,82 +189,10 @@
|
||||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"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",
|
||||
"system_tools",
|
||||
"poetry2nix",
|
||||
"nixpkgs"
|
||||
]
|
||||
@ -455,22 +322,6 @@
|
||||
"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": {
|
||||
"locked": {
|
||||
"lastModified": 1722555339,
|
||||
@ -483,22 +334,6 @@
|
||||
"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": {
|
||||
"locked": {
|
||||
"lastModified": 1722869614,
|
||||
@ -518,51 +353,23 @@
|
||||
"poetry2nix": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"arch_mirror",
|
||||
"system_tools",
|
||||
"flake-utils"
|
||||
],
|
||||
"nix-github-actions": "nix-github-actions",
|
||||
"nixpkgs": [
|
||||
"arch_mirror",
|
||||
"system_tools",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_2",
|
||||
"systems": "systems",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722515463,
|
||||
"narHash": "sha256-6FVPz1WzHak65xJQg8tRjVyFEWMesGxfskKaCxDUnRk=",
|
||||
"lastModified": 1723343306,
|
||||
"narHash": "sha256-/6sRkPq7/5weX2y0V8sQ29Sz35nt8kyj+BsFtkhgbJE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "poetry2nix",
|
||||
"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",
|
||||
"rev": "4a1c112ff0c67f496573dc345bd0b2247818fc29",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -600,16 +407,13 @@
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"arch_mirror": "arch_mirror",
|
||||
"attic": "attic",
|
||||
"fenix": "fenix",
|
||||
"firefox-addons": "firefox-addons",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flake-utils": "flake-utils",
|
||||
"home-manager": "home-manager",
|
||||
"hyprland-contrib": "hyprland-contrib",
|
||||
"nix": "nix",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixos-generators": "nixos-generators",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
@ -618,29 +422,12 @@
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
"rust-overlay": "rust-overlay",
|
||||
"server_tools": "server_tools",
|
||||
"sops-nix": "sops-nix",
|
||||
"systems": "systems_4",
|
||||
"system_tools": "system_tools",
|
||||
"systems": "systems_2",
|
||||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@ -686,30 +473,6 @@
|
||||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@ -733,6 +496,30 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"system_tools": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"poetry2nix": "poetry2nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723392261,
|
||||
"narHash": "sha256-Csa4yuYWcB3aLf7VP14v+Mp0lRzOOCCt9BdmAeeQcYU=",
|
||||
"owner": "RAD-Development",
|
||||
"repo": "system_tools",
|
||||
"rev": "51bcc923b2b3cfb832b05687a01805c5a905b0c9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "RAD-Development",
|
||||
"repo": "system_tools",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
@ -743,40 +530,11 @@
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
"id": "systems",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "systems",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"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": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
@ -794,29 +552,7 @@
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"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",
|
||||
"system_tools",
|
||||
"poetry2nix",
|
||||
"nixpkgs"
|
||||
]
|
||||
|
||||
25
flake.nix
25
flake.nix
@ -29,11 +29,6 @@
|
||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||
systems.url = "github:nix-systems/default";
|
||||
|
||||
arch_mirror = {
|
||||
url = "github:RichieCahill/arch_mirror";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
attic = {
|
||||
url = "github:zhaofengli/attic";
|
||||
inputs = {
|
||||
@ -44,11 +39,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
fenix = {
|
||||
url = "github:nix-community/fenix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
firefox-addons = {
|
||||
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
|
||||
inputs = {
|
||||
@ -72,20 +62,11 @@
|
||||
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 = {
|
||||
url = "github:Mic92/nix-index-database";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nixos-generators = {
|
||||
url = "github:nix-community/nixos-generators";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
@ -123,8 +104,8 @@
|
||||
};
|
||||
};
|
||||
|
||||
server_tools = {
|
||||
url = "github:RAD-Development/server_tools";
|
||||
system_tools = {
|
||||
url = "github:RAD-Development/system_tools";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
flake-utils.follows = "flake-utils";
|
||||
|
||||
24
modules/yubikey.nix
Normal file
24
modules/yubikey.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{
|
||||
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"]
|
||||
nix_version = '2.4'
|
||||
nix_version = '2.23'
|
||||
ignore = ['.direnv']
|
||||
|
||||
|
||||
@ -84,6 +84,10 @@
|
||||
};
|
||||
#systemd.services.spotifyd.serviceConfig = systemd.services.spotifyd.
|
||||
};
|
||||
rad-dev.yubikey = {
|
||||
enable = true;
|
||||
enable-desktop-app = true;
|
||||
};
|
||||
};
|
||||
|
||||
users.users.alice.extraGroups = [ "calibre-web" ];
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
calibre
|
||||
# calibre dedrm?
|
||||
candy-icons
|
||||
cinnamon.nemo-with-extensions
|
||||
nemo-with-extensions
|
||||
croc
|
||||
deadnix
|
||||
direnv
|
||||
@ -93,7 +93,6 @@
|
||||
wget
|
||||
wl-clipboard
|
||||
xboxdrv
|
||||
yubioath-flutter
|
||||
zoom-us
|
||||
zoxide
|
||||
zoom
|
||||
|
||||
@ -9,7 +9,6 @@ in
|
||||
"${../../users/richie/global/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/"
|
||||
"${vars.main_mirror}:/data"
|
||||
];
|
||||
ports = [ "800:80" ];
|
||||
extraOptions = [ "--network=web" ];
|
||||
autoStart = true;
|
||||
};
|
||||
@ -23,7 +22,7 @@ in
|
||||
serviceConfig = {
|
||||
Environment = "MIRROR_DIR=${vars.main_mirror}/archlinux/";
|
||||
Type = "simple";
|
||||
ExecStart = "${inputs.arch_mirror.packages.x86_64-linux.default}/bin/sync_mirror";
|
||||
ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/sync_mirror";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,50 +2,29 @@
|
||||
{
|
||||
imports = [
|
||||
../../users/richie/global/ssh.nix
|
||||
../../users/richie/global/zerotier.nix
|
||||
./arch_mirror.nix
|
||||
./docker
|
||||
./home_assistant.nix
|
||||
./networking.nix
|
||||
./services.nix
|
||||
];
|
||||
|
||||
networking = {
|
||||
hostId = "1beb3026";
|
||||
firewall.enable = false;
|
||||
};
|
||||
|
||||
boot = {
|
||||
zfs.extraPools = [ "Main" ];
|
||||
filesystem = "zfs";
|
||||
useSystemdBoot = true;
|
||||
};
|
||||
|
||||
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";
|
||||
};
|
||||
};
|
||||
};
|
||||
environment.systemPackages = with pkgs; [ docker-compose ];
|
||||
|
||||
services = {
|
||||
nfs.server.enable = true;
|
||||
|
||||
openssh.ports = [ 352 ];
|
||||
openssh = {
|
||||
ports = [ 352 ];
|
||||
listenAddresses = [
|
||||
{ addr = "192.168.95.35"; }
|
||||
{ addr = "192.168.90.35"; }
|
||||
];
|
||||
};
|
||||
|
||||
smartd.enable = true;
|
||||
|
||||
|
||||
@ -26,9 +26,11 @@ frontend ContentSwitching
|
||||
# tmmworkshop.com
|
||||
acl host_mirror hdr(host) -i mirror.tmmworkshop.com jeeves
|
||||
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 uptime_kuma_nodes if host_uptime_kuma
|
||||
use_backend home_asistant_nodes if host_homeassistant
|
||||
|
||||
# tmmworkshop.com
|
||||
backend mirror_nodes
|
||||
@ -38,3 +40,7 @@ backend mirror_nodes
|
||||
backend uptime_kuma_nodes
|
||||
mode http
|
||||
server server uptime_kuma:3001
|
||||
|
||||
backend home_asistant_nodes
|
||||
mode http
|
||||
server server 192.168.95.35:8123
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/9d4ef549-d426-489d-8332-0a49589c6aed"; } ];
|
||||
boot = {
|
||||
|
||||
@ -3,15 +3,47 @@
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
config = {
|
||||
server_port = 8123;
|
||||
http = {
|
||||
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 = {
|
||||
time_zone = "America/New_York";
|
||||
unit_system = "imperial";
|
||||
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 = python3Packages: with python3Packages; [ psycopg2 ];
|
||||
extraPackages =
|
||||
python3Packages: with python3Packages; [
|
||||
psycopg2
|
||||
gtts
|
||||
aioesphomeapi
|
||||
esphome-dashboard-api
|
||||
bleak-esphome
|
||||
pymetno
|
||||
];
|
||||
extraComponents = [ "isal" ];
|
||||
};
|
||||
}
|
||||
|
||||
43
systems/jeeves-jr/networking.nix
Normal file
43
systems/jeeves-jr/networking.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{
|
||||
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 = {
|
||||
Type = "oneshot";
|
||||
EnvironmentFile = config.sops.secrets."server-validation/webhook".path;
|
||||
ExecStart = "${inputs.server_tools.packages.x86_64-linux.default}/bin/validate_jeevesjr";
|
||||
ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_jeevesjr";
|
||||
};
|
||||
};
|
||||
timers.startup_validation = {
|
||||
|
||||
@ -23,7 +23,7 @@ in
|
||||
serviceConfig = {
|
||||
Environment = "MIRROR_DIR=${vars.media_mirror}/archlinux/";
|
||||
Type = "simple";
|
||||
ExecStart = "${inputs.arch_mirror.packages.x86_64-linux.default}/bin/sync_mirror";
|
||||
ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/sync_mirror";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,18 +6,13 @@ in
|
||||
imports = [
|
||||
../../users/richie/global/ssh.nix
|
||||
../../users/richie/global/syncthing_base.nix
|
||||
../../users/richie/global/zerotier.nix
|
||||
./arch_mirror.nix
|
||||
./docker
|
||||
./networking.nix
|
||||
./programs.nix
|
||||
./services.nix
|
||||
];
|
||||
|
||||
networking = {
|
||||
hostId = "1beb3027";
|
||||
firewall.enable = false;
|
||||
};
|
||||
|
||||
boot = {
|
||||
zfs.extraPools = [
|
||||
"media"
|
||||
|
||||
@ -30,12 +30,14 @@ frontend ContentSwitching
|
||||
acl host_grafana hdr(host) -i grafana.tmmworkshop.com
|
||||
acl host_filebrowser hdr(host) -i filebrowser.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 dndrules_nodes if host_dndrules
|
||||
use_backend grafana_nodes if host_grafana
|
||||
use_backend filebrowser_nodes if host_filebrowser
|
||||
use_backend uptime_kuma_nodes if host_uptime_kuma
|
||||
use_backend overseerr_nodes if host_overseerr
|
||||
|
||||
backend mirror_nodes
|
||||
mode http
|
||||
@ -60,3 +62,7 @@ backend filebrowser_nodes
|
||||
backend uptime_kuma_nodes
|
||||
mode http
|
||||
server server uptime_kuma:3001
|
||||
|
||||
backend overseerr_nodes
|
||||
mode http
|
||||
server server overseerr:5055
|
||||
|
||||
@ -112,6 +112,33 @@ in
|
||||
];
|
||||
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 = {
|
||||
image = "ghcr.io/linuxserver/faster-whisper:latest";
|
||||
ports = [ "10300:10300" ];
|
||||
|
||||
@ -35,6 +35,7 @@ in
|
||||
"dnd_file_server"
|
||||
"filebrowser"
|
||||
"grafana"
|
||||
"overseerr"
|
||||
"uptime_kuma"
|
||||
];
|
||||
extraOptions = [ "--network=web" ];
|
||||
|
||||
@ -40,17 +40,6 @@
|
||||
|
||||
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";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
||||
40
systems/jeeves/networking.nix
Normal file
40
systems/jeeves/networking.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{
|
||||
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 = {
|
||||
EnvironmentFile = config.sops.secrets."server-validation/webhook".path;
|
||||
Type = "oneshot";
|
||||
ExecStart = "${inputs.server_tools.packages.x86_64-linux.default}/bin/validate_jeeves";
|
||||
ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_jeeves";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
EnvironmentFile = config.sops.secrets."server-validation/webhook".path;
|
||||
ExecStart = "${inputs.server_tools.packages.x86_64-linux.default}/bin/validate_palatine_hill";
|
||||
ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_palatine_hill";
|
||||
};
|
||||
};
|
||||
timers.startup_validation = {
|
||||
|
||||
@ -8,8 +8,8 @@
|
||||
home.packages = with pkgs; [
|
||||
beeper
|
||||
candy-icons
|
||||
cinnamon.nemo
|
||||
cinnamon.nemo-fileroller
|
||||
nemo
|
||||
nemo-fileroller
|
||||
discord-canary
|
||||
gimp
|
||||
gparted
|
||||
@ -21,5 +21,6 @@
|
||||
util-linux
|
||||
vlc
|
||||
zoom-us
|
||||
prusa-slicer
|
||||
];
|
||||
}
|
||||
|
||||
@ -50,9 +50,6 @@
|
||||
|
||||
// force the use of rust-analyzer from dev shell
|
||||
"rust-analyzer.server.path": "rust-analyzer",
|
||||
|
||||
// other
|
||||
"python.analysis.typeCheckingMode": "basic",
|
||||
"redhat.telemetry.enabled": true,
|
||||
"gitlens.plusFeatures.enabled": false,
|
||||
// new
|
||||
|
||||
@ -43,7 +43,6 @@
|
||||
nix-prefetch
|
||||
nix-tree
|
||||
nixpkgs-fmt
|
||||
inputs.server_tools.packages.x86_64-linux.default
|
||||
inputs.arch_mirror.packages.x86_64-linux.default
|
||||
inputs.system_tools.packages.x86_64-linux.default
|
||||
];
|
||||
}
|
||||
|
||||
@ -30,6 +30,12 @@
|
||||
identityFile = "~/.ssh/id_ed25519";
|
||||
port = 922;
|
||||
};
|
||||
palatine-hill = {
|
||||
hostname = "192.168.76.2";
|
||||
user = "richie";
|
||||
identityFile = "~/.ssh/id_ed25519";
|
||||
port = 666;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user