update inputs

3 files changed, 14 insertions, 60 deletions

diff --git a/flake.lock b/flake.lock
index df70223..209ebb5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -206,11 +206,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1707514827,
-        "narHash": "sha256-Y+wqFkvikpE1epCx57PsGw+M1hX5aY5q/xgk+ebDwxI=",
+        "lastModified": 1708440434,
+        "narHash": "sha256-XY+B9mbhL/i+Q6fP6gBQ6P76rv9rWtpjQiUJ+DGtaUg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "20f65b86b6485decb43c5498780c223571dd56ef",
+        "rev": "526d051b128b82ae045a70e5ff1adf8e6dafa560",
         "type": "github"
       },
       "original": {
@@ -222,11 +222,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1707588924,
-        "narHash": "sha256-0e1ce6X5ghapv6cAF9rxLZKeNyFHHXsLbGxN2cQQE8U=",
+        "lastModified": 1708501555,
+        "narHash": "sha256-zJaF0RkdIPbh8LTmnpW/E7tZYpqIE+MePzlWwUNob4c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "10b813040df67c4039086db0f6eaf65c536886c6",
+        "rev": "b50a77c03d640716296021ad58950b1bb0345799",
         "type": "github"
       },
       "original": {
@@ -283,11 +283,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1707617562,
-        "narHash": "sha256-Kk2vv5e4MqKPjelKoYsa6YaUyv3pvjWY9nJSnP2QU9w=",
+        "lastModified": 1708481452,
+        "narHash": "sha256-s07K6pwJtnB7Z/3wbkf4iaYXj+H5CuDD94I8hohm3Ig=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "a22bbbee9b479c6d95b4819135e856a6d447b3ba",
+        "rev": "3d6647bf9d1f8e537b0d026c51ea25c0cdd92055",
         "type": "github"
       },
       "original": {
@@ -353,11 +353,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1707620614,
-        "narHash": "sha256-gfAoB9dGzBu62NoAoM945aok7+6M+LFu+nvnGwAsTp4=",
+        "lastModified": 1708500294,
+        "narHash": "sha256-mvJIecY3tDKZh7297mqOtOuAvP7U1rqjfLNfmfkjFpU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "2eb7c4ba3aa75e2660fd217eb1ab64d5b793608e",
+        "rev": "f6b80ab6cd25e57f297fe466ad689d8a77057c11",
         "type": "github"
       },
       "original": {
diff --git a/ilex/configuration.nix b/ilex/configuration.nix
index 70ca74d..2fa26cd 100644
--- a/ilex/configuration.nix
+++ b/ilex/configuration.nix
@@ -1,17 +1,10 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
 { config, pkgs, ... }:
 
 {
   imports = [
     ./hardware-configuration.nix
-    # ../modules/glitchtip.nix
-    ../modules/crs-tools.nix
   ];
 
-
   networking.firewall.allowedTCPPorts = [ 5000 ];
 
   boot.kernelPackages =
@@ -62,48 +55,13 @@
       host    all   all        127.0.0.1/32          trust
       host    all   all        ::1/127               trust
     '';
-    # package = pkgs.postgresql_11;
-  };
-
-  services.redis.servers."bookwyrm" = {
-    enable = true;
-    port = 6379;
   };
 
-  # services.glitchtip = {
-  #   enable = true;
-  #   databaseUrl = "postgres://glitchtrip@localhost:5432/glitchtrip";
-  # };
-  # services.redis.servers.glitchtip = {
+  # services.redis.servers."bookwyrm" = {
   #   enable = true;
   #   port = 6379;
   # };
 
-  # services.crs-tracker = {
-  #   enable = true;
-  #   nginxVirtualHostConfig = {
-  #     listen = [{
-  #       addr = "127.0.0.1";
-  #       port = 8080;
-  #       ssl = false;
-  #     }];
-  #   };
-  # };
-
-
-  # for testing nomsring
-  # services.fcgiwrap.enable = true;
-  # services.nginx = {
-  #   enable = true;
-  #   virtualHosts.default = {
-  #     locations."~ (.*)".extraConfig = ''
-  #       fastcgi_pass  unix:${config.services.fcgiwrap.socketAddress};
-  #       include       ${pkgs.nginx}/conf/fastcgi_params;
-  #       fastcgi_param SCRIPT_FILENAME     /tmp/dingsda;
-  #       fastcgi_param PATH_INFO           $1;
-  #     '';
-  #   };
-  # };
   services.tlp = {
     enable = true;
     settings = {
@@ -123,8 +81,4 @@
       USB_EXCLUDE_AUDIO = 1;
     };
   };
-
-
-
 }
-
diff --git a/pkgs/galmon.nix b/pkgs/galmon.nix
index a5a7566..9331e37 100644
--- a/pkgs/galmon.nix
+++ b/pkgs/galmon.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     owner = "berthubert";
     repo = "galmon";
     rev = "refs/heads/master";
-    hash = "sha256-QDluII9Ry3smMup5yOkAQZi35Phdf8m3fsQLDT8JFGc=";
+    hash = "sha256-NSuZYs6oFOB4dP2ypdVq6OZRgXSBHXFskH4I7uMTu+8=";
     fetchSubmodules = true;
   };