diff --git a/config/common/users/emily/default.nix b/config/common/users/emily/default.nix
index 78ed5b3..3b4d339 100644
--- a/config/common/users/emily/default.nix
+++ b/config/common/users/emily/default.nix
@@ -70,7 +70,7 @@
       interactiveShellInit = ''
         set -U fish_greeting
       '';
-      loginShellInit = ''
+      loginShellInit = lib.mkIf config.kyouma.machine-type.graphical ''
         [ (tty) = /dev/tty1 ] ;and exec Hyprland
       '';
     };
diff --git a/config/hosts/base/configuration.nix b/config/hosts/base/configuration.nix
index 238015b..585ae5c 100644
--- a/config/hosts/base/configuration.nix
+++ b/config/hosts/base/configuration.nix
@@ -10,11 +10,10 @@
     efi.canTouchEfiVariables = true;
   };
 
-  services.openssh.enable = true;
-
-  environment.systemPackages = [
-    pkgs.curl
-    pkgs.gitMinimal
+  environment.systemPackages = with pkgs; [
+    colmena
+    curl
+    gitMinimal
   ];
 
   services.xserver.xkb = {
@@ -24,13 +23,13 @@
   console.useXkbConfig = true;
   console.earlySetup = true;
 
+  networking.networkmanager.enable = true;
+
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
   nix.settings.trusted-users = [ "root" "@wheel" ];
   security.sudo.wheelNeedsPassword = false;
 
-  users.users.root.openssh.authorizedKeys.keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA/+iN407+HsfHbbC3tfdA8Yf4TZ08qXQMb4tb/SDAs+ emily@card"
-  ];
+  services.openssh.enable = true;
 
   users.users.emily = {
     isNormalUser = true;
@@ -67,9 +66,6 @@
       interactiveShellInit = ''
         set -U fish_greeting
       '';
-      loginShellInit = ''
-        [ (tty) = /dev/tty1 ] ;and exec Hyprland
-      '';
     };
   };
   system.stateVersion = "23.11";
diff --git a/config/hosts/ryuuko/configuration.nix b/config/hosts/ryuuko/configuration.nix
index 8a0db51..ef64eda 100644
--- a/config/hosts/ryuuko/configuration.nix
+++ b/config/hosts/ryuuko/configuration.nix
@@ -26,7 +26,7 @@
   };
 
   deployment = {
-    targetHost = "192.168.122.152";
+    targetHost = null;
     targetUser = "emily";
   };
 
diff --git a/config/hosts/ryuuko/hardware-configuration-qemu.nix b/config/hosts/ryuuko/hardware-configuration-qemu.nix
new file mode 100644
index 0000000..9be4f9c
--- /dev/null
+++ b/config/hosts/ryuuko/hardware-configuration-qemu.nix
@@ -0,0 +1,40 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+#  fileSystems."/" =
+#    { device = "/dev/disk/by-uuid/92cdb49a-4f15-4880-bf25-2ff1de20119c";
+#      fsType = "btrfs";
+#      options = [ "subvol=nixos" ];
+#    };
+#
+#  fileSystems."/home" =
+#    { device = "/dev/disk/by-uuid/92cdb49a-4f15-4880-bf25-2ff1de20119c";
+#      fsType = "btrfs";
+#      options = [ "subvol=home" ];
+#    };
+#
+#  fileSystems."/boot" =
+#    { device = "/dev/disk/by-uuid/DB0D-757F";
+#      fsType = "vfat";
+#    };
+
+  swapDevices = [ ];
+
+  # 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.interfaces.enp1s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}
+
diff --git a/config/hosts/ryuuko/hardware-configuration-t460.nix b/config/hosts/ryuuko/hardware-configuration-t460.nix
deleted file mode 100644
index 7a08d09..0000000
--- a/config/hosts/ryuuko/hardware-configuration-t460.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/cbf4d839-1afd-4ae8-9295-dd50ec25f713";
-      fsType = "btrfs";
-      options = [ "subvol=nixos" ];
-    };
-
-  boot.initrd.luks.devices."uwu".device = "/dev/disk/by-uuid/5d4cd902-f6ce-48f7-b0ca-0aab29230304";
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/cbf4d839-1afd-4ae8-9295-dd50ec25f713";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/270E-304D";
-      fsType = "vfat";
-    };
-
-  swapDevices = [ ];
-
-  # 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.wlp4s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wwp0s20f0u3.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;
-}
diff --git a/config/hosts/ryuuko/hardware-configuration.nix b/config/hosts/ryuuko/hardware-configuration.nix
index 9be4f9c..096b882 100644
--- a/config/hosts/ryuuko/hardware-configuration.nix
+++ b/config/hosts/ryuuko/hardware-configuration.nix
@@ -2,39 +2,24 @@
 
 {
   imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-#  fileSystems."/" =
-#    { device = "/dev/disk/by-uuid/92cdb49a-4f15-4880-bf25-2ff1de20119c";
-#      fsType = "btrfs";
-#      options = [ "subvol=nixos" ];
-#    };
-#
-#  fileSystems."/home" =
-#    { device = "/dev/disk/by-uuid/92cdb49a-4f15-4880-bf25-2ff1de20119c";
-#      fsType = "btrfs";
-#      options = [ "subvol=home" ];
-#    };
-#
-#  fileSystems."/boot" =
-#    { device = "/dev/disk/by-uuid/DB0D-757F";
-#      fsType = "vfat";
-#    };
-
   swapDevices = [ ];
 
   # 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.interfaces.enp1s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wwp0s20f0u3.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  #powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }
-
diff --git a/config/profiles/graphical/default.nix b/config/profiles/graphical/default.nix
index 12c244b..b478070 100644
--- a/config/profiles/graphical/default.nix
+++ b/config/profiles/graphical/default.nix
@@ -499,7 +499,7 @@
             format-wifi = "  {essid}";
             format-ethernet = "  Wired";
             format-disconnected = "⚠  Disconnected";
-            on-click = "nm-connection-editor";
+            on-click = "${networkmanagerapplet}/bin/nm-connection-editor";
           };
           pulseaudio = {
             scroll-step = 5;
diff --git a/modules/machine-type/default.nix b/modules/machine-type/default.nix
index 49fa20c..29c0994 100644
--- a/modules/machine-type/default.nix
+++ b/modules/machine-type/default.nix
@@ -54,6 +54,5 @@ in {
         message = "hosts of machine-type.protable must also be machine-type.physical";
       }
     ];
-    deployment.tags = mkIf cfg.router [ "router" ];
   };
 }