From 8a765f001b496a331641495351615d0cfa121615 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Wed, 26 Mar 2025 00:20:18 +0100 Subject: [PATCH] Fmt & fix inet for tether & add iso pkg --- flake.nix | 12 ++++++++++- pkgs/miraclecast.nix | 1 - systems/nixos-fw16/default.nix | 37 +++++++++++++++++----------------- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/flake.nix b/flake.nix index 1c05f67..3f946ee 100644 --- a/flake.nix +++ b/flake.nix @@ -238,7 +238,17 @@ in { formatter."${system}" = pkgs.nixpkgs-fmt; - packages."${system}" = import ./pkgs { inherit pkgs lib config; }; + packages."${system}" = + import ./pkgs { inherit pkgs lib config; } + // { + rescue-iso = + let + mod = "${inputs.nixos-images}/nix/image-installer/module.nix"; + os = nixpkgs.legacyPackages.${system}.nixos [ mod ]; + iso = os.config.system.build.isoImage; + in + iso; + }; diskoConfigurations = { nixos-desk = import ./systems/nixos-desk/disko.nix; nixos-pulse = import ./systems/nixos-pulse/disko.nix; diff --git a/pkgs/miraclecast.nix b/pkgs/miraclecast.nix index f46f858..a4ab898 100644 --- a/pkgs/miraclecast.nix +++ b/pkgs/miraclecast.nix @@ -18,7 +18,6 @@ , relyUdev ? true , }: - let gstreamerPluginPaths = lib.concatMapStrings (pth: pth + "/lib/gstreamer-1.0:") [ (lib.getLib gst_all_1.gstreamer) diff --git a/systems/nixos-fw16/default.nix b/systems/nixos-fw16/default.nix index 4299c08..7204ee9 100644 --- a/systems/nixos-fw16/default.nix +++ b/systems/nixos-fw16/default.nix @@ -225,24 +225,25 @@ ''; interfaces = { eth0 = { - useDHCP = false; - ipv4.addresses = [ - { - address = "192.168.0.21"; - prefixLength = 24; - } - ]; - ipv4.routes = [ - { - address = "192.168.0.0"; - prefixLength = 24; - } - { - address = "0.0.0.0"; - prefixLength = 0; - via = "192.168.0.5"; - } - ]; + # useDHCP = false; + useDHCP = true; + # ipv4.addresses = [ + # { + # address = "192.168.0.21"; + # prefixLength = 24; + # } + # ]; + # ipv4.routes = [ + # { + # address = "192.168.0.0"; + # prefixLength = 24; + # } + # { + # address = "0.0.0.0"; + # prefixLength = 0; + # via = "192.168.0.5"; + # } + # ]; }; }; };