flake.lock

@@ -179,11 +179,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1723688146,
-        "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
+        "lastModified": 1722221733,
+        "narHash": "sha256-sga9SrrPb+pQJxG1ttJfMPheZvDOxApFfwXCFO0H9xw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
+        "rev": "12bf09802d77264e441f48e25459c10c93eada2e",
         "type": "github"
       },
       "original": {
@@ -243,11 +243,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1723637854,
-        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
+        "lastModified": 1722185531,
+        "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
+        "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
         "type": "github"
       },
       "original": {

home/base.nix

@@ -5,18 +5,11 @@
     ./zsh.nix
   ];
 
-  home = {
-    packages = with pkgs; [
-      bottom
-      unstable.ncdu
-      neofetch
-    ];
-
-    sessionVariables = {
-      EDITOR = "nvim";
-      VISUAL = "nvim";
-    };
-  };
+  home.packages = with pkgs; [
+    bottom
+    unstable.ncdu
+    neofetch
+  ];
 
   programs.nix-index = {
     enable = true;

hosts/challenger/configuration.nix

@@ -46,11 +46,7 @@
        "nvidia-x11"
        "nvidia-settings"
   ];
-
-  hardware.nvidia = {
-    modesetting.enable = true;
-  };
-
+  hardware.nvidia.modesetting.enable = true;
   hardware.opengl.enable = true;
   services.xserver.videoDrivers = ["nvidia"];
 

hosts/challenger/filesystems.nix

@@ -18,10 +18,4 @@
     interval = "Wed *-*-8..14 00:00:00";
   };
 
-  fileSystems = {
-    "/mnt/feal-syn1/backup" = {
-      device = "feal-syn1.home.feal.no:/volume2/backup";
-      fsType = "nfs";
-    };
-  };
 }

hosts/challenger/hardware-configuration.nix

@@ -14,12 +14,12 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/ea31d0ea-2949-420a-99ea-7f77c4b7091e";
+    { device = "/dev/disk/by-uuid/a4ed02e2-4223-4686-95b0-b29cbd517afe";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/169B-94E2";
+    { device = "/dev/disk/by-uuid/2467-77B7";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };

hosts/challenger/services/nextcloud.nix

@@ -46,11 +46,15 @@ in {
       oidc_login_filter_allowed_values = [ "nextcloud-user" ];
       oidc_login_disable_registration = false;
 
-      "memories.exiftool" = "${cfg.home}/store-apps/memories/bin-ext/exiftool-amd64-glibc";
-      "memories.exiftool_no_local" = false;
-      "memories.vod.disable" = false;
-      "memories.vod.ffmpeg" = "${lib.getExe pkgs.ffmpeg-headless}";
-      "memories.vod.ffprobe" = "${pkgs.ffmpeg-headless}/bin/ffprobe";
+      memories = {
+        # exiftool = "${lib.getExe pkgs.exiftool}"; # TODO - not working, use perl
+        # exiftool_no_local = false;
+        vod = {
+          disable = false;
+          ffmpeg = "${lib.getExe pkgs.ffmpeg-headless}";
+          ffprobe = "${pkgs.ffmpeg-headless}/bin/ffprobe";
+        };
+      };
       preview_ffmpeg_path = "${pkgs.ffmpeg-headless}/bin/ffmpeg";
     };
 
@@ -98,10 +102,7 @@ in {
   };
 
   systemd.services.nextcloud-cron = {
-    path = with pkgs; [
-      exiftool
-      ffmpeg-headless
-    ];
+    path = [ pkgs.perl ]; # exiftool doesn't work, so make perl available instead
   };
 
   systemd.services."nextcloud-setup" = {
@@ -111,12 +112,7 @@ in {
 
   systemd.services."phpfpm-nextcloud" = {
     requires = [ "tank-nextcloud.mount" ];
-    path = with pkgs; [
-      # perl
-      # perlPackages.ImageExifTool
-      exiftool
-      ffmpeg-headless
-    ];
+    path = [ pkgs.perl ];
     serviceConfig = {
       PrivateDevices = lib.mkForce false;
       WorkingDirectory = "/tank/nextcloud";