From cbfbd740fb9b0c73e1211f8f7958e517b824effc Mon Sep 17 00:00:00 2001 From: pupbrained Date: Sun, 6 Oct 2024 00:25:01 -0400 Subject: [PATCH] suckle --- flake.in.nix | 3 +- flake.lock | 31 +++++++++---------- flake.nix | 2 +- homes/x86_64-linux/marshall@navis/default.nix | 12 ++++++- 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/flake.in.nix b/flake.in.nix index 79a9c61..699ed97 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -33,7 +33,8 @@ nixvim = mkInput "pupbrained/nvim-config"; treefmt-nix = mkInput "numtide/treefmt-nix"; xmonad-contrib = mkInput "xmonad/xmonad-contrib"; - zen-browser = mkInput "fufexan/zen-browser-flake"; + # TODO: Remove this once flake is fixed + zen-browser = mkInput "fufexan/zen-browser-flake/5ea9183acb736b9a606a1f33505d20a6f14dc5cf"; cosmic = mkFollowingNixpkgs "lilyinstarlight/nixos-cosmic"; darwin = mkFollowingNixpkgs "LnL7/nix-darwin/master"; diff --git a/flake.lock b/flake.lock index 9cd9ac1..c0df0d7 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728092141, - "narHash": "sha256-u+UxketRUX1z240OUChcypvxlyJni/9uE0hK1QdRZVg=", + "lastModified": 1728184451, + "narHash": "sha256-XuvfrJ3TkHfGKRdiWPN/RD+veVtGl0Db+R44fb5gdT8=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "4e1154ed7ff31817fe4b9a753d3d481940b0baa8", + "rev": "631b0cbf1466553533a87e4b8e77c00731eba21f", "type": "github" }, "original": { @@ -1180,11 +1180,11 @@ ] }, "locked": { - "lastModified": 1727658919, - "narHash": "sha256-YAePt2GldkkRJ08LvZNHcuS6shIVStj+K+1DZN3gbnM=", + "lastModified": 1728185226, + "narHash": "sha256-W+wWyNjFywVfFrbErXhGwgO2HlR0yMHqd1doEEbW9yw=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f9fdf8285690a351e8998f1e703ebdf9cdf51dee", + "rev": "0f7169d3ec7ef1477af6e39731e67a1dc7a9f6e7", "type": "github" }, "original": { @@ -1265,11 +1265,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1727907660, - "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", + "lastModified": 1728067476, + "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", + "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030", "type": "github" }, "original": { @@ -1374,10 +1374,9 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1728018373, + "lastModified": 0, "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "path": "/nix/store/sdzpqjwx7pdx6lsq6llyfqqf7hspp83c-source", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "path" }, "original": { @@ -1401,10 +1400,9 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1728018373, + "lastModified": 0, "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "path": "/nix/store/sdzpqjwx7pdx6lsq6llyfqqf7hspp83c-source", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "path" }, "original": { @@ -1709,11 +1707,11 @@ ] }, "locked": { - "lastModified": 1728008962, - "narHash": "sha256-MjGMCVKqafsrqLQYJHHKXJkvocTjkxKjadBfN952/Zw=", + "lastModified": 1728095260, + "narHash": "sha256-X62hA5ivYLY5G5+mXI6l9eUDkgi6Wu/7QUrwXhJ09oo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "862d0c1e5fe2348a22044f225afef39b75df8cf0", + "rev": "d1d2532ab267cfe6e40dff73fbaf34436c406d26", "type": "github" }, "original": { @@ -2143,6 +2141,7 @@ "original": { "owner": "fufexan", "repo": "zen-browser-flake", + "rev": "5ea9183acb736b9a606a1f33505d20a6f14dc5cf", "type": "github" } } diff --git a/flake.nix b/flake.nix index 29f0403..a2b22af 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,7 @@ }; treefmt-nix.url = "github:numtide/treefmt-nix"; xmonad-contrib.url = "github:xmonad/xmonad-contrib"; - zen-browser.url = "github:fufexan/zen-browser-flake"; + zen-browser.url = "github:fufexan/zen-browser-flake/5ea9183acb736b9a606a1f33505d20a6f14dc5cf"; }; outputs = inputs: inputs.flakegen ./flake.in.nix inputs; } diff --git a/homes/x86_64-linux/marshall@navis/default.nix b/homes/x86_64-linux/marshall@navis/default.nix index 9de377c..2a31629 100644 --- a/homes/x86_64-linux/marshall@navis/default.nix +++ b/homes/x86_64-linux/marshall@navis/default.nix @@ -119,7 +119,17 @@ in { neovide playerctl prismlauncher - python3 + (python312.withPackages + (p: + with p; [ + epc + orjson + sexpdata + six + setuptools + paramiko + rapidfuzz + ])) slack telegram-desktop xdotool