common/mtl-aas.nix

@@ -1,39 +0,0 @@
-# Example configuration:
-#  host: deemz.org
-#  refineryBaseUrl: /refinery
-
-{ config, pkgs, mtlAasHost, mtlAasBaseUrl, ... }:
-{
-  # reverse proxy
-  services.nginx = {
-    enable = true;
-
-    virtualHosts.${mtlAasHost} = {
-      locations."${mtlAasBaseUrl}/" = {
-        proxyPass = "http://127.0.0.1:15478/";
-        extraConfig = ''
-          charset UTF-8;
-          more_set_headers 'Server: NIXOS';
-        '';
-      };
-
-      serverName = mtlAasHost;
-    };
-  };
-
-  # run refinery container as a systemd service
-  systemd.services.mtl-aas = {
-    script = ''
-      ${mtl-aas}/bin/run_server
-    '';
-    serviceConfig = {
-      Type = "exec";
-      User = "mtl-aas";
-    };
-  };
-  users.users.mtl-aas = {
-    isSystemUser = true;
-    group = "mtl-aas";
-  };
-  users.groups.mtl-aas = {};
-}

deemz.org/configuration.nix

@@ -318,10 +318,6 @@ let secrets = import ../secrets.nix; in
         proxyWebsockets = true;
       };
 
-      locations."/apis/mtl-aas/" = {
-        proxyPass = "http://127.0.0.1:15478/";
-      };
-
       forceSSL = true;
       enableACME = true;
       extraConfig = ''

flake.lock

@@ -22,11 +22,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1760862643,
+        "lastModified": 1761468971,
-        "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=",
+        "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c",
+        "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1760878510,
+        "lastModified": 1761373498,
-        "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
+        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
+        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
         "type": "github"
       },
       "original": {

flake.nix

@@ -8,13 +8,9 @@
       url = "git+https://deemz.org/git/joeri/icomidal";
       inputs.nixpkgs.follows = "nixpkgs-stable";
     };
-    mtl-aas = {
-      url = "git+https://deemz.org/git/teaching/mtl-aas";
-      inputs.nixpkgs.follows = "nixpkgs-stable";
-    };
   };
 
-  outputs = { self, nixpkgs-stable, nixpkgs-unstable, icomidal, mtl-aas }:
+  outputs = { self, nixpkgs-stable, nixpkgs-unstable, icomidal }:
     let 
       system = "x86_64-linux";
     in {
@@ -31,12 +27,10 @@
             icomidal=icomidal.packages.${system}.default;
             refineryHost = "deemz.org";
             refineryBaseUrl = "/refinery";
-            mtl-aas=mtl-aas.packages.${system}.default;
           };
           modules = [
             ./deemz.org/configuration.nix
             ./common/refinery.nix
-            ./common/mtl-aas.nix
           ];
         };
         msdl = nixpkgs-stable.lib.nixosSystem {

msdl/configuration.nix

@@ -79,7 +79,6 @@
 
   services.nginx = {
     enable = true;
-    
     recommendedGzipSettings = true;
     recommendedOptimisation = true;
     recommendedProxySettings = true;

t14/configuration.nix

@@ -183,14 +183,9 @@
   virtualisation.docker.enable = true;
 
   # KDE config
-  #services.desktopManager.plasma6.enable = true;
+  services.desktopManager.plasma6.enable = true;
   #services.xserver.desktopManager.xfce.enable = true;
 
-
-  # GNOME
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true; 
-
   # firmware updates
   services.fwupd.enable = true;
 
@@ -209,7 +204,6 @@
   services.udev.extraRules = ''
     ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ATTR{power/wakeup}="disabled"
   '';
-  services.udev.packages = with pkgs; [ gnome-settings-daemon ];
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions

t14/system-packages.nix

@@ -44,7 +44,6 @@ in [
   xfce.xfce4-weather-plugin
   alacritty
   xorg.xkill
-  gpu-screen-recorder-gtk # great screen recorder
 
   # Programming
   git
@@ -119,7 +118,4 @@ in [
   qdigidoc
 
   solaar # extra options for logitech mouse
-
-  # GNOME stuff
-  gnomeExtensions.appindicator
 ]