diff --git a/nix/configuration.nix b/nix/configuration.nix
index c5c477b..ce3f160 100644
--- a/nix/configuration.nix
+++ b/nix/configuration.nix
@@ -5,6 +5,10 @@
 { config, lib, pkgs, ... }:
 
 {
+
+  # Nix Configuration
+  nixpkgs.config.allowUnfree = true;
+
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -17,11 +21,11 @@
 
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "us";
-    useXkbConfig = true; # use xkb.options in tty.
-  };
+#  console = {
+#    font = "Lat2-Terminus16";
+#    keyMap = "us";
+#    useXkbConfig = true; # use xkb.options in tty.
+#  };
 
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
@@ -30,6 +34,10 @@
   networking.firewall.allowedTCPPorts = [ 22 ];
   # networking.firewall.allowedUDPPorts = [ ... ];
 
+  # Enable nix-command and flakes
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+
   # This option defines the first version of NixOS you have installed on this particular machine, and is used
   # to maintain compatibility with application data (e.g. databases) created on older NixOS versions. Most
   # users should NEVER change this value after the initial install, for any reason, even if you've upgraded
diff --git a/nix/flake.nix b/nix/flake.nix
index dc49d1a..1b6245c 100644
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -16,6 +16,7 @@
         ./modules/users.nix
         ./modules/hyprland.nix
         ./modules/applications.nix
+        ./modules/firefox.nix
 
         ./hosts/pluto/conf.nix
         ./hosts/pluto/hardware-configuration.nix
diff --git a/nix/hosts/pluto/hardware-configuration.nix b/nix/hosts/pluto/hardware-configuration.nix
index 6e71def..8374aed 100644
--- a/nix/hosts/pluto/hardware-configuration.nix
+++ b/nix/hosts/pluto/hardware-configuration.nix
@@ -14,14 +14,12 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/d987bb46-2de5-4e0a-a1dd-381118166968";
+    { device = "/dev/disk/by-uuid/892f6bb2-89a9-4205-9419-486f34483e7d";
       fsType = "btrfs";
     };
 
-  boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/64a5f122-22e5-4d81-b249-d29ea111f69c";
-
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/88BC-99EF";
+    { device = "/dev/disk/by-uuid/2819-D198";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };
diff --git a/nix/modules/applications.nix b/nix/modules/applications.nix
index e6e2c19..d0c29d8 100644
--- a/nix/modules/applications.nix
+++ b/nix/modules/applications.nix
@@ -8,8 +8,6 @@
     element-desktop
   ];
 
-  programs.firefox.enable = true;
-
   programs.kdeconnect.enable = true;
   systemd.user.services.kdeconnectd = {
     enable = true;
diff --git a/nix/modules/hyprland.nix b/nix/modules/hyprland.nix
index edf1454..cf9594b 100644
--- a/nix/modules/hyprland.nix
+++ b/nix/modules/hyprland.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs }:
+{ config, lib, pkgs, ... }:
 
 {
   programs.hyprland.enable = true;
diff --git a/nix/modules/users.nix b/nix/modules/users.nix
index 3e4d60f..f1a159b 100644
--- a/nix/modules/users.nix
+++ b/nix/modules/users.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs }:
+{ config, lib, pkgs, ...}:
 
 {
   users.users.nico = {