diff --git a/flake.lock b/flake.lock index 842d89f..8c26b4d 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1746171682, - "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "owner": "nix-community", "repo": "home-manager", - "rev": "50eee705bbdbac942074a8c120e8194185633675", + "rev": "d5f1f641b289553927b3801580598d200a501863", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746422338, - "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", "type": "github" }, "original": { @@ -76,11 +76,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1756266583, + "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730768919, - "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", + "lastModified": 1754340878, + "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", + "rev": "cab778239e705082fe97bb4990e0d24c50924c04", "type": "github" }, "original": { @@ -113,11 +113,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1746537231, - "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", + "lastModified": 1755960406, + "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", + "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2", "type": "github" }, "original": { diff --git a/noah-home.nix b/noah-home.nix index 0251580..014c1e2 100644 --- a/noah-home.nix +++ b/noah-home.nix @@ -18,6 +18,7 @@ in tree btop htop + amdgpu_top tmux mtr pavucontrol @@ -43,6 +44,9 @@ in isync unstable.catgirl unstable.zellij + unstable.yt-dlp + unstable.deno + unstable.ffmpeg # Dev tools git @@ -70,6 +74,7 @@ in #ghc nil python3 + uv #unstable.harec #unstable.hare #unstable.haredo diff --git a/services.nix b/services.nix index a313921..d2c8b92 100644 --- a/services.nix +++ b/services.nix @@ -13,19 +13,19 @@ let (final: prev: { # Override the version of Plex installed to be the latest plexRaw = prev.plexRaw.overrideAttrs rec { - version = "1.42.1.10060-4e8b05daf"; + version = "1.42.2.10156-f737b826c"; src = final.fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "OoItvG0IpgUKlZ0JmzDc2WqMtyZrlNCF7MCnUKqBl/Q="; + sha256 = "1ieh7qc1UBTorqQTKUQgKzM96EtaKZZ8HYq9ILf+X3M="; }; }; - # Override the json object that contains verions and hashes for Immich - immich = prev.immich.override { sourcesJSON = ./overrides/immich-sources.json; }; - # Fix errors wit numpy version failing to resolve in the immich ML package - immich-machine-learning = prev.immich-machine-learning.overrideAttrs - (finalAttrs: prevAttrs: { - pythonRelaxDeps = prevAttrs.pythonRelaxDeps ++ [ "numpy" ]; - }); + ## Override the json object that contains verions and hashes for Immich + #immich = prev.immich.override { sourcesJSON = ./overrides/immich-sources.json; }; + ## Fix errors wit numpy version failing to resolve in the immich ML package + #immich-machine-learning = prev.immich-machine-learning.overrideAttrs + # (finalAttrs: prevAttrs: { + # pythonRelaxDeps = prevAttrs.pythonRelaxDeps ++ [ "numpy" ]; + # }); }) ]; }; diff --git a/users.nix b/users.nix index d21b38c..7d1bde1 100644 --- a/users.nix +++ b/users.nix @@ -27,7 +27,7 @@ in name = "chiefnoah.keys"; # Update this with: # `curl https://meta.sr.ht/~chiefnoah.keys | sha256sum` - sha256 = "02wz63g7s05y79njkrkrk0lhwzai50bl19yp9y8273y876fcjfj8"; + sha256 = "1cry2r7m7c15ajlcdncdx3ppf6m0pzwgn1d025sq8g4d21n1qpal"; })); };