Moved vscodium definition.

added caddyfile plugin to vscodium.
used nixfmt.

apps.mod.nix

@@ -70,19 +70,7 @@
           terminator = {
             enable = true;
           };
-          vscode = {
+
-            enable = true;
-            package = pkgs.vscodium;
-            mutableExtensionsDir = false;
-            extensions = with pkgs.vscode-extensions; [
-              rust-lang.rust-analyzer
-              tuttieee.emacs-mcx
-              tamasfe.even-better-toml
-              vadimcn.vscode-lldb
-              jnoortheen.nix-ide
-              mkhl.direnv
-            ];
-          };
         };
       }
     )

cluster/virtualisation.mod.nix

@@ -8,7 +8,8 @@
     })
   ];
   sucrose.modules = [
-   /* ({
+    /*
+      ({
         virtualisation.docker = {
           enable = true;
           storageDriver = "btrfs";
@@ -18,7 +19,8 @@
             data-root = "/home/emv/docker-data-root/";
           };
         };
-    })*/
+      })
+    */
     (
       { pkgs, ... }:
       {

dev.mod.nix

@@ -15,6 +15,27 @@
       };
     }
   ];
+  personal.home_modules = [
+    (
+      { pkgs, ... }:
+      {
+        programs.vscode = {
+          enable = true;
+          package = pkgs.vscodium;
+          mutableExtensionsDir = false;
+          extensions = with pkgs.vscode-extensions; [
+            rust-lang.rust-analyzer
+            tuttieee.emacs-mcx
+            tamasfe.even-better-toml
+            vadimcn.vscode-lldb
+            jnoortheen.nix-ide
+            mkhl.direnv
+            matthewpi.caddyfile-support
+          ];
+        };
+      }
+    )
+  ];
   personal.modules = [
     (
       { pkgs, ... }:

networking/general.mod.nix

@@ -8,7 +8,7 @@
           enable = true;
           plugins = lib.mkForce [ ]; # networkmanager has a shit ton of vpn plugins by default. which we do not care about because we use wireguard. -e
         };
-        systemd.services.NetworkManager-wait-online.enable = false; ## disable networkmanager's waitonline because it fucks up switches
+        systemd.services.NetworkManager-wait-online.enable = false; # # disable networkmanager's waitonline because it fucks up switches
         networking.usePredictableInterfaceNames = false;
         users.users.emv.extraGroups = [ "networkmanager" ];
         environment.systemPackages = with pkgs; [

networking/ssh.mod.nix

@@ -16,7 +16,10 @@
   ];
   fructose.modules = [
     {
-      services.openssh.ports = [ 22 222 ];
+      services.openssh.ports = [
+        22
+        222
+      ];
     }
   ];
   personal.home_modules = [

networking/tailscale.mod.nix

@@ -39,11 +39,14 @@
     }
   ];
 
-  /*sucrose.modules = [
+  /*
+    sucrose.modules = [
       {
         services.tailscale.extraSetFlags = [
           "--advertise-exit-node"
         ];
       }
-  ];*/ # this is not needed, currently -e
+    ];
+  */
+  # this is not needed, currently -e
 }

nix.mod.nix

@@ -179,7 +179,8 @@ in
           secretKeyFile = config.sops.secrets.binary-cache-secret.path;
         };
 
-       /* systemd.timers."auto-update-rebuild" = {
+        /*
+          systemd.timers."auto-update-rebuild" = {
             wantedBy = [ "timers.target" ];
             timerConfig = {
               OnBootSec = "5m";
@@ -211,7 +212,8 @@ in
               RestartSec = "15m";
               Type = "oneshot";
             };
-        };*/
+          };
+        */
       }
     )
     garbage-collection-module

services/forgejo/forgejo.mod.nix

@@ -25,7 +25,8 @@
             type = "tar.gz";
           };
 
-          settings = { # this directly drops stuff in the forgejo app.ini
+          settings = {
+            # this directly drops stuff in the forgejo app.ini
             server = {
               DOMAIN = "git.collective-conciousness.monster";
               PROTOCOL = "http";

services/murmur/murmur.mod.nix

@@ -1,6 +1,13 @@
 {
   glucose.modules = [
-    ({pkgs, config, lib, ...}: {
+    (
+      {
+        pkgs,
+        config,
+        lib,
+        ...
+      }:
+      {
         services.murmur = {
           enable = true;
 
@@ -16,6 +23,7 @@
           registerUrl = "https://mumble.collective-conciousness.monster";
           registerHostname = "mumble.collective-conciousness.mosnter"; # i vaguely know what the difference between these two are but it is a bit strange, i guess.
         };
-    })
+      }
+    )
   ];
 }

sops.mod.nix

@@ -48,14 +48,17 @@
         '';
       }
     )
-    ({config, ...}:{
+    (
+      { config, ... }:
+      {
         sops.secrets.murmur_login_password = { };
         sops.secrets.murmur_welcome_message = { };
         sops.templates."murmur.env.secrets.yaml".content = ''
           MURMUR_LOGIN_PASSWORD="${config.sops.placeholder."murmur_login_password"}"
           MURMUR_WELCOME_MESSAGE="${config.sops.placeholder."murmur_welcome_message"}"
         '';
-    })
+      }
+    )
   ];
   fructose.modules = [
     (
@@ -68,7 +71,8 @@
       }
     )
     (
-      {config, ...}: {
+      { config, ... }:
+      {
         sops.secrets.postgresdb_admin_password = { };
         sops.secrets.forgejo_db_pass = { };
         sops.templates."postgresdb.env.secrets.yaml".content = ''