cleanup and restructuring

hosts/thinkpad/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, inputs, ... }:
+{ config, pkgs, lib, xdph, ... }:
 {
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
@@ -8,9 +8,6 @@
       ./modules/networks
       ./modules/greetd
       ./modules/snapper
-      ../../shared/vim.nix
-      ../../shared/sops.nix
-      ../../shared/gpg.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
@@ -75,7 +72,7 @@
   xdg.portal = {
     enable = true;
     extraPortals = [
-      inputs.xdph.packages.x86_64-linux.default
+      xdph.packages.x86_64-linux.default
     ];
   };
 

hosts/thinkpad/hardware-configuration.nix

@@ -68,14 +68,6 @@
     [{ device = "/dev/disk/by-uuid/1dd20f07-877c-4ee5-bef5-5e8c6ebe7927"; }];
   boot.resumeDevice = "/dev/disk/by-uuid/1dd20f07-877c-4ee5-bef5-5e8c6ebe7927";
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp9s0.useDHCP = lib.mkDefault true;
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

hosts/thinkpad/modules/networks/default.nix

@@ -13,9 +13,6 @@
   };
   networking = { useNetworkd = true;
     hostName = "thinkpad";
-    hostId = "79353b92"; # Define your hostname.
-    firewall.allowedTCPPortRanges = [{ from = 1714; to = 1764; }]; # open ports for kde connect
-    firewall.allowedUDPPortRanges = [{ from = 1714; to = 1764; }];
     wireless = {
       enable = true;
       userControlled.enable = true;