diff --git a/.envrc b/.envrc
index 0e0fc98..3550a30 100644
--- a/.envrc
+++ b/.envrc
@@ -1,2 +1 @@
 use flake
-PATH_add bin
diff --git a/README.md b/README.md
index 7ec1e2a..0578cbe 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,8 @@ My personal NixOS and home-manager configurations.
 ```sh
 nix develop
 
-deploy-nixos # Rebuild and switch the current NixOS system on this host
-deploy-home # Apply Home Manager configuration for the current user
-deploy-vps # Rebuild and switch NixOS on the remote VPS
+just deploy-nixos # Rebuild and switch the current NixOS system on this host
+just deploy-home # Apply Home Manager configuration for the current user
+just deploy-vps # Rebuild and switch NixOS on the remote VPS
 ```
 
diff --git a/bin/deploy-home b/bin/deploy-home
deleted file mode 100755
index 6071c52..0000000
--- a/bin/deploy-home
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# vim: ft=sh
-
-home-manager switch --flake .#$USER@$(hostname)
diff --git a/bin/deploy-nixos b/bin/deploy-nixos
deleted file mode 100755
index 48d1dbb..0000000
--- a/bin/deploy-nixos
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# vim: ft=sh
-
-sudo nixos-rebuild switch --flake .#$(hostname)
diff --git a/bin/deploy-vps b/bin/deploy-vps
deleted file mode 100755
index 0233f02..0000000
--- a/bin/deploy-vps
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# vim: ft=sh
-
-nixos-rebuild switch --flake .#vps --target-host root@vps
diff --git a/flake.nix b/flake.nix
index db87bd5..235b538 100644
--- a/flake.nix
+++ b/flake.nix
@@ -89,11 +89,8 @@
               pkgs.sops
               pkgs.git
               pkgs.git-crypt
+              pkgs.just
             ];
-
-            shellHook = ''
-              export PATH=${builtins.toPath ./bin}:$PATH
-            '';
           };
         }
       );
diff --git a/home/modules/graphical/udiskie.nix b/home/modules/graphical/udiskie.nix
new file mode 100644
index 0000000..98185fa
--- /dev/null
+++ b/home/modules/graphical/udiskie.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  services.udiskie = {
+    enable = true;
+    settings = {
+      programs_options = {
+        file_manager = "${pkgs.xfce.thunar}/bin/thunar";
+      };
+    };
+  };
+}
diff --git a/hosts/nixos/modules/services/default.nix b/hosts/nixos/modules/services/default.nix
index e09ee8a..39fab6e 100644
--- a/hosts/nixos/modules/services/default.nix
+++ b/hosts/nixos/modules/services/default.nix
@@ -8,5 +8,6 @@
     ./flatpak.nix
     ./restic.nix
     ./zerotierone.nix
+    ./udisks2.nix
   ];
 }
diff --git a/hosts/nixos/modules/services/greetd.nix b/hosts/nixos/modules/services/greetd.nix
index 4650595..52f5f2f 100644
--- a/hosts/nixos/modules/services/greetd.nix
+++ b/hosts/nixos/modules/services/greetd.nix
@@ -6,8 +6,9 @@
     settings = {
       default_session = {
         command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --remember-session";
-       user = "greeter";
+        user = "greeter";
       }; 
     };
+    useTextGreeter = true;
   };
 }
diff --git a/hosts/nixos/modules/services/udisks2.nix b/hosts/nixos/modules/services/udisks2.nix
new file mode 100644
index 0000000..c427974
--- /dev/null
+++ b/hosts/nixos/modules/services/udisks2.nix
@@ -0,0 +1,3 @@
+{
+  services.udisks2.enable = true;
+}
diff --git a/justfile b/justfile
new file mode 100644
index 0000000..10fa05a
--- /dev/null
+++ b/justfile
@@ -0,0 +1,21 @@
+#!/usr/bin/env -S just --justfile
+
+default:
+  @just --list
+
+deploy-nixos:
+  sudo nixos-rebuild switch --flake .#$(hostname)
+
+deploy-vps:
+  nixos-rebuild switch --flake .#vps --target-host root@vps
+
+deploy-home:
+  home-manager switch --flake .#$USER@$(hostname)
+
+update:
+  nix flake update --commit-lock-file
+
+gc:
+  nix-collect-garbage -d
+  nix-collect-garbage --delete-older-than 7d
+  nix-store --gc