diff --git a/configuration.nix b/configuration.nix index 254b493..1f1dd9f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -230,12 +230,6 @@ services = { openssh.enable = true; - tor = { - enable = true; - torsocks = { - enable = true; - }; - }; xrdp = { # enable = true; audio.enable = true; diff --git a/flake.lock b/flake.lock index 99980d5..47018b0 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1767324719, - "narHash": "sha256-RD1IR25udmtmTIPfocuhuIzOK2C+M9nhTQ3mEfARECo=", + "lastModified": 1771388570, + "narHash": "sha256-FWWZEzLWqS6ewMdzDFg1OHhKE6p8Gq9sZsAQPQDOgh4=", "owner": "ninelore", "repo": "nixpkgs-cosmic-unstable", - "rev": "063c9631e355f6143f36f375aa2f96f7c22fdb0b", + "rev": "38761c5789401312651773e895c06e4ccd39c7cd", "type": "github" }, "original": { @@ -89,11 +89,11 @@ }, "crane": { "locked": { - "lastModified": 1766774972, - "narHash": "sha256-8qxEFpj4dVmIuPn9j9z6NTbU+hrcGjBOvaxTzre5HmM=", + "lastModified": 1771121070, + "narHash": "sha256-aIlv7FRXF9q70DNJPI237dEDAznSKaXmL5lfK/Id/bI=", "owner": "ipetkov", "repo": "crane", - "rev": "01bc1d404a51a0a07e9d8759cd50a7903e218c82", + "rev": "a2812c19f1ed2e5ed5ce2ef7109798b575c180e1", "type": "github" }, "original": { @@ -148,11 +148,11 @@ ] }, "locked": { - "lastModified": 1766150702, - "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", + "lastModified": 1771355198, + "narHash": "sha256-89m5VKxIs8QNiIvLsxHu5NpyhDsoXTtoN801IAurnW4=", "owner": "nix-community", "repo": "disko", - "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", + "rev": "92fceb111901a6f13e81199be4fab95fce86a5c9", "type": "github" }, "original": { @@ -166,11 +166,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1770872764, - "narHash": "sha256-n9/S8Y1HY6wr8hYGyq7ySuJB2KdF2kyWho+ofBLfvmA=", + "lastModified": 1771242501, + "narHash": "sha256-7azh4I/Qxz9e3liYmslBptv/wcCZfs2mjbLueKgz6PE=", "owner": "imaviso", "repo": "dwproton-flake", - "rev": "dd410d71c5ea1baa0ffff2686676d20d1f671893", + "rev": "4455649c5773abfc22244b36b5c542282dc76112", "type": "github" }, "original": { @@ -188,11 +188,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1767250179, - "narHash": "sha256-PnQdWvPZqHp+7yaHWDFX3NYSKaOy0fjkwpR+rIQC7AY=", + "lastModified": 1769929675, + "narHash": "sha256-EBpe7sXCPLs+qVePXbA7kc+Kmpmp0pWysEpjjEWTK+E=", "owner": "nix-community", "repo": "fenix", - "rev": "a3eaf682db8800962943a77ab77c0aae966f9825", + "rev": "78d518f5ca32a86dc767de481160dbae640c70cf", "type": "github" }, "original": { @@ -221,15 +221,15 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -320,11 +320,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1771168503, - "narHash": "sha256-CUWJRcnSUgcbcBfJZ4MH1DjT741a9Jflr6552Ph6BP4=", + "lastModified": 1771519087, + "narHash": "sha256-gr/IQALzBKrDnq7tNkb9WOU2T8KBEib6iPvsTeUETDk=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "cfcc3aa142f0003662a1729899b604ef8239c464", + "rev": "2ac3c1f1da69a7b3474fb1adcc8c2280001cf23d", "type": "github" }, "original": { @@ -385,11 +385,11 @@ ] }, "locked": { - "lastModified": 1771188132, - "narHash": "sha256-qLXxN/tPrZtnekaLBQuVtxQfvqqs5cT5WbyH4zZaTGI=", + "lastModified": 1771519029, + "narHash": "sha256-H59Qf82wv5kBXVoyXsmUKW+9J3o8FqgY4uKaLdsLdLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae8003d8b61d0d373e7ca3da1a48f9c870d15df9", + "rev": "167e0b6837115e672ec5f58e2b0ea39093abe807", "type": "github" }, "original": { @@ -406,11 +406,11 @@ ] }, "locked": { - "lastModified": 1767104570, - "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", + "lastModified": 1771269455, + "narHash": "sha256-BZ31eN5F99YH6vkc4AhzKGE+tJgJ52kl8f01K7wCs8w=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", + "rev": "5f1d42a97b19803041434f66681d5c44c9ae62e3", "type": "github" }, "original": { @@ -457,11 +457,11 @@ "valhali": "valhali" }, "locked": { - "lastModified": 1767389413, - "narHash": "sha256-3l9DWMTIaVUC++5l2oSBZYP86QYjFusD7J3BqivPRZk=", + "lastModified": 1771418655, + "narHash": "sha256-bsmRubUzPpcmLW2lEiaF7AhNJ5jFNu2/CA9sVO3UTf8=", "owner": "MordragT", "repo": "nixos", - "rev": "999ab929a2073cd4b1a72fa8944743de19d4c41b", + "rev": "a054fdf806adfe4245af3349fcdfd5550825382c", "type": "github" }, "original": { @@ -481,11 +481,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1767013031, - "narHash": "sha256-p8ANXBakAtfX/aEhLbU6w0tuQe3nrBvLdHbKirJP7ug=", + "lastModified": 1771322141, + "narHash": "sha256-7NF2aiWw7cL+KAdOgSXEV9fg4Y6SH8NmEgSBYIdKfcw=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "c2a82339373daee8cbbcad5f51f22ae6b71069e0", + "rev": "89594c01208e1e0218050d63a3570a3e1b4447ac", "type": "github" }, "original": { @@ -567,11 +567,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1767116409, - "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -583,11 +583,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1767116409, - "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -598,11 +598,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1767116409, - "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -644,11 +644,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -683,11 +683,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1761290947, - "narHash": "sha256-AOOalZPOCh8uFVcs8qxyVeq7P+tfXxCs/aU8o+7uuSo=", + "lastModified": 1767894517, + "narHash": "sha256-QF7hieotASi8KTe6dhJEaRg+Ex0HO1SkoqwsILzwO4k=", "owner": "MordragT", "repo": "nu-env", - "rev": "ae30257182842068d97481f8fbbe850ca623b10f", + "rev": "0b6d3b1ee6a5535e13e28d94a85a6eba0585964d", "type": "github" }, "original": { @@ -702,11 +702,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1767367154, - "narHash": "sha256-D7q0hcj+X0hesIhkDksvuyXbHagkGhfci+fV15wGwWM=", + "lastModified": 1771399164, + "narHash": "sha256-4do0dRhBXjQwjtZhdpHvIsvF27vQv2rGA3GuJ6uZtZE=", "owner": "nix-community", "repo": "NUR", - "rev": "c87d1f269298544231967f0e8f614333cf93b923", + "rev": "974e255a87ea2b1f4b150b0732102207f662abd0", "type": "github" }, "original": { @@ -726,11 +726,11 @@ ] }, "locked": { - "lastModified": 1765911976, - "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", + "lastModified": 1770726378, + "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", + "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae", "type": "github" }, "original": { @@ -776,11 +776,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1767191410, - "narHash": "sha256-cCZGjubgDWmstvFkS6eAw2qk2ihgWkycw55u2dtLd70=", + "lastModified": 1769857242, + "narHash": "sha256-3eKpRRzKz0KzY7CJzRXFm4POwEqbuTohyQ2ajI/zKvg=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "a9026e6d5068172bf5a0d52a260bb290961d1cb4", + "rev": "17304e9c7e11d26139672d3d77aa498b1cae0d69", "type": "github" }, "original": { @@ -799,11 +799,11 @@ ] }, "locked": { - "lastModified": 1766976750, - "narHash": "sha256-w+o3AIBI56tzfMJRqRXg9tSXnpQRN5hAT15o2t9rxYw=", + "lastModified": 1771125043, + "narHash": "sha256-ldf/s49n6rOAxl7pYLJGGS1N/assoHkCOWdEdLyNZkc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9fe44e7f05b734a64a01f92fc51ad064fb0a884f", + "rev": "4912f951a26dc8142b176be2c2ad834319dc06e8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 93ae556..c5d0589 100644 --- a/flake.nix +++ b/flake.nix @@ -192,6 +192,14 @@ enable = true; pulse.enable = true; }; + tor = { + enable = true; + client.enable = true; + relay = { + enable = true; + role = "relay"; + }; + }; xserver = { enable = true; displayManager.lightdm.enable = true; @@ -201,6 +209,14 @@ options = "grp:alt_shift_toggle"; }; }; + zerotierone = { + enable = true; + localConf = { + settings = { + bind = [ "10.20.0.201" ]; + }; + }; + }; }; } )