From 8b5011869183073c7285a04b1cd122aa6c519d91 Mon Sep 17 00:00:00 2001 From: dusk Date: Sun, 9 Nov 2025 06:46:03 +0300 Subject: [PATCH] bleh --- _sources/generated.json | 85 ++++++++++++------- _sources/generated.nix | 76 ++++++++++------- dns/dnsconfig.js | 2 +- flake.lock | 30 +++---- hosts/chernobog/default.nix | 22 +++-- hosts/chernobog/modules/bluetooth.nix | 5 ++ hosts/chernobog/modules/obs.nix | 6 ++ hosts/chernobog/modules/vr.nix | 15 +++- .../dzwonek/modules/headscale.nix/default.nix | 2 +- hosts/dzwonek/modules/ssh.nix | 4 - hosts/volsinii/default.nix | 3 +- hosts/volsinii/modules/ssh.nix | 4 - hosts/wolumonde/default.nix | 10 +-- hosts/wolumonde/modules/atproto.nix | 2 +- hosts/wolumonde/modules/ssh.nix | 4 - nvfetcher.toml | 4 + pkgs-set/overlays/nixpkgs-xr.nix | 1 + secrets/dawn.gaze.systems.did | 1 - secrets/dawn.key.pub | 1 + users/dawn/default.nix | 51 +++++++++++ users/mayer/default.nix | 21 +---- users/modules/git/default.nix | 15 ++++ users/modules/sway/default.nix | 2 +- users/root/default.nix | 14 ++- 24 files changed, 241 insertions(+), 139 deletions(-) create mode 100644 hosts/chernobog/modules/bluetooth.nix create mode 100644 hosts/chernobog/modules/obs.nix create mode 100644 pkgs-set/overlays/nixpkgs-xr.nix create mode 100644 secrets/dawn.key.pub create mode 100644 users/dawn/default.nix diff --git a/_sources/generated.json b/_sources/generated.json index c06ec07..0497996 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -62,7 +62,7 @@ }, "disko": { "cargoLocks": null, - "date": "2025-10-17", + "date": "2025-11-04", "extract": null, "name": "disko", "passthru": null, @@ -74,16 +74,16 @@ "name": null, "owner": "nix-community", "repo": "disko", - "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", - "sha256": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", + "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", + "sha256": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", "sparseCheckout": [], "type": "github" }, - "version": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5" + "version": "af087d076d3860760b3323f6b583f4d828c1ac17" }, "facter": { "cargoLocks": null, - "date": "2025-10-22", + "date": "2025-11-04", "extract": null, "name": "facter", "passthru": null, @@ -95,12 +95,12 @@ "name": null, "owner": "nix-community", "repo": "nixos-facter-modules", - "rev": "70bcd64225d167c7af9b475c4df7b5abba5c7de8", - "sha256": "sha256-4lDjGnWRBLwqKQ4UWSUq6Mvxu9r8DSqCCydodW/Jsi8=", + "rev": "fa695bff9ec37fd5bbd7ee3181dbeb5f97f53c96", + "sha256": "sha256-iaRf6n0KPl9hndnIft3blm1YTAyxSREV1oX0MFZ6Tk4=", "sparseCheckout": [], "type": "github" }, - "version": "70bcd64225d167c7af9b475c4df7b5abba5c7de8" + "version": "fa695bff9ec37fd5bbd7ee3181dbeb5f97f53c96" }, "gomod2nix": { "cargoLocks": null, @@ -125,7 +125,7 @@ }, "home": { "cargoLocks": null, - "date": "2025-10-28", + "date": "2025-11-05", "extract": null, "name": "home", "passthru": null, @@ -137,12 +137,12 @@ "name": null, "owner": "nix-community", "repo": "home-manager", - "rev": "ca2ab1d877a24d5a437dad62f56b8b2c02e964e9", - "sha256": "sha256-fHr+tIYBJccNF8QWqgowfRmEAtAMSt1deZIRNKL8A7c=", + "rev": "af119feb17cb242398e0fb97f92b867d25882522", + "sha256": "sha256-c/164YOPkV09BH8KIUdvVvJs3VF2LNIbE2piKGgXPxk=", "sparseCheckout": [], "type": "github" }, - "version": "ca2ab1d877a24d5a437dad62f56b8b2c02e964e9" + "version": "af119feb17cb242398e0fb97f92b867d25882522" }, "limbusart": { "cargoLocks": null, @@ -207,7 +207,7 @@ }, "nixos-hardware": { "cargoLocks": null, - "date": "2025-10-20", + "date": "2025-11-05", "extract": null, "name": "nixos-hardware", "passthru": null, @@ -219,12 +219,33 @@ "name": null, "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", - "sha256": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=", + "rev": "e4c6ee69e710805a15a3da905214a25618271609", + "sha256": "sha256-VjZLHnj9tqFRigpD6SJtTKmQsys77jCX5YcnmMnUqH8=", + "sparseCheckout": [], + "type": "github" + }, + "version": "e4c6ee69e710805a15a3da905214a25618271609" + }, + "nixpkgs-xr": { + "cargoLocks": null, + "date": "2025-11-06", + "extract": null, + "name": "nixpkgs-xr", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "nix-community", + "repo": "nixpkgs-xr", + "rev": "08cdeeabf5fcb0e44d2be5540e6dfa52f70f0401", + "sha256": "sha256-/SzIdw3HiKb9C66MyiQFuuX5ExVASm0M3abav9ypZPo=", "sparseCheckout": [], "type": "github" }, - "version": "d6645c340ef7d821602fd2cd199e8d1eed10afbc" + "version": "08cdeeabf5fcb0e44d2be5540e6dfa52f70f0401" }, "nsid-tracker": { "cargoLocks": null, @@ -248,7 +269,7 @@ }, "nucleus": { "cargoLocks": null, - "date": "2025-10-31", + "date": "2025-11-05", "extract": null, "name": "nucleus", "passthru": null, @@ -258,17 +279,17 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "424bd6cfb7aaa5f178dc32e79a997d229c7bd823", - "sha256": "sha256-jK+4I2WT60bFQaq6ItlPFzvDj9P3pu386m1AtrzUmc4=", + "rev": "1288cb9847122b8c17375f9b7bd2947e771fd433", + "sha256": "sha256-BgLZW4KhzQqNVoeBMbyfFduSqVuzkJPSVutU/pCWzoo=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/@ptr.pet/nucleus" }, - "version": "424bd6cfb7aaa5f178dc32e79a997d229c7bd823" + "version": "1288cb9847122b8c17375f9b7bd2947e771fd433" }, "stylix": { "cargoLocks": null, - "date": "2025-10-28", + "date": "2025-11-04", "extract": null, "name": "stylix", "passthru": null, @@ -280,16 +301,16 @@ "name": null, "owner": "nix-community", "repo": "stylix", - "rev": "f8f4e3c3658ee962f8f332a56720c8dfc2836f7a", - "sha256": "sha256-nKOOPeblDcebtYfBjHo+PHXHKNSNKuifn1EGcBEgKWs=", + "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b", + "sha256": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=", "sparseCheckout": [], "type": "github" }, - "version": "f8f4e3c3658ee962f8f332a56720c8dfc2836f7a" + "version": "647bb8dd96a206a1b79c4fd714affc88b409e10b" }, "tangled": { "cargoLocks": null, - "date": "2025-10-31", + "date": "2025-11-05", "extract": null, "name": "tangled", "passthru": null, @@ -299,13 +320,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "1502dfc738aa9adfd172dee4244b5cb94e8bc795", - "sha256": "sha256-9BF40ZTZmAvovtijIF7di3QxtGESlFyvalVte0vp4QI=", + "rev": "dd1bcee8c99bf799130645f32c94d1693f812f0d", + "sha256": "sha256-1PGiDLrx1hNGNoUCnmc1Np2t48r7nIxxiTO8JHvaTws=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/@tangled.org/core" }, - "version": "1502dfc738aa9adfd172dee4244b5cb94e8bc795" + "version": "dd1bcee8c99bf799130645f32c94d1693f812f0d" }, "tangled-sqlite-lib": { "cargoLocks": null, @@ -323,7 +344,7 @@ }, "zen-browser": { "cargoLocks": null, - "date": "2025-10-27", + "date": "2025-11-05", "extract": null, "name": "zen-browser", "passthru": null, @@ -335,11 +356,11 @@ "name": null, "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "79a94872a3e6993a051c4e22a2dcb02c1d088acf", - "sha256": "sha256-E1PobJMiFmVUX2YdqYk/MpKb0LXavOYvlg8DCBBzlHc=", + "rev": "fe8ae759ef4b2d313efcf01015d53f047af28281", + "sha256": "sha256-Vas4GE5OFDrxcuXSDvvGr2hxlVsrFCnzhL58YdpIdPI=", "sparseCheckout": [], "type": "github" }, - "version": "79a94872a3e6993a051c4e22a2dcb02c1d088acf" + "version": "fe8ae759ef4b2d313efcf01015d53f047af28281" } } \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix index b407afd..5989c3b 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -43,27 +43,27 @@ }; disko = { pname = "disko"; - version = "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5"; + version = "af087d076d3860760b3323f6b583f4d828c1ac17"; src = fetchFromGitHub { owner = "nix-community"; repo = "disko"; - rev = "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5"; + rev = "af087d076d3860760b3323f6b583f4d828c1ac17"; fetchSubmodules = false; - sha256 = "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw="; + sha256 = "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M="; }; - date = "2025-10-17"; + date = "2025-11-04"; }; facter = { pname = "facter"; - version = "70bcd64225d167c7af9b475c4df7b5abba5c7de8"; + version = "fa695bff9ec37fd5bbd7ee3181dbeb5f97f53c96"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixos-facter-modules"; - rev = "70bcd64225d167c7af9b475c4df7b5abba5c7de8"; + rev = "fa695bff9ec37fd5bbd7ee3181dbeb5f97f53c96"; fetchSubmodules = false; - sha256 = "sha256-4lDjGnWRBLwqKQ4UWSUq6Mvxu9r8DSqCCydodW/Jsi8="; + sha256 = "sha256-iaRf6n0KPl9hndnIft3blm1YTAyxSREV1oX0MFZ6Tk4="; }; - date = "2025-10-22"; + date = "2025-11-04"; }; gomod2nix = { pname = "gomod2nix"; @@ -79,15 +79,15 @@ }; home = { pname = "home"; - version = "ca2ab1d877a24d5a437dad62f56b8b2c02e964e9"; + version = "af119feb17cb242398e0fb97f92b867d25882522"; src = fetchFromGitHub { owner = "nix-community"; repo = "home-manager"; - rev = "ca2ab1d877a24d5a437dad62f56b8b2c02e964e9"; + rev = "af119feb17cb242398e0fb97f92b867d25882522"; fetchSubmodules = false; - sha256 = "sha256-fHr+tIYBJccNF8QWqgowfRmEAtAMSt1deZIRNKL8A7c="; + sha256 = "sha256-c/164YOPkV09BH8KIUdvVvJs3VF2LNIbE2piKGgXPxk="; }; - date = "2025-10-28"; + date = "2025-11-05"; }; limbusart = { pname = "limbusart"; @@ -131,15 +131,27 @@ }; nixos-hardware = { pname = "nixos-hardware"; - version = "d6645c340ef7d821602fd2cd199e8d1eed10afbc"; + version = "e4c6ee69e710805a15a3da905214a25618271609"; src = fetchFromGitHub { owner = "NixOS"; repo = "nixos-hardware"; - rev = "d6645c340ef7d821602fd2cd199e8d1eed10afbc"; + rev = "e4c6ee69e710805a15a3da905214a25618271609"; fetchSubmodules = false; - sha256 = "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU="; + sha256 = "sha256-VjZLHnj9tqFRigpD6SJtTKmQsys77jCX5YcnmMnUqH8="; }; - date = "2025-10-20"; + date = "2025-11-05"; + }; + nixpkgs-xr = { + pname = "nixpkgs-xr"; + version = "08cdeeabf5fcb0e44d2be5540e6dfa52f70f0401"; + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nixpkgs-xr"; + rev = "08cdeeabf5fcb0e44d2be5540e6dfa52f70f0401"; + fetchSubmodules = false; + sha256 = "sha256-/SzIdw3HiKb9C66MyiQFuuX5ExVASm0M3abav9ypZPo="; + }; + date = "2025-11-06"; }; nsid-tracker = { pname = "nsid-tracker"; @@ -157,43 +169,43 @@ }; nucleus = { pname = "nucleus"; - version = "424bd6cfb7aaa5f178dc32e79a997d229c7bd823"; + version = "1288cb9847122b8c17375f9b7bd2947e771fd433"; src = fetchgit { url = "https://tangled.org/@ptr.pet/nucleus"; - rev = "424bd6cfb7aaa5f178dc32e79a997d229c7bd823"; + rev = "1288cb9847122b8c17375f9b7bd2947e771fd433"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-jK+4I2WT60bFQaq6ItlPFzvDj9P3pu386m1AtrzUmc4="; + sha256 = "sha256-BgLZW4KhzQqNVoeBMbyfFduSqVuzkJPSVutU/pCWzoo="; }; - date = "2025-10-31"; + date = "2025-11-05"; }; stylix = { pname = "stylix"; - version = "f8f4e3c3658ee962f8f332a56720c8dfc2836f7a"; + version = "647bb8dd96a206a1b79c4fd714affc88b409e10b"; src = fetchFromGitHub { owner = "nix-community"; repo = "stylix"; - rev = "f8f4e3c3658ee962f8f332a56720c8dfc2836f7a"; + rev = "647bb8dd96a206a1b79c4fd714affc88b409e10b"; fetchSubmodules = false; - sha256 = "sha256-nKOOPeblDcebtYfBjHo+PHXHKNSNKuifn1EGcBEgKWs="; + sha256 = "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w="; }; - date = "2025-10-28"; + date = "2025-11-04"; }; tangled = { pname = "tangled"; - version = "1502dfc738aa9adfd172dee4244b5cb94e8bc795"; + version = "dd1bcee8c99bf799130645f32c94d1693f812f0d"; src = fetchgit { url = "https://tangled.org/@tangled.org/core"; - rev = "1502dfc738aa9adfd172dee4244b5cb94e8bc795"; + rev = "dd1bcee8c99bf799130645f32c94d1693f812f0d"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-9BF40ZTZmAvovtijIF7di3QxtGESlFyvalVte0vp4QI="; + sha256 = "sha256-1PGiDLrx1hNGNoUCnmc1Np2t48r7nIxxiTO8JHvaTws="; }; - date = "2025-10-31"; + date = "2025-11-05"; }; tangled-sqlite-lib = { pname = "tangled-sqlite-lib"; @@ -205,14 +217,14 @@ }; zen-browser = { pname = "zen-browser"; - version = "79a94872a3e6993a051c4e22a2dcb02c1d088acf"; + version = "fe8ae759ef4b2d313efcf01015d53f047af28281"; src = fetchFromGitHub { owner = "0xc000022070"; repo = "zen-browser-flake"; - rev = "79a94872a3e6993a051c4e22a2dcb02c1d088acf"; + rev = "fe8ae759ef4b2d313efcf01015d53f047af28281"; fetchSubmodules = false; - sha256 = "sha256-E1PobJMiFmVUX2YdqYk/MpKb0LXavOYvlg8DCBBzlHc="; + sha256 = "sha256-Vas4GE5OFDrxcuXSDvvGr2hxlVsrFCnzhL58YdpIdPI="; }; - date = "2025-10-27"; + date = "2025-11-05"; }; } diff --git a/dns/dnsconfig.js b/dns/dnsconfig.js index c22a1df..82fbcc5 100644 --- a/dns/dnsconfig.js +++ b/dns/dnsconfig.js @@ -104,7 +104,7 @@ D( // atproto TXT("_atproto", "did=did:plc:dfl62fgb7wtjj3fcbb72naae"), A("nil", WOLUMONDE_IP, CF_PROXY_OFF), - TXT("_atproto.nil", "did=did:web:dawn.gaze.systems"), + TXT("_atproto.nil", "did=did:plc:dumbmutttrskde4ibwbnbike"), TXT("_atproto.june", "did=did:plc:y3z2rr7q5rywu4fjn3fmfyop"), // june CNAME("june", "girlboss.ceo."), diff --git a/flake.lock b/flake.lock index 02945b8..874de1e 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1761548673, - "narHash": "sha256-/513FfwpfbeppPdGDbmLhgcctLqEHdx8Rs92jImKA3M=", + "lastModified": 1762525922, + "narHash": "sha256-DX0/D0o/lUQRMCuoAoJiXkDqoISLSgkQAlsPqPS4i6M=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "25ef687b6a0a13e9d39c3949e7de05873f5571a9", + "rev": "863eed9a7967cb307ecdcdba0c7b87db6a314865", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1761513701, - "narHash": "sha256-w7qOcQb1FSMZASvWe01r99QqZ5LnHO0k3rgs5ryyig0=", + "lastModified": 1762463325, + "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", "owner": "nix-community", "repo": "home-manager", - "rev": "255b6a0ef2f488a2fad051361699cc67db57338c", + "rev": "0562fef070a1027325dd4ea10813d64d2c967b39", "type": "github" }, "original": { @@ -67,11 +67,11 @@ ] }, "locked": { - "lastModified": 1761376732, - "narHash": "sha256-wavx9gROyuRZKSvPCCBh78gOur7o88ndRi545njNRrM=", + "lastModified": 1762452596, + "narHash": "sha256-Iaga+mkwWnWa6FxsAYknpHzeP344VCKGkdudX420LgA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8bef482d65425d0cff6b20c11a5f054f85569a38", + "rev": "99919fd35e70c1b18ce948d5329928d751031312", "type": "github" }, "original": { @@ -105,11 +105,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761373498, - "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", + "lastModified": 1762363567, + "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", + "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "type": "github" }, "original": { @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1761446259, - "narHash": "sha256-JNNOtIIVIX+yBIsh1rq1Nxhc1LZq168vuQB5sqrZbCY=", + "lastModified": 1762483116, + "narHash": "sha256-Z8EVsTH10BjCdFyPxbUu5jBV+HGL39rh9+beQcnNRm0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "95098bb4d55ebe167c082fc40705a73ef76b58e4", + "rev": "9de55b59b6aaadbd9dbf223765a835239b767ee5", "type": "github" }, "original": { diff --git a/hosts/chernobog/default.nix b/hosts/chernobog/default.nix index 01f797e..cb9d527 100644 --- a/hosts/chernobog/default.nix +++ b/hosts/chernobog/default.nix @@ -1,6 +1,4 @@ { - config, - lib, tlib, pkgs, inputs, @@ -10,18 +8,18 @@ imports = with inputs; [ - "${inputs.facter}/modules/nixos/facter.nix" - "${inputs.disko}/module.nix" - "${inputs.home}/nixos" - "${inputs.nixos-hardware}/common/pc" - "${inputs.nixos-hardware}/common/pc/ssd" - "${inputs.nixos-hardware}/common/cpu/amd" - "${inputs.nixos-hardware}/common/cpu/amd/pstate.nix" - "${inputs.nixos-hardware}/common/cpu/amd/zenpower.nix" - "${inputs.nixos-hardware}/common/gpu/amd" + "${facter}/modules/nixos/facter.nix" + "${disko}/module.nix" + "${home}/nixos" + "${nixos-hardware}/common/pc" + "${nixos-hardware}/common/pc/ssd" + "${nixos-hardware}/common/cpu/amd" + "${nixos-hardware}/common/cpu/amd/pstate.nix" + "${nixos-hardware}/common/cpu/amd/zenpower.nix" + "${nixos-hardware}/common/gpu/amd" ../../users/root ../../users/mayer - ../../modules/base + ../../modules ../../locale/default.nix ] ++ (tlib.importFolder (toString ./modules)); diff --git a/hosts/chernobog/modules/bluetooth.nix b/hosts/chernobog/modules/bluetooth.nix new file mode 100644 index 0000000..cb88321 --- /dev/null +++ b/hosts/chernobog/modules/bluetooth.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: { + hardware.bluetooth.enable = true; + + environment.systemPackages = [pkgs.bluetuith]; +} diff --git a/hosts/chernobog/modules/obs.nix b/hosts/chernobog/modules/obs.nix new file mode 100644 index 0000000..a61a6b8 --- /dev/null +++ b/hosts/chernobog/modules/obs.nix @@ -0,0 +1,6 @@ +{ + programs.obs-studio = { + enable = true; + enableVirtualCamera = true; + }; +} diff --git a/hosts/chernobog/modules/vr.nix b/hosts/chernobog/modules/vr.nix index a53ea62..3da1bdf 100644 --- a/hosts/chernobog/modules/vr.nix +++ b/hosts/chernobog/modules/vr.nix @@ -10,9 +10,22 @@ openFirewall = true; defaultRuntime = true; autoStart = true; + config = { + enable = true; + json = { + scale = 1.0; + bitrate = 60000000; + encoders = [ + { + encoder = "vaapi"; + codec = "h265"; + } + ]; + }; + }; }; # programs.envision.enable = true; - environment.systemPackages = [ pkgs.wlx-overlay-s ]; + environment.systemPackages = with pkgs; [ wlx-overlay-s eepyxr wayvr-dashboard ]; } diff --git a/hosts/dzwonek/modules/headscale.nix/default.nix b/hosts/dzwonek/modules/headscale.nix/default.nix index c9830cb..34f2339 100644 --- a/hosts/dzwonek/modules/headscale.nix/default.nix +++ b/hosts/dzwonek/modules/headscale.nix/default.nix @@ -24,7 +24,7 @@ in other-infra = [ "group:admin" ]; }; hosts = { - chernobog = "100.64.0.9"; + chernobog = "100.64.0.8"; wolumonde = "100.64.0.2"; higashi = "100.64.0.5"; }; diff --git a/hosts/dzwonek/modules/ssh.nix b/hosts/dzwonek/modules/ssh.nix index ce91435..c32af7c 100644 --- a/hosts/dzwonek/modules/ssh.nix +++ b/hosts/dzwonek/modules/ssh.nix @@ -1,11 +1,7 @@ -{ inputs, ... }: { services.fail2ban.enable = true; services.openssh = { enable = true; settings.PasswordAuthentication = false; }; - users.users.root.openssh.authorizedKeys.keys = [ - (builtins.readFile "${inputs.self}/secrets/yusdacra.key.pub") - ]; } diff --git a/hosts/volsinii/default.nix b/hosts/volsinii/default.nix index c7d9565..de539e8 100644 --- a/hosts/volsinii/default.nix +++ b/hosts/volsinii/default.nix @@ -2,7 +2,6 @@ inputs, tlib, pkgs, - modulesPath, ... }: { @@ -11,7 +10,9 @@ "${inputs.home}/nixos" "${inputs.disko}/module.nix" ../../modules + ../../modules/stylix-null.nix ../../users/root + ../../users/dawn ./disk-config.nix ] ++ (tlib.importFolder (toString ./modules)); diff --git a/hosts/volsinii/modules/ssh.nix b/hosts/volsinii/modules/ssh.nix index ce91435..c32af7c 100644 --- a/hosts/volsinii/modules/ssh.nix +++ b/hosts/volsinii/modules/ssh.nix @@ -1,11 +1,7 @@ -{ inputs, ... }: { services.fail2ban.enable = true; services.openssh = { enable = true; settings.PasswordAuthentication = false; }; - users.users.root.openssh.authorizedKeys.keys = [ - (builtins.readFile "${inputs.self}/secrets/yusdacra.key.pub") - ]; } diff --git a/hosts/wolumonde/default.nix b/hosts/wolumonde/default.nix index 179c38a..e925c73 100644 --- a/hosts/wolumonde/default.nix +++ b/hosts/wolumonde/default.nix @@ -5,15 +5,15 @@ ... }: { - imports = [ + imports = with inputs; [ ../../modules ../../modules/stylix-null.nix ../../locale - "${inputs.home}/nixos" ../../users/root - "${inputs.agenix}/modules/age.nix" - "${inputs.ncr}/firewall" - "${inputs.ncr}/firewall/hetzner" + "${home}/nixos" + "${agenix}/modules/age.nix" + "${ncr}/firewall" + "${ncr}/firewall/hetzner" ] ++ (tlib.importFolder (toString ./modules)); diff --git a/hosts/wolumonde/modules/atproto.nix b/hosts/wolumonde/modules/atproto.nix index 4571e33..461cfba 100644 --- a/hosts/wolumonde/modules/atproto.nix +++ b/hosts/wolumonde/modules/atproto.nix @@ -56,7 +56,7 @@ in "test.gaze.systems" = mkHandleCfg "gaze.systems" "did:web:dawn.gaze.systems"; "poor.dog" = mkHandleCfg "poor.dog" "did:plc:dfl62fgb7wtjj3fcbb72naae"; "ptr.pet" = mkHandleCfg "ptr.pet" "did:plc:dfl62fgb7wtjj3fcbb72naae"; - "nil.ptr.pet" = mkHandleCfg "ptr.pet" "did:web:dawn.gaze.systems"; + "nil.ptr.pet" = mkHandleCfg "ptr.pet" "did:plc:dumbmutttrskde4ibwbnbike"; "june.ptr.pet" = mkHandleCfg "ptr.pet" "did:plc:y3z2rr7q5rywu4fjn3fmfyop"; "drew.gaze.systems" = mkHandleCfg "gaze.systems" "did:plc:vo6ie3kd6xvpjlof4pnb2zzp"; "eris.gaze.systems" = mkHandleCfg "gaze.systems" "did:plc:bxjnsrfzozl365rsdo5yvuz5"; diff --git a/hosts/wolumonde/modules/ssh.nix b/hosts/wolumonde/modules/ssh.nix index 28516de..f7041b4 100644 --- a/hosts/wolumonde/modules/ssh.nix +++ b/hosts/wolumonde/modules/ssh.nix @@ -1,12 +1,8 @@ -{ inputs, ... }: { services.fail2ban.enable = true; services.openssh = { enable = true; settings.PasswordAuthentication = false; }; - users.users.root.openssh.authorizedKeys.keys = [ - (builtins.readFile "${inputs.self}/secrets/yusdacra.key.pub") - ]; networking.firewall.public."ssh".allowedTCPPorts = [ 22 ]; } diff --git a/nvfetcher.toml b/nvfetcher.toml index 444c3c5..5206b7f 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -71,3 +71,7 @@ fetch.github = "0xc000022070/zen-browser-flake" [stylix] src.git = "https://github.com/nix-community/stylix" fetch.github = "nix-community/stylix" + +[nixpkgs-xr] +src.git = "https://github.com/nix-community/nixpkgs-xr" +fetch.github = "nix-community/nixpkgs-xr" diff --git a/pkgs-set/overlays/nixpkgs-xr.nix b/pkgs-set/overlays/nixpkgs-xr.nix new file mode 100644 index 0000000..9ed0c08 --- /dev/null +++ b/pkgs-set/overlays/nixpkgs-xr.nix @@ -0,0 +1 @@ +{inputs, ...}: final: prev: ((import inputs.nixpkgs-xr).overlays.default final prev) // { wivrn = prev.wivrn; } diff --git a/secrets/dawn.gaze.systems.did b/secrets/dawn.gaze.systems.did index 5ae1197..5170ded 100644 --- a/secrets/dawn.gaze.systems.did +++ b/secrets/dawn.gaze.systems.did @@ -6,7 +6,6 @@ ], "id": "did:web:dawn.gaze.systems", "alsoKnownAs": [ - "at://nil.ptr.pet", "at://dawn.gaze.systems", "at://test.gaze.systems" ], diff --git a/secrets/dawn.key.pub b/secrets/dawn.key.pub new file mode 100644 index 0000000..b293b40 --- /dev/null +++ b/secrets/dawn.key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILUIHFy8lBU8Iy5253Lglw0v67k9ozxjLWprjTjwTsrm diff --git a/users/dawn/default.nix b/users/dawn/default.nix new file mode 100644 index 0000000..82fa607 --- /dev/null +++ b/users/dawn/default.nix @@ -0,0 +1,51 @@ +{lib, tlib, inputs, pkgs, ...}@nixosArgs: +let + l = lib; + nixosConfig = nixosArgs.config; +in +{ + users.users.dawn = { + isNormalUser = true; + createHome = true; + home = "/home/dawn"; + extraGroups = ["wheel"]; + shell = pkgs.bashInteractive; + hashedPassword = "$y$j9T$TxLlqj0RWsBtIrEhOTyqh1$mfvSCn5j7VAUymWe2/qUTB7.JdwXbqF5qWqUjqQCMu3"; + openssh.authorizedKeys.keys = [ + (builtins.readFile "${inputs.self}/secrets/yusdacra.key.pub") + ]; + }; + + environment.shells = with pkgs; [ + bashInteractive + nushell + ]; + + home-manager.users.dawn = {pkgs, ...}: { + imports = + let + modulesToEnable = l.flatten [ + [ + "zoxide" + "direnv" + "nushell" + ] + # dev stuff + [ + "zed" + "helix" + "git" + "ssh" + ] + ]; + in + l.flatten [ + (tlib.prefixStrings "${inputs.self}/users/modules/" modulesToEnable) + ]; + + home = { + homeDirectory = nixosConfig.users.users.dawn.home; + packages = with pkgs; [omnisharp-roslyn rustup gcc gnumake cmake dotnet-sdk_8]; + }; + }; +} diff --git a/users/mayer/default.nix b/users/mayer/default.nix index ef95cfc..6d4ec1e 100644 --- a/users/mayer/default.nix +++ b/users/mayer/default.nix @@ -63,17 +63,10 @@ in home-manager.users.mayer = { - config, pkgs, inputs, - secrets, ... }: - let - personal = import ../../personal.nix; - name = personal.name; - email = personal.emails.primary; - in { imports = let @@ -124,22 +117,10 @@ in prismlauncher gearlever signal-desktop + bs-manager ]; }; fonts.fontconfig.enable = l.mkForce true; - - programs.git.includes = [ - { - contents = { - gpg.format = "ssh"; - commit.gpgsign = true; - user = { - inherit name email; - signingkey = builtins.readFile ../../secrets/yusdacra.key.pub; - }; - }; - } - ]; }; } diff --git a/users/modules/git/default.nix b/users/modules/git/default.nix index 8f96c1d..b1da96b 100644 --- a/users/modules/git/default.nix +++ b/users/modules/git/default.nix @@ -1,8 +1,23 @@ { pkgs, ... }: +let + personal = import ../../../personal.nix; + name = personal.name; + email = personal.emails.primary; +in { programs.git = { enable = true; includes = [ + { + contents = { + gpg.format = "ssh"; + commit.gpgsign = true; + user = { + inherit name email; + signingkey = builtins.readFile ../../../secrets/yusdacra.key.pub; + }; + }; + } { contents = { diff --git a/users/modules/sway/default.nix b/users/modules/sway/default.nix index faf7cfb..9c85004 100644 --- a/users/modules/sway/default.nix +++ b/users/modules/sway/default.nix @@ -10,7 +10,7 @@ imports = [ ../wayland ../swaylock - ../swayidle + # ../swayidle ../wlsunset ../mako ../tofi diff --git a/users/root/default.nix b/users/root/default.nix index 02e6318..fb13803 100644 --- a/users/root/default.nix +++ b/users/root/default.nix @@ -1,8 +1,14 @@ -{ pkgs, ... }: +{ inputs, pkgs, ... }: { - users.users.root.initialHashedPassword = "$6$XLWo1sPpgp63Zm$XHBbULH9q1gb/.yalPPU/I7EgTcW80bM.moCjIe/qGyOwE47VcXNVbTHloBZdIWQq0MfIG0IxInAu59.oJyos/"; - environment.systemPackages = [ pkgs.nushell ]; - users.users.root.shell = pkgs.nushell; + users.users.root = { + shell = pkgs.nushell; + initialHashedPassword = "$6$XLWo1sPpgp63Zm$XHBbULH9q1gb/.yalPPU/I7EgTcW80bM.moCjIe/qGyOwE47VcXNVbTHloBZdIWQq0MfIG0IxInAu59.oJyos/"; + openssh.authorizedKeys.keys = [ + (builtins.readFile "${inputs.self}/secrets/yusdacra.key.pub") + ]; + }; + + environment.systemPackages = [pkgs.bashInteractive pkgs.nushell]; home-manager.users.root = { imports = [ ../modules/nushell ]; }; -- 2.51.2