diff --git a/configuration.nix b/configuration.nix
index 7a4d756..eeed48f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -14,9 +14,7 @@ in {
     ];
 
   # Bootloader.
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "nodev";
-  boot.loader.grub.useOSProber = true;
+  boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.supportedFilesystems = [ "ntfs" ];
   boot.kernelModules = [ "v4l2loopback" ];
@@ -83,6 +81,8 @@ in {
     packages = with pkgs; [];
   };
 
+  services.udisks2.enable = true;
+
   # hardware.pulseaudio.enable = true;
   # hardware.pulseaudio.support32Bit = true;
   # nixpkgs.config.pulseaudio = true;
@@ -92,10 +92,23 @@ in {
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  virtualisation.docker.enable = true;
-  virtualisation.docker.rootless = {
-    enable = true;
-    setSocketVariable = true;
+  # virtualisation.docker.enable = true;
+  # virtualisation.docker.rootless = {
+  #   enable = true;
+  #   setSocketVariable = true;
+  # };
+
+  virtualisation.containers.enable = true;  
+  virtualisation = {
+    podman = {
+      enable = true;
+
+      # Create a `docker` alias for podman, to use it as a drop-in replacement
+      dockerCompat = true;
+
+      # Required for containers under podman-compose to be able to talk to each other.
+      defaultNetwork.settings.dns_enabled = true;
+    };
   };
 
   # List packages installed in system profile. To search, run:
@@ -103,7 +116,6 @@ in {
   environment.systemPackages = with pkgs; [
     vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     neovim
-    docker
     curl
     gsettings-desktop-schemas
     mlocate
@@ -117,6 +129,7 @@ in {
     obsidian
     os-prober
     libsForQt5.kdeconnect-kde
+    polkit_gnome
     wireguard-tools
     git
     gnupg
@@ -149,7 +162,10 @@ in {
     bluez
     wl-clipboard
     home-manager
-    file
+    file    
+    dive # look into docker image layers
+    podman-tui # status of containers in the terminal
+    podman-compose # start group of containers for dev
     (epsonscan2.override { withNonFreePlugins = true; })
   ];
 
diff --git a/dotfiles/hypr/hyprland.conf b/dotfiles/hypr/hyprland.conf
index b179a44..16c8380 100644
--- a/dotfiles/hypr/hyprland.conf
+++ b/dotfiles/hypr/hyprland.conf
@@ -114,7 +114,7 @@ bind = $mainMod, Q, killactive,
 bind = $mainMod, M, exit, 
 bind = $mainMod, E, exec, dolphin
 bind = $mainMod, V, togglefloating, 
-bind = $mainMod, R, exec, fuzzel
+bind = $mainMod, R, exec, fuzzel --terminal kitty
 bind = $mainMod, D, exec, dmenu_path | fuzzel -d | sh
 bind = $mainMod SHIFT, P, exec, ~/scripts/password-select.sh
 bind = $mainMod SHIFT, U, exec, ~/scripts/usernames.sh
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index 2a64a87..81e4148 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -15,6 +15,7 @@ compinit
 export TERM="xterm"
 
 # Shorthands
+alias ls='ls --color=yes'
 alias l='ls -l'
 alias la='ls -a'
 alias ll='ls -la'