diff --git a/flake.lock b/flake.lock index 95ec1ea..fd8dcbd 100644 --- a/flake.lock +++ b/flake.lock @@ -69,6 +69,22 @@ } }, "base16-alacritty": { + "flake": false, + "locked": { + "lastModified": 1703982197, + "narHash": "sha256-TNxKbwdiUXGi4Z4chT72l3mt3GSvOcz6NZsUH8bQU/k=", + "owner": "aarowill", + "repo": "base16-alacritty", + "rev": "c95c200b3af739708455a03b5d185d3d2d263c6e", + "type": "github" + }, + "original": { + "owner": "aarowill", + "repo": "base16-alacritty", + "type": "github" + } + }, + "base16-alacritty-yaml": { "flake": false, "locked": { "lastModified": 1674275109, @@ -81,6 +97,7 @@ "original": { "owner": "aarowill", "repo": "base16-alacritty", + "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", "type": "github" } }, @@ -265,11 +282,11 @@ ] }, "locked": { - "lastModified": 1705240333, - "narHash": "sha256-s9h2h44fCi54sSIT9ktd3eDik9JDpQE9DeYuXcA44u4=", + "lastModified": 1705332421, + "narHash": "sha256-USpGLPme1IuqG78JNqSaRabilwkCyHmVWY0M9vYyqEA=", "owner": "numtide", "repo": "devshell", - "rev": "ca1ff587c602b934afe830ea3cb26d0fbde4c395", + "rev": "83cb93d6d063ad290beee669f4badf9914cc16ec", "type": "github" }, "original": { @@ -307,11 +324,11 @@ ] }, "locked": { - "lastModified": 1705281959, - "narHash": "sha256-9NZiSMAduz4qbFu77Cg9RNFcrjgS9UOjriD+v8FeueY=", + "lastModified": 1705540973, + "narHash": "sha256-kNt/qAEy7ueV7NKbVc8YMHWiQAAgrir02MROYNI8fV0=", "owner": "nix-community", "repo": "disko", - "rev": "2a561be6b5dd049182af1973bb7e28f7a0ac9be2", + "rev": "0033adc6e3f1ed076f3ed1c637ef1dfe6bef6733", "type": "github" }, "original": { @@ -500,11 +517,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1704152458, - "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=", + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "88a2cd8166694ba0b6cb374700799cec53aef527", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", "type": "github" }, "original": { @@ -592,11 +609,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -791,11 +808,11 @@ ] }, "locked": { - "lastModified": 1705269478, - "narHash": "sha256-j7Rp8Y3ckBHOlIzqe0g2+/BVce9SU/dVtn4Eb0rMuY4=", + "lastModified": 1705535278, + "narHash": "sha256-V5+XKfNbiY0bLKLQlH+AXyhHttEL7XcZBH9iSbxxexA=", "owner": "nix-community", "repo": "home-manager", - "rev": "846200eb574faa2af808ed02e653c2b8ed51fd71", + "rev": "b84191db127c16a92cbdf7f7b9969d58bb456699", "type": "github" }, "original": { @@ -894,11 +911,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1705234148, - "narHash": "sha256-4jiDPebv7cksMlKUuDb9zOKuaTJEdY72L3nXuO9FEGc=", + "lastModified": 1705423846, + "narHash": "sha256-PULm77CvMZ9cQ4MaTXgvJom2ePB9c38p39JB4TFXEdw=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "26326a1330e15308df66f70e7133d0de9de0b657", + "rev": "1d0951ca1b3721ff4e6049c3a37df56c78c60c65", "type": "github" }, "original": { @@ -931,11 +948,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1705263072, - "narHash": "sha256-DCqqaNWn9G81U+0Myyr36JrOKitcmS34oBWxqiHjabk=", + "lastModified": 1705592620, + "narHash": "sha256-97/yDm6n9C6fma0pSM/mMQeMLfmEOZPGbpKARNoKeG4=", "owner": "astro", "repo": "microvm.nix", - "rev": "088ba565537eaef1041a87be5a44ca0daa4e1908", + "rev": "ccf44d60393a571b549448167fa03882693a5a3d", "type": "github" }, "original": { @@ -1075,11 +1092,11 @@ ] }, "locked": { - "lastModified": 1701689616, - "narHash": "sha256-ewnfgvRy73HoP5KnYmy1Rcr4m4yShvsb6TCCaKoW8pc=", + "lastModified": 1705400161, + "narHash": "sha256-0MFaNIwwpVWB1N9m7cfHAM2pSVtYESQ7tlHxnDTOhM4=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "246219bc21b943c6f6812bb7744218ba0df08600", + "rev": "521fb4cdd8a2e1a00d1adf0fea7135d1faf04234", "type": "github" }, "original": { @@ -1105,11 +1122,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705133751, - "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "lastModified": 1705496572, + "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", "type": "github" }, "original": { @@ -1226,11 +1243,11 @@ ] }, "locked": { - "lastModified": 1705304162, - "narHash": "sha256-cKw0ODK8KmBr7GfxaDlSnaU9BoprNRbWI6Kvv36isDQ=", + "lastModified": 1705585910, + "narHash": "sha256-5pvcEdTiVn5F+6gpyQbTxeLhcRlV/oN8nNiwjgLqigs=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "b2b2ac38df53cdcae172302a11ae34448f4a2598", + "rev": "5b2b874c87882a5fc7f30be353410432e685ca0d", "type": "github" }, "original": { @@ -1314,11 +1331,11 @@ "pre-commit-hooks": "pre-commit-hooks_3" }, "locked": { - "lastModified": 1705268857, - "narHash": "sha256-IMaCyPTp5Za0xVUorHRxq39VaUrEDuWA9MbV1z6eHR8=", + "lastModified": 1705581923, + "narHash": "sha256-ms+6X+Sbx7Je8vMzux4ricuUR6JNHGoMZJLqhjGLxn8=", "owner": "nix-community", "repo": "nixvim", - "rev": "9e04eb3c3c6fcb6ea31e4d3633ea5fd7378906cb", + "rev": "df7a90127b079a39bfaba3eae1885ce6ab3a062a", "type": "github" }, "original": { @@ -1524,11 +1541,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1702865809, - "narHash": "sha256-K7caQe+KqjqTBFmJawmBjmm25S6bza5CXhAqbXFLyH8=", + "lastModified": 1705112162, + "narHash": "sha256-IAM0+Uijh/fwlfoeDrOwau9MxcZW3zeDoUHc6Z3xfqM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b2aafcee4a8842cecfc877ff7dd271f333dc0fa8", + "rev": "9e0af26ffe52bf955ad5575888f093e41fba0104", "type": "github" }, "original": { @@ -1576,6 +1593,7 @@ "inputs": { "base16": "base16", "base16-alacritty": "base16-alacritty", + "base16-alacritty-yaml": "base16-alacritty-yaml", "base16-fish": "base16-fish", "base16-foot": "base16-foot", "base16-helix": "base16-helix", @@ -1587,11 +1605,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1704308480, - "narHash": "sha256-88ICCdJyYYtsolRnPhI9IF+bhUIVUyhJ7nrKcKPgf6M=", + "lastModified": 1705504375, + "narHash": "sha256-oRVxuJ6sCljsgfoWb+SsIK2MvUjsxrXQHRoVTUDVC40=", "owner": "danth", "repo": "stylix", - "rev": "9bc1900b6888efdda39c2e02c7c8666911b72608", + "rev": "2d59480b4531ce8d062d20a42560a266cb42b9d0", "type": "github" }, "original": { @@ -1796,11 +1814,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1705313011, - "narHash": "sha256-ASZCgwE1rTnhlMfooTrcLIaxaQBdFKcpX7r8rYtrpE8=", + "lastModified": 1705487953, + "narHash": "sha256-6oh1H7/74v57m3AtK8jQLvN9LtKqyeT862krjJasOJs=", "owner": "Toqozz", "repo": "wired-notify", - "rev": "2857b543b2fc0d1471ceb5409c846fbaa4ed8062", + "rev": "fe0f02af93b09e5fe689c948a557e466b99d9a58", "type": "github" }, "original": { diff --git a/modules/services/samba.nix b/modules/services/samba.nix index 43ca8e4..1728daa 100644 --- a/modules/services/samba.nix +++ b/modules/services/samba.nix @@ -149,7 +149,7 @@ hasBunker = true; } {}) (mkShare { - name = "patri-data"; + name = "patri"; user = "patrick"; group = "patrick"; hasBunker = true; @@ -220,10 +220,15 @@ options = ["bind"]; device = "/paperless/consume/${v."#user"}"; }; - "${v.path}/media" = { + "${v.path}/media/archive" = { fsType = "none "; - options = ["bind"]; - device = "/paperless/media/${v."#user"}"; + options = ["bind" "ro"]; + device = "/paperless/media/documents/archive/${v."#user"}"; + }; + "${v.path}/media/originals" = { + fsType = "none "; + options = ["bind" "ro"]; + device = "/paperless/media/documents/originals/${v."#user"}"; }; })); @@ -234,7 +239,12 @@ group = "paperless"; mode = "0770"; }; - "10-smb-paperless"."/paperless/media/${v."#user"}".d = { + "10-smb-paperless"."/paperless/media/documents/archive/${v."#user"}".d = { + user = "paperless"; + group = "paperless"; + mode = "0770"; + }; + "10-smb-paperless"."/paperless/media/documents/originals/${v."#user"}".d = { user = "paperless"; group = "paperless"; mode = "0770"; diff --git a/users/patrick/smb.nix b/users/patrick/smb.nix index d0bdfd7..2935c40 100644 --- a/users/patrick/smb.nix +++ b/users/patrick/smb.nix @@ -5,12 +5,17 @@ in [ { inherit address credentials; - remotePath = "patri-data"; + remotePath = "patri"; automatic = true; } { inherit address credentials; - remotePath = "patri-data-important"; + remotePath = "patri-important"; + automatic = true; + } + { + inherit address credentials; + remotePath = "patri-paperless"; automatic = true; } { @@ -18,11 +23,6 @@ remotePath = "family-data"; automatic = true; } - #{ - # inherit address credentials; - # remotePath = "patri-paperless"; - # automatic = true; - #} { inherit address credentials; remotePath = "media";