diff --git a/.envrc b/.envrc
index 3550a30..0e0fc98 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1,2 @@
 use flake
+PATH_add bin
diff --git a/README.md b/README.md
index 0578cbe..7ec1e2a 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,8 @@ My personal NixOS and home-manager configurations.
 ```sh
 nix develop
 
-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
+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
 ```
 
diff --git a/bin/deploy-home b/bin/deploy-home
new file mode 100755
index 0000000..6071c52
--- /dev/null
+++ b/bin/deploy-home
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# vim: ft=sh
+
+home-manager switch --flake .#$USER@$(hostname)
diff --git a/bin/deploy-nixos b/bin/deploy-nixos
new file mode 100755
index 0000000..48d1dbb
--- /dev/null
+++ b/bin/deploy-nixos
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# vim: ft=sh
+
+sudo nixos-rebuild switch --flake .#$(hostname)
diff --git a/bin/deploy-vps b/bin/deploy-vps
new file mode 100755
index 0000000..0233f02
--- /dev/null
+++ b/bin/deploy-vps
@@ -0,0 +1,4 @@
+#!/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 235b538..db87bd5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -89,8 +89,11 @@
               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
deleted file mode 100644
index 98185fa..0000000
--- a/home/modules/graphical/udiskie.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ 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 39fab6e..e09ee8a 100644
--- a/hosts/nixos/modules/services/default.nix
+++ b/hosts/nixos/modules/services/default.nix
@@ -8,6 +8,5 @@
     ./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 52f5f2f..4650595 100644
--- a/hosts/nixos/modules/services/greetd.nix
+++ b/hosts/nixos/modules/services/greetd.nix
@@ -6,9 +6,8 @@
     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
deleted file mode 100644
index c427974..0000000
--- a/hosts/nixos/modules/services/udisks2.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  services.udisks2.enable = true;
-}
diff --git a/justfile b/justfile
deleted file mode 100644
index 10fa05a..0000000
--- a/justfile
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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