diff --git a/parts/modules/base/secrets.nix b/parts/modules/base/secrets.nix
index e9e6d8e..8138d07 100644
--- a/parts/modules/base/secrets.nix
+++ b/parts/modules/base/secrets.nix
@@ -2,13 +2,13 @@
   hostSecrets = ../../../secrets/hosts + ("/" + hostname);
   publicKey = builtins.readFile (hostSecrets + "/id_ed25519.pub");
 in {
+  age.identityPaths = ["/etc/ssh/ssh_host_ed25519_key"];
   age.rekey = {
     storageMode = "local";
     hostPubkey = publicKey;
     masterIdentities = [
       {
         identity = ../../../secrets/yubikey-identity.pub;
-        # pubkey = "age1yubikey1q25a8ax2t0ujv7q5wvpmlpa52h599n6682jprxuftlw4zpxy2xu9s6lhrel";
       }
     ];
     extraEncryptionPubkeys = [
diff --git a/parts/modules/base/user.nix b/parts/modules/base/user.nix
index 3c74cab..38202bd 100644
--- a/parts/modules/base/user.nix
+++ b/parts/modules/base/user.nix
@@ -19,8 +19,8 @@ in {
     users.users.${username} = {
       isNormalUser = true;
       extraGroups = ["wheel"];
-      initialPassword = "password";
-      #hashedPasswordFile = secrets.hashed-user-password.path;
+      # initialPassword = "password";
+      hashedPasswordFile = secrets.hashed-user-password.path;
     };
 
     home-manager = {
diff --git a/parts/modules/desktop/hyprland/default.nix b/parts/modules/desktop/hyprland/default.nix
index 4a8c6e0..2b32181 100644
--- a/parts/modules/desktop/hyprland/default.nix
+++ b/parts/modules/desktop/hyprland/default.nix
@@ -11,13 +11,6 @@ with lib; let
   };
 in {
   config = {
-    # assertions = [
-    #   {
-    #     message = "The terminal must be set to enable Hyprland";
-    #     assertion = config.defaults.terminal != null;
-    #   }
-    # ];
-
     programs.uwsm.enable = true;
     programs.hyprland = {
       enable = true;
@@ -137,7 +130,6 @@ in {
             "SUPER, RETURN, exec, ${getExe config.programs.uwsm.package} app -- ${cfg.default-apps.terminal}"
             "SUPER, BACKSPACE, killactive"
             "SUPER, SPACE, exec, ${getExe config.programs.uwsm.package} app -- walker"
-            # "SUPER SHIFT, SPACE, exec, uwsm app -- walker --modules applications"
             "SUPER, p, exec, ${getExe config.programs.uwsm.package} app -- loginctl lock-session"
             "SUPER, S, togglefloating"
             "SUPER, A, pseudo"
@@ -168,6 +160,10 @@ in {
             "SUPER, tab, changegroupactive, f"
             "SUPER SHIFT, tab, changegroupactive, b"
           ];
+          bindm = [
+            "SUPER, mouse:272, movewindow"
+            "SUPER, mouse:273, resizewindow"
+          ];
           layerrule = [
             "noanim, gtk4-layer-shell"
           ];
diff --git a/secrets/hosts/desktop/.rekey/0cf462314d1153383e45885fa463da8a-hosts-private.age b/secrets/hosts/desktop/.rekey/0cf462314d1153383e45885fa463da8a-hosts-private.age
new file mode 100644
index 0000000..9dd4138
--- /dev/null
+++ b/secrets/hosts/desktop/.rekey/0cf462314d1153383e45885fa463da8a-hosts-private.age
@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 UqEUow u6/RRC5NcVzXn8tdtvEvUwQGJN2jE0xk3f5HGRmp/hk
+Q4iSNDZw14gmOsLABO5LphhQ84u/fsiUZ1rVG27LRsQ
+-> MAskmMnK-grease N@S4Bj]M # o~4B
+jP9Rl2WxLEF+juAY/6/O/bV+jQmJc/GwKQ
+--- wf9BUbi+gvb1v0zFxWTBXHCh0iz+A0LHrQcvVebGS78
+v��B!(���o	w�fRW{���h���1�U�y
݂���ݹ���B�
iL���s�õͼǃ�☗-1�,���x���+��Z��W������=���haP����嫍T`"��W:J*f�"]K{
\ No newline at end of file
diff --git a/secrets/hosts/desktop/.rekey/17eacaf7b15fa57e9d3b07c3b2ac3c67-hashed-user-password.age b/secrets/hosts/desktop/.rekey/17eacaf7b15fa57e9d3b07c3b2ac3c67-hashed-user-password.age
deleted file mode 100644
index 278181a..0000000
--- a/secrets/hosts/desktop/.rekey/17eacaf7b15fa57e9d3b07c3b2ac3c67-hashed-user-password.age
+++ /dev/null
@@ -1,9 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 A8c9xw D9IFvUr0BSZy79t3fSE2npoMN0jrwYajs90kugmsJHg
-iBkPdDy08n9/jLNZMtAmo/4H2z6ecUFtX7RLLoILMT8
--> %+-grease Gzov)
-HDGg1mWlWIWQrJlxYOS6yQMl7hYTYs8BuVsMCLzvqd69Zkno6wu18glvdJa8vE7K
-GMGA/Y+rNNOKUfuA
---- 38IhzDL/m22pXh3P3EwGdkaOb41zhOEgjCjklDinKLY
-�>k!!��E|�-!5
-�����\N�IZ��^����{mb�|�$��q�rJ�	���
�,��e�3mեy�������E֓V��\!f�z�{�\RoL:5b�a$<
\ No newline at end of file
diff --git a/secrets/hosts/desktop/.rekey/17f5ff9c4b92cb7f347ac9b2928663c3-hosts-private.age b/secrets/hosts/desktop/.rekey/17f5ff9c4b92cb7f347ac9b2928663c3-hosts-private.age
deleted file mode 100644
index 1d832ed..0000000
--- a/secrets/hosts/desktop/.rekey/17f5ff9c4b92cb7f347ac9b2928663c3-hosts-private.age
+++ /dev/null
@@ -1,9 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 A8c9xw vwvIaZMn8QyG84uMuab+w4Rd5BhcWr8BiVP0q3Q8Vmw
-Q8H1A0qsDJrseCPp/0b2izZ5YFH8AkcoYdZOToVRh64
--> SqbTHL-grease G p2
-Jxq1dNLGCEOINUnUv823NkzQ1qs0VRiK9U4PX31SNFIUZOVa2bY0OrJTcbHZ0pSA
-CP2MkJOU697eKau5EqU
---- gK7PWlbmYYYm55M6rAlmwXkIQyLXECCkqXDhuvqRiTk
-�4V��b(
-�w��r!�)$�*��H��R�,o�%�P�x�,�A��~�K.��s'pYU~a�|y�?��f�!ג��H�{����UZ>|�5ׁu����[M񸲁�uac+��$=�V
\ No newline at end of file
diff --git a/secrets/hosts/desktop/.rekey/39eef7c92756704a2f02dbc28dae754c-ssh-key.age b/secrets/hosts/desktop/.rekey/39eef7c92756704a2f02dbc28dae754c-ssh-key.age
new file mode 100644
index 0000000..8904083
Binary files /dev/null and b/secrets/hosts/desktop/.rekey/39eef7c92756704a2f02dbc28dae754c-ssh-key.age differ
diff --git a/secrets/hosts/desktop/.rekey/9d8414c36a2327ce7b848f024f39d1a9-ssh-key-ao.age b/secrets/hosts/desktop/.rekey/9d8414c36a2327ce7b848f024f39d1a9-ssh-key-ao.age
new file mode 100644
index 0000000..3f07f04
Binary files /dev/null and b/secrets/hosts/desktop/.rekey/9d8414c36a2327ce7b848f024f39d1a9-ssh-key-ao.age differ
diff --git a/secrets/hosts/desktop/.rekey/c3467bfd959f8272d5c86924c52d4bc8-ssh-key-ao.age b/secrets/hosts/desktop/.rekey/c3467bfd959f8272d5c86924c52d4bc8-ssh-key-ao.age
deleted file mode 100644
index 47b691e..0000000
Binary files a/secrets/hosts/desktop/.rekey/c3467bfd959f8272d5c86924c52d4bc8-ssh-key-ao.age and /dev/null differ
diff --git a/secrets/hosts/desktop/.rekey/d2eab34dbcc75fb0c877f5ebc803e4a8-ssh-key.age b/secrets/hosts/desktop/.rekey/d2eab34dbcc75fb0c877f5ebc803e4a8-ssh-key.age
deleted file mode 100644
index 0395191..0000000
--- a/secrets/hosts/desktop/.rekey/d2eab34dbcc75fb0c877f5ebc803e4a8-ssh-key.age
+++ /dev/null
@@ -1,8 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 A8c9xw qCaqMTHiVFpmQo4DXNF1mYrolsIyAOhmaeZnBQaij2w
-s/ZmUahbNMGvXpZkR6eneNSpCDwqeWDdAljbbG38DOw
--> 3_!S5-grease @U_EDTXu =1'PeW0i XZ
-KhlRKp2Wl3vDf43wQy4V48RT2BEKPB3e+/7sv7kXHLaTdA+hb3RvV9+q6zpXIPcG
-kKYNklB0ot33u0ZMtb/BseNTb9GsaQ
---- APmzE7xvyCNYSddLXLdU9m4xCJSzZWPQsQHAmD+93Dc
-���b9yl��ʾ��X�U��ͪ/K�T}�]�|D됝���~*�����[�������5�=�/�\�*�6��6$o�ˊmA�:+&�)K���q�…,��v ;��斞@Ӛ�۽�7󑭼�.��mĘ�� Eo��Q8>�)[<�b���q��gmMQ�
��F
i�N^�*f�EA�$����%U�1��H‚�`�}%�����Ǣ��2ê<j�� K��&��w 	����cJ1����˅�u�r���_;�wg��U����+dls��k��5�
�x�u5�RsT��+�F}^��v�w���Is�y;��
a'V��[�1�m���#��F��� =@O�t2;_+.�g�U��-6�
��ѣ�
�u���Ο����s ���lk:�C��)S�9�og�@�r�뗾�����6A��QbW�/+DX��O��q�
���R�M���4
\ No newline at end of file
diff --git a/secrets/hosts/desktop/.rekey/ee5a41ab13f76c0a94f806599c7e59ee-hashed-user-password.age b/secrets/hosts/desktop/.rekey/ee5a41ab13f76c0a94f806599c7e59ee-hashed-user-password.age
new file mode 100644
index 0000000..cbbc172
--- /dev/null
+++ b/secrets/hosts/desktop/.rekey/ee5a41ab13f76c0a94f806599c7e59ee-hashed-user-password.age
@@ -0,0 +1,9 @@
+age-encryption.org/v1
+-> ssh-ed25519 UqEUow lOiqtaU59sviO86OjdXbv2mnReguEiYVI2UwHjz+3DY
+wx441QWONFPp5nsFDSPznMpksHj6T7cbyOkb/u441Y8
+-> 05t*\i";-grease
+aCx/vBx9OI/xyUnu+YKgkongRLrCkVayx7aDE7gJIxDKjOZ5167SP74QH+fUBTR8
+
+--- m4axBN9TgMRF6joQESnU32wnbWn0L4LdkZyr8N+P8zI
+�����[�Њ���V91���#A�cd/������3Û���Þ�F���?P4RT�/����bڊ
+�_~�2Sn�V]����ұ�;��+�E���+Gv/�xmX�
\ No newline at end of file
diff --git a/secrets/hosts/desktop/id_ed25519.pub b/secrets/hosts/desktop/id_ed25519.pub
index 3976143..8defab3 100644
--- a/secrets/hosts/desktop/id_ed25519.pub
+++ b/secrets/hosts/desktop/id_ed25519.pub
@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFtjpdHPRXg75YBonNshQdeuNZ3W3k/RzdYY+8QuQ3Pc nickolaj1177@gmail.com
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMdBiNbNPcMdI/hp4zgBS3ShqYuVVRvUAA1ffrdiBQ0k nickolaj@fireproof.website
\ No newline at end of file
diff --git a/secrets/hosts/laptop/.rekey/ee5a41ab13f76c0a94f806599c7e59ee-hashed-user-password.age b/secrets/hosts/laptop/.rekey/ee5a41ab13f76c0a94f806599c7e59ee-hashed-user-password.age
index 86cb0cb..9eaf31e 100644
Binary files a/secrets/hosts/laptop/.rekey/ee5a41ab13f76c0a94f806599c7e59ee-hashed-user-password.age and b/secrets/hosts/laptop/.rekey/ee5a41ab13f76c0a94f806599c7e59ee-hashed-user-password.age differ