From 741de2c73ea793c9b950e4d918ff4c0590cdaace Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Sun, 22 Dec 2024 20:12:45 -0600 Subject: [PATCH] using 24.05 to download mypaint from cache --- flake.lock | 127 ++++++++++++++++++++++++------------------- flake.nix | 15 +++-- modules/apps/art.nix | 6 +- overlay.nix | 7 ++- 4 files changed, 91 insertions(+), 64 deletions(-) diff --git a/flake.lock b/flake.lock index 406cb72..a356757 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1734400729, - "narHash": "sha256-Bf+oya0BuleVXYGIWsb0eWnrK6s0aiesOsI7Mpj1pMU=", + "lastModified": 1734906446, + "narHash": "sha256-6OWluVE2A8xi+8V3jN9KA72RCgJjYdyyuLBUjxZ2q2U=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a132fa41be7ebe797ad758e84d9df068151a723b", + "rev": "eecb74dc79bb6752a2a507e6edee3042390a6091", "type": "github" }, "original": { @@ -124,11 +124,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1734683891, - "narHash": "sha256-yZkDRiSa3VCJADq0905cPh5/pc/XFSZSieSbPawvDng=", + "lastModified": 1734856449, + "narHash": "sha256-RBFKEjRPGKk0AtO3CaO3mVgc93AVrShrznzkc6kjw1Q=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "140626783e8592928c30f4de3d41c78db040a640", + "rev": "67130d18a136f0c6a0f0391ada98d98c8503285e", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1734682829, - "narHash": "sha256-L1rpxcvnlvu19rJlISFQfDpPlBo8V4qmrZh9BO29tLM=", + "lastModified": 1734855516, + "narHash": "sha256-iG/p+qKkapHxZdlVoY4GE2eSB+4QicvWXCLCNfDS9QM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0164b013076cc9549e4a694cf3fdecf411427e2d", + "rev": "6e615f2298f3738547ccfc9bd6cacee3b9a323e6", "type": "github" }, "original": { @@ -330,11 +330,11 @@ ] }, "locked": { - "lastModified": 1734622215, - "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", + "lastModified": 1734893686, + "narHash": "sha256-JUEZn9MmpLGsW4J3luSX+R4BhcThccYpYg5AuKW7zG0=", "owner": "nix-community", "repo": "home-manager", - "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", + "rev": "edb8b00e4d17b2116b60eca50f38ac68f12b9ab4", "type": "github" }, "original": { @@ -380,11 +380,11 @@ ] }, "locked": { - "lastModified": 1734364709, - "narHash": "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=", + "lastModified": 1734906540, + "narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "f388aacd22be4a6e4d634fbaf6f75eb0713d239a", + "rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", "type": "github" }, "original": { @@ -409,11 +409,11 @@ ] }, "locked": { - "lastModified": 1733684019, - "narHash": "sha256-2kYREgmSmbLsmDpLEq96hxVAU3qz8aCvVhF65yCFZHY=", + "lastModified": 1734906236, + "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "fb2c0268645a77403af3b8a4ce8fa7ba5917f15d", + "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c", "type": "github" }, "original": { @@ -440,11 +440,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1734639812, - "narHash": "sha256-MbE5G26NM18O9+VnYW5hweAv28o7RJaVFOrZT0gIvr0=", + "lastModified": 1734907157, + "narHash": "sha256-sF3Wot4jIemoSo0YigdHyoR5JMaXgKja+mPJGoXXk/k=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "71dc9f6128b8d2e382b2a574d2d5f15e2d907f3a", + "rev": "5f7ad767dbf0bac9ddd6bf6c825fb9ed7921308a", "type": "github" }, "original": { @@ -494,11 +494,11 @@ ] }, "locked": { - "lastModified": 1733940128, - "narHash": "sha256-hmfXWj2GA9cj1QUkPFYtAAeohhs615zL4E3APy3FnvQ=", + "lastModified": 1734906472, + "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "3833097e50473a152dd614d4b468886840b4ea78", + "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152", "type": "github" }, "original": { @@ -523,11 +523,11 @@ ] }, "locked": { - "lastModified": 1734364628, - "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=", + "lastModified": 1734906259, + "narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5", + "rev": "0404833ea18d543df44df935ebf1b497310eb046", "type": "github" }, "original": { @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1734384247, - "narHash": "sha256-bl3YyJb2CgaeVKYq/l8j27vKdbkTpDNFDsnCl0dnNlY=", + "lastModified": 1734796073, + "narHash": "sha256-TnuKsa8OHrSJEmHm3TLGOWbPNA1gRjmZLsRzKrCqOsg=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e6cf45cd1845368702e03b8912f4cc44ebba3322", + "rev": "c3331116ebd0b71df5ae8c6efe9a7f94148b03bf", "type": "github" }, "original": { @@ -573,11 +573,11 @@ ] }, "locked": { - "lastModified": 1734384417, - "narHash": "sha256-noYeXcNQ15g1/gIJIYT2zdO66wzY5Z06PYz6BfKUZA8=", + "lastModified": 1734793513, + "narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "90e87f7fcfcce4862826d60332cbc5e2f87e1f88", + "rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61", "type": "github" }, "original": { @@ -593,11 +593,11 @@ ] }, "locked": { - "lastModified": 1734808688, - "narHash": "sha256-QkTK5e5mbnzujwrnCQOzHiAHo5oOl38vJxucMi7gaDQ=", + "lastModified": 1734833107, + "narHash": "sha256-i0SFvkJOAe8F6X+laav1vNl2G39HEGksD0crLt9iBf0=", "ref": "refs/heads/master", - "rev": "6754437195f663ff38343526c126856e3a5249c8", - "revCount": 53, + "rev": "b90636dc631f2e08afe3e856032949af33037175", + "revCount": 54, "type": "git", "url": "ssh://git@gitlab.com/CaptainJawZ/scripts-flake.git" }, @@ -615,11 +615,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1734658860, - "narHash": "sha256-72LJNZJ9NyF+VuC2mVdxzXCPW7bNiOP8ZhKZ4zjnmh8=", + "lastModified": 1734831989, + "narHash": "sha256-YrMVnLkWxV+qmN9ZuUo00yYJFtU1r4L5ho8l3X3ScHA=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "8137dad521d4067c34291ca25209598b87a95d5e", + "rev": "e45e2276facb9218c119e68c45efd2f9e79d292d", "type": "github" }, "original": { @@ -654,6 +654,22 @@ "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, + "nixpkgs-paint": { + "locked": { + "lastModified": 1734529975, + "narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1730741070, @@ -672,11 +688,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -695,11 +711,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734730524, - "narHash": "sha256-/KN3utjNF9jIwiVZ2hwhHtFKdjx/Y+mX2tHB2JQDykk=", + "lastModified": 1734916361, + "narHash": "sha256-iI+6xqQ5RfgoDWcyPKWekTV0Xgp8NHG3+bxFowmqM8I=", "owner": "nix-community", "repo": "nur", - "rev": "fc0c588583759af23ea63ae1374711e1c056274d", + "rev": "6f85066a2b5aa95b7dad94b33bcd972cdff5e9f1", "type": "github" }, "original": { @@ -719,11 +735,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1734379367, - "narHash": "sha256-Keu8z5VgT5gnCF4pmB+g7XZFftHpfl4qOn7nqBcywdE=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -740,6 +756,7 @@ "jawz-scripts": "jawz-scripts", "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs_2", + "nixpkgs-paint": "nixpkgs-paint", "nur": "nur", "sops-nix": "sops-nix", "stylix": "stylix", @@ -785,11 +802,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1734531336, - "narHash": "sha256-BWwJTAiWmZudUdUbyets7e3zQfjvZYtkU51blBnUBjw=", + "lastModified": 1734885904, + "narHash": "sha256-NxA4JnLuXyle2/nUKDbW8vORwSd+Z20limIl7DhlZbs=", "owner": "danth", "repo": "stylix", - "rev": "a2d66f25478103ac9b4adc6d6713794f7005221e", + "rev": "4d87b96ceca38532f39c1b7efd8a9235bfcee3d6", "type": "github" }, "original": { @@ -985,11 +1002,11 @@ ] }, "locked": { - "lastModified": 1734422917, - "narHash": "sha256-0y7DRaXslhfqVKV8a/talYTYAe2NHOQhMZG7KMNRCtc=", + "lastModified": 1734907020, + "narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "3e884d941ca819c1f2e50df8bdae0debded1ed87", + "rev": "d7f18dda5e511749fa1511185db3536208fb1a63", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b950136..5ace8c4 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,7 @@ description = "JawZ NixOS flake setup"; inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + nixpkgs-paint.url = "github:nixos/nixpkgs?ref=nixos-24.05"; ucodenix.url = "github:e-tho/ucodenix"; doom-emacs.url = "github:marienz/nix-doom-emacs-unstraightened"; jawz-scripts = { @@ -39,10 +40,14 @@ let inherit (self) outputs; system = "x86_64-linux"; - pkgs = import inputs.nixpkgs { - inherit system; - config.allowUnfree = true; - }; + mkpkgs = + repo: + import repo { + inherit system; + config.allowUnfree = true; + }; + pkgs = mkpkgs inputs.nixpkgs; + pkgsP = mkpkgs inputs.nixpkgs-paint; lib = inputs.nixpkgs.lib // inputs.home-manager.lib; createConfig = name: @@ -54,7 +59,7 @@ modules = [ { nixpkgs.overlays = [ - (import ./overlay.nix { inherit pkgs; }) + (import ./overlay.nix { inherit pkgs pkgsP; }) inputs.doom-emacs.overlays.default ]; } diff --git a/modules/apps/art.nix b/modules/apps/art.nix index 65a597d..fb81c28 100644 --- a/modules/apps/art.nix +++ b/modules/apps/art.nix @@ -17,9 +17,9 @@ emulsion-palette # self explanatory gimp # the coolest bestest art program to never exist krita # art to your heart desire! - # mypaint # not the best art program - # mypaint-brushes # but it's got some - # mypaint-brushes1 # nice damn brushes + mypaint # not the best art program + mypaint-brushes # but it's got some + mypaint-brushes1 # nice damn brushes blender # cgi animation and sculpting drawpile # arty party with friends!! pureref # create inspiration/reference boards diff --git a/overlay.nix b/overlay.nix index c1b5668..45bb491 100644 --- a/overlay.nix +++ b/overlay.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{ pkgs, pkgsP }: _final: prev: { gnome = prev.gnome.overrideScope ( _final: prev: { @@ -39,4 +39,9 @@ _final: prev: { ripgrep = prev.ripgrep.override { withPCRE2 = true; }; papirus-icon-theme = prev.papirus-icon-theme.override { color = "green"; }; blender = prev.blender.override { cudaSupport = true; }; + inherit (pkgsP) + mypaint + mypaint-brushes + mypaint-brushes1 + ; }