From 5f927fe155128c7639786f751c58c8ed5ec2e80d Mon Sep 17 00:00:00 2001 From: yaroslav Date: Mon, 16 Mar 2026 22:33:44 +0300 Subject: [PATCH] fixed tailscale --- flake.lock | 384 +++++++++++++++++++----- flake.nix | 7 +- home/yaroslav/home.nix | 7 + home/yaroslav/home_gui.nix | 4 + home/yaroslav/steam.nix | 3 +- hosts/Aphelion/Aphelion_misc.nix | 4 +- hosts/generic/configuration_generic.nix | 54 ++-- hosts/generic/persistence.nix | 1 + 8 files changed, 356 insertions(+), 108 deletions(-) diff --git a/flake.lock b/flake.lock index 0c65fd0..5349cb9 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,39 @@ { "nodes": { + "abseil-src": { + "flake": false, + "locked": { + "lastModified": 1722535511, + "narHash": "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4=", + "owner": "abseil", + "repo": "abseil-cpp", + "rev": "4447c7562e3bc702ade25105912dce503f0c4010", + "type": "github" + }, + "original": { + "owner": "abseil", + "ref": "20240722.0", + "repo": "abseil-cpp", + "type": "github" + } + }, + "asio-src": { + "flake": false, + "locked": { + "lastModified": 1702548444, + "narHash": "sha256-8Xo6J6+dTvDtsthjbLMMTInHMDnMMM0rQwzbZu70J/s=", + "owner": "chriskohlhoff", + "repo": "asio", + "rev": "22ccfc94fc77356f7820601f9f33b9129a337d2d", + "type": "github" + }, + "original": { + "owner": "chriskohlhoff", + "ref": "asio-1-30-0", + "repo": "asio", + "type": "github" + } + }, "asus-numberpad-driver": { "inputs": { "nixpkgs": [ @@ -20,6 +54,23 @@ "type": "github" } }, + "curl-src": { + "flake": false, + "locked": { + "lastModified": 1743572790, + "narHash": "sha256-huAGWNm2rYBmgzUuYQ21IYp2skyQECelEkXPMBJY3cE=", + "owner": "curl", + "repo": "curl", + "rev": "1c3149881769e7bd79b072e48374e4c2b3678b2f", + "type": "github" + }, + "original": { + "owner": "curl", + "ref": "curl-8_13_0", + "repo": "curl", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -50,23 +101,6 @@ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, - "original": { - "id": "flake-utils", - "type": "indirect" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, "original": { "owner": "numtide", "repo": "flake-utils", @@ -88,6 +122,23 @@ "type": "github" } }, + "fmt-src": { + "flake": false, + "locked": { + "lastModified": 1758127535, + "narHash": "sha256-AZDmIeU1HbadC+K0TIAGogvVnxt0oE9U6ocpawIgl6g=", + "owner": "fmtlib", + "repo": "fmt", + "rev": "e424e3f2e607da02742f73db84873b8084fc714c", + "type": "github" + }, + "original": { + "owner": "fmtlib", + "ref": "12.0.0", + "repo": "fmt", + "type": "github" + } + }, "hm-stable": { "inputs": { "nixpkgs": [ @@ -170,6 +221,57 @@ "type": "github" } }, + "incbin-src": { + "flake": false, + "locked": { + "lastModified": 1748303270, + "narHash": "sha256-vgOfViZnWTKpBB6vDNDJSB3YuuGGVhg++zsi9Ubatno=", + "owner": "graphitemaster", + "repo": "incbin", + "rev": "22061f51fe9f2f35f061f85c2b217b55dd75310d", + "type": "github" + }, + "original": { + "owner": "graphitemaster", + "repo": "incbin", + "rev": "22061f51fe9f2f35f061f85c2b217b55dd75310d", + "type": "github" + } + }, + "json-src": { + "flake": false, + "locked": { + "lastModified": 1744360948, + "narHash": "sha256-cECvDOLxgX7Q9R3IE86Hj9JJUxraDQvhoyPDF03B2CY=", + "owner": "nlohmann", + "repo": "json", + "rev": "55f93686c01528224f448c19128836e7df245f72", + "type": "github" + }, + "original": { + "owner": "nlohmann", + "ref": "v3.12.0", + "repo": "json", + "type": "github" + } + }, + "libgit2-src": { + "flake": false, + "locked": { + "lastModified": 1749227175, + "narHash": "sha256-/xI3v7LNhpgfjv/m+sZwYDhhYvS6kQYxiiiG3+EF8Mw=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "0060d9cf5666f015b1067129bd874c6cc4c9c7ac", + "type": "github" + }, + "original": { + "owner": "libgit2", + "ref": "v1.9.1", + "repo": "libgit2", + "type": "github" + } + }, "lix": { "flake": false, "locked": { @@ -207,6 +309,146 @@ "url": "https://git.lix.systems/lix-project/nixos-module" } }, + "luajit-src": { + "flake": false, + "locked": { + "lastModified": 1763177035, + "narHash": "sha256-oYD86MqmlJpiCuEs4LwVtxvarPtz1RPWm8nJqNE0sBs=", + "owner": "SteamClientHomebrew", + "repo": "LuaJIT", + "rev": "89550023569c3e195e75e12951c067fe5591e0d2", + "type": "github" + }, + "original": { + "owner": "SteamClientHomebrew", + "ref": "v2.1", + "repo": "LuaJIT", + "type": "github" + } + }, + "luajson-src": { + "flake": false, + "locked": { + "lastModified": 1763065879, + "narHash": "sha256-5Mdp4jp+rqz2ufkBa1gMfd8nep+Um+mBdr6+Ut6yz9I=", + "owner": "SteamClientHomebrew", + "repo": "LuaJSON", + "rev": "0c1fabf07c42f3907287d1e4f729e0620c1fe6fd", + "type": "github" + }, + "original": { + "owner": "SteamClientHomebrew", + "repo": "LuaJSON", + "rev": "0c1fabf07c42f3907287d1e4f729e0620c1fe6fd", + "type": "github" + } + }, + "millennium": { + "inputs": { + "abseil-src": "abseil-src", + "asio-src": "asio-src", + "curl-src": "curl-src", + "fmt-src": "fmt-src", + "incbin-src": "incbin-src", + "json-src": "json-src", + "libgit2-src": "libgit2-src", + "luajit-src": "luajit-src", + "luajson-src": "luajson-src", + "millennium-src": "millennium-src", + "minhook-src": "minhook-src", + "mini-src": "mini-src", + "minizip-src": "minizip-src", + "nixpkgs": [ + "nixpkgs-unstable" + ], + "re2-src": "re2-src", + "websocketpp-src": "websocketpp-src", + "zlib-src": "zlib-src" + }, + "locked": { + "dir": "packages/nix", + "lastModified": 1773092463, + "narHash": "sha256-U1XMtoBNs00icBqWeLZ8hfP5Ra+uTcc8jHaUU/BkI9w=", + "owner": "SteamClientHomebrew", + "repo": "Millennium", + "rev": "293401478502ac4f224c55468f0191083a3ef59b", + "type": "github" + }, + "original": { + "dir": "packages/nix", + "owner": "SteamClientHomebrew", + "repo": "Millennium", + "type": "github" + } + }, + "millennium-src": { + "flake": false, + "locked": { + "lastModified": 1770463863, + "narHash": "sha256-MceGTpXobCAh5Ll/1iTWcEf6/nHY3Ll1t06JxbYc+Co=", + "owner": "SteamClientHomebrew", + "repo": "Millennium", + "rev": "1bc62c94a06f25f7e8d7e269f11cd968cf576bff", + "type": "github" + }, + "original": { + "owner": "SteamClientHomebrew", + "repo": "Millennium", + "rev": "1bc62c94a06f25f7e8d7e269f11cd968cf576bff", + "type": "github" + } + }, + "minhook-src": { + "flake": false, + "locked": { + "lastModified": 1743163800, + "narHash": "sha256-0eGFfg365bb4zic1WTHMvKHbxuhhGp72/clu8OklHXs=", + "owner": "TsudaKageyu", + "repo": "minhook", + "rev": "c3fcafdc10146beb5919319d0683e44e3c30d537", + "type": "github" + }, + "original": { + "owner": "TsudaKageyu", + "ref": "v1.3.4", + "repo": "minhook", + "type": "github" + } + }, + "mini-src": { + "flake": false, + "locked": { + "lastModified": 1743356736, + "narHash": "sha256-zBFFOlECbie7+62fTGf+NP4gNmfv2Qddw3ys6xn7o9U=", + "owner": "metayeti", + "repo": "mINI", + "rev": "52b66e987cb56171dc91d96115cdf094b6e4d7a0", + "type": "github" + }, + "original": { + "owner": "metayeti", + "ref": "0.9.18", + "repo": "mINI", + "type": "github" + } + }, + "minizip-src": { + "flake": false, + "locked": { + "lastModified": 1746408966, + "narHash": "sha256-I3CZwtfJMsZYQOMdGhooUN8vssnQj6rCzv8F+rne3vg=", + "owner": "zlib-ng", + "repo": "minizip-ng", + "rev": "f3ed731e27a97e30dffe076ed5e0537daae5c1bd", + "type": "github" + }, + "original": { + "owner": "zlib-ng", + "ref": "4.0.10", + "repo": "minizip-ng", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1768564909, @@ -256,22 +498,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1771369470, "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", @@ -287,6 +513,23 @@ "type": "github" } }, + "re2-src": { + "flake": false, + "locked": { + "lastModified": 1762353507, + "narHash": "sha256-0J1HVk+eR7VN0ymucW9dNlT36j16XIfCzcs1EVyEIEU=", + "owner": "google", + "repo": "re2", + "rev": "927f5d53caf8111721e734cf24724686bb745f55", + "type": "github" + }, + "original": { + "owner": "google", + "ref": "2025-11-05", + "repo": "re2", + "type": "github" + } + }, "root": { "inputs": { "asus-numberpad-driver": "asus-numberpad-driver", @@ -294,9 +537,9 @@ "home-manager": "home-manager", "impermanence": "impermanence", "lix-module": "lix-module", + "millennium": "millennium", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", - "yandex-music": "yandex-music", "zapret-discord-youtube": "zapret-discord-youtube" } }, @@ -330,57 +573,27 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "yandex-music": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2", - "ymExe": "ymExe" - }, - "locked": { - "lastModified": 1758795263, - "narHash": "sha256-8MIkTa/4/j3iPyFB+bxk9kOJMxTz59S0W2LZf/iOJRU=", - "owner": "cucumber-sp", - "repo": "yandex-music-linux", - "rev": "6b059b558d13edf360e4dec8d1ff99d402b4f0bb", - "type": "github" - }, - "original": { - "owner": "cucumber-sp", - "repo": "yandex-music-linux", - "type": "github" - } - }, - "ymExe": { + "websocketpp-src": { "flake": false, "locked": { - "narHash": "sha256-Og6LXQJxVF3PLXcsdX0A3W9SKmBixrz5FkAtONblUh4=", - "type": "file", - "url": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.69.1.exe" + "lastModified": 1587320717, + "narHash": "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM=", + "owner": "zaphoyd", + "repo": "websocketpp", + "rev": "56123c87598f8b1dd471be83ca841ceae07f95ba", + "type": "github" }, "original": { - "type": "file", - "url": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.69.1.exe" + "owner": "zaphoyd", + "ref": "0.8.2", + "repo": "websocketpp", + "type": "github" } }, "zapret-discord-youtube": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2", "zapret-flowseal": "zapret-flowseal" }, "locked": { @@ -412,6 +625,23 @@ "repo": "zapret-discord-youtube", "type": "github" } + }, + "zlib-src": { + "flake": false, + "locked": { + "lastModified": 1754565515, + "narHash": "sha256-c2RYqHi3hj/ViBzJcYWoNib27GAbq/B1SJUfvG7CPG4=", + "owner": "zlib-ng", + "repo": "zlib-ng", + "rev": "425439062b114a0f6cf625022c41d929c7e879f9", + "type": "github" + }, + "original": { + "owner": "zlib-ng", + "ref": "2.2.5", + "repo": "zlib-ng", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index b11e2e6..80353e3 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,10 @@ nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; impermanence.url = "github:nix-community/impermanence"; - yandex-music.url = "github:cucumber-sp/yandex-music-linux"; + millennium = { + url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -30,7 +33,7 @@ # chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; }; - outputs = { self, nixpkgs-unstable, impermanence, home-manager, nixpkgs-stable, hm-stable, lix-module, asus-numberpad-driver, zapret-discord-youtube, ...}@inputs: { + outputs = { self, nixpkgs-unstable, impermanence, home-manager, nixpkgs-stable, hm-stable, millennium, lix-module, asus-numberpad-driver, zapret-discord-youtube, ...}@inputs: { nixosConfigurations = { Ratchet = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; diff --git a/home/yaroslav/home.nix b/home/yaroslav/home.nix index 72ee0ab..d605e33 100644 --- a/home/yaroslav/home.nix +++ b/home/yaroslav/home.nix @@ -9,6 +9,12 @@ let ref = ref; }; }; + kostek001-pkgs = { + url = "github:kostek001/pkgs"; + # Only if using nixpkgs-unstable + inputs.nixpkgs.follows = "nixpkgs"; + }; + in { @@ -80,6 +86,7 @@ in p7zip playerctl pywal16 + pywalfox-native qmk inetutils lsof diff --git a/home/yaroslav/home_gui.nix b/home/yaroslav/home_gui.nix index 415d871..c4edf99 100644 --- a/home/yaroslav/home_gui.nix +++ b/home/yaroslav/home_gui.nix @@ -25,7 +25,11 @@ # teamspeak3 thunderbird prismlauncher + kdePackages.dolphin kdePackages.kcalc + kdePackages.kio # needed since 25.11 + kdePackages.kio-fuse #to mount remote filesystems via FUSE + kdePackages.kio-extras #extra protocols support (sftp, fish and more) krita nextcloud-client nicotine-plus diff --git a/home/yaroslav/steam.nix b/home/yaroslav/steam.nix index 3cc146b..d681e6c 100644 --- a/home/yaroslav/steam.nix +++ b/home/yaroslav/steam.nix @@ -1,7 +1,8 @@ -{ config, lib, ... }: +{ config, pkgs, lib, ... }: { programs.steam = { enable = true; + package = pkgs.millennium-steam; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers diff --git a/hosts/Aphelion/Aphelion_misc.nix b/hosts/Aphelion/Aphelion_misc.nix index c940a92..1d26512 100644 --- a/hosts/Aphelion/Aphelion_misc.nix +++ b/hosts/Aphelion/Aphelion_misc.nix @@ -1,5 +1,7 @@ -{ config, lib, ... }: +{ inputs, config, lib, ... }: { + # millenium steam + nixpkgs.overlays = [ inputs.millennium.overlays.default ]; virtualisation.waydroid.enable = true; services.flatpak.enable = true; programs.throne.enable = true; diff --git a/hosts/generic/configuration_generic.nix b/hosts/generic/configuration_generic.nix index 1ab79a9..b3a6d6f 100644 --- a/hosts/generic/configuration_generic.nix +++ b/hosts/generic/configuration_generic.nix @@ -17,7 +17,6 @@ git wget nfs-utils - pantum-driver ]; nixpkgs.config.allowUnfree = true; @@ -149,32 +148,33 @@ udev vulkan-loader wayland - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXft - xorg.libXi - xorg.libXinerama - xorg.libXmu - xorg.libXrandr - xorg.libXrender - xorg.libXt - xorg.libXtst - xorg.libXxf86vm - xorg.libpciaccess - xorg.libxcb - xorg.xcbutil - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - xorg.xkeyboardconfig + webkitgtk_4_1 + libICE + libSM + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXft + libXi + libXinerama + libXmu + libXrandr + libXrender + libXt + libXtst + libXxf86vm + libpciaccess + libxcb + xcbutil + xcbutilimage + xcbutilkeysyms + xcbutilrenderutil + xcbutilwm + xkeyboardconfig xz zlib ]; diff --git a/hosts/generic/persistence.nix b/hosts/generic/persistence.nix index c9eaecf..b2065ea 100644 --- a/hosts/generic/persistence.nix +++ b/hosts/generic/persistence.nix @@ -8,6 +8,7 @@ "/var/lib/nixos" "/var/lib/systemd/coredump" "/var/lib/systemd/timers" + "/var/lib/tailsale" "/var/lib/fprint" "/var/lib/flatpak" "/var/lib/libvirt"