From 2c5d877a9a2208e6cfd6c480d62dcd061ef499fb Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 26 Mar 2025 00:53:16 -0400 Subject: [PATCH] update --- etcnixos/flake.lock | 12 +++++------ etcnixos/system-mreow.nix | 6 +----- etcnixos/util/untar.nix | 21 -------------------- home-manager/flake.lock | 42 +++++++++++++++++++-------------------- 4 files changed, 28 insertions(+), 53 deletions(-) delete mode 100644 etcnixos/util/untar.nix diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index ef56975..d920b4f 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1742895049, - "narHash": "sha256-yW6jHx1SxPwCyvjV1oXdXBN15I19TQMfmvhWYa3+igQ=", + "lastModified": 1742921081, + "narHash": "sha256-c1mq2EwulIoLng2oww3IozEGTarxuCBRJ5w5KIS0Mf4=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "d64bc1983d0be93e9d6db032698c7519ab99af56", + "rev": "ef953b78549dc877d958d002a8661cbb65e87a1f", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1742701794, - "narHash": "sha256-bJIFFa6/4vBGoNmCwjO5TCIbiveV2BRxVLqHcxk5jXw=", + "lastModified": 1742871411, + "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=", "owner": "nix-community", "repo": "home-manager", - "rev": "9172a6f956f7e0f7810861b9b1146f1c43d9abcb", + "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625", "type": "github" }, "original": { diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index fecb706..000abc6 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -6,10 +6,6 @@ inputs, ... }: - -let - untar = pkgs.callPackage ./util/untar.nix; -in { imports = [ ./common.nix @@ -88,7 +84,7 @@ in mkdir -p ${config.boot.lanzaboote.pkiBundle} ${pkgs.gnutar}/bin/tar xf ${./secrets/secureboot.tar} -C ${config.boot.lanzaboote.pkiBundle} chown -R root:wheel ${config.boot.lanzaboote.pkiBundle} - chmod -R 700 ${config.boot.lanzaboote.pkiBundle} + chmod -R 500 ${config.boot.lanzaboote.pkiBundle} ''; }; diff --git a/etcnixos/util/untar.nix b/etcnixos/util/untar.nix deleted file mode 100644 index f5bb304..0000000 --- a/etcnixos/util/untar.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - stdenv, - gnutar, - src, -}: -stdenv.mkDerivation { - pname = "untar"; - version = "1.0"; - - inherit src; - - buildInputs = [ gnutar ]; - - # input is a file, not a directory, skip unpackPhase - unpackPhase = "true"; - - installPhase = '' - mkdir -p $out - tar xf ${src} -C $out/ - ''; -} diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 29025cf..f4180aa 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1742871411, - "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=", + "lastModified": 1742957044, + "narHash": "sha256-gwW0tBIA77g6qq45y220drTy0DmThF3fJMwVFUtYV9c=", "owner": "nix-community", "repo": "home-manager", - "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625", + "rev": "ce287a5cd3ef78203bc78021447f937a988d9f6f", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742832363, - "narHash": "sha256-STJUQ7PVfjlWdHSuxXDH/UZNjrUVO1Up/x2AwhtJRio=", + "lastModified": 1742954683, + "narHash": "sha256-ZJBJzpWQcZYuxiX7YbLCaiZl1aOt8xQphXt0ZO0st+8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8720365191e3931cefd3fc9484dccba5e219b73d", + "rev": "41db28938147dfa2a2d528f24b59b6962b96f0c5", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1742719554, - "narHash": "sha256-zBB/Niset99u6/b6z9hS2IYfDigDI9huiG0QXvDKDS4=", + "lastModified": 1742877599, + "narHash": "sha256-3Xy1mlAUcYSQSpt0Q/flA+o6Y1ZACDW52vVP2CX52w8=", "owner": "YaLTeR", "repo": "niri", - "rev": "c709696237f3e963225b8df248538cc691ccba3d", + "rev": "4534d3726676a403eb3dd19d28371bd8acd98401", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742512142, - "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", + "lastModified": 1742751704, + "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", + "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1742870002, - "narHash": "sha256-eQnw8ufyLmrboODU8RKVNh2Mv7SACzdoFrRUV5zdNNE=", + "lastModified": 1742956365, + "narHash": "sha256-Slrqmt6kJ/M7Z/ce4ebQWsz2aeEodrX56CsupOEPoz0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b4c18f262dbebecb855136c1ed8047b99a9c75b6", + "rev": "a0e3395c63cdbc9c1ec17915f8328c077c79c4a1", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1742671548, - "narHash": "sha256-nJK70IyhyOXth5Dcyv7DKtv95TTZkqcAYHVj4Uq2Blw=", + "lastModified": 1742773235, + "narHash": "sha256-YhJex62HHVF6EfdGLIC01uM6jH8XJu5ryZ+LlhG7wMs=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0fa13c6fb43ae26a597103989a42e44a03d2d827", + "rev": "b2613aec05f9e3f8488ef924203d62cafb712642", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1742871532, - "narHash": "sha256-ciC3zul202dnIwpAplSaCJTeXOUce7Pl1d+SMFwPQls=", + "lastModified": 1742957876, + "narHash": "sha256-gMW/S6xEpzfPkFt/pE6bi3wd4/eVPOYKZGDUz9vVML4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "bef72020b20475847f24cd27134dca06724d4ba7", + "rev": "1e40a8e9fa79991940c17a2e6d354346c73ad002", "type": "github" }, "original": {