diff --git a/flake.nix b/flake.nix
index 17f4a95..e93ca0b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -90,7 +90,7 @@
   in {
     # Custom pages availbe through 'nix build', 'nix shell', etc
     # packages =
-    #   forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
+    #   forAllSystems (system: ./pkgs nixpkgs.legacyPackages.${system});
     packages.x86_64-linux.iso =
       self.nixosConfigurations.iso.config.system.build.isoImage;
     packages.x86_64-linux.iso-re =
@@ -103,9 +103,9 @@
     # Your custom packages and modifications, exported as overlays
     overlays = import ./overlays {inherit inputs;};
     # Nixos modules
-    nixosModules = import ./modules/nixos;
+    nixosModules.modules = [./modules/nixos];
     # Home-manager modules
-    homeManagerModules = import ./modules/home-manager;
+    homeManagerModules.modules = [./modules/home-manager];
 
     # NixOS configuration entrypoint
     # 'nixos-rebuild --flake .#nixos'
diff --git a/hosts/sachiel/configuration.nix b/hosts/sachiel/configuration.nix
index 162b616..46fd847 100644
--- a/hosts/sachiel/configuration.nix
+++ b/hosts/sachiel/configuration.nix
@@ -126,51 +126,37 @@
     };
   };
 
-  programs.fish.enable = true;
-  services.xserver = {
-    enable = true;
-    windowManager.i3.enable = true;
-    resolutions = [
-      {
-        # x = 3840;
-        # y = 2160;
-        #
-        x = 2880;
-        y = 1920;
-      }
-    ];
-    dpi = 180;
-    upscaleDefaultCursor = true;
-    monitorSection = ''
-      Modeline "2880x1920" 60.001 2880 2928 2960 3040 1920 1925 1930 1976 +HSync -Vsync
-    '';
-  };
-  services.displayManager = {
-    defaultSession = "none+i3";
-    environment = {
-      WINIT_X11_SCALE_FACTOR = "1.75";
-      GDK_SCALE = "2";
-      GDK_DPI_SCALE = "0.5";
-      QT_AUTO_SCREEN_SCALE_FACTOR = "1";
-      XCURSOR_SIZE = "64";
+  services = {
+    xserver = {
+      enable = true;
+      windowManager.i3.enable = true;
+      resolutions = [
+        {
+          # x = 3840;
+          # y = 2160;
+          #
+          x = 2880;
+          y = 1920;
+        }
+      ];
+      dpi = 180;
+      upscaleDefaultCursor = true;
+      monitorSection = ''
+        Modeline "2880x1920" 60.001 2880 2928 2960 3040 1920 1925 1930 1976 +HSync -Vsync
+      '';
+    };
+    displayManager = {
+      defaultSession = "none+i3";
+      environment = {
+        WINIT_X11_SCALE_FACTOR = "1.75";
+        GDK_SCALE = "2";
+        GDK_DPI_SCALE = "0.5";
+        QT_AUTO_SCREEN_SCALE_FACTOR = "1";
+        XCURSOR_SIZE = "64";
+      };
     };
   };
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.mutableUsers = true;
-  users.users."${inputs.nix-secrets.username}" = {
-    uid = 1000;
-    isNormalUser = true;
-    description = inputs.nix-secrets.name;
-    extraGroups = ["networkmanager" "wheel"];
-    openssh.authorizedKeys.keys = inputs.nix-secrets.ssh-keys;
-    shell = pkgs.fish;
-    hashedPassword = inputs.nix-secrets.hashedPassword;
-  };
-  # Disable root user
-  # users.users.root.hashedPassword = "!";
-  users.users.root.initialPassword = "test";
-
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
diff --git a/hosts/sachiel/hardware-configuration.nix b/hosts/sachiel/hardware-configuration.nix
index 2a61250..b3793a9 100644
--- a/hosts/sachiel/hardware-configuration.nix
+++ b/hosts/sachiel/hardware-configuration.nix
@@ -2,9 +2,7 @@
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 {
-  config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {
@@ -12,10 +10,12 @@
     (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["ahci" "virtio_pci" "xhci_pci" "sr_mod" "virtio_blk"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = [];
+  boot = {
+    initrd.availableKernelModules = ["ahci" "virtio_pci" "xhci_pci" "sr_mod" "virtio_blk"];
+    initrd.kernelModules = [];
+    kernelModules = ["kvm-amd"];
+    extraModulePackages = [];
+  };
 
   swapDevices = [];
 
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 3c2397a..18db1ca 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -5,4 +5,5 @@
   agenix = import ./system/agenix/default.nix;
   boot = import ./system/boot/default.nix;
   impermanence = import ./system/impermanence/default.nix;
+  user = import ./user/default.nix;
 }