refactor: cleanup

flake.lock

@@ -180,11 +180,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1703674883,
-        "narHash": "sha256-Jna6MOmLdfgot+AopHv28L+wpwVDfaiafLtO7E4bkj0=",
+        "lastModified": 1703787578,
+        "narHash": "sha256-YanYMRry0uvExeCZYbM7yEp3H0gct9SocfFWvsYtyfs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "458544594ba7f0333cf5718045ee7a8eaf5de433",
+        "rev": "f8a4a5c18f4fee53ac3016a52a97df2aaeede65b",
         "type": "github"
       },
       "original": {

hosts/falkenstein/modules/nginx/default.nix

@@ -38,32 +38,8 @@
         add_header Access-Control-Allow-Origin *;
         return 200 '${builtins.toJSON data}';
       '';
-      user = "rfive-web";
-      group = "rfive-web";
     in
     {
-      users.users.${user} = {
-        group = group;
-        isSystemUser = true;
-      };
-      users.groups.${group} = { };
-      services.phpfpm.pools.rfivede = {
-        user = user;
-        group = group;
-        settings = {
-          "listen.owner" = config.services.nginx.user;
-          "pm" = "dynamic";
-          "pm.max_children" = 32;
-          "pm.max_requests" = 500;
-          "pm.start_servers" = 2;
-          "pm.min_spare_servers" = 2;
-          "pm.max_spare_servers" = 5;
-          "php_admin_value[error_log]" = "stderr";
-          "php_admin_flag[log_errors]" = true;
-          "catch_workers_output" = true;
-        };
-        phpEnv."PATH" = lib.makeBinPath [ pkgs.php ];
-      };
       networking.firewall.allowedTCPPorts = [ 80 443 ];
       networking.firewall.allowedUDPPorts = [ 443 ];
       services.nginx = {
@@ -77,24 +53,7 @@
           enableACME = true;
           forceSSL = true;
           root = "/srv/web/${config.networking.domain}";
-          extraConfig = ''
-            index index.html index.php;
-          '';
           locations = {
-            "/" = {
-              tryFiles = "$uri $uri/ /index.php?$query_string";
-            };
-            "~ \.php$" = {
-              extraConfig = ''
-                try_files $uri =404;
-                fastcgi_pass unix:${config.services.phpfpm.pools.rfivede.socket};
-                fastcgi_split_path_info ^(.+\.php)(/.+)$;
-                fastcgi_index index.php;
-                include ${pkgs.nginx}/conf/fastcgi_params;
-                include ${pkgs.nginx}/conf/fastcgi.conf;
-                fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
-              '';
-            };
             "/.well-known/matrix/client".extraConfig = mkWellKnown clientConfig;
             "/.well-known/matrix/server".extraConfig = mkWellKnown serverConfig;
           };

hosts/thinkpad/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 {
 
   imports =

hosts/thinkpad/modules/backup/default.nix

@@ -32,8 +32,9 @@
         "/home/*/.wine*"
         "/home/*/.mypy_cache*"
         "/home/*/.local/share"
-        "/home/*/.local/share"
-        "/home/*/Linux/Isos"
+        # contains very big files that don't need to clutter up the backup
+        # if I ever happen to have important data in virtual machines, this can be reconsidered
+        "/var/lib/libvirt"
       ];
       encryption_passcommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets."borg/passphrase".path}";
       compression = "lz4";

hosts/thinkpad/modules/sound/default.nix

@@ -10,5 +10,6 @@
   environment.systemPackages = with pkgs; [
     helvum
     easyeffects
+    pavucontrol
   ];
 }

hosts/thinkpad/modules/virtualisation/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 {
   virtualisation = {
     libvirtd = {

users/rouven/modules/packages.nix

@@ -5,7 +5,6 @@
     # essentials
     htop-vim
     lsof
-    killall
     zip
     unzip
     man-pages
@@ -21,10 +20,6 @@
     imv
     remmina
 
-    # sound
-    pavucontrol
-    spotify
-
     # bluetooth
     blueman
 
@@ -33,11 +28,7 @@
     filezilla
     dbeaver
 
-    # totp
-    numberstation
-
     # messaging
-    discord
     tdesktop
     gajim
     gomuks
@@ -47,10 +38,9 @@
     prismlauncher
     superTuxKart
 
-    # yubikey and password stuff
+    # cryptography
     yubikey-manager
-    yubikey-manager-qt
-    # yubioath-flutter # broken (again...)
+    python311Packages.pyhanko
 
     # misc
     neofetch # obligatory
@@ -71,10 +61,6 @@
     gnumake
     go
 
-    # libs
-    libyubikey
-    libfido2
-    python311Packages.pyhanko
   ];
 
 

users/rouven/modules/spotify/default.nix

@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 {
-  home.packages = [ pkgs.spotify-tui ];
+  home.packages = with pkgs;[ spotify spotify-tui ];
   age.secrets.spotify = {
     file = ../../../../secrets/rouven/spotify.age;
   };

users/rouven/modules/wayland/breaktimer.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 {
   systemd.user = {
     services.ianny = {