diff --git a/home/apps/laptop.nix b/home/apps/laptop.nix
index 729e1db..a5bd904 100644
--- a/home/apps/laptop.nix
+++ b/home/apps/laptop.nix
@@ -3,7 +3,7 @@
     ./kitty
     ./lf
     ./neofetch
-    ./nvim
+    ./nvim/laptop.nix
     ./qutebrowser
     ./spicetify
     ./wofi
diff --git a/home/apps/nvim/default.nix b/home/apps/nvim/laptop.nix
similarity index 100%
rename from home/apps/nvim/default.nix
rename to home/apps/nvim/laptop.nix
diff --git a/home/apps/nvim/server.nix b/home/apps/nvim/server.nix
new file mode 100644
index 0000000..d9a152e
--- /dev/null
+++ b/home/apps/nvim/server.nix
@@ -0,0 +1,33 @@
+{ inputs, ... }: {
+  imports = [
+    inputs.nixvim.homeManagerModules.nixvim
+    ./auto-pairs.nix
+    ./options.nix
+    ./telescope.nix
+    ./nvim-tree.nix
+    ./lightline.nix
+    ./git.nix
+    ./cmp.nix
+    ./none-ls.nix
+    ./wilder.nix
+    ./lsp.nix
+    ./treesitter.nix
+    ./toggleterm.nix
+    ./whichkey.nix
+    ./alpha.nix
+    ./keymaps.nix
+    ./comment.nix
+    ./oil.nix
+    ./trouble.nix
+    ./noice.nix
+  ];
+
+  programs.nixvim = {
+    enable = true;
+    colorschemes.catppuccin = {
+      enable = true;
+      settings = { transparent_background = true; };
+    };
+  };
+
+}
diff --git a/home/apps/server.nix b/home/apps/server.nix
index ad229b2..c866955 100644
--- a/home/apps/server.nix
+++ b/home/apps/server.nix
@@ -1 +1 @@
-{ imports = [ ./lf ./neofetch ./nvim ]; }
+{ imports = [ ./lf ./neofetch ./nvim/server.nix ]; }
diff --git a/home/scripts/nixy/default.nix b/home/scripts/nixy/default.nix
index ebbe610..d5f7314 100644
--- a/home/scripts/nixy/default.nix
+++ b/home/scripts/nixy/default.nix
@@ -43,6 +43,10 @@ let
     sudo /run/current-system/bin/switch-to-configuration boot
   '';
 
+  remote-rebuild = pkgs.writeShellScriptBin "remote-rebuild" ''
+    ssh heaven "cd ~/.config/nixos && git pull && heaven-rebuild"
+  '';
+
 in {
   home.packages = with pkgs; [
     nixy-rebuild
@@ -55,5 +59,6 @@ in {
     heaven-update
     heaven-gc
     heaven-cb
+    remote-rebuild
   ];
 }
diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml
index ead7a3b..4b32448 100644
--- a/secrets/secrets.yaml
+++ b/secrets/secrets.yaml
@@ -1,4 +1,4 @@
-sshconfig: ENC[AES256_GCM,data:8Py74wNMCbaXWtnp0bAf7I+u2KwDI/yuzStKvPwB9MUtrvKeCLDxtDfTkemDUm7yENTvOErJavHQQGhsNfPqO4mbhm5w3xSGn9IJ+/p0QrSmKLsE789WPC+UJhGo/FtSk3SHPue8um4N8AB7u/+RaSaqd8n9RRplKcU0xuqn8t5TgONbsExb9ad5F3gcSSv2mutcFRde2OXqI0GU+xyrlsxkTTn6I3/YR51bvsUtk97iRz1e9My/EbhTSY30J8DNB2p8MxqaGLY3O/3o8IfUBHpgrhqghdXfP5HunhCV/xWn9c6WvbMNZ8tP3/SVTv9uvzDvDzdxtw6vFHZETZ6RIDQG1DLj2TEsNnV5xqMAI3pQyMgQRLZr/rqcorhYKvVzrwLiiG66KS/caW35U2I2UXr+WEdrb/6yiJifyfPEzduG8mndAUNaUJXprUsnUeJHxru1Dv4gqbX6JzBh3PXRs1W4bhWF//3/KtuUuQxd1dK0Batk5T3NGwzwiIwHdE6EkfUGiViDU5iP/K8k8QfiLaUMDDHSByVDnEKMRolvBMDx6dFQXVYewnP3CcN4Om9QLI7IS+Sqan4bzxojZDSDELSquQrp7yDUu1m2yNc0EsDSnLO+fQrFH+ismj7w1Y0WnbEczzm++G7zYHko4LLXVKm/N60=,iv:64bp52rf/7m5elXZwWAUjhVW9La4jPYVcnrN6FpEEQM=,tag:SzhPN1Tx05l5M1XrRxzFzA==,type:str]
+sshconfig: ENC[AES256_GCM,data:JgQHX+NidVEv+PQPx+94Cdrb9wzzLzKBbTwIZq1QkcrXr+q0NOwC7NDb8DLPe7Vbk56cnWlnfjeRTtQp9wWzQ1EPFK4X/o+TEvSpQVtA/BhtQ2YaJPQGyALlrsLAfwW/KCCT0Gb+PvrEGhGuc076AIYX5S3vbxQvG3OOb/w+YwNiKEVb6neSwKbYgsy6Zfa6YXT1IgFKS5hpqEy+/Q7xwxQBXxXCMqssxVJBl+3rqtOM3iv+tCTF83xrSKtcIGXIlTM057BJIH5RPyWLimL4nXRHMwCRD8hhia9QZF3t/6LvoE8DSdDGoz19YJVsRCTzGL1qYNNkc8oXYXSGmG6TlqmGNipsFqaT1n+LL7ms/8GC3/S0Ey1R8AJFPqHe/M4b+ZGlqnaqm+Lv7aHsJv+rHfkmqQIaKZHgukS3PsKMHe8XrDC3jGdzC/pru+i8B+fCrFk9r4f5nBurURDAMeD4TlQ8L4dOj26LruIAsc3CHOXccLqtUNZ9ppZhoG6ymaLrf6UN9hFHP+31XdnfNKt4q9K5BfY2hlp49x7Aw2pmCYIeXGAHvnA/g0nT16rbAzL+L+aPnWlWTh0/AFeBg/6cAYQn35otuoltriOKT3HzWp8SD6NKYJy1JAAIasa7H9eA3s8qC0h3s3AfJSj9w4A8Bvi4mjur2Q9ExI+TeSyeAKgAV5mvaXLvERxXpaO693oYQCaOEBHeCFm+bWakBDU7Wpsvmcf3iORL2LHiv4FuHpItvLlhZ4MzObvalvDz4F76hnAw94KfljcbHOk2awIZ6PSyydWJ3coT9a1lSRVJTkURu/wOQP+/ve7UKbbK5YKzNw==,iv:/jwoaIr0Fac1fxE5++ZNLO2G7p1njJ7QC5dPnRbTIBk=,tag:t2aqWP302cCAmYlzq/TNGw==,type:str]
 sshconfigheaven: ENC[AES256_GCM,data:avOWd3yfj+5W8wd6YF6GgnkTvCHL3JHSMvDSVrJSopkRxrZjr+t1F38UCrwOjwJR5WjjK2sRhjb5y/+oWVekDMgSHgvNz7qVvwDqemc9aCSGx9AaNrwI9etdlxxSnpIjNwuv3JJ/ey1tRd0NtRCn0ZED9Q==,iv:DwKL2SXK4THkauzaM92p042O7AoBkX7O80Sg3xvqjCc=,tag:m6YvIGFaZ5iTlJvFEwQmyA==,type:str]
 gk: ENC[AES256_GCM,data:cDNhKne49s23V/ew0BqSmR6G0yGcKWHLljZreKbgGqkuhuHzTyVK//Ac0N4mAY8iT91TKXVAeEkXnyKCo+aCAasABm0+zWGf5KOHInYuay8fSXbMeZdu1Me+IjAWnKeNrR3A7Ji+oFGMuHVzOBSt29Iz5NwwRdDbrTprtjPWzNMu+pg6d8n1+bxqaUoKkFzoR7QDjOUkJQfzeEsMplm84rTSXVDri2p2OqvtD9ZcvmzBeQtc0BCYhsLBkq98o7bxdqAHBoFiri+EVusYynAQ/GuMY8vGlP9hCXzJhg9zMUSuLhk8Vs4mgkfKzfllsr+FeVA/AOU041yCt2tbjRZQT3arqWNFy07uvB+mues4c5kX88wZMxA1E0/r7aktdhTVAgVCLxAr5w643LHRbnGkqzYabqCkpxC2A9IR4nMBVDchIdGjLw2NlTE9Y0c26fZkver6H9r+d1WXdNVaekF0jTzTOOziEftVI8ocNBY3HKiXK1jUZV1rre3OBn3T/eT+zEkTaB83z4Ytmpps6U8U,iv:YXS2maDUgxVZI8BhJjJ4MuvnyDKVMGEtmnkiLw61NB8=,tag:A/8xH24bXbDsndM9LbG+Ig==,type:str]
 oxk: ENC[AES256_GCM,data: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,iv:wvGN3wh+t3vhepc8FQRcuFnHWnde9Gw97YvGsTjge0c=,tag:ILrkx/cGPbhXjVLFkAnhcQ==,type:str]
@@ -21,8 +21,8 @@ sops:
             cmVxVC8rVDlWMUdZaGw3bmdOaWZGS1EKYahBlc8XpB5UdKZQkvxbLcKQ/xkFJjWo
             FSfQWnjhe/a7BJtJEcKZkjOQU0mYqlSu+uT2RA9diCQeRUJPRF+nAw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-06-07T19:20:13Z"
-    mac: ENC[AES256_GCM,data:wUSkCTZXJt7qGbwljRs1Na/ae/KBng57dCZ+NuovpvvlMbKuNQ0igu8BWItLkhm1miQgHW5fcz3/XWazx3lsVuRIjwh9NqZ3IWdZGZ78WqecqsbVJH952bcT6Ma2dFZpr7wD/lzkZIagv3zan/PFp8tfzbH3ceIrJh0nqJ/bW1Y=,iv:PHtzoZKP1+5XAKgZC6KBHIMT74ETwsOVRf4l6dDcyDU=,tag:HZwskd5MAoeHvWHEg3/dvw==,type:str]
+    lastmodified: "2024-06-07T19:27:54Z"
+    mac: ENC[AES256_GCM,data:3vHs+YnzGDsBRRbT83uvumDtrV/jfMHBdCDirw9otSfkKPUj7kgfkSae4RFISH5+X48xbhICThVRTUPiOQFlvR+T3M7SZjM3ptfg6gmk3RwX2LQFMLo51tYtkWnjYexZqckUDKm48G8Eh7ye8dN7YqrMJ7/iYkYGPTZkmmNSgMM=,iv:xyNAGpaFhdBUKsmSCCzN/L1P3m0tJsVPoCMCI3png0g=,tag:crI+mgIgAmGwmQlC8FKWLQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1