From a69cd1aa555460c47ff592b875e854100d74a183 Mon Sep 17 00:00:00 2001 From: oqyude Date: Sun, 18 May 2025 12:36:11 +0300 Subject: [PATCH] 123 --- flake.lock | 48 +++++++++++++++++------------------ home/main.nix | 26 +++++++++---------- home/server.nix | 2 +- modules/extra/self/zapret.nix | 2 +- 4 files changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 1ea749f..06f82a1 100755 --- a/flake.lock +++ b/flake.lock @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1747439237, - "narHash": "sha256-5rCGrnkglKKj4cav1U3HC+SIUNJh08pqOK4spQv9RjA=", + "lastModified": 1747559278, + "narHash": "sha256-10VfcILI2zYY1/ZlOx/cakDmpJgSEJYEG3gMrjzFREY=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae755329092c87369b9e9a1510a8cf1ce2b1c708", + "rev": "ee85cfc5c132e2cf956a7b5ab156ddaedaefcbbc", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747273974, - "narHash": "sha256-2OzfizT3iwD+2dO1Fl4T6+52XBbviq4DuTMTGRK3P9k=", + "lastModified": 1747533402, + "narHash": "sha256-qJp0bOnD21uewBaxQM+rVeI0NZQRKcl7wqikp9O8NRk=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "bafc474d9d2ac0f97411b48679b00811fff39cfa", + "rev": "d5de3ceae21a58c50daf06b7284ffcba885f5e2b", "type": "github" }, "original": { @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1747470409, - "narHash": "sha256-R9TP2//BDKyjNzuZybplIZm7HQEnwL8khs7EmmTPYP4=", + "lastModified": 1747540584, + "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "c1f63a0c3bf1b2fe05124ccb099333163e2184a7", + "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce", "type": "github" }, "original": { @@ -250,11 +250,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746576598, - "narHash": "sha256-FshoQvr6Aor5SnORVvh/ZdJ1Sa2U4ZrIMwKBX5k2wu0=", + "lastModified": 1747426788, + "narHash": "sha256-N4cp0asTsJCnRMFZ/k19V9akkxb7J/opG+K+jU57JGc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3582c75c7f21ce0b429898980eddbbf05c68e55", + "rev": "12a55407652e04dcf2309436eb06fef0d3713ef3", "type": "github" }, "original": { @@ -328,11 +328,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1747426788, - "narHash": "sha256-N4cp0asTsJCnRMFZ/k19V9akkxb7J/opG+K+jU57JGc=", + "lastModified": 1747467164, + "narHash": "sha256-JBXbjJ0t6T6BbVc9iPVquQI9XSXCGQJD8c8SgnUquus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12a55407652e04dcf2309436eb06fef0d3713ef3", + "rev": "3fcbdcfc707e0aa42c541b7743e05820472bdaec", "type": "github" }, "original": { @@ -344,11 +344,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747426788, - "narHash": "sha256-N4cp0asTsJCnRMFZ/k19V9akkxb7J/opG+K+jU57JGc=", + "lastModified": 1747467164, + "narHash": "sha256-JBXbjJ0t6T6BbVc9iPVquQI9XSXCGQJD8c8SgnUquus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12a55407652e04dcf2309436eb06fef0d3713ef3", + "rev": "3fcbdcfc707e0aa42c541b7743e05820472bdaec", "type": "github" }, "original": { @@ -367,11 +367,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1747518354, - "narHash": "sha256-prYhj4zQmA6OBRkoBzeUM0OiEkqJ8NIC9GRbGzdlYqQ=", + "lastModified": 1747560503, + "narHash": "sha256-y1YURQrX6Nty9CsbADMDNq5yPqef7AzXOteCabgh+sE=", "owner": "nix-community", "repo": "NUR", - "rev": "76940e043e7cb733e1608f9bb2b29de708491ecb", + "rev": "ccaa2b66741a9c4ab2d5f8677a07d578f602d2ad", "type": "github" }, "original": { @@ -506,11 +506,11 @@ }, "zapret": { "locked": { - "lastModified": 1747470474, - "narHash": "sha256-S+vGlg+3ACev+pn+QaeN719NSDRXXnAdwKPMhgg23Nc=", + "lastModified": 1747560901, + "narHash": "sha256-NI2HlkeNjB02k46V+KkCLGAzeR+WlKsPwm0B3EGWR8M=", "owner": "oqyude", "repo": "zapret-easyflake", - "rev": "a60b28a36f59a4d9a43fff3ba06d98689a1e709f", + "rev": "4366a3a42abe4f72fda8e5164db9fab1e8b900ea", "type": "github" }, "original": { diff --git a/home/main.nix b/home/main.nix index 9f7d163..c3b6f00 100755 --- a/home/main.nix +++ b/home/main.nix @@ -56,29 +56,29 @@ let username = "${inputs.zeroq.devices.admin}"; file = { "ssh" = { - source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.user-storage}/SSH/${config.home.username}"; + source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.user-storage}/ssh/${config.home.username}"; target = ".ssh"; }; "External" = { source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.therima-drive}"; target = "External"; }; - "Music" = { - source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.vetymae-drive}/Users/User/Music"; - target = "Music"; - }; +# "Music" = { +# source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.vetymae-drive}/Users/User/Music"; +# target = "Music"; +# }; "Pictures" = { source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.vetymae-drive}/Users/User/Pictures"; target = "Pictures"; }; - "Deploy" = { - source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.vetymae-drive}/Users/User/Deploy"; - target = "Deploy"; - }; - "Misc" = { - source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.vetymae-drive}/Users/User/Misc"; - target = "Misc"; - }; +# "Deploy" = { +# source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.vetymae-drive}/Users/User/Deploy"; +# target = "Deploy"; +# }; +# "Misc" = { +# source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.vetymae-drive}/Users/User/Misc"; +# target = "Misc"; +# }; }; }; }; diff --git a/home/server.nix b/home/server.nix index 37ffc6a..4726fe4 100755 --- a/home/server.nix +++ b/home/server.nix @@ -37,7 +37,7 @@ let home = { file = { "ssh" = { - source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.storage}/SSH/${inputs.zeroq.devices.server.hostname}"; + source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.storage}/ssh/${inputs.zeroq.devices.server.hostname}"; target = ".ssh"; }; "Music" = { diff --git a/modules/extra/self/zapret.nix b/modules/extra/self/zapret.nix index ef3e429..26571e4 100644 --- a/modules/extra/self/zapret.nix +++ b/modules/extra/self/zapret.nix @@ -6,7 +6,7 @@ }: { systemd.services.zapret = { - enable = false; + enable = true; description = "zapret complete"; unitConfig = { After = [ "network-online.target" ];