diff --git a/flake.lock b/flake.lock index f0232e4..fcca04c 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1734906446, - "narHash": "sha256-6OWluVE2A8xi+8V3jN9KA72RCgJjYdyyuLBUjxZ2q2U=", + "lastModified": 1736102453, + "narHash": "sha256-5qb4kb7Xbt8jJFL/oDqOor9Z2+E+A+ql3PiyDvsfWZ0=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "eecb74dc79bb6752a2a507e6edee3042390a6091", + "rev": "4846091641f3be0ad7542086d52769bb7932bde6", "type": "github" }, "original": { @@ -102,17 +102,17 @@ "cpu-microcodes": { "flake": false, "locked": { - "lastModified": 1734880358, - "narHash": "sha256-nLxzu0X1txVOu7LxadpOLL+EbcS6FCI/xrulsqglMg4=", + "lastModified": 1735409317, + "narHash": "sha256-08yRkyEKk94ax8KfqRFsffXH8J6DCOCE7vKLvHORWZM=", "owner": "platomav", "repo": "CPUMicrocodes", - "rev": "9953c622cc5555b88cb73f042a78bbc8e0edc587", + "rev": "ec5200961ecdf78cf00e55d73902683e835edefd", "type": "github" }, "original": { "owner": "platomav", "repo": "CPUMicrocodes", - "rev": "9953c622cc5555b88cb73f042a78bbc8e0edc587", + "rev": "ec5200961ecdf78cf00e55d73902683e835edefd", "type": "github" } }, @@ -124,11 +124,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1736066025, - "narHash": "sha256-+yugWAq6AOWgO4bRioiU75L9R7Z+3uuqDBiBbWpRWC0=", + "lastModified": 1736411822, + "narHash": "sha256-HHtxhSeFIxPDILnOLLNCGTKSHIeG7TfflXw91wNn0RI=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "4bdba569326d0c891a49a771db394afd096ecf93", + "rev": "a9a96f21aee5560eb0d2e4aa42f274dcf374faca", "type": "github" }, "original": { @@ -140,11 +140,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1733434763, - "narHash": "sha256-sebujw5VvBWMS+wXyjiGF81iyjPM/QQDnw5l7tDJCvk=", + "lastModified": 1736402840, + "narHash": "sha256-R11GSC6TXSTYnFqEc2x0EPh6oruQJ/EPECyc4rWcMZk=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "ba1dca322f9a07bc2b7bec6a98f2c3c55c0bbd77", + "rev": "2b4f762b1e6a366cfcd9ffb3e17f127c64df2657", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1736043148, - "narHash": "sha256-SDmtnPo16p6daIkOxp21k6arPteLamCLvaxi5A1bIq0=", + "lastModified": 1736385356, + "narHash": "sha256-ddNEYJylKbApbxboWk57oq/wkIs3QRYnhDuSgUwG4wE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "37b07e4331db0102655ce8e18d846894751a33b4", + "rev": "b8a53ec5e21526aff929faa711dd22b3d9c5d49b", "type": "github" }, "original": { @@ -176,6 +176,22 @@ "type": "github" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1734969791, + "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -229,11 +245,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1735774679, - "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -326,11 +342,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1736092609, - "narHash": "sha256-AyQh4Odsb2yVZb0nqoijs0vU3N3bBBEzwGi3pukObOo=", + "lastModified": 1736436522, + "narHash": "sha256-9UHWb2T2VJRYN+72yEFjXgJcuFZqKQSHggj6oy9tzJs=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "f4a9b65f788ac437649fea95a905bc9e92c0e668", + "rev": "12ce9f2e3b19cf1810746dcfe5b19f173004e256", "type": "github" }, "original": { @@ -438,11 +454,11 @@ ] }, "locked": { - "lastModified": 1736066484, - "narHash": "sha256-uTstP36WaFrw+TEHb8nLF14hFPzQBOhmIxzioHCDaL8=", + "lastModified": 1736421950, + "narHash": "sha256-RyrX0WFXxFrYvzHNLTIyuk3NcNl3UBykuYru/P0zW5E=", "owner": "nix-community", "repo": "home-manager", - "rev": "5ad12b6ea06b84e48f6b677957c74f32d47bdee0", + "rev": "d4aebb947a301b8da8654a804979a738c5c5da50", "type": "github" }, "original": { @@ -517,11 +533,11 @@ ] }, "locked": { - "lastModified": 1734906236, - "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=", + "lastModified": 1736115290, + "narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c", + "rev": "52202272d89da32a9f866c0d10305a5e3d954c50", "type": "github" }, "original": { @@ -548,11 +564,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1736105724, - "narHash": "sha256-mIJ522Sgr+lSivD5r81/ah+PuDvEikOg2uhIR43/MA0=", + "lastModified": 1736421227, + "narHash": "sha256-zuwvJLMvnf9kgpkJIte52D7r3C4hJo7UbXCtsQYuP+0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "1b06d222cf5abfc9802f7787315a8190f011d43e", + "rev": "e66eab7b6a90514251439f661454c536afa3e5c8", "type": "github" }, "original": { @@ -573,11 +589,11 @@ ] }, "locked": { - "lastModified": 1735734474, - "narHash": "sha256-9OV4lOqrEJVLdOrpNN/9msNwAhI6FQTu4N7fufilG08=", + "lastModified": 1735774328, + "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "271df559dd30e4bc5ec6af02d017ac0aaabd63a7", + "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb", "type": "github" }, "original": { @@ -602,11 +618,11 @@ ] }, "locked": { - "lastModified": 1734906472, - "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=", + "lastModified": 1736114838, + "narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152", + "rev": "6997fe382dcf396704227d2b98ffdd5066da6959", "type": "github" }, "original": { @@ -631,11 +647,11 @@ ] }, "locked": { - "lastModified": 1734906259, - "narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=", + "lastModified": 1735393019, + "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0404833ea18d543df44df935ebf1b497310eb046", + "rev": "55608efdaa387af7bfdc0eddb404c409958efa43", "type": "github" }, "original": { @@ -656,11 +672,11 @@ ] }, "locked": { - "lastModified": 1735316583, - "narHash": "sha256-AiiUwHWHfEdpFzXy7l1x3zInCUa1xcRMrbZ1XRSkzwU=", + "lastModified": 1736164519, + "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "8f15d45b120b33712f6db477fe5ffb18034d0ea8", + "rev": "3c895da64b0eb19870142196fa48c07090b441c4", "type": "github" }, "original": { @@ -681,11 +697,11 @@ ] }, "locked": { - "lastModified": 1734793513, - "narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=", + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", "type": "github" }, "original": { @@ -701,11 +717,11 @@ ] }, "locked": { - "lastModified": 1736021712, - "narHash": "sha256-e38bvl5+L62/Ec8R7CoJ+ShL/lnAjX/ILxWU8zo7+Bk=", + "lastModified": 1736447285, + "narHash": "sha256-RG8/48tWHq/tTAIN5X6GYGWARxnwts9LK53Ww49lcks=", "ref": "refs/heads/master", - "rev": "ede7c1c0e079ace607815d6698565c8438f07cf2", - "revCount": 59, + "rev": "e8a367ef38cc7b80b060a211097c42625297ffbf", + "revCount": 60, "type": "git", "url": "ssh://git@gitlab.com/CaptainJawZ/scripts-flake.git" }, @@ -723,11 +739,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1736041337, - "narHash": "sha256-ImIZdS70uEHLC1NxRfc0bTVhUSBZjDNyaLlUAiloL8g=", + "lastModified": 1736275344, + "narHash": "sha256-96yQIFgep6DT5XuGEYl7O0GCbPOZv6NVctl7nw0m3Gg=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "118be90db8e4b06e3829b7b6ea901b610e870040", + "rev": "6f431d614aa0e50a01253b7167c8c97a0ec83872", "type": "github" }, "original": { @@ -738,11 +754,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735915915, - "narHash": "sha256-Q4HuFAvoKAIiTRZTUxJ0ZXeTC7lLfC9/dggGHNXNlCw=", + "lastModified": 1736241350, + "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a27871180d30ebee8aa6b11bf7fef8a52f024733", + "rev": "8c9fd3e564728e90829ee7dbac6edc972971cd0f", "type": "github" }, "original": { @@ -762,22 +778,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" } }, - "nixpkgs-paint": { - "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1733423277, @@ -794,22 +794,6 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1733229606, @@ -826,13 +810,45 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs11": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs5": { + "locked": { + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { @@ -851,11 +867,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736102571, - "narHash": "sha256-kqwFSGjc51UwN83cJxU9+Ld9SoKMTWl7oM3efx7Ma2A=", + "lastModified": 1736449505, + "narHash": "sha256-/EUs0GT+Wc8mgSZeF+vgQT8Ky2DxPlDoR7MwrLFPm6w=", "owner": "nix-community", "repo": "nur", - "rev": "b95b380c7800128a1dc9f286de3fb92868909645", + "rev": "e25579f62653e325b2b51aeb92b53cd3ab2a1690", "type": "github" }, "original": { @@ -871,15 +887,14 @@ "nixpkgs": [ "hyprland", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" + ] }, "locked": { - "lastModified": 1734797603, - "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -897,7 +912,8 @@ "jawz-scripts": "jawz-scripts", "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs_2", - "nixpkgs-paint": "nixpkgs-paint", + "nixpkgs11": "nixpkgs11", + "nixpkgs5": "nixpkgs5", "nur": "nur", "sops-nix": "sops-nix", "stylix": "stylix", @@ -911,11 +927,11 @@ ] }, "locked": { - "lastModified": 1736064798, - "narHash": "sha256-xJRN0FmX9QJ6+w8eIIIxzBU1AyQcLKJ1M/Gp6lnSD20=", + "lastModified": 1736203741, + "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5dc08f9cc77f03b43aacffdfbc8316807773c930", + "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", "type": "github" }, "original": { @@ -930,6 +946,7 @@ "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_2", "git-hooks": "git-hooks", @@ -941,14 +958,15 @@ "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux" + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1736011580, - "narHash": "sha256-8gmk/i9ZA5C6LGRnqHb5sZ8UKaqT5GnS6XxeSPMSz+s=", + "lastModified": 1736300059, + "narHash": "sha256-z3mR+0gBN/iVM8UgfCSIxjgw4jm1bu1kjMKyQx9mGBc=", "owner": "danth", "repo": "stylix", - "rev": "7dfcdb410118dcd02ba1d85a2179a6f1c877403f", + "rev": "168306ce7f5d823ccee8b7d4e112ea20671c2b8f", "type": "github" }, "original": { @@ -1067,6 +1085,22 @@ "type": "github" } }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1093,11 +1127,11 @@ "cpu-microcodes": "cpu-microcodes" }, "locked": { - "lastModified": 1734918967, - "narHash": "sha256-2BoHRzShQYseyY1eNlHAlFLGZVJqWbCnW3F4BZMWyiU=", + "lastModified": 1736198812, + "narHash": "sha256-7ZGGuLEz3SfL0Sqj6p92AL0VBAqwgvXy4Rln0zqrPw0=", "owner": "e-tho", "repo": "ucodenix", - "rev": "e672b17a0991427328efbbca8dc88ea855888709", + "rev": "769032e440674d3d963fa9e66e301f9265cd3d24", "type": "github" }, "original": { @@ -1115,11 +1149,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1735507919, - "narHash": "sha256-4cR4mk1660p3y8wnX0XbHSQh4KX0mbMn6/2YnALNt8o=", + "lastModified": 1736449219, + "narHash": "sha256-ka8Lmw08Wyq5FrrQetIQI5gGyf6RAbtWQ4f+dlZlz6U=", "ref": "refs/heads/main", - "rev": "59a82ea8cd284c7535bc06b8f6156abb7da96f6a", - "revCount": 874, + "rev": "fd661977850e02fa356df4324c86c73b29c2621a", + "revCount": 893, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" diff --git a/overlay.nix b/overlay.nix index 56ef9d5..9f284fe 100644 --- a/overlay.nix +++ b/overlay.nix @@ -1,4 +1,8 @@ -{ pkgs, pkgsP }: +{ + pkgs, + pkgs5, + pkgs11, +}: _final: prev: { gnome = prev.gnome.overrideScope ( _final: prev: { @@ -29,11 +33,17 @@ _final: prev: { discord-ptb = prev.discord.override { withVencord = true; }; ripgrep = prev.ripgrep.override { withPCRE2 = true; }; papirus-icon-theme = prev.papirus-icon-theme.override { color = "green"; }; - blender = prev.blender.override { cudaSupport = true; }; - inherit (pkgsP) + blender = pkgs11.blender.override { cudaSupport = true; }; + inherit (pkgs5) mypaint mypaint-brushes mypaint-brushes1 + ; + inherit (pkgs11) rmlint + torrenttools + gimp + shipwright + libreoffice ; }