From e522024eb965675acd59aea4b2e594bda6948446 Mon Sep 17 00:00:00 2001 From: John Lancaster <32917998+jsl12@users.noreply.github.com> Date: Thu, 20 Mar 2025 18:47:07 -0500 Subject: [PATCH] flake update --- flake.lock | 30 +++++++++++++++--------------- flake.nix | 10 ++++++---- scripts/default.nix | 2 +- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 23bca02..5c710a7 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1741670053, - "narHash": "sha256-SkRdBYdaMCUiKExeOdrvHGRcFUqp35YjIEdhIVu0WOA=", + "lastModified": 1742489664, + "narHash": "sha256-fFyOU2/c9rbVbzD4dqf6auEBUx658riCQOHcBhamRYM=", "owner": "cachix", "repo": "devenv", - "rev": "47abb5dfd5b7824a0979ef86f3986aea48847312", + "rev": "c3f0053b68d618d5496be6b881b664437cf918b1", "type": "github" }, "original": { @@ -178,11 +178,11 @@ ] }, "locked": { - "lastModified": 1741701235, - "narHash": "sha256-gBlb8R9gnjUAT5XabJeel3C2iEUiBHx3+91651y3Sqo=", + "lastModified": 1742508854, + "narHash": "sha256-vQQTIl4+slrcu7ftVKNBql9ngBdY0dcYGujdT7zIVp0=", "owner": "nix-community", "repo": "home-manager", - "rev": "c630dfa8abcc65984cc1e47fb25d4552c81dd37e", + "rev": "da0181819479ddc034a3db9a77ed21ea3bcc0668", "type": "github" }, "original": { @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1734114420, - "narHash": "sha256-n52PUzub5jZWc8nI/sR7UICOheU8rNA+YZ73YaHeCBg=", + "lastModified": 1741798497, + "narHash": "sha256-E3j+3MoY8Y96mG1dUIiLFm2tZmNbRvSiyN7CrSKuAVg=", "owner": "domenkozar", "repo": "nix", - "rev": "bde6a1a0d1f2af86caa4d20d23eca019f3d57eee", + "rev": "f3f44b2baaf6c4c6e179de8cbb1cc6db031083cd", "type": "github" }, "original": { @@ -295,11 +295,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", "type": "github" }, "original": { @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1741644481, - "narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=", + "lastModified": 1742406979, + "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e653d71e82575a43fe9d228def8eddb73887b866", + "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 90099db..980a262 100644 --- a/flake.nix +++ b/flake.nix @@ -110,15 +110,17 @@ packages = with pkgs; [ git gdbm + # (python312.withPackages (python-pkgs: with python-pkgs; [ gdbm ])) (python312.withPackages (python-pkgs: with python-pkgs; [ + gdbm notebook # kinda hacky, but needed so that jupyter notebook has some shared library it needs? ])) - (writeShellScriptBin "ad-nb" "cd $(readlink -f /etc/nixos) && devenv up") + # (writeShellScriptBin "ad-nb" "cd $(readlink -f /etc/nixos) && devenv up") ]; - processes = { - my-jup.exec = "uv run jupyter notebook"; - }; + # processes = { + # my-jup.exec = "uv run jupyter notebook"; + # }; enterShell = '' alias appdaemon="${pkgs.uv}/bin/uv run --frozen python -m appdaemon" diff --git a/scripts/default.nix b/scripts/default.nix index ad4655f..c9fd2d9 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -7,7 +7,7 @@ (pkgs.writeShellScriptBin "nfsu" '' FLAKE=$(readlink -f /etc/nixos) nix flake update --flake $FLAKE --impure - git -C /etc/nixos add $FLAKE > /dev/null 2>&1 + git -C $FLAKE add "$FLAKE/flake.lock" > /dev/null 2>&1 sudo nixos-rebuild switch --flake $FLAKE#${systemSettings.hostName} --impure '') (pkgs.writeShellScriptBin "ads" "nix develop --no-pure-eval $(readlink -f /etc/nixos)")