From 285c5ad7cc1fcf613c70a98e38777426cbe43bce Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Fri, 31 Mar 2023 12:06:29 -0400 Subject: [PATCH] refactor(wireless): privatize networks --- flake.lock | 8 ++++---- hosts/Infini-DESKTOP/default.nix | 6 ++---- hosts/Infini-FRAMEWORK/default.nix | 5 +++-- hosts/Infini-STICK/default.nix | 6 ++---- hosts/Infini-SWIFT/default.nix | 11 +++++------ 5 files changed, 16 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 98eb25c..9a03094 100644 --- a/flake.lock +++ b/flake.lock @@ -703,11 +703,11 @@ }, "private": { "locked": { - "lastModified": 1680192378, - "narHash": "sha256-/zpk/EIDQkwoEPsYksKywno8+XAsKfYs0hxPekGafuk=", + "lastModified": 1680278490, + "narHash": "sha256-CiP5oShOX+BXh8r+7mEMJg2OzszZ3XOwdqlu3zhU6Uk=", "ref": "refs/heads/master", - "rev": "f451f10bd4711ebc4c538c18a92e722a00ef1697", - "revCount": 1, + "rev": "5dc38740b5b82d2b55e5dac54b666faf5e4fcfd8", + "revCount": 2, "type": "git", "url": "ssh://git@github.com/Infinidoge/universe-private" }, diff --git a/hosts/Infini-DESKTOP/default.nix b/hosts/Infini-DESKTOP/default.nix index e3fc93c..15e3643 100644 --- a/hosts/Infini-DESKTOP/default.nix +++ b/hosts/Infini-DESKTOP/default.nix @@ -1,13 +1,11 @@ -{ suites, profiles, pkgs, lib, ... }: { +{ suites, profiles, pkgs, lib, private, ... }: { imports = lib.lists.flatten [ (with suites; [ base develop ]) - (with profiles; [ - networking.wireless - ]) + private.nixosModules.wireless ./hardware-configuration.nix ]; diff --git a/hosts/Infini-FRAMEWORK/default.nix b/hosts/Infini-FRAMEWORK/default.nix index 23017a6..b66867e 100644 --- a/hosts/Infini-FRAMEWORK/default.nix +++ b/hosts/Infini-FRAMEWORK/default.nix @@ -1,9 +1,10 @@ -{ suites, profiles, pkgs, lib, ... }: { +{ suites, profiles, pkgs, lib, private, ... }: { imports = lib.lists.flatten [ (with suites; [ base ]) + private.nixosModules.wireless + (with profiles; [ - networking.wireless # services.proxy ]) diff --git a/hosts/Infini-STICK/default.nix b/hosts/Infini-STICK/default.nix index e3ea8af..e870c84 100644 --- a/hosts/Infini-STICK/default.nix +++ b/hosts/Infini-STICK/default.nix @@ -1,10 +1,8 @@ -{ lib, suites, profiles, ... }: { +{ lib, suites, profiles, private, ... }: { imports = lib.lists.flatten [ (with suites; [ base develop ]) - (with profiles; [ - networking.wireless - ]) + private.nixosModules.wireless ./hardware-configuration.nix ]; diff --git a/hosts/Infini-SWIFT/default.nix b/hosts/Infini-SWIFT/default.nix index e6fd0c0..1a3e97b 100644 --- a/hosts/Infini-SWIFT/default.nix +++ b/hosts/Infini-SWIFT/default.nix @@ -1,11 +1,10 @@ -{ suites, profiles, pkgs, lib, ... }: { +{ suites, profiles, pkgs, lib, private, ... }: { imports = lib.our.flattenListSet { suites = with suites; [ base develop ]; - imports = [ ./hardware-configuration.nix ]; - profiles = with profiles; - [ - networking.wireless - ]; + imports = [ + ./hardware-configuration.nix + private.nixosModules.wireless + ]; }; system.stateVersion = "21.11";