diff --git a/configuration.nix b/configuration.nix
index 88b5237..1a4d962 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -10,12 +10,12 @@
       ./hardware-configuration.nix
     ];
 
-  nix = {
-    package = pkgs.nixFlakes;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-  };
+#  nix = {
+#    package = pkgs.nixFlakes;
+#    extraOptions = ''
+#      experimental-features = nix-command flakes
+#    '';
+#  };
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -80,7 +80,7 @@
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.mira = {
     isNormalUser = true;
-    extraGroups = [ "wheel", "docker" ]; # Enable ‘sudo’ for the user.
+    extraGroups = [ "wheel" "docker" ]; # Enable ‘sudo’ for the user.
     packages = with pkgs; [
       firefox
       tree
@@ -112,11 +112,13 @@
     btrbk
     czkawka
     docker
+    fzf
     hyfetch
     hyperfine
     jellyfin-media-player
     lazydocker
     lazygit
+    git
     lsd
     mcfly
     neovim 
@@ -138,26 +140,26 @@
 
   programs.zsh.enable = true;
 
-  programs.zoxide = {
-    enable = true;
-    enableBashIntegration = true;
-    enableFishIntegration = true;
-    enableZshIntegration = true;
-  };
+#  programs.zoxide = {
+#    enable = true;
+#    enableBashIntegration = true;
+#    enableFishIntegration = true;
+#    enableZshIntegration = true;
+#  };
 
-  programs.fzf = {
-    enable = true;
-    enableBashIntegration = true;
-    enableFishIntegration = true;
-    enableZshIntegration = true;
-  };
+#  programs.fzf = {
+#    enable = true;
+#    enableBashIntegration = true;
+#    enableFishIntegration = true;
+#    enableZshIntegration = true;
+#  };
 
-  programs.mcfly = {
-    enable = true;
-    enableBashIntegration = true;
-    enableZshIntegration = true;
-    enableFishIntegration = true;
-  };
+#  programs.mcfly = {
+#    enable = true;
+#    enableBashIntegration = true;
+#    enableZshIntegration = true;
+#    enableFishIntegration = true;
+#  };
 
   # List services that you want to enable:
 
@@ -171,7 +173,7 @@
 
   };
 
-  virtualization.docker = {
+  virtualisation.docker = {
     storageDriver = "overlay2";
     enableOnBoot = true;
     enable = true;
diff --git a/flake.nix b/flake.nix
deleted file mode 100644
index df5a6ac..0000000
--- a/flake.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# /etc/nixos/flake.nix
-{
-  description = "flake for mira::auxin";
-
-  inputs = {
-    nixpkgs = {
-      url = "github:NixOS/nixpkgs/nixos-unstable";
-    };
-  };
-
-  outputs = { self, nixpkgs }: {
-    nixosConfigurations = {
-      auxin = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          ./configuration.nix
-        ];
-      };
-    };
-  };
-}
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index ec65e12..39df066 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -16,19 +16,19 @@
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/b6931dc5-1ccb-4d81-abf6-38b6febc6176";
       fsType = "btrfs";
-      options = [ "subvol=@nixos", "noatime" ];
+      options = [ "subvol=@nixos" "noatime" ];
     };
 
   fileSystems."/nix" =
     { device = "/dev/disk/by-uuid/b6931dc5-1ccb-4d81-abf6-38b6febc6176";
       fsType = "btrfs";
-      options = [ "subvol=@nix", "noatime" ];
+      options = [ "subvol=@nix" "noatime" ];
     };
 
   fileSystems."/home" =
     { device = "/dev/disk/by-uuid/b6931dc5-1ccb-4d81-abf6-38b6febc6176";
       fsType = "btrfs";
-      options = [ "subvol=@home", "noatime", "compress=zstd" ];
+      options = [ "subvol=@home" "noatime" "compress=zstd" ];
     };
   fileSystems."/swap" =
     { device = "/dev/disk/by-uuid/b6931dc5-1ccb-4d81-abf6-38b6febc6176";
@@ -44,10 +44,10 @@
   fileSystems."/raid" =
     { device = "/dev/sdb1";
       fsType = "btrfs";
-      options = [ "noatime", "noauto", "x-systemd.automount", "nofail", "space_cache=v2", "compress=zstd"]
+      # options = [ "noatime" "noauto" "x-systemd.automount" "nofail" "space_cache=v2" "compress=zstd"];
     };
 
-  swapDevices = [ "/swap/swapfile" ];
+#  swapDevices = [ "/swap/swapfile" ];
 
   # 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