ctucx.git: nixfiles

cleanup

diff --git a/configurations/programs/mpv.nix b/configurations/programs/mpv.nix
@@ -17,7 +17,7 @@
           name        = "mpv Media Player";
           genericName = "Multimedia player";
           icon        = "mpv";
-          exec        = "umpv --player-operation-mode=pseudo-gui -- %U";
+          exec        = "mpv --player-operation-mode=pseudo-gui -- %U";
           terminal    = false;
           mimeType    = [ "application/ogg" "application/x-ogg" "application/mxf" "application/sdp" "application/smil" "application/x-smil" "application/streamingmedia" "application/x-streamingmedia"
                           "application/vnd.rn-realmedia" "application/vnd.rn-realmedia-vbr" "audio/aac" "audio/x-aac" "audio/vnd.dolby.heaac.1" "audio/vnd.dolby.heaac.2" "audio/aiff;audio/x-aiff"

diff --git a/configurations/services/prometheus-node-exporter.nix b/configurations/services/prometheus-node-exporter.nix
@@ -4,6 +4,7 @@
 
   services = {
     prometheus.exporters.node.enable = true;
+
     nginx = {
       enable = true;
       virtualHosts."${config.networking.hostName}.${config.networking.domain}" = {

diff --git a/machines/lollo/configuration.nix b/machines/lollo/configuration.nix
@@ -4,7 +4,7 @@
   imports = [
     ./hardware-configuration.nix
     ../../configurations/common.nix
-    ./node-exporter.nix
+    ../../configurations/services/node-exporter.nix
 
     ./router
     ./smarthome

@@ -12,8 +12,8 @@
 
     ../../configurations/services/pipewire.nix
     ../../configurations/services/spotifyd.nix
+    ../../configurations/services/restic-server.nix
     ./syncthing.nix
-    ./restic-server.nix
   ];
 
   boot.loader = {

@@ -21,11 +21,9 @@
     efi.canTouchEfiVariables = true;
   };
 
-  time.timeZone = "Europe/Berlin";
-
   networking = {
     hostName        = "lollo";
-    domain          = "home.ctu.cx";
+    domain          = "ctu.cx";
     useDHCP         = false;
   };
 

@@ -35,7 +33,7 @@
     wireguard-tools
   ];
 
-  system.stateVersion = "21.11"; # Did you read the comment?
+  system.stateVersion = "21.11";
   home-manager.users.leah.home.stateVersion = "21.11";
 }
 

diff --git a/machines/lollo/node-exporter.nix b/machines/lollo/node-exporter.nix
@@ -1,4 +1,4 @@
-{config, lib, pkgs, ...}:
+{ config, lib, pkgs, ...}:
 
 {
 

diff --git a/machines/lollo/smarthome/default.nix b/machines/lollo/smarthome/default.nix
@@ -1,4 +1,4 @@
-{config, lib, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
 {
 

diff --git a/machines/lollo/smarthome/influxdb2.nix b/machines/lollo/smarthome/influxdb2.nix
@@ -1,4 +1,4 @@
-{config, lib, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
 {
 

diff --git a/machines/lollo/smarthome/mbusd.nix b/machines/lollo/smarthome/mbusd.nix
@@ -1,4 +1,4 @@
-{config, lib, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
 let
   mbusd = pkgs.stdenv.mkDerivation rec {

diff --git a/machines/lollo/smarthome/serial2tcp.nix b/machines/lollo/smarthome/serial2tcp.nix
@@ -1,4 +1,4 @@
-{ pkgs, ...}:
+{ pkgs, ... }:
 
 let
   serial2tcp = pkgs.nimPackages.buildNimPackage {

diff --git a/machines/lollo/smarthome/smartied.nix b/machines/lollo/smarthome/smartied.nix
@@ -1,4 +1,4 @@
-{ pkgs, ...}:
+{ config, pkgs, ... }:
 
 let
   secrets = import ../../../secrets;

diff --git a/machines/lollo/smarthome/zigbee2mqtt.nix b/machines/lollo/smarthome/zigbee2mqtt.nix
@@ -1,4 +1,4 @@
-{config, lib, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
 let
   pkgsUnstable = import <nixpkgsUnstable> {};

diff --git a/machines/lollo/syncthing.nix b/machines/lollo/syncthing.nix
@@ -1,4 +1,4 @@
-{config, lib, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
 {
 

@@ -16,9 +16,7 @@
       virtualHosts."syncthing.lollo.ctu.cx" = {
         enableACME = true;
         forceSSL   = true;
-        locations."/" = {
-          proxyPass   = "http://127.0.0.1:8384/";
-        };
+        locations."/".proxyPass = "http://127.0.0.1:8384/";
       };
     };
   };

diff --git a/machines/lollo/websites/wiki.home.ctu.cx.nix b/machines/lollo/websites/wiki.home.ctu.cx.nix
@@ -79,8 +79,6 @@ let
 
 in {
 
-  systemd.services.phpfpm-pinedocs.serviceConfig.ProtectHome = lib.mkForce false;
-
   services.phpfpm.pools.pinedocs  = {
     user  = "leah";
     group = "users";