From e7b6ab283e845add98fd087f71e7dc098fed72a2 Mon Sep 17 00:00:00 2001 From: yaroslav Date: Tue, 12 Aug 2025 15:41:05 +0300 Subject: [PATCH] switched aphelion to lix --- flake.lock | 86 +++++++++++++++++++++++++++- flake.nix | 7 ++- hosts/Aphelion/hardware-Aphelion.nix | 4 ++ 3 files changed, 95 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index d03b3e8..f574230 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,44 @@ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, "original": { "id": "flake-utils", "type": "indirect" } }, + "flakey-profile": { + "locked": { + "lastModified": 1712898590, + "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "hm-stable": { "inputs": { "nixpkgs": [ @@ -94,6 +127,41 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1753223229, + "narHash": "sha256-tkT4aCZZE6IEmjYotOzKKa2rV3pGpH3ZREeQn7ACgdU=", + "rev": "7ac20fc47cf2f1b7469c7a2f379e5a3a51a6789a", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7ac20fc47cf2f1b7469c7a2f379e5a3a51a6789a.tar.gz?rev=7ac20fc47cf2f1b7469c7a2f379e5a3a51a6789a" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils", + "flakey-profile": "flakey-profile", + "lix": "lix", + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1753282722, + "narHash": "sha256-KYMUrTV7H/RR5/HRnjV5R3rRIuBXMemyJzTLi50NFTs=", + "rev": "46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-1.tar.gz" + } + }, "nixpkgs": { "locked": { "lastModified": 1741379970, @@ -164,6 +232,7 @@ "hm-stable": "hm-stable", "home-manager": "home-manager", "impermanence": "impermanence", + "lix-module": "lix-module", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "yandex-music": "yandex-music", @@ -185,9 +254,24 @@ "type": "github" } }, + "systems_2": { + "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", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs", "ymExe": "ymExe" }, diff --git a/flake.nix b/flake.nix index d5f05ef..535fd48 100644 --- a/flake.nix +++ b/flake.nix @@ -22,10 +22,14 @@ url = "github:asus-linux-drivers/asus-numberpad-driver"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-1.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; zapret.url = "github:n0vvvonder/zapret-flake.nix"; }; - outputs = { self, nixpkgs-unstable, impermanence, home-manager, zapret, nixpkgs-stable, hm-stable, asus-numberpad-driver, ...}@inputs: { + outputs = { self, nixpkgs-unstable, impermanence, home-manager, zapret, nixpkgs-stable, hm-stable, lix-module, asus-numberpad-driver, ...}@inputs: { nixosConfigurations = { Ratchet = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; @@ -61,6 +65,7 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ + lix-module.nixosModules.default impermanence.nixosModules.impermanence ./hosts/generic/persistence.nix ./hosts/generic/configuration_generic.nix diff --git a/hosts/Aphelion/hardware-Aphelion.nix b/hosts/Aphelion/hardware-Aphelion.nix index f4e9486..dc84991 100644 --- a/hosts/Aphelion/hardware-Aphelion.nix +++ b/hosts/Aphelion/hardware-Aphelion.nix @@ -63,6 +63,10 @@ # 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.firewall.allowedTCPPorts = [ 42420 ]; + networking.firewall.trustedInterfaces = [ "enp12s0" "wlp11s0" ]; + #networking.firewall.enable = false; + # networking.interfaces.enp12s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp11s0.useDHCP = lib.mkDefault true; hardware.bluetooth.enable = true; # enables support for Bluetooth