From 8a8f202bf9714f5a7bffeeef38b0222322117e62 Mon Sep 17 00:00:00 2001
From: iFargle <albert@sysctl.io>
Date: Thu, 21 Sep 2023 19:32:42 +0900
Subject: [PATCH] Testing

---
 nixos/default.nix                        |  1 -
 nixos/hosts/nixos-framework/default.nix  |  1 +
 nixos/hosts/nixos-framework/disks.nix    | 38 ------------------------
 nixos/hosts/nixos-linode-img/default.nix |  3 +-
 4 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/nixos/default.nix b/nixos/default.nix
index 146cdef2..1c1832d0 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -9,7 +9,6 @@
       ./common/services/fail2ban.nix
       ./common/services/telegraf.nix
       ./common/services/tailscale.nix
-      ./common/services/fwupd.nix
       ./common/services/gnupg-agent.nix
       ./common/services/opensnitch.nix
 
diff --git a/nixos/hosts/nixos-framework/default.nix b/nixos/hosts/nixos-framework/default.nix
index 691f913f..3c49cdee 100644
--- a/nixos/hosts/nixos-framework/default.nix
+++ b/nixos/hosts/nixos-framework/default.nix
@@ -1,6 +1,7 @@
 { inputs, config, lib, pkgs, modulesPath, desktop, username, ... }: {
   imports = [ 
     (modulesPath + "/installer/scan/not-detected.nix")
+    ./disks.nix
     ../../common/services/powertop.nix 
     ../../common/modules/secureboot.nix
   ];
diff --git a/nixos/hosts/nixos-framework/disks.nix b/nixos/hosts/nixos-framework/disks.nix
index 11d5859a..e69de29b 100644
--- a/nixos/hosts/nixos-framework/disks.nix
+++ b/nixos/hosts/nixos-framework/disks.nix
@@ -1,38 +0,0 @@
-{ disks ? }: {
-  disko.devices = {
-    disk = {
-      vda = {
-        type = "disk";
-        device = "/dev/vda";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "100M";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-              };
-            };
-            luks = {
-              size = "100%";
-              content = {
-                type = "luks";
-                name = "crypted";
-                extraOpenArgs = [ "--allow-discards" ];
-                passwordFile = "/tmp/secret.key";
-                content = {
-                  type = "filesystem";
-                  format = "ext4";
-                  mountpoint = "/";
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}
\ No newline at end of file
diff --git a/nixos/hosts/nixos-linode-img/default.nix b/nixos/hosts/nixos-linode-img/default.nix
index e2be83f3..665109a1 100644
--- a/nixos/hosts/nixos-linode-img/default.nix
+++ b/nixos/hosts/nixos-linode-img/default.nix
@@ -1,10 +1,9 @@
 { config, lib, pkgs, modulesPath, desktop, username, ... }: {
   nixpkgs.config.allowUnfree = false;
 
+  networking.useDHCP = lib.mkDefault true;
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   networking.hostName = "nixos-linode-img";
 
   networking.firewall.allowedTCPPorts = [ 22 ];
-  networking.useDHCP = lib.mkForce false;
-  networking.enableIPv6 = lib.mkForce false;
 }