diff --git a/flake.lock b/flake.lock index 76159f4..0f8bf88 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1722347739, - "narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=", + "lastModified": 1725016199, + "narHash": "sha256-2TMk7F2a27ZtOUW/bftkDyZKp3OQ71E5XnfKSUT8HZQ=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a", + "rev": "cff00196f0fcf734a2bf164eb0dfdb6e58c5c906", "type": "github" }, "original": { @@ -55,7 +55,88 @@ "type": "github" } }, + "attic": { + "inputs": { + "crane": "crane", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1724226964, + "narHash": "sha256-cltFh4su2vcFidxKp7LuEgX3ZGLfPy0DCdrQZ/QTe68=", + "owner": "zhaofengli", + "repo": "attic", + "rev": "6d9aeaef0a067d664cb11bb7704f7ec373d47fb2", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "main", + "repo": "attic", + "type": "github" + } + }, "cachix": { + "inputs": { + "devenv": "devenv", + "flake-compat": "flake-compat_3", + "git-hooks": "git-hooks", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1724232775, + "narHash": "sha256-6u2DycIEgrgNYlLxyGqdFVmBNiKIitnQKJ1pbRP5oko=", + "owner": "cachix", + "repo": "cachix", + "rev": "03b6cb3f953097bff378fb8b9ea094bd091a4ec7", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "master", + "repo": "cachix", + "type": "github" + } + }, + "cachix_2": { + "inputs": { + "devenv": "devenv_2", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1712055811, + "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", + "owner": "cachix", + "repo": "cachix", + "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, + "cachix_3": { "locked": { "lastModified": 1635350005, "narHash": "sha256-tAMJnUwfaDEB2aa31jGcu7R7bzGELM9noc91L2PbVjg=", @@ -74,6 +155,7 @@ "chaotic": { "inputs": { "compare-to": "compare-to", + "fenix": "fenix", "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", @@ -82,11 +164,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1722963859, - "narHash": "sha256-TQ5sQ+PX0OeMZx+nYBA0CL3R9Yv6MupLzFU0iQrGGrc=", + "lastModified": 1725043054, + "narHash": "sha256-wNKROMH0TmS3yqpces3ldlRLE75Bec0gfmaP9DF6OPc=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "f41d02a7ca6433c98fac378569617f2652628624", + "rev": "1de4f25728a7f37785da5742f6d3fe98daffe83f", "type": "github" }, "original": { @@ -110,10 +192,213 @@ "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" } }, + "complement": { + "flake": false, + "locked": { + "lastModified": 1722323564, + "narHash": "sha256-6w6/N8walz4Ayc9zu7iySqJRmGFukhkaICLn4dweAcA=", + "owner": "matrix-org", + "repo": "complement", + "rev": "6e4426a9e63233f9821a4d2382bfed145244183f", + "type": "github" + }, + "original": { + "owner": "matrix-org", + "ref": "main", + "repo": "complement", + "type": "github" + } + }, + "conduwuit": { + "inputs": { + "attic": "attic", + "cachix": "cachix", + "complement": "complement", + "crane": "crane_2", + "fenix": "fenix_2", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_3", + "liburing": "liburing", + "nix-filter": "nix-filter", + "nixpkgs": "nixpkgs_5", + "rocksdb": "rocksdb" + }, + "locked": { + "lastModified": 1725035022, + "narHash": "sha256-ku4o0aXtpIcS+XMVUwBSMmBr3BvEMFPOTABJ4Sqp+MI=", + "owner": "girlbossceo", + "repo": "conduwuit", + "rev": "9fde835673d3a227fd3f9740edf17076a5e01a28", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "repo": "conduwuit", + "type": "github" + } + }, + "crane": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722960479, + "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", + "owner": "ipetkov", + "repo": "crane", + "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724006180, + "narHash": "sha256-PVxPj0Ga2fMYMtcT9ARCthF+4U71YkOT7ZjgD/vf1Aw=", + "owner": "ipetkov", + "repo": "crane", + "rev": "7ce92819802bc583b7e82ebc08013a530f22209f", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "ref": "master", + "repo": "crane", + "type": "github" + } + }, + "devenv": { + "inputs": { + "cachix": "cachix_2", + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "nix": "nix_2", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "git-hooks" + ] + }, + "locked": { + "lastModified": 1723156315, + "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", + "owner": "cachix", + "repo": "devenv", + "rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_2": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "flake-compat" + ], + "nix": "nix", + "nixpkgs": "nixpkgs_3", + "poetry2nix": "poetry2nix", + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1708704632, + "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", + "owner": "cachix", + "repo": "devenv", + "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "python-rewrite", + "repo": "devenv", + "type": "github" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1724999484, + "narHash": "sha256-AIR8uYGteWS/RyHyZJAHQAUEJ/Mv4ktkPe2mzbJ2zCE=", + "owner": "nix-community", + "repo": "fenix", + "rev": "e3bb9176e807e2b166d54153ce8caea5cb2c6700", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1724221791, + "narHash": "sha256-mKX67QPnUybOopVph/LhOV1G/H4EvPxDIfSmbufrVdA=", + "owner": "nix-community", + "repo": "fenix", + "rev": "e88b38a5a3834e039d413a88f8150a75ef6453ef", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "fenix", + "type": "github" + } + }, "firefox": { "inputs": { - "cachix": "cachix", - "flake-compat": "flake-compat", + "cachix": "cachix_3", + "flake-compat": "flake-compat_5", "lib-aggregate": "lib-aggregate", "mozilla": "mozilla", "nixpkgs": [ @@ -121,11 +406,11 @@ ] }, "locked": { - "lastModified": 1722953784, - "narHash": "sha256-p8c3s2dDDXhXFjNPQzoQtprE/vR/UwXKlgBkftTaIq8=", + "lastModified": 1725072289, + "narHash": "sha256-pe57i9Pq/aaT7eZma1N+RI5v0uZnFBPMjKgmlYYxY2E=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "28dc0a7e43033e88456e5d001889ce2f23c6ffdd", + "rev": "7d1eb1e28ca04aa248de27e1ec26ee5ef6f0c75b", "type": "github" }, "original": { @@ -135,6 +420,71 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "ref": "master", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { "locked": { "lastModified": 1717312683, "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", @@ -203,6 +553,24 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "inputs": { "systems": "systems_5" }, @@ -216,11 +584,12 @@ }, "original": { "owner": "numtide", + "ref": "main", "repo": "flake-utils", "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { "systems": "systems_6" }, @@ -238,6 +607,94 @@ "type": "github" } }, + "flake-utils_5": { + "inputs": { + "systems": "systems_8" + }, + "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_6": { + "inputs": { + "systems": "systems_9" + }, + "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" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1723202784, + "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "cachix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -246,11 +703,11 @@ ] }, "locked": { - "lastModified": 1722630065, - "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "afc892db74d65042031a093adb6010c4c3378422", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -266,11 +723,11 @@ ] }, "locked": { - "lastModified": 1722936497, - "narHash": "sha256-UBst8PkhY0kqTgdKiR8MtTBt4c1XmjJoOV11efjsC/o=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "a6c743980e23f4cef6c2a377f9ffab506568413a", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -295,11 +752,11 @@ ] }, "locked": { - "lastModified": 1721330371, - "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=", + "lastModified": 1722623071, + "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc", + "rev": "912d56025f03d41b1ad29510c423757b4379eb1c", "type": "github" }, "original": { @@ -315,16 +772,16 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", - "systems": "systems_4", + "nixpkgs": "nixpkgs_6", + "systems": "systems_7", "xdph": "xdph" }, "locked": { - "lastModified": 1722956902, - "narHash": "sha256-g3cAlVmRtnyqMZw88MKqVNM8eU88XzgNAlXdTkym5q8=", + "lastModified": 1725032272, + "narHash": "sha256-A0AiFlPoqDK/IwUiV7SGIi8uW2zOqmmiZY6j8i367LU=", "ref": "refs/heads/main", - "rev": "b0a70f63e3865eaa77f0b78a04b230aa583bc95c", - "revCount": 5055, + "rev": "c5fd5771814958ad274ea9abb961fff621a35b9c", + "revCount": 5165, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -398,11 +855,11 @@ ] }, "locked": { - "lastModified": 1721324361, - "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", + "lastModified": 1724174162, + "narHash": "sha256-fOOBLwil6M9QWMCiSULwjMQzrXhHXUnEqmjHX5ZHeVI=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", + "rev": "16e5c9465f04477d8a3dd48a0a26bf437986336c", "type": "github" }, "original": { @@ -423,11 +880,11 @@ ] }, "locked": { - "lastModified": 1722098849, - "narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=", + "lastModified": 1724966483, + "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f", + "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2", "type": "github" }, "original": { @@ -470,11 +927,11 @@ ] }, "locked": { - "lastModified": 1722666143, - "narHash": "sha256-uTr3LiytFHFUYmIrhs5NoGlm5DCJxQlfyaZEKCU/DS8=", + "lastModified": 1724999205, + "narHash": "sha256-Lc9kb5hhUohcJlUye5Pu8BNYHDPIOUtejYySTvHTlio=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "bcfe9dc708c92590fec676692b3ed79443eda819", + "rev": "a14f978f74e89213a5f565f827454dd6178b2bb5", "type": "github" }, "original": { @@ -485,15 +942,15 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_4", "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1722773431, - "narHash": "sha256-puSEio9yjWojIBDBts4BSGZ43rv1LzIevdYOKmW/Mjg=", + "lastModified": 1724587851, + "narHash": "sha256-+tnTRvR9TzXQDl5OynS+tKBZyPB6viT99zs4fXI0lfk=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "04a4b4d84e02590715e753da3d35fb03cddc6425", + "rev": "eda1cdaddc64064f53e65ae614e061010e5fb92f", "type": "github" }, "original": { @@ -502,6 +959,23 @@ "type": "github" } }, + "liburing": { + "flake": false, + "locked": { + "lastModified": 1724199144, + "narHash": "sha256-MVjnwO6EbKzzSrU51dSseLarZ1fRp+6SagAf/nE/XZU=", + "owner": "axboe", + "repo": "liburing", + "rev": "2d4e799017d64cd2f8304503eef9064931bb3fbd", + "type": "github" + }, + "original": { + "owner": "axboe", + "ref": "master", + "repo": "liburing", + "type": "github" + } + }, "mozilla": { "flake": false, "locked": { @@ -518,6 +992,50 @@ "type": "github" } }, + "nix": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, + "nix-filter": { + "locked": { + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "main", + "repo": "nix-filter", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -541,13 +1059,70 @@ "type": "github" } }, + "nix-github-actions_2": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688870561, + "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nix_2": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -559,11 +1134,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1722732880, - "narHash": "sha256-do2Mfm3T6SR7a5A804RhjQ+JTsF5hk4JTPGjCTRM/m8=", + "lastModified": 1724547350, + "narHash": "sha256-WKkGeNpenNMKD1gOF0Xuqi3VsKX/QCAiwz9qe5PDvzA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "8bebd4c74f368aacb047f0141db09ec6b339733c", + "rev": "b741d900fecd2f0c32d90f853b24be9f5f098b7d", "type": "github" }, "original": { @@ -572,6 +1147,38 @@ "type": "github" } }, + "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-regression_2": { + "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": 1720535198, @@ -589,6 +1196,38 @@ } }, "nixpkgs-stable_2": { + "locked": { + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { + "locked": { + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_4": { "locked": { "lastModified": 1713042715, "narHash": "sha256-RifMwYuKu5v6x6O65msKDTqKkQ9crGwOB7yr20qMEuE=", @@ -606,11 +1245,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -652,13 +1291,61 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1722185531, - "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", + "lastModified": 1723827930, + "narHash": "sha256-EU+W5F6y2CVNxGrGIMpY7nSVYq72WRChYxF4zpjx0y4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", + "rev": "d4a7a4d0e066278bfb0d77bd2a7adde1c0ec9e3d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1692808169, + "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -668,7 +1355,39 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_5": { + "locked": { + "lastModified": 1724271409, + "narHash": "sha256-z4nw9HxkaXEn+5OT8ljLVL2oataHvAzUQ1LEi8Fp+SY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "36a9aeaaa17a2d4348498275f9fe530cd4f9e519", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1720539341, "narHash": "sha256-tcj6LedqeXOBYMrCtl65xBJI7lx9f0JK51ZsQE1AM8A=", @@ -684,7 +1403,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_8": { "locked": { "lastModified": 1712791164, "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", @@ -700,7 +1419,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_9": { "locked": { "lastModified": 1712883908, "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", @@ -716,29 +1435,13 @@ "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1714906307, - "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { - "lastModified": 1722962430, - "narHash": "sha256-cYCTGKF6Fum7PEvXsRcQcBnEmcd4yeM4GQitG0lKLw8=", + "lastModified": 1725083573, + "narHash": "sha256-F9WeDQi+U1+y6BDGvW8PYyi9LALbpo4DlpzfZONh5a0=", "owner": "nix-community", "repo": "NUR", - "rev": "a9a00bc38734f053d434ee3797ec637b4429d0d7", + "rev": "83ead973ba76b6ecf2d72dff9b60b56749e29518", "type": "github" }, "original": { @@ -754,11 +1457,11 @@ ] }, "locked": { - "lastModified": 1721833508, - "narHash": "sha256-octs3o8RrgMepxLpwf3hmGMRpVAxaKvbjOiRDlnhrHo=", + "lastModified": 1724244905, + "narHash": "sha256-5JPKfkzjWsXIQx8xkaC/ynptGnJyspbAjFlXapFr8aE=", "owner": "MOIS3Y", "repo": "nvchad4nix", - "rev": "1cc87a23dfe3debecbe3bbbc32c625e84d15aa56", + "rev": "bef089e0af4d1434ae8f475fefe99c2aa348b0e4", "type": "github" }, "original": { @@ -767,16 +1470,61 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_2", + "nix-github-actions": "nix-github-actions_2", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1692876271, + "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, + "rocksdb": { + "flake": false, + "locked": { + "lastModified": 1724285323, + "narHash": "sha256-k60kreKQ0v+bQ16yBd2SfLYpuNjMw2qoRmZL/S3k6CU=", + "owner": "girlbossceo", + "repo": "rocksdb", + "rev": "5a67ad7ce46328578ee5587fb0c23faa03d14e67", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "ref": "v9.5.2", + "repo": "rocksdb", + "type": "github" + } + }, "root": { "inputs": { "anyrun": "anyrun", "chaotic": "chaotic", + "conduwuit": "conduwuit", "firefox": "firefox", "home-manager": "home-manager_2", "hyprland": "hyprland", "hyprland-contrib": "hyprland-contrib", - "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs": "nixpkgs_7", + "nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs2105": "nixpkgs2105", "nixpkgs2305": "nixpkgs2305", @@ -786,9 +1534,43 @@ "shwewo": "shwewo" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1724937894, + "narHash": "sha256-M/28TIG+fm5x3GtQ6qSGDw1NHS4nHttz0DM7JcDs4g8=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "0ae42bd42576566540a84c62e118aa823edcf2ec", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1724153119, + "narHash": "sha256-WxpvDJDttkINkXmUA/W5o11lwLPYhATAgu0QUAacZ2g=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "3723e5910c14f0ffbd13de474b8a8fcc74db04ce", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "secrets": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_8", "sops-nix": "sops-nix" }, "locked": { @@ -807,7 +1589,7 @@ }, "shwewo": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ], @@ -817,11 +1599,11 @@ "tdesktop": "tdesktop" }, "locked": { - "lastModified": 1715005960, - "narHash": "sha256-X6qV++Paxy6x5qGk5e+8HCaBE5UiQuHNgaPQz6uhOws=", + "lastModified": 1723582075, + "narHash": "sha256-ru8OK6QqWzlAW76ET419VRA0IGUtsZnpsmarnnIlKJ0=", "owner": "shwewo", "repo": "flake", - "rev": "7fef88d30bc9ea194f7057d373aa2b45c517082d", + "rev": "fa1311e31e45577af3116e98dcb3a748e900c912", "type": "github" }, "original": { @@ -832,8 +1614,8 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs": "nixpkgs_9", + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { "lastModified": 1713066950, @@ -896,16 +1678,16 @@ }, "systems_4": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -939,17 +1721,62 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_9": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tdesktop": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_6" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1715005420, - "narHash": "sha256-yHyDqkwFILw4ri0Ap9kIxhLVS8dQJbbpkgZaKNDBvsg=", + "lastModified": 1723145632, + "narHash": "sha256-HxDvohiEQlp59onOSm9fu7qKqEysudpzV4jS+z6dzGM=", "owner": "shwewo", "repo": "telegram-desktop-patched", - "rev": "a89dc5009ee9965d4469ee2548dd9d51a3ef4142", + "rev": "fc7ac99fc16ad99b10fc0a00098049a91ca214d7", "type": "github" }, "original": { @@ -975,11 +1802,11 @@ ] }, "locked": { - "lastModified": 1722365976, - "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=", + "lastModified": 1724073926, + "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341", + "rev": "a08ecbbf33598924e93542f737fc6169a26b481e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3c431e3..00f2a46 100644 --- a/flake.nix +++ b/flake.nix @@ -45,6 +45,8 @@ url = "github:MOIS3Y/nvchad4nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + + conduwuit.url = "github:girlbossceo/conduwuit"; }; outputs = inputs@{ self, nixpkgs, home-manager, nur, ... }: @@ -86,7 +88,7 @@ dlaptop = makeSystem "dlaptop" unstable; intelnuc = makeSystem "intelnuc" stable; huanan = makeSystem "huanan" pkgs; - prtapc = makeSystem "prtapc" pkgs; + prtapc = makeSystem "prtapc" stable; }; }; } diff --git a/home/home.nix b/home/home.nix index 4bfb93e..42f3f25 100644 --- a/home/home.nix +++ b/home/home.nix @@ -144,9 +144,13 @@ osc = "no"; osd-bar = "no"; border = "no"; + demuxer-max-bytes = "8000000KiB"; + cache = "yes"; + cache-secs = "7200"; }; - scripts = with pkgs.mpvScripts; [autoload cutter quality-menu sponsorblock youtube-upnext thumbnail reload mpv-cheatsheet memo autoload - # uosc thumbfast + scripts = with pkgs.mpvScripts; [autoload cutter quality-menu sponsorblock youtube-upnext reload mpv-cheatsheet memo autoload + uosc thumbfast + # thumbnail ]; scriptOpts = { autoload = { diff --git a/home/theme.nix b/home/theme.nix index 5b54a57..2928f29 100644 --- a/home/theme.nix +++ b/home/theme.nix @@ -31,7 +31,6 @@ in { adw-gtk3 nerdfonts layan-gtk-theme - gruvbox-gtk-theme ]; sessionVariables.XCURSOR_THEME = cursor-theme; pointerCursor = { @@ -81,9 +80,14 @@ in { # package = unstable.tokyonight-gtk-theme; # }; + # theme = { + # name = "Gruvbox-Dark"; + # package = unstable.gruvbox-gtk-theme; + # }; + theme = { - name = "Gruvbox-Dark"; - package = unstable.gruvbox-gtk-theme; + name = "Dracula"; + package = pkgs.dracula-theme; }; iconTheme = { @@ -91,6 +95,11 @@ in { # name = "Papirus"; package = lib.mkForce stable.papirus-icon-theme; }; + + # iconTheme = { + # name = "Dracula"; + # package = lib.mkForce pkgs.dracula-icon-theme; + # }; # gtk3.extraCss = '' # headerbar, .titlebar, # .csd:not(.popup):not(tooltip):not(messagedialog) decoration{ diff --git a/hosts/dlaptop/hardware.nix b/hosts/dlaptop/hardware.nix index 3193ee0..1fe2554 100644 --- a/hosts/dlaptop/hardware.nix +++ b/hosts/dlaptop/hardware.nix @@ -8,6 +8,7 @@ lib, pkgs, modulesPath, + inputs, ... }: { imports = [(modulesPath + "/installer/scan/not-detected.nix")]; @@ -268,7 +269,7 @@ # package32 = inputs.hyprland.inputs.nixpkgs.legacyPackages."x86_64-linux".pkgsi686Linux.mesa.drivers; }; - chaotic.mesa-git.enable = true; + # chaotic.mesa-git.enable = true; # chaotic.mesa-git.extraPackages = [ pkgs.amdvlk ]; # chaotic.mesa-git.extraPackages32 = [ pkgs.driversi686Linux.amdvlk ]; diff --git a/hosts/dlaptop/services.nix b/hosts/dlaptop/services.nix index bd6234a..db87dfe 100644 --- a/hosts/dlaptop/services.nix +++ b/hosts/dlaptop/services.nix @@ -62,7 +62,7 @@ ]; services.udev.extraRules = '' # Suspend the system when battery level drops to 6% or lower - SUBSYSTEM=="power_supply", ATTR{status}=="Discharging", ATTR{capacity}=="[0-6]", RUN+="${pkgs.systemd}/bin/systemctl hibernate" + # SUBSYSTEM=="power_supply", ATTR{status}=="Discharging", ATTR{capacity}=="[0-6]", RUN+="${pkgs.systemd}/bin/systemctl hibernate" # # lock when yubi removed # ACTION=="remove",\ diff --git a/hosts/dlaptop/system.nix b/hosts/dlaptop/system.nix index 703df23..c6cd5d3 100644 --- a/hosts/dlaptop/system.nix +++ b/hosts/dlaptop/system.nix @@ -22,6 +22,7 @@ inputs.chaotic.nixosModules.default ]; + services.blueman.enable = true; time.timeZone = "Europe/Moscow"; @@ -196,6 +197,28 @@ podman = { enable = true; dockerCompat = true; + }; + oci-containers.containers = { + cloudflare-warp = { + # image = "caomingjun/warp --sysctl net.ipv6.conf.all.disable_ipv6=0 --sysctl net.ipv4.conf.all.src_valid_mark=1 --cap-add NET_ADMIN,mknod --device /dev/net/tun --security-opt=\"label=disable\" --network ns:/var/run/netns/novpn"; + image = "caomingjun/warp --sysctl net.ipv6.conf.all.disable_ipv6=0 --sysctl net.ipv4.conf.all.src_valid_mark=1 --cap-add NET_ADMIN,mknod --security-opt=\"label=disable\" --network ns:/var/run/netns/novpn"; + ports = [ + "1080:1080" + "1081:1081" + ]; + environment = { + # GOST_ARGS = " -L=socks5://:1081 -F=socks5://0.0.0.0:1082 & warp-cli mode proxy & warp-cli proxy port 1082"; + GOST_ARGS = " -L=socks5://:1080"; + BETA_FIX_HOST_CONNECTIVITY="1"; + }; + volumes = [ + "warp:/var/lib/cloudflare-warp" + ]; + environment = { + WARP_SLEEP = "2"; + }; + extraOptions = [ "--privileged" ]; + }; # do sudo rm /dev/net/tun; sudo modprobe tun before running contaner if it doesnt work }; spiceUSBRedirection.enable = true; libvirtd.enable = true; diff --git a/hosts/dlaptop/xorg.nix b/hosts/dlaptop/xorg.nix index 585bb0c..9cffb0d 100644 --- a/hosts/dlaptop/xorg.nix +++ b/hosts/dlaptop/xorg.nix @@ -1,5 +1,9 @@ -{ lib, pkgs, self, ... }: - +{ lib, pkgs, self, config, ... }: +let + greetdSessions = pkgs.writeText "sessions" '' + Hyprland 2>&1 > /dev/null:gnome-shell --wayland:gnome-shell --x11 + ''; +in { imports = [ "${self}/pkgs/gnome.nix" @@ -25,15 +29,50 @@ TERMINAL = "foot"; }; + security = { + polkit.enable = true; + pam.services.greetd.enableGnomeKeyring = true; + rtkit.enable = true; + }; + + services.greetd = { + enable = true; + settings = { + default_session = { + # command = ''${pkgs.greetd.tuigreet}/bin/tuigreet --time --sessions ${config.services.displayManager.sessionData.desktops}/share/xsessions:${config.services.displayManager.sessionData.desktops}/share/wayland-sessions --remember --cmd --cmd "Hyprland 2>&1 > /dev/null"''; + command = ''${pkgs.greetd.tuigreet}/bin/tuigreet --asterisks --time --sessions ${config.services.displayManager.sessionData.desktops}/share/wayland-sessions --remember --cmd "Hyprland 2>&1 > /dev/null"''; + user = "greeter"; + }; + gnome_x11_session = { + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd gnome-shell --x11"; + user = "greeter"; + }; + gnome_wayland_session = { + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd gnome-shell --wayland"; + user = "greeter"; + }; + }; + }; + systemd.services.greetd.serviceConfig = { + Type = "idle"; + StandardInput = "tty"; + StandardOutput = "tty"; + StandardError = "journal"; + TTYReset = true; + TTYHangup = true; + TTYVTDisallocate = true; + }; + services.xserver = { enable = true; videoDrivers = [ "amdgpu" ]; displayManager = { - gdm.enable = true; - autoLogin = { - enable = false; - user = "delta"; - }; + # gdm.enable = true; + # autoLogin = { + # enable = false; + # user = "delta"; + # }; + # ly.enable = true; }; desktopManager.gnome.enable = true; xkb.layout = "us"; diff --git a/hosts/generic.nix b/hosts/generic.nix index 4ccbf82..559de5b 100644 --- a/hosts/generic.nix +++ b/hosts/generic.nix @@ -63,12 +63,14 @@ in { "https://shwewo.cachix.org" "https://anyrun.cachix.org" "https://hyprland.cachix.org" + "https://attic.kennel.juneis.dog/conduit" # "https://nyx.chaotic.cx/" ]; trusted-public-keys = [ "shwewo.cachix.org-1:84cIX7ETlqQwAWHBnd51cD4BeUVXCyGbFdtp+vLxKOo=" "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk=" # "nyx.chaotic.cx-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" ]; }; diff --git a/hosts/prtapc/hardware-configuration.nix b/hosts/prtapc/hardware-configuration.nix index 3acb853..92929aa 100644 --- a/hosts/prtapc/hardware-configuration.nix +++ b/hosts/prtapc/hardware-configuration.nix @@ -24,19 +24,16 @@ }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/0385-75D4"; + { device = "/dev/disk/by-uuid/8962-C3EE"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; - swapDevices = [ ]; + swapDevices = + [ { device = "/dev/disk/by-uuid/63d0283b-59bf-4e31-9d06-066815685509"; } + ]; - # 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..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; networking.hostId = "aabbcc00"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/hosts/prtapc/system.nix b/hosts/prtapc/system.nix index ebbe594..7d0dfb1 100644 --- a/hosts/prtapc/system.nix +++ b/hosts/prtapc/system.nix @@ -2,8 +2,34 @@ # your system. Help is available in the configuration.nix(5) man page, on # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, inputs, ... }: +let + nixpkgs2305 = import inputs.nixpkgs2305 { system = "${pkgs.system}"; config = { allowUnfree = true; }; }; + update-iptables = pkgs.writeScriptBin "update-iptables" '' + #!/usr/bin/env bash + #!/usr/bin/env bash + + # Define your target domain and port for redirection + TARGET_DOMAIN="catgirl.cloud" + REDIRECT_PORT="12345" + + # Resolve the IP address of the target domain + TARGET_IP=$(dig +short $TARGET_DOMAIN | tail -n 1) + + # Exit if no IP address is found + if [ -z "$TARGET_IP" ]; then + echo "Failed to resolve IP address for $TARGET_DOMAIN" + exit 1 + fi + + # Add the new iptables rule for the resolved IP + sudo iptables -t nat -A OUTPUT -p tcp -d "$TARGET_IP" -j REDIRECT --to-ports "$REDIRECT_PORT" + + echo "iptables rule added for $TARGET_DOMAIN ($TARGET_IP) redirecting to port $REDIRECT_PORT" + ''; + +in { imports = [ # Include the results of the hardware scan. @@ -11,9 +37,9 @@ ]; # Use the GRUB 2 boot loader. - boot.loader.grub.enable = true; - boot.loader.grub.device = "/dev/nvme0n1p1"; - #boot.loader.systemd-boot.enable = true; + # boot.loader.grub.enable = true; + # boot.loader.grub.device = "/dev/"; + boot.loader.systemd-boot.enable = true; # boot.loader.grub.efiSupport = true; # boot.loader.grub.efiInstallAsRemovable = true; # boot.loader.efi.efiSysMountPoint = "/boot/efi"; @@ -46,7 +72,7 @@ users.users.root.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGGL2UD0frl9F2OPBiPlSQqxDsuACbAVgwH24F0KT14L delta@dlaptop" ]; - users.users.root.hashedPassword = ""; # nopass on first boot + users.users.root.hashedPassword = ""; # i'll setup pass with passwd after boot users.users.delta = { uid = 1000; isNormalUser = true; @@ -59,7 +85,140 @@ hostName = "prtapc"; networkmanager.enable = true; }; + + documentation.man.enable = false; + services.xserver.desktopManager.xfce.enable = true; + services.matrix-conduit = { + enable = true; + package = inputs.conduwuit.packages.x86_64-linux.default; + settings = { + global = { + allow_registration = true; + # database_backend = "rocksdb"; + server_name = "${inputs.secrets.home.matrix.url}"; + registration_token = "${inputs.secrets.home.matrix.regword}"; + allow_federation = true; + address = "0.0.0.0"; + well_known = { + client = "https://${inputs.secrets.home.matrix.url}"; + server = "${inputs.secrets.home.matrix.url}:443"; + }; + max_request_size = 1073741824; + }; + misc = { + new_user_displayname_suffix = ""; + media_compat_file_link = false; + }; + }; + }; + services.cloudflared.enable = true; + services.cloudflared.tunnels = { + "02c42e31-a1b6-49c4-b470-faca3a66f938" = { + default = "http_status:404"; + credentialsFile = "/home/cloudflared/.cloudflared/02c42e31-a1b6-49c4-b470-faca3a66f938.json"; + }; + }; + users.groups.cloudflared = { }; + users.users.cloudflared = { + group = "cloudflared"; + isSystemUser = true; + }; + services.tailscale = { + enable = true; + extraUpFlags = "--accept-dns=false"; + }; + environment.systemPackages = with pkgs; [ + (pkgs.writeScriptBin "warp-cli" "${nixpkgs2305.cloudflare-warp}/bin/warp-cli $@") + ]; + + systemd.services.warp-svc = { + enable = true; + description = "Cloudflare Zero Trust Client Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "pre-network.target" ]; + + serviceConfig = { + Type = "simple"; + Restart = "on-failure"; + RestartSec = "15"; + DynamicUser = "no"; + # ReadOnlyPaths = "/etc/resolv.conf"; + CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_SYS_PTRACE"; + AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_SYS_PTRACE"; + StateDirectory = "cloudflare-warp"; + RuntimeDirectory = "cloudflare-warp"; + LogsDirectory = "cloudflare-warp"; + ExecStart = "${nixpkgs2305.cloudflare-warp}/bin/warp-svc"; + }; + + postStart = '' + while true; do + set -e + status=$(${nixpkgs2305.cloudflare-warp}/bin/warp-cli status || true) + set +e + + if [[ "$status" != *"Unable to connect to CloudflareWARP daemon"* ]]; then + ${nixpkgs2305.cloudflare-warp}/bin/warp-cli set-custom-endpoint 162.159.193.1:2408 + exit 0 + fi + sleep 1 + done + ''; + }; + + systemd.services.updateIptables = { + description = "Update iptables rules for dynamic DNS target (proxy for matrix)"; + serviceConfig = { + ExecStart = "${update-iptables}/bin/update-iptables"; + Type = "oneshot"; + }; + path = with pkgs; [ + bash + iproute2 + iptables + sing-box + dig + ]; + }; + + systemd.timers.updateIptables = { + description = "Timer to update iptables rules for dynamic DNS target"; + timerConfig = { + OnBootSec = "2min"; + OnUnitActiveSec = "30min"; + }; + wantedBy = [ "timers.target" ]; + }; + + systemd.services.updateIptables.wantedBy = [ "network-online.target" ]; + + systemd.services.sing-box = { + description = "Sing-Box Service"; + after = [ "network.target" ]; # Ensure the service starts after the network is available + + serviceConfig = { + ExecStart = "${pkgs.sing-box}/bin/sing-box run -c /etc/sing-box/config.json"; + Restart = "always"; + RestartSec = 5; + User = "root"; + }; + + wantedBy = [ "multi-user.target" ]; # Ensure the service starts at boot + }; + + + services.redsocks = { + enable = true; + redsocks = [ + { + port = 12345; + proxy = "127.0.0.1:4000"; + type = "socks5"; + redirectCondition = "--dst 148.251.41.235"; + } + ]; + }; # Configure keymap in X11 # services.xserver.xkb.layout = "us"; diff --git a/pkgs/apps.nix b/pkgs/apps.nix index fd55949..5da3916 100644 --- a/pkgs/apps.nix +++ b/pkgs/apps.nix @@ -153,6 +153,8 @@ in { ffmpeg_7 stable.qutebrowser tailwindcss + fluffychat + nheko ]); # services.flatpak.enable = true; @@ -264,6 +266,8 @@ in { # thunar-archive-plugin # thunar-volman # ]; + + programs.mosh.enable = true; programs.fish = { enable = true; diff --git a/pkgs/socks.nix b/pkgs/socks.nix index 06fa7bf..edc2208 100644 --- a/pkgs/socks.nix +++ b/pkgs/socks.nix @@ -39,9 +39,9 @@ let }; socksed = [ # IP of the proxies is 192.168.150.2 - { name = "singbox-aus"; script = "sing-box run -c /run/secrets/singbox-aus";} # port 4000 - { name = "socks-warp" ; script = "wireproxy -c /run/secrets/wproxy"; } # port 3333 - { name = "socks-novpn"; script = "gost -L socks5://192.168.150.2:3334"; } # port 3334 + { name = "singbox-aus"; script = "sing-box run -c /run/secrets/singbox-aus"; } # port 4000 + { name = "socks-warp" ; script = "wireproxy -c /run/secrets/wproxy"; autostart = false; } # port 3333 + { name = "socks-novpn"; script = "gost -L socks5://192.168.150.2:3334"; } # port 3334 { name = "opera-socks"; # script = "sing-box run -c ${opera-singboxcfg} & opera-proxy -bootstrap-dns https://1.1.1.1/dns-query -bind-address 192.168.150.2:18088"; # script = "gost -L=socks5://192.168.150.2:3335 -F=http://192.168.150.2:18088 opera-proxy -bootstrap-dns https://1.1.1.1/dns-query -bind-address 192.168.150.2:18088"; @@ -280,7 +280,8 @@ in { # UseBridges = true; # ClientTransportPlugin = "snowflake exec ${pkgs.snowflake}/bin/client"; # Bridge = "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ fronts=www.shazam.com,www.cosmopolitan.com,www.esquire.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn"; - Socks5Proxy = "localhost:4000"; # requires setting warp-svc to proxy mode: warp-cli set-mode proxy && warp-cli set-proxy-port 4000 + # Socks5Proxy = "localhost:4000"; # requires setting warp-svc to proxy mode: warp-cli set-mode proxy && warp-cli set-proxy-port 4000 + # Socks5Proxy = "127.0.0.1:1080"; # requires setting warp-svc to proxy mode: warp-cli set-mode proxy && warp-cli set-proxy-port 4000 ControlPort = 9051; CookieAuthentication = true; };