hosts/tohru/configuration.nix

@@ -77,6 +77,9 @@
     "rpool".device = "/dev/nvme0n1p2";
   };
 
+  # This option defines the first version of NixOS you have installed on this particular machine,
+  # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
+  # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
   system.stateVersion = "23.11";
 }
 

hosts/tohru/home.nix

@@ -29,31 +29,25 @@
       userEmail = "git@katherina.rocks";
     };
 
-    programs.vscode =
+    programs.vscode = let
-      let
+      system = builtins.currentSystem;
-        system = builtins.currentSystem;
+      sources = import ../../npins;
-        sources = import ../../npins;
+      extensions = (import sources.nix-vscode-extensions).extensions.${system};
-        extensions = (import sources.nix-vscode-extensions).extensions.${system};
+    in {
-      in
+      enable = true;
-      {
+      package = pkgs.vscodium;
-        enable = true;
+      extensions = (with pkgs.vscode-extensions; [
-        package = pkgs.vscodium;
+        jnoortheen.nix-ide
-        extensions = (with pkgs.vscode-extensions; [
+      ]) ++ (with extensions.open-vsx; [
-          jnoortheen.nix-ide
+        robbowen.synthwave-vscode
-        ]) ++ (with extensions.open-vsx; [
+      ]);
-          robbowen.synthwave-vscode
+      userSettings = {
-        ]);
+        "git.autofetch" = true;
-        userSettings = {
+        "nix.enableLanguageServer" = true;
-          "git.autofetch" = true;
+        "nix.serverPath" = "nil";
-          "nix.enableLanguageServer" = true;
+        "workbench.colorTheme" = "SynthWave '84";
-          "nix.serverPath" = "nil";
-          "nix.serverSettings".nil = {
-            diagnostics.ignored = [ "unused_binding" "unused_with" ];
-            formatting.command = [ "nixpkgs-fmt" ];
-          };
-          "workbench.colorTheme" = "SynthWave '84";
-        };
       };
+    };
 
     home.stateVersion = "23.11";
   };

hosts/yevaud/configuration.nix

@@ -1,8 +1,12 @@
+# Edit this configuration file to define what should be installed on
+# your system. Help is available in the configuration.nix(5) man page, on
+# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
+
 { config, lib, pkgs, ... }:
 
 {
   imports =
-    [
+    [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
     ];
 
@@ -95,12 +99,16 @@
       proxy_cookie_path / "/; secure; HttpOnly; SameSite=strict";
     '';
 
-    virtualHosts = {
+    virtualHosts = let
-      "git.katherina.rocks" = {
+      base = {
         forceSSL = true;
         enableACME = true;
-        locations."/".proxyPass = "http://[::1]:3000/";
       };
+      proxy = port: {
+        locations."/".proxyPass = "http://[::1]:${toString(port)}/";
+      };
+    in {
+      "git.katherina.rocks" = base // proxy 3000;
     };
   };
   security.acme = {
@@ -131,7 +139,12 @@
     };
   };
 
-  system.stateVersion = "23.11";
+  # Copy the NixOS configuration file and link it from the resulting system
+  # (/run/current-system/configuration.nix). This is useful in case you
+  # accidentally delete configuration.nix.
+  # system.copySystemConfiguration = true;
+
+  system.stateVersion = "23.11"; # Did you read the comment?
 
 }