From d315f016d2fde1591fe4937aee2cc14a2062aa7b Mon Sep 17 00:00:00 2001 From: DarkGuibrine Date: Sat, 16 May 2026 02:12:10 -0300 Subject: [PATCH] add more mods --- flake.lock | 170 +++++++++--------- hosts/Alfa/conf/GM/configs/self-host.nix | 14 +- .../config/self-host/self-host.nix | 1 + mods/nixos/nixos.nix | 1 + mods/nixos/tailscale/tailscale.nix | 21 +++ 5 files changed, 114 insertions(+), 93 deletions(-) create mode 100644 mods/nixos/tailscale/tailscale.nix diff --git a/flake.lock b/flake.lock index f4188e0..25e8db0 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1777475243, - "narHash": "sha256-EiCeDGJewyWq2Mtdt5m8qyo/W5PXVUCacLuZJ/diBQ8=", + "lastModified": 1778493762, + "narHash": "sha256-PG7vz7Dk3U3hB8OXtIS3bJ4QmJEw08ycFprJuAO7YS0=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "12e7b06163456e4c3685ee83b8fdc277fe03bdc8", + "rev": "75aac6845b47e913b53c2a0af7fd124fdb8fe84a", "type": "github" }, "original": { @@ -59,11 +59,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1777988971, - "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1778292335, - "narHash": "sha256-Aa8s4mz31xzRQHykNmfzsqUNOCAoEN+txgNsOWosYdI=", + "lastModified": 1778700931, + "narHash": "sha256-b5LHDafXv7Q+PLf/cQEF/WN1EmSoUltRqBDX8pl5HuQ=", "owner": "darkguibrine", "repo": "hayase-nix", - "rev": "bb0ca907fa75721bd06a1fd0b99c224e4e72b5b2", + "rev": "728e5821937fb99f89abc392bf7c51155294958e", "type": "github" }, "original": { @@ -150,11 +150,11 @@ ] }, "locked": { - "lastModified": 1778365864, - "narHash": "sha256-ImoT/wqmgMImf2dAC+E0MverAdA4QXsedOeES9B7Ezw=", + "lastModified": 1778905298, + "narHash": "sha256-mqzr2uSY3TzBxnpFGocsT7fATE8tqU+eb0V+OhNR53I=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f419037039a152448c5f4ae9494154753d1b399", + "rev": "92a8736142944ed3b2c4aba8b364583b6fda15a5", "type": "github" }, "original": { @@ -171,11 +171,11 @@ ] }, "locked": { - "lastModified": 1778365864, - "narHash": "sha256-ImoT/wqmgMImf2dAC+E0MverAdA4QXsedOeES9B7Ezw=", + "lastModified": 1778858474, + "narHash": "sha256-uOh5fCoxOgdFa50WymuhCwJKuEVv/Eo4VYjK0SgzlPs=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f419037039a152448c5f4ae9494154753d1b399", + "rev": "ca77575d39c908de876c10f93704532689df546f", "type": "github" }, "original": { @@ -192,11 +192,11 @@ ] }, "locked": { - "lastModified": 1777594677, - "narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=", + "lastModified": 1778805320, + "narHash": "sha256-nGFJ01m2CTBKD4ABtcY4vLhHrRN91LKr/pn41PcU78A=", "owner": "nix-community", "repo": "home-manager", - "rev": "899c08a15beae5da51a5cecd6b2b994777a948da", + "rev": "9846abe15e7d0d36b8acbd4d05f2b87461744c92", "type": "github" }, "original": { @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1778408709, - "narHash": "sha256-DKIuvXXnv4+2wN+AY1qGfQ4uv/2dsOluMCCDEJCJ00g=", + "lastModified": 1778656613, + "narHash": "sha256-msfEuGxdU3hMykJKkkKfE+kT1Us/3o4XLjdOaQLyYHA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "6d7bfd32efacd9a06c36df65f47c875395547977", + "rev": "98800e4d24a3be2d5e9fa47e0dc7c5a1982f99a7", "type": "github" }, "original": { @@ -237,11 +237,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1778392415, - "narHash": "sha256-UbEC8dOIWwCG4mww7SGhYMgM1yi8ewgKLi8O3uhX33M=", + "lastModified": 1778862364, + "narHash": "sha256-O0qC3IOHRscJcGPuDlIS4cLboKJZq358KH3oVzBeQjo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "670859bacca122ec1158c882b4cf2828930b3669", + "rev": "9ab3f8b17e22ead80525c4572b74156acf870526", "type": "github" }, "original": { @@ -270,11 +270,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1778389445, - "narHash": "sha256-9NyDMVf8ydUZGTzcPcLMQf0o1B3bte/00UGbuXHNWh8=", + "lastModified": 1778858756, + "narHash": "sha256-9VvAHNoi2wd0fxLfJOPChZMS7l6rhCtAJmpd59Hv5rw=", "owner": "YaLTeR", "repo": "niri", - "rev": "38191826cb1e5fb9051a7e141fefe4941a2b4bed", + "rev": "cd5ac3e5e04bb5a11276d3c755fa25242818e05f", "type": "github" }, "original": { @@ -308,11 +308,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770841267, - "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -339,11 +339,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1778435793, - "narHash": "sha256-Qi4UlkqLvorzUfGSda06fNBX9qHs1MoPy+96jvOvX1Y=", + "lastModified": 1778906273, + "narHash": "sha256-c2dM/pECfvRi0rCwmMVoD9P1jS6ESwAZ//wQZRW33HQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "539206eac557c86e4b6134dc65d2bb63482b7940", + "rev": "1f3661533a9ec5bf2e363c8980ca4864879dbacf", "type": "github" }, "original": { @@ -354,11 +354,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1778003029, - "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=", + "lastModified": 1778737229, + "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5", + "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", "type": "github" }, "original": { @@ -370,11 +370,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1778003029, - "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=", + "lastModified": 1778737229, + "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5", + "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", "type": "github" }, "original": { @@ -417,11 +417,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1777268161, - "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", + "lastModified": 1778443072, + "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", + "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", "type": "github" }, "original": { @@ -465,11 +465,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1777954456, - "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", + "lastModified": 1778443072, + "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", + "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", "type": "github" }, "original": { @@ -481,11 +481,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1778274207, - "narHash": "sha256-I4puXmX1iovcCHZlRmztO3vW0mAbbRvq4F8wgIMQ1MM=", + "lastModified": 1778794387, + "narHash": "sha256-BL04pOS9453Awkeb9f90XBJXBSkWxN+vB7HIgnL0iMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b3da656039dc7a6240f27b2ef8cc6a3ef3bccae7", + "rev": "8a1b0127302ea51e05bf4ea5a291743fac442406", "type": "github" }, "original": { @@ -497,11 +497,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1777954456, - "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", + "lastModified": 1778443072, + "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", + "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", "type": "github" }, "original": { @@ -513,11 +513,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1777954456, - "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", + "lastModified": 1778443072, + "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", + "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", "type": "github" }, "original": { @@ -529,11 +529,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1778274207, - "narHash": "sha256-I4puXmX1iovcCHZlRmztO3vW0mAbbRvq4F8wgIMQ1MM=", + "lastModified": 1778794387, + "narHash": "sha256-BL04pOS9453Awkeb9f90XBJXBSkWxN+vB7HIgnL0iMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3da656039dc7a6240f27b2ef8cc6a3ef3bccae7", + "rev": "8a1b0127302ea51e05bf4ea5a291743fac442406", "type": "github" }, "original": { @@ -545,11 +545,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1777954456, - "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", + "lastModified": 1778443072, + "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", + "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", "type": "github" }, "original": { @@ -565,11 +565,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1778104114, - "narHash": "sha256-+tbqLv7IW5Aem8kGF6cp4n3MtNBcwqmuGlMt6S1kQjs=", + "lastModified": 1778830602, + "narHash": "sha256-5HKL37GkJNRHsU8GS38UshBY7UyvTOQim2L4quSYGfE=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "eb2b53ddaa7564f5c93031cbe65cd5b6ef3c12a9", + "rev": "13964255121d100a7306e76a28010f19e8b33a1a", "type": "github" }, "original": { @@ -588,11 +588,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1777773024, - "narHash": "sha256-pLU+KB84A0Jei/vTD6pOS4Ovkmq3QDfPQHg1MlKsRqM=", + "lastModified": 1778377995, + "narHash": "sha256-uUzHDHqQF1rdVNiTa05L0mML3/d7fpbAShjCRWxbrBQ=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "d3e26ccd9eecde9139be00caf5dc2d4260fb31ee", + "rev": "d8327a723eed6dd9aebe8e0b162126f390e827df", "type": "github" }, "original": { @@ -607,11 +607,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1778514069, - "narHash": "sha256-zRIMx4RyO11e4NzTj3yrQwK+Ac5FeDiCNUpIQp64FoI=", + "lastModified": 1778906070, + "narHash": "sha256-RlUmGoriRD2eB4NpEcFzpx8XP99UaXiAcDc76E7g9nc=", "owner": "nix-community", "repo": "NUR", - "rev": "ffa79687195ba625b97ebe37cbe7414f3f93504c", + "rev": "d75b47276e57bcf5ef14f6cf9070f9e61a70f6f0", "type": "github" }, "original": { @@ -629,11 +629,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1778432182, - "narHash": "sha256-GKMj2ahDJOwJbrQr1vVQ3/Eb+Prri+nPwOfX+TY3zbU=", + "lastModified": 1778867960, + "narHash": "sha256-TOQb4wa+hql3X/uLGHsIFaNURVXoe9VJ1kCzmREPYqQ=", "owner": "lonerOrz", "repo": "nyx-loner", - "rev": "ac354d5e8b3eea3cc68bcf4ff0e09b67fd665ddb", + "rev": "a27bfaeab1570c84e6ff4bcc515cfff6606238ad", "type": "github" }, "original": { @@ -666,11 +666,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1778222427, - "narHash": "sha256-6GFiP611nEJvtm+m03sMyfaVIJ9QOCi//hS+PPKyyPA=", + "lastModified": 1778488696, + "narHash": "sha256-QSWgYuZUCNUJ/cxmaq83WkcT7lHQDDfsPVgH+96kIl0=", "ref": "refs/heads/master", - "rev": "d1760ed1f31c02a95b37a9bf4084129c829ebe7f", - "revCount": 817, + "rev": "7d1c9a9c6721606b129829134d6f614f015621e2", + "revCount": 818, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -707,11 +707,11 @@ ] }, "locked": { - "lastModified": 1770952264, - "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=", + "lastModified": 1777605393, + "narHash": "sha256-Hjp0VOOHgHcTrX23iVvnfAudPcuCmfkfpQNFwv2v/ks=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188", + "rev": "ff88db34cfa486fc4964a6991cab1678d82eee8c", "type": "github" }, "original": { @@ -728,11 +728,11 @@ ] }, "locked": { - "lastModified": 1778383025, - "narHash": "sha256-UK7s2LJS1YwIMFL7PSaNJvLXT9pyRgm7X+HNPgMXiEE=", + "lastModified": 1778815121, + "narHash": "sha256-xlhD+1NVJbhrUUM2usRHW6iKWTXP2uw2Fo6sWJmLg8g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4568a557ca325ff81fb354382d4a9968daa1001a", + "rev": "017351829a9356423afd2cca0dde9b63346c8ab3", "type": "github" }, "original": { @@ -850,11 +850,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1778394798, - "narHash": "sha256-/jR8bModWv0ji305ecMgAB+2eaXLZiYdH+9Z4JIRkuA=", + "lastModified": 1778846616, + "narHash": "sha256-cqNwCnEdzUlUgNk9c3bVkXnEfmhzHvHre2Nr2C0sIfo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "45bc54456044b96492923739bfae633e1a4352e1", + "rev": "3e3671b5f0e7c60e8f10bdf8667598603203546a", "type": "github" }, "original": { diff --git a/hosts/Alfa/conf/GM/configs/self-host.nix b/hosts/Alfa/conf/GM/configs/self-host.nix index 1a03566..ff0c498 100644 --- a/hosts/Alfa/conf/GM/configs/self-host.nix +++ b/hosts/Alfa/conf/GM/configs/self-host.nix @@ -7,15 +7,13 @@ }: { - ## tailscale - services.tailscale = { - enable = true; - extraUpFlags = [ - "--exit-node-allow-lan-access=true" - "--ssh" - "--accept-dns=true" - ]; + mods = { + netbird.enable = true; + tailscale.enable = true; + flakePath = "/etc/nixos"; }; + + networking.nftables.enable = true; networking.firewall = { enable = true; diff --git a/hosts/darkgui-vps/config/self-host/self-host.nix b/hosts/darkgui-vps/config/self-host/self-host.nix index 3eb8cbf..54eece5 100644 --- a/hosts/darkgui-vps/config/self-host/self-host.nix +++ b/hosts/darkgui-vps/config/self-host/self-host.nix @@ -9,6 +9,7 @@ mods = { netbird.enable = true; + tailscale.enable = true; flakePath = "/etc/nixos"; }; diff --git a/mods/nixos/nixos.nix b/mods/nixos/nixos.nix index 4cb71bd..dc1c9d0 100644 --- a/mods/nixos/nixos.nix +++ b/mods/nixos/nixos.nix @@ -2,6 +2,7 @@ { imports = [ ./netbird/netbird.nix + ./tailscale/tailscale.nix ]; options.mods = { diff --git a/mods/nixos/tailscale/tailscale.nix b/mods/nixos/tailscale/tailscale.nix new file mode 100644 index 0000000..09df2cd --- /dev/null +++ b/mods/nixos/tailscale/tailscale.nix @@ -0,0 +1,21 @@ +{ + config, + lib, + ... +}: +{ + options.mods.tailscale = { + enable = lib.mkEnableOption "tailscale"; + }; + + config = lib.mkIf config.mods.tailscale.enable { + services.tailscale = { + enable = true; + extraUpFlags = [ + "--exit-node-allow-lan-access=true" + "--ssh" + "--accept-dns=true" + ]; + }; + }; +}