1 files changed, 33 insertions, 41 deletions

diff --git a/home/home.nix b/home/home.nix
index eaf1dee..6d1a061 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -180,6 +180,8 @@
   programs.neovim = {
     enable = true;
     viAlias = true;
+    withRuby = false;
+    withPython3 = false;
     plugins = with pkgs; [
       (vimPlugins.nvim-treesitter.withPlugins 
         (plugins: [ tree-sitter-grammars.tree-sitter-nix ]))
@@ -288,62 +290,63 @@
   programs.ssh = {
     # forwardAgent = true;
     enable = true;
+    enableDefaultConfig = true;
 
     extraConfig = ''
       SetEnv TERM=xterm-256color
     '';
-    matchBlocks = let
+    settings = let
       keydir = config.home.homeDirectory + "/.ssh";
-      hetznerlogin = match: {user = "root"; identityFile = keydir + "/hetzner.pub";} // match;
-      vpslogin = hostname: hetznerlogin {inherit hostname;};
+      hetznerlogin = match: { User = "root"; IdentityFile = keydir + "/hetzner.pub";} // match;
+      vpslogin = hostname: hetznerlogin { inherit hostname; };
     in {
       "flora" = vpslogin "flora.stuebinm.eu";
       "chaski" = vpslogin "chaski.stuebinm.eu";
-      "cgit" = vpslogin "flora.stuebinm.eu" // {user = "git";};
+      "cgit" = vpslogin "flora.stuebinm.eu" // {User = "git";};
       "mate" = {
-        hostname = "192.168.69.174";
-        user = "root";
-        identityFile = keydir + "/hetzner.pub";
+        Hostname = "192.168.69.174";
+        User = "root";
+        IdentityFile = keydir + "/hetzner.pub";
       };
       "c3voc" = {
-        hostname = "git.c3voc.de";
-        user = "git";
-        identityFile = keydir + "/id_surltesh-echer";
+        Hostname = "git.c3voc.de";
+        User = "git";
+        IdentityFile = keydir + "/id_surltesh-echer";
       };
       "encoder* mixer* atem* minion*" = {
         # hostname = "%h.lan.c3voc.de";
-        user = "voc";
-        extraOptions.StrictHostKeyChecking = "no";
+        User = "voc";
+        StrictHostKeyChecking = "no";
       };
       "nobelium" = {
-        hostname = "no.colorspace.club";
-        user = "root";
-        identityFile = keydir + "/id_ed25519";
+        Hostname = "no.colorspace.club";
+        User = "root";
+        IdentityFile = keydir + "/id_ed25519";
       };
       "colorspace-git" = {
-        hostname = "no.colorspace.club";
-        user = "git";
-        identityFile = keydir + "/id_ed25519";
+        Hostname = "no.colorspace.club";
+        User = "git";
+        IdentityFile = keydir + "/id_ed25519";
       };
       "git.infra4future.de" = {
-        hostname = "git.infra4future.de";
-        user = "gitea";
-        identityFile = keydir + "/id_ed25519";
-        addressFamily = "inet";
+        Hostname = "git.infra4future.de";
+        User = "gitea";
+        IdentityFile = keydir + "/id_ed25519";
+        AddressFamily = "inet";
       };
       "namauh" = {
-        hostname = "10.11.99.1";
-        user = "root";
-        identityFile = keydir + "/id_ed25519";
+        Hostname = "10.11.99.1";
+        User = "root";
+        IdentityFile = keydir + "/id_ed25519";
       };
       "billy" = {
-        hostname = "billy.books.exposed";
-        user = "root";
-        identityFile = keydir + "/id_ed25519";
+        Hostname = "billy.books.exposed";
+        User = "root";
+        IdentityFile = keydir + "/id_ed25519";
       };
       "regiolis" = {
-        hostname = "regiolis.erpu.eu";
-        user = "terru";
+        Hostname = "regiolis.erpu.eu";
+        User = "terru";
       };
     };
   };
@@ -361,17 +364,6 @@
   };
 
 
-  services.mako = {
-    enable = true;
-    settings = {
-      background-color = "#74389eb0";
-      border-color = "#c27cb6ff";
-      default-timeout = 5000; # milliseconds
-      padding = "10";
-      output = "DP-9";
-    };
-  };
-
   services.mpd = {
     enable = true;
     musicDirectory = "${config.home.homeDirectory}/music";