diff --git a/flake.lock b/flake.lock index cdd41ea..cbc822f 100644 --- a/flake.lock +++ b/flake.lock @@ -63,10 +63,7 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": [ - "justray", - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { "lastModified": 1788450739, @@ -124,7 +121,9 @@ }, "justray": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": [ + "flake-parts" + ], "nixpkgs": [ "nixpkgs" ] @@ -347,6 +346,21 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1788057806, + "narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nmd": { "inputs": { "nixpkgs": [ @@ -436,6 +450,7 @@ "deploy-rs": "deploy-rs", "disko": "disko", "flake-compat": "flake-compat", + "flake-parts": "flake-parts", "grub2-themes": "grub2-themes", "home-manager": "home-manager", "justray": "justray", diff --git a/flake.nix b/flake.nix index ff77e68..ba76275 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,7 @@ url = "github:luynrs/justray"; inputs = { nixpkgs.follows = "nixpkgs"; + flake-parts.follows = "flake-parts"; }; }; @@ -45,6 +46,7 @@ inputs.systems.follows = "nix-systems"; }; flake-compat.url = "github:edolstra/flake-compat"; + flake-parts.url = "github:hercules-ci/flake-parts"; nixos-hardware = { url = "github:NixOS/nixos-hardware/master"; # без follows nixos-hardware лочит свой собственный nixpkgs (две копии в lock/store) @@ -53,7 +55,6 @@ nix-systems.url = "github:nix-systems/default"; # nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; # flake-utils.url = "github:numtide/flake-utils"; - # flake-parts.url = "github:hercules-ci/flake-parts"; # noctalia = { # url = "github:noctalia-dev/noctalia-shell"; # inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/containers/tape-rotation.nix b/modules/containers/tape-rotation.nix index 6881405..888f002 100644 --- a/modules/containers/tape-rotation.nix +++ b/modules/containers/tape-rotation.nix @@ -152,8 +152,7 @@ in tmpfiles.rules = [ (xlib.helpers.mkTmpfile "d" xlib.dirs.services-mnt-folder "0755" "root" "root") (xlib.helpers.mkTmpfile "d" xlib.dirs.services-nodes-folder "0755" "root" "root") - (xlib.helpers.mkTmpfile "d" "${xlib.dirs.services-nodes-folder}/${xlib.device.hostname}" - "0755" + (xlib.helpers.mkTmpfile "d" "${xlib.dirs.services-nodes-folder}/${xlib.device.hostname}" "0755" "root" "root" ) @@ -174,4 +173,4 @@ in sopsFile = ./secrets/tape-rotation.env; mode = "0400"; }; -} \ No newline at end of file +} diff --git a/modules/server/nextcloud.nix b/modules/server/nextcloud.nix index 996c80d..83355d3 100644 --- a/modules/server/nextcloud.nix +++ b/modules/server/nextcloud.nix @@ -125,7 +125,7 @@ notes onlyoffice polls - previewgenerator + # previewgenerator spreed tables tasks