diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml index b7a0f6c..3b36789 100644 --- a/.github/workflows/build-machines-and-homes.yml +++ b/.github/workflows/build-machines-and-homes.yml @@ -54,7 +54,7 @@ jobs: - name: cache if: always() run: | - nix copy --all --to 's3://nixcache?endpoint=s3.cy7.sh' --verbose + nix copy ".#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel" --to "s3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem" build-homes: strategy: fail-fast: false diff --git a/.sops.yaml b/.sops.yaml index 9e9a860..c812080 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -128,4 +128,3 @@ creation_rules: - age: - *yt - *cy - - *chunk diff --git a/flake.lock b/flake.lock index 35e109f..0f289a9 100644 --- a/flake.lock +++ b/flake.lock @@ -448,6 +448,30 @@ "type": "github" } }, + "helix": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": "nixpkgs_4", + "rust-overlay": [ + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1743094823, + "narHash": "sha256-ZWBc4zCMlJXn5u6JN9lZLOasIaTqxc6RHEKP7w6Ktq4=", + "owner": "helix-editor", + "repo": "helix", + "rev": "7929c0719d739e248adfd80cd7e5b8e386a43938", + "type": "github" + }, + "original": { + "owner": "helix-editor", + "repo": "helix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -827,6 +851,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1743082947, "narHash": "sha256-wZ/bfXu9x025oNa4pVcwYbgVRSl2tf/izZTegPSljUQ=", @@ -957,13 +997,14 @@ "flake-parts": "flake-parts_2", "flake-utils": "flake-utils", "garage": "garage", + "helix": "helix", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "lix-module": "lix-module", "nil": "nil", "nix-index-database": "nix-index-database", "nix-ld": "nix-ld", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable_2", "nixvim": "nixvim", "nvim-github-theme": "nvim-github-theme", @@ -997,11 +1038,11 @@ ] }, "locked": { - "lastModified": 1743129211, - "narHash": "sha256-gE8t+U9miTwm2NYWS9dFY8H1/QB4ifaFDq1KdV9KEqo=", + "lastModified": 1743042789, + "narHash": "sha256-yPlxN0r3pQjUIwyX/qeWSTdpHjWy/AfmM0PK1bYkO18=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f93da1d26ba9963f34f94a6872b67a7939699543", + "rev": "b4d2dee9d16e7725b71969f28862ded3a94a7934", "type": "github" }, "original": { @@ -1090,11 +1131,11 @@ ] }, "locked": { - "lastModified": 1743126894, - "narHash": "sha256-FUsh0AWH3ndHvZsGkAf0Ng/wn8z9JydhhkICYoU4aEk=", + "lastModified": 1743040433, + "narHash": "sha256-OskUn34vJJdealUG1rdOdnpBEBRfJfw9vKeqNyZKs+s=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "2473e00df450ad863f552f2cc8da78e6a942118d", + "rev": "14a6e019c40901428b97cdef2d873c18386c8e7f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b76d3e1..52d012f 100644 --- a/flake.nix +++ b/flake.nix @@ -91,6 +91,11 @@ flake-utils.follows = "flake-utils"; }; }; + helix = { + url = "github:helix-editor/helix"; + inputs.flake-utils.follows = "flake-utils"; + inputs.rust-overlay.follows = "rust-overlay"; + }; nvim-github-theme = { url = "github:projekt0n/github-nvim-theme"; diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index cd6baa4..4e431b2 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -102,7 +102,6 @@ freetube gopls rust-analyzer - minio-client ]; home.sessionVariables = { @@ -152,4 +151,17 @@ }; programs.nix-index-database.comma.enable = true; + programs.helix = { + enable = true; + settings = { + theme = "github_dark"; + editor = { + line-number = "relative"; + lsp.display-messages = true; + }; + keys.insert = { + "C-[" = "normal_mode"; + }; + }; + }; } diff --git a/hosts/common.nix b/hosts/common.nix index 77e0edb..1d54545 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -1,4 +1,4 @@ -{ inputs, config, ... }: +{ inputs, ... }: { nix = { settings = { @@ -9,7 +9,7 @@ "root" "@wheel" ]; - extra-trusted-public-keys = [ + trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8=" ]; @@ -17,9 +17,6 @@ "https://nix-community.cachix.org" "https://nixcache.cy7.sh" ]; - secret-key-files = [ - config.sops.secrets.cache-priv-key.path - ]; }; channel.enable = false; optimise = { @@ -77,11 +74,4 @@ services.thermald.enable = true; environment.enableAllTerminfo = true; - - sops.secrets.cache-priv-key = { - format = "binary"; - sopsFile = ../secrets/cache-priv-key.pem; - mode = "0440"; - group = "users"; - }; } diff --git a/modules/caddy.nix b/modules/caddy.nix index 3e6ca63..131edf3 100644 --- a/modules/caddy.nix +++ b/modules/caddy.nix @@ -19,9 +19,9 @@ in plugins = [ # error message will tell you the correct version tag to use # (still need the @ to pass nix config check) - "github.com/caddy-dns/cloudflare@v0.0.0-20250228175314-1fb64108d4de" + "github.com/caddy-dns/cloudflare@v0.0.0-20240703190432-89f16b99c18e" ]; - hash = "sha256-YYpsf8HMONR1teMiSymo2y+HrKoxuJMKIea5/NEykGc="; + hash = "sha256-W09nFfBKd+9QEuzV3RYLeNy2CTry1Tz3Vg1U2JPNPPc="; }; logFormat = lib.mkForce "level INFO"; acmeCA = "https://acme-v02.api.letsencrypt.org/directory"; diff --git a/overlay/default.nix b/overlay/default.nix index f4a7353..71bee1e 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -23,6 +23,7 @@ in meta.mainProgram = "garage"; } ); + helix = pkgFrom inputs.helix "default"; } ) ]