Compare commits

...

5 Commits

6 changed files with 46 additions and 25 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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