From 76f5f4159ea316a5ea10daa0f956a2d92a9d57f7 Mon Sep 17 00:00:00 2001 From: joy Date: Sun, 8 Dec 2024 09:25:45 +0100 Subject: [PATCH] update --- flake.lock | 18 +++++++++--------- flake.nix | 3 --- hosts/desktop/default.nix | 1 + hosts/iso/default.nix | 9 --------- hosts/laptop/default.nix | 1 + hosts/server/default.nix | 1 + modules/system/networking/default.nix | 15 ++++++++++++--- 7 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 hosts/iso/default.nix diff --git a/flake.lock b/flake.lock index dc51ff9..ca180b7 100644 --- a/flake.lock +++ b/flake.lock @@ -97,11 +97,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1733488732, - "narHash": "sha256-Evin/MkMF+U1zSFCpCcHsxJQg78ilouObSr7YGAH8v0=", + "lastModified": 1733630610, + "narHash": "sha256-ygrT4DEeQ4fFpDXIT53ZTsr6cA3pvQTAwQp1GMMq3dI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "656d7f28b05f70d132851c8655771f1a29e25a76", + "rev": "8a0b6c1bb922a406f3ce4debe5823d7b4850b6dc", "type": "gitlab" }, "original": { @@ -360,11 +360,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1733220138, - "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", + "lastModified": 1733384649, + "narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", + "rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13", "type": "github" }, "original": { @@ -500,11 +500,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1733427445, - "narHash": "sha256-E854RAbAX+DZHDo4HIk2nkqpIvvoAm+P7oDx7TmhWk8=", + "lastModified": 1733510476, + "narHash": "sha256-RH/8yIuo+fNLCjQ6e1mnXwmmxymjvfWC9JcbDuIA8TM=", "owner": "danth", "repo": "stylix", - "rev": "eb918dbffa24c4dae497f3ce3173660f948d5237", + "rev": "e309d64fe7f203274a7913e1d2b74307d15ba122", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2004d9c..d63fe61 100644 --- a/flake.nix +++ b/flake.nix @@ -51,9 +51,6 @@ server = nixosconf { modules = [./hosts/server]; }; - iso = nixosconf { - modules = [./hosts/iso]; - }; }; }; diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index cdffc63..b56dd0f 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -23,6 +23,7 @@ gdm.enable = true; theme.enable = true; hyprland.enable = true; + networking.enable = true; imports = [ ./hardware.nix diff --git a/hosts/iso/default.nix b/hosts/iso/default.nix deleted file mode 100644 index a59b8e5..0000000 --- a/hosts/iso/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{modulesPath, ...}: { - imports = [ - "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" - ../../modules/system - ../../modules/programs - ]; - - nixpkgs.hostPlatform = "x86_64-linux"; -} diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index bd8a32d..11fe467 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -21,6 +21,7 @@ gdm.enable = true; theme.enable = true; hyprland.enable = true; + networking.enable = true; imports = [ ./hardware.nix diff --git a/hosts/server/default.nix b/hosts/server/default.nix index 9592ab5..e9d7ae5 100644 --- a/hosts/server/default.nix +++ b/hosts/server/default.nix @@ -6,6 +6,7 @@ forgejo.enable = true; immich.enable = true; docker.enable = true; + networking.enable = true; services.logind.lidSwitch = "ignore"; boot.loader.grub.enable = true; diff --git a/modules/system/networking/default.nix b/modules/system/networking/default.nix index 6583569..e20add5 100644 --- a/modules/system/networking/default.nix +++ b/modules/system/networking/default.nix @@ -1,5 +1,14 @@ { - networking.networkmanager.enable = true; - networking.firewall.enable = false; - networking.nameservers = ["9.9.9.9" "149.112.112.112" "2620:fe::fe" "2620:fe::9"]; + lib, + config, + ... +}: { + options = { + networking.enable = lib.mkEnableOption ""; + }; + config = lib.mkIf config.networking.enable { + networking.networkmanager.enable = true; + networking.firewall.enable = false; + networking.nameservers = ["9.9.9.9" "149.112.112.112" "2620:fe::fe" "2620:fe::9"]; + }; }