From 1f19fcd2d909ab14f03d71590d17265688a8d828 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Nov 2022 00:23:53 +0000 Subject: [PATCH 01/26] build(deps): bump cachix/cachix-action from 11 to 12 Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action) from 11 to 12. - [Release notes](https://github.com/cachix/cachix-action/releases) - [Commits](https://github.com/cachix/cachix-action/compare/v11...v12) --- updated-dependencies: - dependency-name: cachix/cachix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/nix-flake-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nix-flake-check.yml b/.github/workflows/nix-flake-check.yml index 275a23c..7944505 100644 --- a/.github/workflows/nix-flake-check.yml +++ b/.github/workflows/nix-flake-check.yml @@ -18,7 +18,7 @@ jobs: experimental-features = nix-command flakes access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} system-features = nixos-test benchmark big-parallel kvm - - uses: cachix/cachix-action@v11 + - uses: cachix/cachix-action@v12 with: name: dadada authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' -- 2.49.0 From b970326df961643176664eb5ac642ad500819842 Mon Sep 17 00:00:00 2001 From: dadada Date: Tue, 29 Nov 2022 11:54:23 +0100 Subject: [PATCH 02/26] install cachix --- nixos/gorgon/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix index c4cd428..6121011 100644 --- a/nixos/gorgon/configuration.nix +++ b/nixos/gorgon/configuration.nix @@ -79,6 +79,7 @@ in ghostscript config.dadada.pkgs.recipemd config.dadada.pkgs.map + cachix ]; networking.firewall = { -- 2.49.0 From b207e698d836f1dc94fef54770e54571daea3e0e Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 3 Dec 2022 20:59:01 +0100 Subject: [PATCH 03/26] update to nixpkgs release 22.11 --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index f2340f8..e193815 100644 --- a/flake.lock +++ b/flake.lock @@ -536,16 +536,16 @@ }, "myNixpkgs": { "locked": { - "lastModified": 1669418739, - "narHash": "sha256-T86oFvcUIRwHWBWUt7WjaP4BP/3lDGbv5AppQSI1FkI=", + "lastModified": 1670009809, + "narHash": "sha256-yt/dQ32Vz4WenDLu4XeHbnXFxiHbTcnU0WwiLW5Ce6c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "695b3515251873e0a7e2021add4bba643c56cde3", + "rev": "660e7737851506374da39c0fa550c202c824a17c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 823729e..5882872 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "dadada's nix flake"; inputs = { - myNixpkgs.url = github:NixOS/nixpkgs/nixos-22.05; + myNixpkgs.url = github:NixOS/nixpkgs/nixos-22.11; flake-utils.url = github:numtide/flake-utils; home-manager = { url = github:nix-community/home-manager/release-22.05; -- 2.49.0 From e87cabaf6c877ced6bfda6679964f9bc08e1fecd Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 3 Dec 2022 21:06:29 +0100 Subject: [PATCH 04/26] pkgs: remove PHP 7.4 composer --- home/home/pkgs.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/home/pkgs.nix b/home/home/pkgs.nix index bca6a42..d6a4fb6 100644 --- a/home/home/pkgs.nix +++ b/home/home/pkgs.nix @@ -97,7 +97,6 @@ with pkgs; [ pandoc # document converter and templater pass pavucontrol - php74Packages.composer pinentry-gnome playerctl procs # ps in rust -- 2.49.0 From 3e7b2775786e35773b0200d69c7057dd226ed0b4 Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 3 Dec 2022 21:50:39 +0100 Subject: [PATCH 05/26] pkgs: remove jetbrains IDEs --- home/home/pkgs.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/home/home/pkgs.nix b/home/home/pkgs.nix index d6a4fb6..05828b9 100644 --- a/home/home/pkgs.nix +++ b/home/home/pkgs.nix @@ -61,8 +61,6 @@ with pkgs; [ irssi jameica jc # convert output to json - jetbrains.idea-community - jetbrains.phpstorm josm jq jq -- 2.49.0 From d271d95e78ffbcd29dd83a23ed7ce4b6262db264 Mon Sep 17 00:00:00 2001 From: dadada Date: Thu, 8 Dec 2022 17:00:01 +0100 Subject: [PATCH 06/26] use clippy in rust-analyzer and use hx as EDITOR --- home/modules/helix/config/languages.toml | 3 +++ home/modules/session.nix | 2 +- home/modules/zsh.nix | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/home/modules/helix/config/languages.toml b/home/modules/helix/config/languages.toml index e69de29..7b576c0 100644 --- a/home/modules/helix/config/languages.toml +++ b/home/modules/helix/config/languages.toml @@ -0,0 +1,3 @@ +[[language]] +name = "rust" +config = { rust-analyzer = { checkOnSave = { command = "clippy" } } } diff --git a/home/modules/session.nix b/home/modules/session.nix index 4da85a8..879400d 100644 --- a/home/modules/session.nix +++ b/home/modules/session.nix @@ -13,7 +13,7 @@ in type = types.attrs; default = { }; example = '' - EDITOR = "vim"; + EDITOR = "hx"; PAGER = "less"; ''; }; diff --git a/home/modules/zsh.nix b/home/modules/zsh.nix index 59453c2..1e73c0a 100644 --- a/home/modules/zsh.nix +++ b/home/modules/zsh.nix @@ -19,7 +19,7 @@ in enableVteIntegration = true; autocd = true; sessionVariables = { - EDITOR = "vim"; + EDITOR = "hx"; }; history = { extended = true; -- 2.49.0 From 69259f389bb09f6e8f3a83c850b33575086fb209 Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 10 Dec 2022 12:02:53 +0100 Subject: [PATCH 07/26] migrate gitea settings --- nixos/agares/configuration.nix | 3 +++ nixos/modules/gitea.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/agares/configuration.nix b/nixos/agares/configuration.nix index 7bde1ab..0b2e4ed 100644 --- a/nixos/agares/configuration.nix +++ b/nixos/agares/configuration.nix @@ -11,6 +11,9 @@ # to be able to use qemu from substituter environment.noXlibs = false; + # libvirtd + security.polkit.enable = true; + dadada = { admin.enable = true; networking.localResolver.enable = true; diff --git a/nixos/modules/gitea.nix b/nixos/modules/gitea.nix index 28c9983..bc4c6a0 100644 --- a/nixos/modules/gitea.nix +++ b/nixos/modules/gitea.nix @@ -17,7 +17,6 @@ in rootUrl = "https://git.dadada.li/"; log.level = "Error"; domain = config.networking.domain; - ssh.enable = true; cookieSecure = true; enableUnixSocket = true; database = { @@ -28,6 +27,7 @@ in server = { LANDING_PAGE = "explore"; OFFLINE_MODE = true; + DISABLE_SSH = false; }; picture = { DISABLE_GRAVATAR = true; -- 2.49.0 From c4ed2cbad990fbc68ed441551504a22e8b9fa0cc Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 10 Dec 2022 12:09:09 +0100 Subject: [PATCH 08/26] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'myNixpkgs': 'github:NixOS/nixpkgs/660e7737851506374da39c0fa550c202c824a17c' (2022-12-02) → 'github:NixOS/nixpkgs/7a6a010c3a1d00f8470a5ca888f2f927f1860a19' (2022-12-08) • Updated input 'nix-doom-emacs': 'github:nix-community/nix-doom-emacs/3c02175dd06714c15ddd2f73708de9b4dacc6aa9' (2022-11-25) → 'github:nix-community/nix-doom-emacs/c852431c25a9d2b8f9322505a38868d4cee6b8d6' (2022-12-09) • Updated input 'nix-doom-emacs/emacs-overlay': 'github:nix-community/emacs-overlay/49d5cbd389a3fb843793cd7503ad7abdb4f40a9d' (2022-11-24) → 'github:nix-community/emacs-overlay/1b6e5b25af402e9f2fd49cf210cada9444c32504' (2022-12-08) • Updated input 'nix-doom-emacs/revealjs': 'github:hakimel/reveal.js/9f1f7789bfbf689d9c1615e523d5c6262771e90f' (2022-11-17) → 'github:hakimel/reveal.js/4fe3946cb43de57f79aaa7b646aee7e78f4bcc75' (2022-12-07) • Updated input 'nix-doom-emacs/ts-fold': 'github:jcs-elpa/ts-fold/c3da5520b988720f7f6e9e5e11b60746598112e0' (2022-09-14) → 'github:jcs-elpa/ts-fold/fb91989a9489755b890bf9e1957e5f29eaef59f6' (2022-12-04) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/0099253ad0b5283f06ffe31cf010af3f9ad7837d' (2022-11-22) → 'github:NixOS/nixos-hardware/9d87bc030a0bf3f00e953dbf095a7d8e852dab6b' (2022-12-04) • Updated input 'nvd': 'git+https://gitlab.com/khumba/nvd.git?ref=master&rev=f87f29530beb039d283530ab533d700c53120b83' (2022-10-15) → 'git+https://gitlab.com/khumba/nvd.git?ref=refs%2fheads%2fmaster&rev=f87f29530beb039d283530ab533d700c53120b83' (2022-10-15) --- flake.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index e193815..78d245f 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1669319842, - "narHash": "sha256-JSfABiy5/7usgQSy/ua3XbsjJ6F9Dd3P4nJiE56gFME=", + "lastModified": 1670523171, + "narHash": "sha256-T8NRgu8jgyNwkwC6Ew31MIXM7RZ17ShA556ZgV5D9N0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "49d5cbd389a3fb843793cd7503ad7abdb4f40a9d", + "rev": "1b6e5b25af402e9f2fd49cf210cada9444c32504", "type": "github" }, "original": { @@ -536,11 +536,11 @@ }, "myNixpkgs": { "locked": { - "lastModified": 1670009809, - "narHash": "sha256-yt/dQ32Vz4WenDLu4XeHbnXFxiHbTcnU0WwiLW5Ce6c=", + "lastModified": 1670543317, + "narHash": "sha256-4mMR56rtxKr+Gwz399jFr4i76SQZxsLWxxyfQlPXRm0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "660e7737851506374da39c0fa550c202c824a17c", + "rev": "7a6a010c3a1d00f8470a5ca888f2f927f1860a19", "type": "github" }, "original": { @@ -581,11 +581,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1669340080, - "narHash": "sha256-/YLYpng6mZ2/NgaCiL3BCQK1cegbUNrQx1Cc1i+nQ8E=", + "lastModified": 1670549573, + "narHash": "sha256-2kQkcmfQPbDkCIJKiG7dsYGCSSzSxL5MFXTS7j5cbLQ=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "3c02175dd06714c15ddd2f73708de9b4dacc6aa9", + "rev": "c852431c25a9d2b8f9322505a38868d4cee6b8d6", "type": "github" }, "original": { @@ -639,11 +639,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1669146234, - "narHash": "sha256-HEby7EG1yaq1oT2Ze6Cvok9CFju1XHkSvVHmkptLW9U=", + "lastModified": 1670174919, + "narHash": "sha256-XdQr3BUnrvVLRFunLWrZORhwYHDG0+9jUUe0Jv1pths=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0099253ad0b5283f06ffe31cf010af3f9ad7837d", + "rev": "9d87bc030a0bf3f00e953dbf095a7d8e852dab6b", "type": "github" }, "original": { @@ -719,7 +719,7 @@ "locked": { "lastModified": 1665876905, "narHash": "sha256-rZJuhvO7hIPezbwFESOEdGm+ZJldrEiPIvyhICJ6xoQ=", - "ref": "master", + "ref": "refs/heads/master", "rev": "f87f29530beb039d283530ab533d700c53120b83", "revCount": 25, "type": "git", @@ -833,11 +833,11 @@ "revealjs": { "flake": false, "locked": { - "lastModified": 1668674340, - "narHash": "sha256-JEXPS67bgKnnRdA37mC18PyGm4EWVQ/BrWeBZLVKPvU=", + "lastModified": 1670408834, + "narHash": "sha256-2LG8/AwMC+caNK9DKDyVGw+EPT2W6ys177xQj7mdKng=", "owner": "hakimel", "repo": "reveal.js", - "rev": "9f1f7789bfbf689d9c1615e523d5c6262771e90f", + "rev": "4fe3946cb43de57f79aaa7b646aee7e78f4bcc75", "type": "github" }, "original": { @@ -945,11 +945,11 @@ "ts-fold": { "flake": false, "locked": { - "lastModified": 1663136308, - "narHash": "sha256-FI25RLoHqhcjA2qel75LVmQH4rTkKiAUR2w9QODT1XM=", + "lastModified": 1670179791, + "narHash": "sha256-BxgHT8xw+3W655YvbeLDUMFs6gTAMPX5CxJUWt/38ds=", "owner": "jcs-elpa", "repo": "ts-fold", - "rev": "c3da5520b988720f7f6e9e5e11b60746598112e0", + "rev": "fb91989a9489755b890bf9e1957e5f29eaef59f6", "type": "github" }, "original": { -- 2.49.0 From 62db411fddcd8e522319d93d8b8724572c01d5d7 Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 10 Dec 2022 12:09:55 +0100 Subject: [PATCH 09/26] update home-manager --- flake.lock | 26 +++++++++++++++++++++----- flake.nix | 2 +- home/configurations.nix | 35 ----------------------------------- home/home/default.nix | 2 ++ hydra-jobs.nix | 4 ---- outputs.nix | 2 -- 6 files changed, 24 insertions(+), 47 deletions(-) delete mode 100644 home/configurations.nix diff --git a/flake.lock b/flake.lock index 78d245f..e59a885 100644 --- a/flake.lock +++ b/flake.lock @@ -482,19 +482,20 @@ "inputs": { "nixpkgs": [ "myNixpkgs" - ] + ], + "utils": "utils_2" }, "locked": { - "lastModified": 1667907331, - "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", + "lastModified": 1670253003, + "narHash": "sha256-/tJIy4+FbsQyslq1ipyicZ2psOEd8dvl4OJ9lfisjd0=", "owner": "nix-community", "repo": "home-manager", - "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", + "rev": "0e8125916b420e41bf0d23a0aa33fadd0328beb3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "home-manager", "type": "github" } @@ -973,6 +974,21 @@ "type": "github" } }, + "utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "ws-butler": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 5882872..4bc1215 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ myNixpkgs.url = github:NixOS/nixpkgs/nixos-22.11; flake-utils.url = github:numtide/flake-utils; home-manager = { - url = github:nix-community/home-manager/release-22.05; + url = github:nix-community/home-manager/release-22.11; inputs.nixpkgs.follows = "myNixpkgs"; }; nix-doom-emacs = { diff --git a/home/configurations.nix b/home/configurations.nix deleted file mode 100644 index 7b086a8..0000000 --- a/home/configurations.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ self -, nixpkgs -, home-manager -, nix-doom-emacs -, helix -, ... -} @ inputs: -let - hmConfiguration = - { homeDirectory ? "/home/dadada" - , extraModules ? [ ] - , system ? "x86_64-linux" - , username ? "dadada" - , stateVersion - }: (home-manager.lib.homeManagerConfiguration { - configuration = { ... }: { - imports = (nixpkgs.lib.attrValues self.hmModules) ++ extraModules; - - nixpkgs = { - config = import ./nixpkgs-config.nix { - pkgs = nixpkgs; - }; - }; - - manual.manpages.enable = false; - }; - inherit system homeDirectory username stateVersion; - }); -in -{ - home = hmConfiguration { - extraModules = [ ./home nix-doom-emacs.hmModule ]; - stateVersion = "20.09"; - }; -} diff --git a/home/home/default.nix b/home/home/default.nix index 6968409..a870c6b 100644 --- a/home/home/default.nix +++ b/home/home/default.nix @@ -21,6 +21,8 @@ let ]; in { + home.stateVersion = "20.09"; + programs.git = { signing = { key = "D68C84695C087E0F733A28D0EEB8D1CE62C4DFEA"; diff --git a/hydra-jobs.nix b/hydra-jobs.nix index 078386e..135b95e 100644 --- a/hydra-jobs.nix +++ b/hydra-jobs.nix @@ -2,8 +2,4 @@ (nixpkgs.lib.mapAttrs' (name: config: nixpkgs.lib.nameValuePair name config.config.system.build.toplevel) self.nixosConfigurations -) // -(nixpkgs.lib.mapAttrs' - (name: config: nixpkgs.lib.nameValuePair name config.activation-script) - self.hmConfigurations ) // self.checks.x86_64-linux diff --git a/outputs.nix b/outputs.nix index 7b78694..dff9822 100644 --- a/outputs.nix +++ b/outputs.nix @@ -59,8 +59,6 @@ })) // { - hmConfigurations = import ./home/configurations.nix inputs; - hmModules = import ./home/modules; nixosConfigurations = import ./nixos/configurations.nix inputs; -- 2.49.0 From 7855de6a3efd4d5de8093c63c36e2b8d0b016f59 Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 17 Dec 2022 02:36:12 +0100 Subject: [PATCH 10/26] fix backup --- nixos/modules/backup.nix | 46 +++++++++++++++---------------- nixos/modules/profiles/backup.nix | 4 +-- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/nixos/modules/backup.nix b/nixos/modules/backup.nix index 44087f0..0adeafe 100644 --- a/nixos/modules/backup.nix +++ b/nixos/modules/backup.nix @@ -58,8 +58,8 @@ in }; }; - config = mkIf cfg.gs.enable { - fileSystems = mkIf cfg.gs { + config = { + fileSystems = mkIf cfg.gs.enable { "/backup" = { device = "/dev/disk/by-uuid/0fdab735-cc3e-493a-b4ec-cbf6a77d48d5"; fsType = "ext4"; @@ -67,8 +67,7 @@ in }; }; - services.borgbackup.jobs.gs = - { + services.borgbackup.jobs.gs = mkIf cfg.gs.enable { paths = "/"; exclude = backupExcludes; repo = "/backup/${config.networking.hostName}"; @@ -86,26 +85,25 @@ in yearly = -1; # Keep at least one archive for each year }; startAt = "monthly"; - } - // mkIf cfg.bs.enable { - services.borgbackup.jobs.bs = { - paths = "/"; - exclude = backupExcludes; - repo = "borg@backup0.dadada.li:/mnt/storage/backup/${config.networking.hostName}"; - doInit = false; - environment = { - BORG_RSH = "ssh -i ${cfg.bs.sshIdentityFile} -o 'StrictHostKeyChecking accept-new' -o 'TCPKeepAlive=yes'"; - }; - encryption = { - mode = "repokey"; - passCommand = "cat ${cfg.bs.passphrasePath}"; - }; - compression = "auto,lz4"; - startAt = "daily"; - environment = { - BORG_RELOCATED_REPO_ACCESS_IS_OK = "yes"; - }; - }; + }; + + services.borgbackup.jobs.bs = mkIf cfg.bs.enable { + paths = "/"; + exclude = backupExcludes; + repo = "borg@backup0.dadada.li:/mnt/storage/backup/${config.networking.hostName}"; + doInit = false; + environment = { + BORG_RSH = "ssh -i ${cfg.bs.sshIdentityFile} -o 'StrictHostKeyChecking accept-new' -o 'TCPKeepAlive=yes'"; }; + encryption = { + mode = "repokey"; + passCommand = "cat ${cfg.bs.passphrasePath}"; + }; + compression = "auto,lz4"; + startAt = "daily"; + environment = { + BORG_RELOCATED_REPO_ACCESS_IS_OK = "yes"; + }; + }; }; } diff --git a/nixos/modules/profiles/backup.nix b/nixos/modules/profiles/backup.nix index dfa3f2e..88dfab5 100644 --- a/nixos/modules/profiles/backup.nix +++ b/nixos/modules/profiles/backup.nix @@ -5,8 +5,8 @@ in { dadada.backupClient.bs = { enable = true; - passphrasePath = config.age.secrets."${config.networking.hostName}-backup-passphrase.path"; - sshIdentityFile = config.age.secrets."${config.networking.hostName}-backup-ssh-key.path"; + passphrasePath = config.age.secrets."${config.networking.hostName}-backup-passphrase".path; + sshIdentityFile = config.age.secrets."${config.networking.hostName}-backup-ssh-key".path; }; age.secrets."${config.networking.hostName}-backup-passphrase".file = "${secretsPath}/${config.networking.hostName}-backup-passphrase.age"; -- 2.49.0 From 2277e25eca806a0a6f40403d46f47e1db1db0874 Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 17 Dec 2022 03:36:59 +0100 Subject: [PATCH 11/26] fix formatting --- nixos/modules/backup.nix | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/nixos/modules/backup.nix b/nixos/modules/backup.nix index 0adeafe..49df52b 100644 --- a/nixos/modules/backup.nix +++ b/nixos/modules/backup.nix @@ -68,23 +68,23 @@ in }; services.borgbackup.jobs.gs = mkIf cfg.gs.enable { - paths = "/"; - exclude = backupExcludes; - repo = "/backup/${config.networking.hostName}"; - doInit = false; - encryption = { - mode = "repokey"; - passCommand = "cat ${cfg.gs.passphrasePath}"; - }; - compression = "auto,lz4"; - prune.keep = { - within = "1d"; # Keep all archives from the last day - daily = 7; - weekly = 2; - monthly = -1; # Keep at least one archive for each month - yearly = -1; # Keep at least one archive for each year - }; - startAt = "monthly"; + paths = "/"; + exclude = backupExcludes; + repo = "/backup/${config.networking.hostName}"; + doInit = false; + encryption = { + mode = "repokey"; + passCommand = "cat ${cfg.gs.passphrasePath}"; + }; + compression = "auto,lz4"; + prune.keep = { + within = "1d"; # Keep all archives from the last day + daily = 7; + weekly = 2; + monthly = -1; # Keep at least one archive for each month + yearly = -1; # Keep at least one archive for each year + }; + startAt = "monthly"; }; services.borgbackup.jobs.bs = mkIf cfg.bs.enable { -- 2.49.0 From 157c109a00ec6854c1341e1beea05fe1b4547f44 Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 17 Dec 2022 13:42:15 +0100 Subject: [PATCH 12/26] exclude borg config directory from backups --- nixos/modules/backup.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/backup.nix b/nixos/modules/backup.nix index 49df52b..198651c 100644 --- a/nixos/modules/backup.nix +++ b/nixos/modules/backup.nix @@ -15,6 +15,7 @@ with lib; let "/mnt" "/nix" "/proc" + "/root" "/run" "/sys" "/tmp" -- 2.49.0 From 01b5fdb887ad77a3544d00699e0db57956a00030 Mon Sep 17 00:00:00 2001 From: dadada Date: Tue, 20 Dec 2022 13:26:06 +0100 Subject: [PATCH 13/26] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'devshell': 'github:numtide/devshell/96a9dd12b8a447840cc246e17a47b81a4268bba7' (2022-10-31) → 'github:numtide/devshell/5aa3a8039c68b4bf869327446590f4cdf90bb634' (2022-12-19) • Updated input 'myNixpkgs': 'github:NixOS/nixpkgs/7a6a010c3a1d00f8470a5ca888f2f927f1860a19' (2022-12-08) → 'github:NixOS/nixpkgs/0938d73bb143f4ae037143572f11f4338c7b2d1c' (2022-12-17) • Updated input 'nix-doom-emacs': 'github:nix-community/nix-doom-emacs/c852431c25a9d2b8f9322505a38868d4cee6b8d6' (2022-12-09) → 'github:nix-community/nix-doom-emacs/2150fd40b2110bbd11dcb62fa5f307ec345b0fb0' (2022-12-16) • Updated input 'nix-doom-emacs/emacs-overlay': 'github:nix-community/emacs-overlay/1b6e5b25af402e9f2fd49cf210cada9444c32504' (2022-12-08) → 'github:nix-community/emacs-overlay/c873175c2f8d96cd77c5b6552f411ddd0959e483' (2022-12-15) • Updated input 'nix-doom-emacs/org': 'github:emacs-straight/org-mode/0737112852afe835a5a5833a2dd0a6852c04e0f0' (2022-11-19) → 'github:emacs-straight/org-mode/42153ea2fec66f90c1623be25d6774d96ecf8062' (2022-12-10) • Updated input 'nix-doom-emacs/ts-fold': 'github:jcs-elpa/ts-fold/fb91989a9489755b890bf9e1957e5f29eaef59f6' (2022-12-04) → 'github:jcs-elpa/ts-fold/85db0117ead108213cc2a4210f72746d8ad8d20a' (2022-12-10) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/9d87bc030a0bf3f00e953dbf095a7d8e852dab6b' (2022-12-04) → 'github:NixOS/nixos-hardware/25010a042c23695ae457a97aad60e9b1d49f2ecc' (2022-12-19) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index e59a885..effd3e3 100644 --- a/flake.lock +++ b/flake.lock @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1667210711, - "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=", + "lastModified": 1671489820, + "narHash": "sha256-qoei5HDJ8psd1YUPD7DhbHdhLIT9L2nadscp4Qk37uk=", "owner": "numtide", "repo": "devshell", - "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7", + "rev": "5aa3a8039c68b4bf869327446590f4cdf90bb634", "type": "github" }, "original": { @@ -194,11 +194,11 @@ "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1670523171, - "narHash": "sha256-T8NRgu8jgyNwkwC6Ew31MIXM7RZ17ShA556ZgV5D9N0=", + "lastModified": 1671128331, + "narHash": "sha256-oa3HZNgyAWEx09eElSISpRCltgYqHshjphJ9eeTO6As=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1b6e5b25af402e9f2fd49cf210cada9444c32504", + "rev": "c873175c2f8d96cd77c5b6552f411ddd0959e483", "type": "github" }, "original": { @@ -537,11 +537,11 @@ }, "myNixpkgs": { "locked": { - "lastModified": 1670543317, - "narHash": "sha256-4mMR56rtxKr+Gwz399jFr4i76SQZxsLWxxyfQlPXRm0=", + "lastModified": 1671313200, + "narHash": "sha256-itZTrtHeDJjV696+ur0/TzkTqb5y3Eb57WRLRPK3rwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7a6a010c3a1d00f8470a5ca888f2f927f1860a19", + "rev": "0938d73bb143f4ae037143572f11f4338c7b2d1c", "type": "github" }, "original": { @@ -582,11 +582,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1670549573, - "narHash": "sha256-2kQkcmfQPbDkCIJKiG7dsYGCSSzSxL5MFXTS7j5cbLQ=", + "lastModified": 1671154105, + "narHash": "sha256-OI6M2/Kcd1bJuodxV6rV5KtDJMUeewsqKy1B2PLNVys=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "c852431c25a9d2b8f9322505a38868d4cee6b8d6", + "rev": "2150fd40b2110bbd11dcb62fa5f307ec345b0fb0", "type": "github" }, "original": { @@ -640,11 +640,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1670174919, - "narHash": "sha256-XdQr3BUnrvVLRFunLWrZORhwYHDG0+9jUUe0Jv1pths=", + "lastModified": 1671467847, + "narHash": "sha256-eIeZIQbbW0QYDW0nhDaieokw6VakPO3TyJ3RmxqGHOs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9d87bc030a0bf3f00e953dbf095a7d8e852dab6b", + "rev": "25010a042c23695ae457a97aad60e9b1d49f2ecc", "type": "github" }, "original": { @@ -750,11 +750,11 @@ "org": { "flake": false, "locked": { - "lastModified": 1668865287, - "narHash": "sha256-q7TfqUuEdZsD+JkF8Cr0Lnn0po6qo2zXMZDieocLpeQ=", + "lastModified": 1670680538, + "narHash": "sha256-afmN2tOY6Par235bVsqhtFHOSVyw4NBgTxI5Eo6Yk5A=", "owner": "emacs-straight", "repo": "org-mode", - "rev": "0737112852afe835a5a5833a2dd0a6852c04e0f0", + "rev": "42153ea2fec66f90c1623be25d6774d96ecf8062", "type": "github" }, "original": { @@ -946,11 +946,11 @@ "ts-fold": { "flake": false, "locked": { - "lastModified": 1670179791, - "narHash": "sha256-BxgHT8xw+3W655YvbeLDUMFs6gTAMPX5CxJUWt/38ds=", + "lastModified": 1670681486, + "narHash": "sha256-Ss1FWOq51+0FQpQWXPiSWHmNYU6NurUvI2wAjOGV/kA=", "owner": "jcs-elpa", "repo": "ts-fold", - "rev": "fb91989a9489755b890bf9e1957e5f29eaef59f6", + "rev": "85db0117ead108213cc2a4210f72746d8ad8d20a", "type": "github" }, "original": { -- 2.49.0 From d91116448809f1b7621d659c02c144783e6590f2 Mon Sep 17 00:00:00 2001 From: dadada Date: Tue, 20 Dec 2022 19:44:32 +0100 Subject: [PATCH 14/26] fix DNS search domain in space --- nixos/modules/networking.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/networking.nix b/nixos/modules/networking.nix index 734f964..e47be1d 100644 --- a/nixos/modules/networking.nix +++ b/nixos/modules/networking.nix @@ -63,12 +63,12 @@ in private-domain = [ "dadada.li" (mkIf cfg.localResolver.uwu "uwu") - (mkIf cfg.localResolver.s0 "s0") + (mkIf cfg.localResolver.s0 "space.stratum0.net") ]; domain-insecure = [ "dadada.li" (mkIf cfg.localResolver.uwu "uwu") - (mkIf cfg.localResolver.s0 "s0") + (mkIf cfg.localResolver.s0 "space.stratum0.net") ]; interface = [ "127.0.0.1" @@ -97,7 +97,7 @@ in ) ( mkIf cfg.localResolver.s0 { - name = "s0."; + name = "space.stratum0.net."; forward-addr = [ "192.168.178.1" ]; -- 2.49.0 From 7fb03dbe2e5d81eef7a3f96e9254b39b52b0d0b1 Mon Sep 17 00:00:00 2001 From: dadada Date: Thu, 29 Dec 2022 14:21:25 +0100 Subject: [PATCH 15/26] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/0e8125916b420e41bf0d23a0aa33fadd0328beb3' (2022-12-05) → 'github:nix-community/home-manager/89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706' (2022-12-28) • Updated input 'myNixpkgs': 'github:NixOS/nixpkgs/0938d73bb143f4ae037143572f11f4338c7b2d1c' (2022-12-17) → 'github:NixOS/nixpkgs/dac57a4eccf1442e8bf4030df6fcbb55883cb682' (2022-12-24) • Updated input 'nix-doom-emacs': 'github:nix-community/nix-doom-emacs/2150fd40b2110bbd11dcb62fa5f307ec345b0fb0' (2022-12-16) → 'github:nix-community/nix-doom-emacs/85a48dbec84e9c26785b58fecdefa1cfc580aea7' (2022-12-23) • Updated input 'nix-doom-emacs/emacs-overlay': 'github:nix-community/emacs-overlay/c873175c2f8d96cd77c5b6552f411ddd0959e483' (2022-12-15) → 'github:nix-community/emacs-overlay/9c95614e0b1a2f6a3f4cf9b99b17439887ea0373' (2022-12-22) • Updated input 'nix-doom-emacs/ts-fold': 'github:jcs-elpa/ts-fold/85db0117ead108213cc2a4210f72746d8ad8d20a' (2022-12-10) → 'github:jcs-elpa/ts-fold/a64f5252a66253852bef1c627cea9e39928e6392' (2022-12-19) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/25010a042c23695ae457a97aad60e9b1d49f2ecc' (2022-12-19) → 'github:NixOS/nixos-hardware/9577ab1eaf01a738b015a7a7ab2a4616e158b6cd' (2022-12-21) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index effd3e3..957c6ef 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1671128331, - "narHash": "sha256-oa3HZNgyAWEx09eElSISpRCltgYqHshjphJ9eeTO6As=", + "lastModified": 1671729646, + "narHash": "sha256-crrTM9K1q8zGZ2gibEPJAudAnr0bMqPiLr1I8P+I5ls=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c873175c2f8d96cd77c5b6552f411ddd0959e483", + "rev": "9c95614e0b1a2f6a3f4cf9b99b17439887ea0373", "type": "github" }, "original": { @@ -486,11 +486,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1670253003, - "narHash": "sha256-/tJIy4+FbsQyslq1ipyicZ2psOEd8dvl4OJ9lfisjd0=", + "lastModified": 1672244468, + "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=", "owner": "nix-community", "repo": "home-manager", - "rev": "0e8125916b420e41bf0d23a0aa33fadd0328beb3", + "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706", "type": "github" }, "original": { @@ -537,11 +537,11 @@ }, "myNixpkgs": { "locked": { - "lastModified": 1671313200, - "narHash": "sha256-itZTrtHeDJjV696+ur0/TzkTqb5y3Eb57WRLRPK3rwA=", + "lastModified": 1671883564, + "narHash": "sha256-C15oAtyupmLB3coZY7qzEHXjhtUx/+77olVdqVMruAg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0938d73bb143f4ae037143572f11f4338c7b2d1c", + "rev": "dac57a4eccf1442e8bf4030df6fcbb55883cb682", "type": "github" }, "original": { @@ -582,11 +582,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1671154105, - "narHash": "sha256-OI6M2/Kcd1bJuodxV6rV5KtDJMUeewsqKy1B2PLNVys=", + "lastModified": 1671758850, + "narHash": "sha256-B6us/CLIIPJRJgjn/hVp7N07j90kil4HmjUVj8TBhKE=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "2150fd40b2110bbd11dcb62fa5f307ec345b0fb0", + "rev": "85a48dbec84e9c26785b58fecdefa1cfc580aea7", "type": "github" }, "original": { @@ -640,11 +640,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1671467847, - "narHash": "sha256-eIeZIQbbW0QYDW0nhDaieokw6VakPO3TyJ3RmxqGHOs=", + "lastModified": 1671631481, + "narHash": "sha256-LP6NvQQNKdqDpXngECo6oCiWfYRb0KPGM5+D5lu7mPw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "25010a042c23695ae457a97aad60e9b1d49f2ecc", + "rev": "9577ab1eaf01a738b015a7a7ab2a4616e158b6cd", "type": "github" }, "original": { @@ -946,11 +946,11 @@ "ts-fold": { "flake": false, "locked": { - "lastModified": 1670681486, - "narHash": "sha256-Ss1FWOq51+0FQpQWXPiSWHmNYU6NurUvI2wAjOGV/kA=", + "lastModified": 1671426601, + "narHash": "sha256-NrvSK+olbi4P+9q5KOomNHGgmrRtI9cW9ZqkdU4n0Sc=", "owner": "jcs-elpa", "repo": "ts-fold", - "rev": "85db0117ead108213cc2a4210f72746d8ad8d20a", + "rev": "a64f5252a66253852bef1c627cea9e39928e6392", "type": "github" }, "original": { -- 2.49.0 From 43bf42992959de9ea88d36e78c0fbb9c9155b8fb Mon Sep 17 00:00:00 2001 From: dadada Date: Sun, 1 Jan 2023 14:58:34 +0100 Subject: [PATCH 16/26] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'deploy-rs': 'github:serokell/deploy-rs/2a3c5f70eee04a465aa534d8bd4fcc9bb3c4a8ce' (2022-11-18) → 'github:serokell/deploy-rs/a5619f5660a00f58c2b7c16d89058e92327ac9b8' (2022-12-29) • Updated input 'deploy-rs/flake-compat': 'github:edolstra/flake-compat/64a525ee38886ab9028e6f61790de0832aa3ef03' (2022-03-25) → 'github:edolstra/flake-compat/009399224d5e398d03b22badca40a37ac85412a1' (2022-11-17) • Updated input 'deploy-rs/utils': 'github:numtide/flake-utils/0f8662f1319ad6abf89b3380dd2722369fc51ade' (2022-03-26) → 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) • Updated input 'myNixpkgs': 'github:NixOS/nixpkgs/dac57a4eccf1442e8bf4030df6fcbb55883cb682' (2022-12-24) → 'github:NixOS/nixpkgs/913a47cd064cc06440ea84e5e0452039a85781f0' (2022-12-29) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/9577ab1eaf01a738b015a7a7ab2a4616e158b6cd' (2022-12-21) → 'github:NixOS/nixos-hardware/0517e81e8ce24a0f4f9eebedbd7bbefcac97c058' (2023-01-01) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 957c6ef..2fee42f 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1668797197, - "narHash": "sha256-0w6iD3GSSQbIeSFVDzAAQZB+hDq670ZTms3d9XI+BtM=", + "lastModified": 1672327199, + "narHash": "sha256-pFlngSHXKBhAmbaKZ4FYtu57LLunG+vWdL7a5vw1RvQ=", "owner": "serokell", "repo": "deploy-rs", - "rev": "2a3c5f70eee04a465aa534d8bd4fcc9bb3c4a8ce", + "rev": "a5619f5660a00f58c2b7c16d89058e92327ac9b8", "type": "github" }, "original": { @@ -306,11 +306,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", "type": "github" }, "original": { @@ -537,11 +537,11 @@ }, "myNixpkgs": { "locked": { - "lastModified": 1671883564, - "narHash": "sha256-C15oAtyupmLB3coZY7qzEHXjhtUx/+77olVdqVMruAg=", + "lastModified": 1672353432, + "narHash": "sha256-oZfgp/44/o2tWiylV30cR+DLyWTJ+5dhsdWZVpzs3e4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dac57a4eccf1442e8bf4030df6fcbb55883cb682", + "rev": "913a47cd064cc06440ea84e5e0452039a85781f0", "type": "github" }, "original": { @@ -640,11 +640,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1671631481, - "narHash": "sha256-LP6NvQQNKdqDpXngECo6oCiWfYRb0KPGM5+D5lu7mPw=", + "lastModified": 1672566874, + "narHash": "sha256-/lmz3/xzdghGSFeCcTiKMjbj0uRmUqTZhh4HHeUJ++g=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9577ab1eaf01a738b015a7a7ab2a4616e158b6cd", + "rev": "0517e81e8ce24a0f4f9eebedbd7bbefcac97c058", "type": "github" }, "original": { @@ -961,11 +961,11 @@ }, "utils": { "locked": { - "lastModified": 1648297722, - "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { -- 2.49.0 From 7cde861e0bdc2f1bb42cd45db8653e9f49de053f Mon Sep 17 00:00:00 2001 From: dadada Date: Mon, 2 Jan 2023 20:27:00 +0100 Subject: [PATCH 17/26] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'myNixpkgs': 'github:NixOS/nixpkgs/913a47cd064cc06440ea84e5e0452039a85781f0' (2022-12-29) → 'github:NixOS/nixpkgs/6a0d2701705c3cf6f42c15aa92b7885f1f8a477f' (2022-12-30) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/0517e81e8ce24a0f4f9eebedbd7bbefcac97c058' (2023-01-01) → 'github:NixOS/nixos-hardware/ca29e25c39b8e117d4d76a81f1e229824a9b3a26' (2023-01-02) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 2fee42f..c96d6c6 100644 --- a/flake.lock +++ b/flake.lock @@ -537,11 +537,11 @@ }, "myNixpkgs": { "locked": { - "lastModified": 1672353432, - "narHash": "sha256-oZfgp/44/o2tWiylV30cR+DLyWTJ+5dhsdWZVpzs3e4=", + "lastModified": 1672441588, + "narHash": "sha256-jx5kxOyeObnVD44HRebKYL3cjWrcKhhcDmEYm0/naDY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "913a47cd064cc06440ea84e5e0452039a85781f0", + "rev": "6a0d2701705c3cf6f42c15aa92b7885f1f8a477f", "type": "github" }, "original": { @@ -640,11 +640,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1672566874, - "narHash": "sha256-/lmz3/xzdghGSFeCcTiKMjbj0uRmUqTZhh4HHeUJ++g=", + "lastModified": 1672644464, + "narHash": "sha256-RYlvRMcQNT7FDoDkViijQBHg9g+blsB+U6AvL/gAsPI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0517e81e8ce24a0f4f9eebedbd7bbefcac97c058", + "rev": "ca29e25c39b8e117d4d76a81f1e229824a9b3a26", "type": "github" }, "original": { -- 2.49.0 From 40d4500f9d5eaf4c3c7df983156cc6b1703f6377 Mon Sep 17 00:00:00 2001 From: dadada Date: Tue, 3 Jan 2023 11:36:10 +0100 Subject: [PATCH 18/26] disable serving expired DNS entries This should be fine, since popular names are prefetched and should therefore not expire that often. --- nixos/modules/networking.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/networking.nix b/nixos/modules/networking.nix index e47be1d..07ad57d 100644 --- a/nixos/modules/networking.nix +++ b/nixos/modules/networking.nix @@ -42,7 +42,7 @@ in prefetch = true; prefetch-key = true; - serve-expired = true; + serve-expired = false; aggressive-nsec = true; hide-identity = true; -- 2.49.0 From 7192681abefd0c93753860216781bbf0d7ba0435 Mon Sep 17 00:00:00 2001 From: dadada Date: Thu, 12 Jan 2023 10:34:56 +0100 Subject: [PATCH 19/26] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'agenix': 'github:ryantm/agenix/a630400067c6d03c9b3e0455347dc8559db14288' (2022-10-15) → 'github:ryantm/agenix/42d371d861a227149dc9a7e03350c9ab8b8ddd68' (2023-01-09) • Updated input 'myNixpkgs': 'github:NixOS/nixpkgs/6a0d2701705c3cf6f42c15aa92b7885f1f8a477f' (2022-12-30) → 'github:NixOS/nixpkgs/54644f409ab471e87014bb305eac8c50190bcf48' (2023-01-10) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/ca29e25c39b8e117d4d76a81f1e229824a9b3a26' (2023-01-02) → 'github:NixOS/nixos-hardware/88016c96c3c338aa801695cdd9f186820bcfe4d6' (2023-01-11) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index c96d6c6..1460b13 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1665870395, - "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=", + "lastModified": 1673301561, + "narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=", "owner": "ryantm", "repo": "agenix", - "rev": "a630400067c6d03c9b3e0455347dc8559db14288", + "rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68", "type": "github" }, "original": { @@ -537,11 +537,11 @@ }, "myNixpkgs": { "locked": { - "lastModified": 1672441588, - "narHash": "sha256-jx5kxOyeObnVD44HRebKYL3cjWrcKhhcDmEYm0/naDY=", + "lastModified": 1673345971, + "narHash": "sha256-4DfFcKLRfVUTyuGrGNNmw37IeIZSoku9tgTVmu/iD98=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a0d2701705c3cf6f42c15aa92b7885f1f8a477f", + "rev": "54644f409ab471e87014bb305eac8c50190bcf48", "type": "github" }, "original": { @@ -640,11 +640,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1672644464, - "narHash": "sha256-RYlvRMcQNT7FDoDkViijQBHg9g+blsB+U6AvL/gAsPI=", + "lastModified": 1673440569, + "narHash": "sha256-FQ5o0yI+MH9MgfseeGDsVIIpIqv3BCgq+0NzncuZ9Zo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ca29e25c39b8e117d4d76a81f1e229824a9b3a26", + "rev": "88016c96c3c338aa801695cdd9f186820bcfe4d6", "type": "github" }, "original": { -- 2.49.0 From 979d013d9dd0795ca448008587d0de42612fdc55 Mon Sep 17 00:00:00 2001 From: dadada Date: Thu, 12 Jan 2023 10:52:11 +0100 Subject: [PATCH 20/26] disable docker and libvirtd --- nixos/modules/profiles/laptop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/profiles/laptop.nix b/nixos/modules/profiles/laptop.nix index 1ceca94..07e93b6 100644 --- a/nixos/modules/profiles/laptop.nix +++ b/nixos/modules/profiles/laptop.nix @@ -40,8 +40,8 @@ with lib; { }; virtualisation = { - libvirtd.enable = mkDefault true; - docker.enable = mkDefault true; + libvirtd.enable = mkDefault false; + docker.enable = mkDefault false; docker.liveRestore = false; }; -- 2.49.0 From 0ad2548567e037d7c4eee7005eef0fd02c86a08d Mon Sep 17 00:00:00 2001 From: dadada Date: Fri, 13 Jan 2023 16:41:49 +0100 Subject: [PATCH 21/26] fix accessing Zynq via JTAG --- nixos/gorgon/configuration.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix index 6121011..daf9f6e 100644 --- a/nixos/gorgon/configuration.nix +++ b/nixos/gorgon/configuration.nix @@ -15,6 +15,13 @@ let echo "Signing paths" $OUT_PATHS nix store sign --key-file /etc/nix/key.private $OUT_PATHS ''; + noMtpUdevRules = pkgs.writeTextFile { + name = "no-mtp-probe"; + text = '' + ATTR{idVendor}=="0403", ATTR{idProduct}=="6010", ENV{MTP_NO_PROBE}="1", GROUP="dialout", MODE="0666" + ''; + destination = "/etc/udev/rules.d/00-no-mtp.rules"; + }; in { imports = [ @@ -91,13 +98,18 @@ in 21027 # Syncthing ]; }; - + + systemd.services.modem-manager.enable = lib.mkForce false; + systemd.services."dbus-org.freedesktop.ModemManager1".enable = lib.mkForce false; + + services.udev.packages= [ noMtpUdevRules ]; + virtualisation.libvirtd.enable = true; users.users = { dadada = { isNormalUser = true; - extraGroups = [ "wheel" "networkmanager" "libvirtd" "adbusers" "kvm" "video" "scanner" "lp" "docker" ]; + extraGroups = [ "wheel" "networkmanager" "libvirtd" "adbusers" "kvm" "video" "scanner" "lp" "docker" "dialout" ]; shell = "/run/current-system/sw/bin/zsh"; }; }; -- 2.49.0 From bf4b918fb560bdd9227f929fbf5d97065731767c Mon Sep 17 00:00:00 2001 From: dadada Date: Fri, 13 Jan 2023 17:04:29 +0100 Subject: [PATCH 22/26] improve udev rule for xilinx JTAG --- nixos/gorgon/configuration.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix index daf9f6e..8e2461f 100644 --- a/nixos/gorgon/configuration.nix +++ b/nixos/gorgon/configuration.nix @@ -15,12 +15,13 @@ let echo "Signing paths" $OUT_PATHS nix store sign --key-file /etc/nix/key.private $OUT_PATHS ''; - noMtpUdevRules = pkgs.writeTextFile { - name = "no-mtp-probe"; + + xilinxJtag = pkgs.writeTextFile { + name = "xilinx-jtag"; text = '' - ATTR{idVendor}=="0403", ATTR{idProduct}=="6010", ENV{MTP_NO_PROBE}="1", GROUP="dialout", MODE="0666" + ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010", TAG+="uaccess" ''; - destination = "/etc/udev/rules.d/00-no-mtp.rules"; + destination = "/etc/udev/rules.d/61-xilinx-jtag.rules"; }; in { @@ -102,7 +103,7 @@ in systemd.services.modem-manager.enable = lib.mkForce false; systemd.services."dbus-org.freedesktop.ModemManager1".enable = lib.mkForce false; - services.udev.packages= [ noMtpUdevRules ]; + services.udev.packages= [ xilinxJtag ];#noMtpUdevRules ]; virtualisation.libvirtd.enable = true; -- 2.49.0 From 62c6956182b024cef428e35ca6f5cd12e5a7f87e Mon Sep 17 00:00:00 2001 From: dadada Date: Fri, 13 Jan 2023 19:44:07 +0100 Subject: [PATCH 23/26] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'myNixpkgs': 'github:NixOS/nixpkgs/54644f409ab471e87014bb305eac8c50190bcf48' (2023-01-10) → 'github:NixOS/nixpkgs/6a3f9996408c970b99b8b992b11bb249d1455b62' (2023-01-12) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1460b13..0c316ab 100644 --- a/flake.lock +++ b/flake.lock @@ -537,11 +537,11 @@ }, "myNixpkgs": { "locked": { - "lastModified": 1673345971, - "narHash": "sha256-4DfFcKLRfVUTyuGrGNNmw37IeIZSoku9tgTVmu/iD98=", + "lastModified": 1673527292, + "narHash": "sha256-903EpRSDCfUvic7Hsiqwy+h7zlMTLAUbCXkEGGriCfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54644f409ab471e87014bb305eac8c50190bcf48", + "rev": "6a3f9996408c970b99b8b992b11bb249d1455b62", "type": "github" }, "original": { -- 2.49.0 From b253f2b6b4a3e5becae309390f3db93b57029f99 Mon Sep 17 00:00:00 2001 From: dadada Date: Mon, 16 Jan 2023 12:01:21 +0100 Subject: [PATCH 24/26] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'myNixpkgs': 'github:NixOS/nixpkgs/6a3f9996408c970b99b8b992b11bb249d1455b62' (2023-01-12) → 'github:NixOS/nixpkgs/a83ed85c14fcf242653df6f4b0974b7e1c73c6c6' (2023-01-14) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/88016c96c3c338aa801695cdd9f186820bcfe4d6' (2023-01-11) → 'github:NixOS/nixos-hardware/7bd6b87b3712e68007823e8dd5c37ee9b114fee3' (2023-01-15) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0c316ab..6a28903 100644 --- a/flake.lock +++ b/flake.lock @@ -537,11 +537,11 @@ }, "myNixpkgs": { "locked": { - "lastModified": 1673527292, - "narHash": "sha256-903EpRSDCfUvic7Hsiqwy+h7zlMTLAUbCXkEGGriCfM=", + "lastModified": 1673704454, + "narHash": "sha256-5Wdj1MgdOgn3+dMFIBtg+IAYZApjF8JzwLWDPieg0C4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a3f9996408c970b99b8b992b11bb249d1455b62", + "rev": "a83ed85c14fcf242653df6f4b0974b7e1c73c6c6", "type": "github" }, "original": { @@ -640,11 +640,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1673440569, - "narHash": "sha256-FQ5o0yI+MH9MgfseeGDsVIIpIqv3BCgq+0NzncuZ9Zo=", + "lastModified": 1673803274, + "narHash": "sha256-zaJDlHFXewT4KUsidMpRcPE+REymGH1Y3Eoc3Pjv4Xs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "88016c96c3c338aa801695cdd9f186820bcfe4d6", + "rev": "7bd6b87b3712e68007823e8dd5c37ee9b114fee3", "type": "github" }, "original": { -- 2.49.0 From 4d380ff601d5e30a37730a0b369fff46e239dd82 Mon Sep 17 00:00:00 2001 From: dadada Date: Sun, 22 Jan 2023 14:15:15 +0100 Subject: [PATCH 25/26] fix gs backup --- nixos/gorgon/configuration.nix | 8 ++++---- nixos/modules/backup.nix | 2 ++ nixos/modules/profiles/backup.nix | 6 ++++++ secrets/gorgon-backup-gs-passphrase.age | 10 ++++++++++ secrets/secrets.nix | 1 + 5 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 secrets/gorgon-backup-gs-passphrase.age diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix index 8e2461f..34da64e 100644 --- a/nixos/gorgon/configuration.nix +++ b/nixos/gorgon/configuration.nix @@ -99,12 +99,12 @@ in 21027 # Syncthing ]; }; - + systemd.services.modem-manager.enable = lib.mkForce false; systemd.services."dbus-org.freedesktop.ModemManager1".enable = lib.mkForce false; - - services.udev.packages= [ xilinxJtag ];#noMtpUdevRules ]; - + + services.udev.packages = [ xilinxJtag ]; #noMtpUdevRules ]; + virtualisation.libvirtd.enable = true; users.users = { diff --git a/nixos/modules/backup.nix b/nixos/modules/backup.nix index 198651c..06cf81d 100644 --- a/nixos/modules/backup.nix +++ b/nixos/modules/backup.nix @@ -88,6 +88,8 @@ in startAt = "monthly"; }; + systemd.timers."borgbackup-job-gs".enable = false; + services.borgbackup.jobs.bs = mkIf cfg.bs.enable { paths = "/"; exclude = backupExcludes; diff --git a/nixos/modules/profiles/backup.nix b/nixos/modules/profiles/backup.nix index 88dfab5..dc57f96 100644 --- a/nixos/modules/profiles/backup.nix +++ b/nixos/modules/profiles/backup.nix @@ -9,6 +9,12 @@ in sshIdentityFile = config.age.secrets."${config.networking.hostName}-backup-ssh-key".path; }; + dadada.backupClient.gs = { + enable = true; + passphrasePath = config.age.secrets."${config.networking.hostName}-backup-passphrase-gs".path; + }; + age.secrets."${config.networking.hostName}-backup-passphrase".file = "${secretsPath}/${config.networking.hostName}-backup-passphrase.age"; + age.secrets."${config.networking.hostName}-backup-passphrase-gs".file = "${secretsPath}/${config.networking.hostName}-backup-passphrase-gs.age"; age.secrets."${config.networking.hostName}-backup-ssh-key".file = "${secretsPath}/${config.networking.hostName}-backup-ssh-key.age"; } diff --git a/secrets/gorgon-backup-gs-passphrase.age b/secrets/gorgon-backup-gs-passphrase.age new file mode 100644 index 0000000..56e974e --- /dev/null +++ b/secrets/gorgon-backup-gs-passphrase.age @@ -0,0 +1,10 @@ +age-encryption.org/v1 +-> ssh-ed25519 0aOabg 9911l+glO4IHD+/KEqVMfJHNHAxP/iShTVpGHgKC/TY +9g7vLb+T2079yst1ZKXKlwAVhF9zQd79vl/UWpnBJq8 +-> ssh-ed25519 Otklkw egRNXEFrQMSJ5rZTM4ND5LgJjkIW66YKtCeWQ1rkNTE +YQViNMFpP/S3Tpc1yvIHIWud7QHTnO0RK3FQbPlQ8N4 +-> xV2q-grease +2HGDr4IOqMcYh5ud219N73Gq8lyOWX4irrjCnNe1CR8dpjWN+rnDnCFbEB3Troqp +4zVnSNw +--- dPWJpPMiJkxAA+H8HmahTdMCGa5HaglmYmgUzhctgUo +@ÌB¾t]šøzïï‘øy*}ˆ‰§îþõ-A’¾×ÁPbÈvÙØhúnŠß =`-Âà4Ò \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index b236900..7650525 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -18,6 +18,7 @@ in "pruflas-wg-hydra-key.age".publicKeys = [ systems.pruflas dadada ]; "hydra-github-authorization.age".publicKeys = [ systems.pruflas dadada ]; "miniflux-admin-credentials.age".publicKeys = [ systems.surgat dadada ]; + "gorgon-backup-gs-passphrase.age".publicKeys = [ systems.gorgon dadada ]; } // backupSecrets "gorgon" // backupSecrets "ifrit" // -- 2.49.0 From 81f0db14ac4c2e71cda48d729f1bfd785c6d74d8 Mon Sep 17 00:00:00 2001 From: dadada Date: Sun, 22 Jan 2023 14:37:50 +0100 Subject: [PATCH 26/26] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'deploy-rs': 'github:serokell/deploy-rs/a5619f5660a00f58c2b7c16d89058e92327ac9b8' (2022-12-29) → 'github:serokell/deploy-rs/8c9ea9605eed20528bf60fae35a2b613b901fd77' (2023-01-19) • Updated input 'myNixpkgs': 'github:NixOS/nixpkgs/a83ed85c14fcf242653df6f4b0974b7e1c73c6c6' (2023-01-14) → 'github:NixOS/nixpkgs/cdead16a444a3e5de7bc9b0af8e198b11bb01804' (2023-01-20) • Updated input 'nix-doom-emacs': 'github:nix-community/nix-doom-emacs/85a48dbec84e9c26785b58fecdefa1cfc580aea7' (2022-12-23) → 'github:nix-community/nix-doom-emacs/cac2195c172b084562f028542cd2332ef6d6f27c' (2023-01-20) • Updated input 'nix-doom-emacs/emacs-overlay': 'github:nix-community/emacs-overlay/9c95614e0b1a2f6a3f4cf9b99b17439887ea0373' (2022-12-22) → 'github:nix-community/emacs-overlay/fa7dedfa5e1171a76ff78a1260064e1b20ec93bb' (2023-01-19) • Updated input 'nix-doom-emacs/flake-compat': 'github:edolstra/flake-compat/009399224d5e398d03b22badca40a37ac85412a1' (2022-11-17) → 'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17) • Updated input 'nix-doom-emacs/org': 'github:emacs-straight/org-mode/42153ea2fec66f90c1623be25d6774d96ecf8062' (2022-12-10) → 'github:emacs-straight/org-mode/ecb62e2e317b1a4b5b8a6c0f111ed7ef18413040' (2023-01-12) • Updated input 'nix-doom-emacs/revealjs': 'github:hakimel/reveal.js/4fe3946cb43de57f79aaa7b646aee7e78f4bcc75' (2022-12-07) → 'github:hakimel/reveal.js/6510916b9f55a8f3110030bcdd1aee1b7fb77b6f' (2023-01-18) • Updated input 'nix-doom-emacs/ts-fold': 'github:jcs-elpa/ts-fold/a64f5252a66253852bef1c627cea9e39928e6392' (2022-12-19) → 'github:jcs-elpa/ts-fold/75d6f9ed317b042b5bc7cb21503596d1c7a1b8c0' (2023-01-10) --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 6a28903..f0b79ae 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1672327199, - "narHash": "sha256-pFlngSHXKBhAmbaKZ4FYtu57LLunG+vWdL7a5vw1RvQ=", + "lastModified": 1674127017, + "narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=", "owner": "serokell", "repo": "deploy-rs", - "rev": "a5619f5660a00f58c2b7c16d89058e92327ac9b8", + "rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77", "type": "github" }, "original": { @@ -194,11 +194,11 @@ "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1671729646, - "narHash": "sha256-crrTM9K1q8zGZ2gibEPJAudAnr0bMqPiLr1I8P+I5ls=", + "lastModified": 1674151952, + "narHash": "sha256-c0dwSGWi8LH2uBsv7ZJK11To1w8oFjTs+d2dtiusGug=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9c95614e0b1a2f6a3f4cf9b99b17439887ea0373", + "rev": "fa7dedfa5e1171a76ff78a1260064e1b20ec93bb", "type": "github" }, "original": { @@ -322,11 +322,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -537,11 +537,11 @@ }, "myNixpkgs": { "locked": { - "lastModified": 1673704454, - "narHash": "sha256-5Wdj1MgdOgn3+dMFIBtg+IAYZApjF8JzwLWDPieg0C4=", + "lastModified": 1674242456, + "narHash": "sha256-yBy7rCH7EiBe9+CHZm9YB5ii5GRa+MOxeW0oDEBO8SE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a83ed85c14fcf242653df6f4b0974b7e1c73c6c6", + "rev": "cdead16a444a3e5de7bc9b0af8e198b11bb01804", "type": "github" }, "original": { @@ -582,11 +582,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1671758850, - "narHash": "sha256-B6us/CLIIPJRJgjn/hVp7N07j90kil4HmjUVj8TBhKE=", + "lastModified": 1674178427, + "narHash": "sha256-3bSxHYmHET/6VVnSSzAEGRCV2ZoKCbVAvn/NXnDYOwM=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "85a48dbec84e9c26785b58fecdefa1cfc580aea7", + "rev": "cac2195c172b084562f028542cd2332ef6d6f27c", "type": "github" }, "original": { @@ -750,11 +750,11 @@ "org": { "flake": false, "locked": { - "lastModified": 1670680538, - "narHash": "sha256-afmN2tOY6Par235bVsqhtFHOSVyw4NBgTxI5Eo6Yk5A=", + "lastModified": 1673519709, + "narHash": "sha256-XtGk32Lw2iGDgH5Q4Rjhig0Iq5hpIM0EKQoptJ+nT3k=", "owner": "emacs-straight", "repo": "org-mode", - "rev": "42153ea2fec66f90c1623be25d6774d96ecf8062", + "rev": "ecb62e2e317b1a4b5b8a6c0f111ed7ef18413040", "type": "github" }, "original": { @@ -834,11 +834,11 @@ "revealjs": { "flake": false, "locked": { - "lastModified": 1670408834, - "narHash": "sha256-2LG8/AwMC+caNK9DKDyVGw+EPT2W6ys177xQj7mdKng=", + "lastModified": 1674035434, + "narHash": "sha256-z+XxEX+GVcnKt4GAollnHTEHA8YkQfVOLLUuHka6EtA=", "owner": "hakimel", "repo": "reveal.js", - "rev": "4fe3946cb43de57f79aaa7b646aee7e78f4bcc75", + "rev": "6510916b9f55a8f3110030bcdd1aee1b7fb77b6f", "type": "github" }, "original": { @@ -946,11 +946,11 @@ "ts-fold": { "flake": false, "locked": { - "lastModified": 1671426601, - "narHash": "sha256-NrvSK+olbi4P+9q5KOomNHGgmrRtI9cW9ZqkdU4n0Sc=", + "lastModified": 1673328482, + "narHash": "sha256-6yQ35uJDAK531QNQZgloQaOQayRa8azOlOMbO8lXsHE=", "owner": "jcs-elpa", "repo": "ts-fold", - "rev": "a64f5252a66253852bef1c627cea9e39928e6392", + "rev": "75d6f9ed317b042b5bc7cb21503596d1c7a1b8c0", "type": "github" }, "original": { -- 2.49.0