diff --git a/flake.lock b/flake.lock index 7679f22..c0b86dc 100644 --- a/flake.lock +++ b/flake.lock @@ -192,11 +192,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1720734513, - "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", + "lastModified": 1721135958, + "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", "owner": "nix-community", "repo": "home-manager", - "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", + "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", "type": "github" }, "original": { @@ -654,11 +654,11 @@ ] }, "locked": { - "lastModified": 1720969601, - "narHash": "sha256-oESu3KD4Y1AWMCd+J4EGPcJ2tZidRPG4OP/HuRxAAfc=", + "lastModified": 1721192756, + "narHash": "sha256-52+luhZYD8IVmCK1JyuK3ZQUAR5m3MuDtUFVreaLHcc=", "owner": "abenz1267", "repo": "walker", - "rev": "2cd3e8c265a02fbaf13a77f8fd428d22bc273b9b", + "rev": "67c8238b32350f64e947738337d273cd68ce64d5", "type": "github" }, "original": { diff --git a/system/roles/workstation/runners.nix b/system/roles/workstation/runners.nix index 6b6fae4..f1fec0e 100644 --- a/system/roles/workstation/runners.nix +++ b/system/roles/workstation/runners.nix @@ -47,6 +47,11 @@ in { xorg.libX11 ]; }; + + # Some pre-compiled binaries hard-code ssl cert file to /etc/ssl/cert.pem + # instead of what NixOS uses (/etc/ssl/certs/ca-certificates.crt). Make a + # symlink there for compatibility. + # - For example the rye installed python binaries look there + environment.etc."ssl/cert.pem".source = "/etc/ssl/certs/ca-certificates.crt"; }; } - diff --git a/system/shared/default.nix b/system/shared/default.nix index 0c0019e..849efc8 100644 --- a/system/shared/default.nix +++ b/system/shared/default.nix @@ -12,6 +12,5 @@ _: { ./system.nix ./network.nix ./localisation.nix - ./packages.nix ]; } diff --git a/system/shared/environment/packages.nix b/system/shared/environment/packages.nix index 77c4c76..c4cf3e1 100644 --- a/system/shared/environment/packages.nix +++ b/system/shared/environment/packages.nix @@ -1,5 +1,7 @@ -{ pkgs, ... }: { +{pkgs, ...}: { environment.systemPackages = with pkgs; [ + killall + openssl curl wget pciutils diff --git a/system/shared/packages.nix b/system/shared/packages.nix deleted file mode 100644 index d5d1ad5..0000000 --- a/system/shared/packages.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pkgs, - ... -}: { - environment.systemPackages = with pkgs; [ - killall - ]; -}