nixos: update to 23.05

- remove ihatemoney (deprecated)
- personal website: update uncss

6 files changed, 11 insertions, 41 deletions

diff --git a/config/services/web/default.nix b/config/services/web/default.nix
index 1711f34..e4feec4 100644
--- a/config/services/web/default.nix
+++ b/config/services/web/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-  imports = [ ./money ./quentin ./rss ./searx ./webkeydirectory ];
+  imports = [ ./quentin ./rss ./searx ./webkeydirectory ];
 
   security.acme = {
     acceptTerms = true;
diff --git a/config/services/web/money/default.nix b/config/services/web/money/default.nix
deleted file mode 100644
index 3a9f58b..0000000
--- a/config/services/web/money/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, config, ... }:
-
-let cfg = config.services.ihatemoney;
-in {
-  services.nginx.virtualHosts.money = lib.mkIf cfg.enable {
-    serverName = "money.${config.networking.domain}";
-    forceSSL = true;
-    enableACME = true;
-    locations."/".proxyPass = "http://127.0.0.1${cfg.uwsgiConfig.http}/";
-  };
-
-  services.ihatemoney = {
-    enable = true;
-    enableAdminDashboard = true;
-    adminHashedPassword =
-      "pbkdf2:sha256:150000$s78RCYkJ$9c15a62ed1c89625cb78b5bde87d03b6dd1a03831afa4dbb2abb15ea4c1e150b";
-    uwsgiConfig = { http = ":8000"; };
-  };
-
-  services.opensmtpd = lib.mkIf cfg.enable {
-    enable = true;
-    serverConfiguration = ''
-      listen on lo
-      action block mda "cat >/dev/null"
-      match from any for any action block
-    '';
-  };
-}
diff --git a/flake.lock b/flake.lock
index e103d27..31a9a3a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -66,11 +66,11 @@
         "nur": "nur"
       },
       "locked": {
-        "lastModified": 1685793683,
-        "narHash": "sha256-cm14871fdWn1G6oneOk9hkoaJUyep40bOXkxGKsKp0A=",
+        "lastModified": 1691232865,
+        "narHash": "sha256-N8HE9n8YzmR4NAQtVUCyzIC/Co3sMJaDBNb8bNUU9Kk=",
         "owner": "qaristote",
         "repo": "my-nixpkgs",
-        "rev": "b5c31329bfbf8833bf58610a5df419ef375f7be5",
+        "rev": "787f732bb680113def9ed8f760cead582ca16606",
         "type": "github"
       },
       "original": {
@@ -95,11 +95,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1685780302,
-        "narHash": "sha256-NckUaSu5MxNGC9bctaiZEwjSxbJm9jVj3qHq/zwamvA=",
+        "lastModified": 1691214979,
+        "narHash": "sha256-Eelao5vT59w3opKHwXFtse42mJNAC56ZvjG3SCP/VTQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "15fded2696f08d5550b00de4661b352d41e2374a",
+        "rev": "7b349f174726189594f19027c76f503fbd7e44d6",
         "type": "github"
       },
       "original": {
@@ -111,11 +111,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1685701911,
-        "narHash": "sha256-qoBUwecp2SgY8Haa0b13t3pu5hHcdSHFAtQl18tB5bw=",
+        "lastModified": 1691200960,
+        "narHash": "sha256-ViCeJYmhFuJInp13giSXNdD1NvGHgx/op2iijQYzGWU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6d5bc0380bec4392109e0f60928b424ce9b179c7",
+        "rev": "a7c57ba85e9cbbe79c42c2f3e2a38411db52eff9",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index f01142a..1a64ab8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
       inputs.nixpkgs.follows = "/nixpkgs";
     };
     my-nixpkgs.url = "github:qaristote/my-nixpkgs";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11-small";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05-small";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
   };
 
diff --git a/tests/configuration.nix b/tests/configuration.nix
index a1ccf52..4eec59e 100644
--- a/tests/configuration.nix
+++ b/tests/configuration.nix
@@ -34,7 +34,6 @@ in {
   services.nginx.virtualHosts = {
     quentin = nginxMakeLocal 8080;
     searx = nginxMakeLocal 8081;
-    money = nginxMakeLocal 8082;
     rss = nginxMakeLocal 8083;
     webkeydirectory = nginxMakeLocal 8084;
   };
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 4fbfb43..f676a96 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -24,7 +24,6 @@ echo Checking that all the services are running :
 declare -A PORTS
 PORTS[quentin]=8080
 PORTS[searx]=8081
-PORTS[money]=8082
 PORTS[rss]=8083
 PORTS[openpgpkey]=8084
 for SERVICE in "${!PORTS[@]}"