oops it's been a minute
This commit is contained in:
parent
5f434b1979
commit
55013f738c
22 changed files with 468 additions and 323 deletions
394
flake.lock
generated
394
flake.lock
generated
|
@ -7,7 +7,7 @@
|
|||
},
|
||||
"locked": {
|
||||
"lastModified": 1,
|
||||
"narHash": "sha256-Fv6zq7iMMhVlpU0sRue/TPbMD0He4vlZevbkneu8HrY=",
|
||||
"narHash": "sha256-i8aDgwpx8MU3fC5wozbQ9E82BHqxzX0eHtpPczgN3xU=",
|
||||
"path": "./flakes/ComfyUI",
|
||||
"type": "path"
|
||||
},
|
||||
|
@ -25,7 +25,7 @@
|
|||
},
|
||||
"locked": {
|
||||
"lastModified": 1,
|
||||
"narHash": "sha256-7Yiajjk7Rp8i3xV14XJquSmPHXesD4ZrPeCG51fNXr0=",
|
||||
"narHash": "sha256-/oS8eQ7LvBzZx37otTguGK2XQR8eQwj/WI08FljssbE=",
|
||||
"path": "./flakes/ComfyUI-Plugins",
|
||||
"type": "path"
|
||||
},
|
||||
|
@ -37,11 +37,11 @@
|
|||
"comfyui_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1729105110,
|
||||
"narHash": "sha256-M/by34k6P4Sj/dfsW1FdVRZmaTHxZ0mMX/cuYXIPeaw=",
|
||||
"lastModified": 1730402285,
|
||||
"narHash": "sha256-Al5oTuy6LsVpfOLHJ6YkY1Suc3HEXc8eR7jKJszli5c=",
|
||||
"owner": "comfyanonymous",
|
||||
"repo": "ComfyUI",
|
||||
"rev": "7390ff3b1ec2e15017ba4a52d6eaabc4aa4636e3",
|
||||
"rev": "cc9cf6d1bd957d764ad418258b61d7e08187573b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -51,18 +51,12 @@
|
|||
}
|
||||
},
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"helix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709610799,
|
||||
"narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=",
|
||||
"lastModified": 1727974419,
|
||||
"narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "81c393c776d5379c030607866afef6406ca1be57",
|
||||
"rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -74,11 +68,11 @@
|
|||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1673956053,
|
||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -88,22 +82,6 @@
|
|||
}
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1673956053,
|
||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1717312683,
|
||||
|
@ -121,7 +99,25 @@
|
|||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib_2"
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727826117,
|
||||
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714606777,
|
||||
|
@ -157,11 +153,11 @@
|
|||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709126324,
|
||||
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
|
||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -188,24 +184,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_3": {
|
||||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681202837,
|
||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flakey-profile": {
|
||||
"locked": {
|
||||
"lastModified": 1712898590,
|
||||
|
@ -223,11 +201,11 @@
|
|||
},
|
||||
"flatpaks": {
|
||||
"locked": {
|
||||
"lastModified": 1729025406,
|
||||
"narHash": "sha256-uYbDN6JikC19WfD3zg0kpOpJVZFvBhHXYo3YJo28vOs=",
|
||||
"lastModified": 1730108712,
|
||||
"narHash": "sha256-vIvmXmjAQIY39hACGFe/cdBK2r3ZprpHLwX2HIy7Mj8=",
|
||||
"owner": "gmodena",
|
||||
"repo": "nix-flatpak",
|
||||
"rev": "8d1193a959c7810f01610c10a055b0020390bf4e",
|
||||
"rev": "1cba177bb0a948c919af7596e40bef307543d40a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -239,11 +217,11 @@
|
|||
"gguf": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1728958305,
|
||||
"narHash": "sha256-XJwWx9gm1Qo/B4t7olPajJlPqKJvciTRpB+9fyf8aXQ=",
|
||||
"lastModified": 1729651119,
|
||||
"narHash": "sha256-1TLoQS8rcJ5Y4VcWk3mAGg7/+jnjF/VN9QkhU99nCC4=",
|
||||
"owner": "city96",
|
||||
"repo": "ComfyUI-GGUF",
|
||||
"rev": "68ad5fb2149ead7e4978f83f14e045ecd812a394",
|
||||
"rev": "6561064dcfb3dfa638e3739506acfd34924e1cc5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -252,20 +230,41 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"git-hooks-nix": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729104314,
|
||||
"narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nix-rice",
|
||||
"pre-commit-hooks",
|
||||
"git-hooks-nix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1660459072,
|
||||
"narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
|
||||
"lastModified": 1709087332,
|
||||
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
|
||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -282,11 +281,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729068734,
|
||||
"narHash": "sha256-JOqmdtcdQohQL1qvTDrVJvd+nkydRm+Lyf3qVF5iQ5E=",
|
||||
"lastModified": 1730790589,
|
||||
"narHash": "sha256-xJ6bQ4VmdTB7A+dMbmOMaZ8a6erB6rkZkB+yzqD7gd4=",
|
||||
"owner": "helix-editor",
|
||||
"repo": "helix",
|
||||
"rev": "d1b8129491124ce6068e95ccc58a7fefb1c9db45",
|
||||
"rev": "b53dafe326d51b7f64a1c52379e3d4150cd2991e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -302,11 +301,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727875173,
|
||||
"narHash": "sha256-pC6J9cHtTREsZvSIoySj//cRltGYphgR9pV4/vMA3Z4=",
|
||||
"lastModified": 1730490306,
|
||||
"narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=",
|
||||
"owner": "n-hass",
|
||||
"repo": "home-manager",
|
||||
"rev": "6aa79fd47e5d657257ebc4756dd2fdbe3aadabe8",
|
||||
"rev": "1743615b61c7285976f85b303a36cdf88a556503",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -335,11 +334,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1729199869,
|
||||
"narHash": "sha256-buAN+K/8zIPo6dmb984BNOzZzQlK9TBdKPYLbdwWWGM=",
|
||||
"rev": "52b64662a4924741e465b9caed6b2b4f8539aced",
|
||||
"lastModified": 1730764481,
|
||||
"narHash": "sha256-Fyor1ynFLPdNM+eazlX95eca8PBLCi2op4+tixs5SXs=",
|
||||
"rev": "1c28270c9d18e3a4913f70d62428b43973aa256a",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/52b64662a4924741e465b9caed6b2b4f8539aced.tar.gz?rev=52b64662a4924741e465b9caed6b2b4f8539aced"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1c28270c9d18e3a4913f70d62428b43973aa256a.tar.gz?rev=1c28270c9d18e3a4913f70d62428b43973aa256a"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
@ -404,8 +403,8 @@
|
|||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728878008,
|
||||
"narHash": "sha256-+7Lv9bu6WzX1aYRilirx72FisvjWIBQZruKLlLvq+tw=",
|
||||
"lastModified": 1730435090,
|
||||
"narHash": "sha256-psE+ujalvatAdFmtFiFsxUlQjHP9zFNi0+UaEDsyci0=",
|
||||
"path": "/home/bolt/code/meat",
|
||||
"type": "path"
|
||||
},
|
||||
|
@ -417,11 +416,11 @@
|
|||
"murex": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1729016342,
|
||||
"narHash": "sha256-/Sa6kqv13nx7XJw7m6/+xt+07W3GvUCLE1bWXcHfcvQ=",
|
||||
"lastModified": 1729788399,
|
||||
"narHash": "sha256-sh88YPBX0uCHqutwipBtK6Y6c7FjivcD1ujdR7LEDhs=",
|
||||
"owner": "lmorg",
|
||||
"repo": "murex",
|
||||
"rev": "b215b50c4a1df475652a6ff88ad3ae505d9483a7",
|
||||
"rev": "2164bcbf9a410b110e22207189a8906236b5dd1c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -438,7 +437,7 @@
|
|||
},
|
||||
"locked": {
|
||||
"lastModified": 1,
|
||||
"narHash": "sha256-UDab4bRm6kP80bS6dPrG8VWneYJardggLZydgGMrLN0=",
|
||||
"narHash": "sha256-+uxh2LvWiKil2pHmniWKhsRla4St4cRe79GObfzVQkc=",
|
||||
"path": "./flakes/murex-module-jump",
|
||||
"type": "path"
|
||||
},
|
||||
|
@ -454,7 +453,7 @@
|
|||
},
|
||||
"locked": {
|
||||
"lastModified": 1,
|
||||
"narHash": "sha256-3FzA3nyfpRY3b6N0906t43PCQBvD4TbNBClqXil1crg=",
|
||||
"narHash": "sha256-z3f1BUGtTb/mTMRPJfqZy1r11XDnsEbOEiRGi90+Tos=",
|
||||
"path": "./flakes/murex-module-starship",
|
||||
"type": "path"
|
||||
},
|
||||
|
@ -486,11 +485,11 @@
|
|||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728790083,
|
||||
"narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=",
|
||||
"lastModified": 1730604744,
|
||||
"narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=",
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22",
|
||||
"rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -501,18 +500,19 @@
|
|||
},
|
||||
"nix-rice": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"flake-parts": "flake-parts",
|
||||
"git-hooks-nix": "git-hooks-nix",
|
||||
"kitty-themes-src": "kitty-themes-src",
|
||||
"nixpkgs-lib": "nixpkgs-lib",
|
||||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
"nixpkgs": "nixpkgs_9",
|
||||
"nixpkgs-lib": "nixpkgs-lib_2",
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1682952592,
|
||||
"narHash": "sha256-1qXvqCxnWpk0ELdpmS2OMDu047gvl166CGBm+sfi8oo=",
|
||||
"lastModified": 1729607649,
|
||||
"narHash": "sha256-H0cr8kohjo+fJIKIpcLZwtmRUGH01Gyld0ulhfqe/Rw=",
|
||||
"owner": "bertof",
|
||||
"repo": "nix-rice",
|
||||
"rev": "dddd03ed3c5e05c728b0df985f7af905b002f588",
|
||||
"rev": "91c9dc46b80ecd7295e9accff4728f4efc9a291e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -523,17 +523,17 @@
|
|||
},
|
||||
"nixd": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"flake-root": "flake-root",
|
||||
"nixpkgs": "nixpkgs_9",
|
||||
"nixpkgs": "nixpkgs_10",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727793617,
|
||||
"narHash": "sha256-vZ+t0jvKZczYBB9ZAj7CQ1sBv9PE66G9/LkB6a+Iogg=",
|
||||
"lastModified": 1730169047,
|
||||
"narHash": "sha256-CmvRSsW97XVrc0WrE2v/acRsfdRhFiFKRwg7PmfYKPc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixd",
|
||||
"rev": "c38702b17580a31e84c958b5feed3d8c7407f975",
|
||||
"rev": "20290ee46699f7c62528d8f44bab1aeac7c8fcf1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -544,17 +544,17 @@
|
|||
},
|
||||
"nixos-cosmic": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"nixpkgs": "nixpkgs_10",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"nixpkgs": "nixpkgs_11",
|
||||
"nixpkgs-stable": "nixpkgs-stable_2",
|
||||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729209055,
|
||||
"narHash": "sha256-QN0W/LJzUZGFdx4dYz8L7Z7uioAc3Po+AtGUs/IyV4Y=",
|
||||
"lastModified": 1730830166,
|
||||
"narHash": "sha256-F2SA8PkrV+Ed8WZKwEimO2oBxQJFJU2ni/wqIbupX4Y=",
|
||||
"owner": "lilyinstarlight",
|
||||
"repo": "nixos-cosmic",
|
||||
"rev": "e1c81bcb1321916bc1546d3da4907f31c5a5e948",
|
||||
"rev": "49ee81f51e7449314af27915f3719cc76e9abe1f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -565,10 +565,10 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1728492678,
|
||||
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
|
||||
"path": "/nix/store/60sn02zhawl3kwn0r515zff3h6hg6ydz-source",
|
||||
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
|
||||
"lastModified": 1729880355,
|
||||
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
|
||||
"path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source",
|
||||
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
|
@ -578,11 +578,23 @@
|
|||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1681001314,
|
||||
"narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=",
|
||||
"lastModified": 1727825735,
|
||||
"narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib_2": {
|
||||
"locked": {
|
||||
"lastModified": 1729386149,
|
||||
"narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4",
|
||||
"rev": "cce4521b6df014e79a7b7afc58c703ed683c916e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -591,7 +603,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib_2": {
|
||||
"nixpkgs-lib_3": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
"lastModified": 1714253743,
|
||||
|
@ -611,27 +623,27 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1678872516,
|
||||
"narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
|
||||
"lastModified": 1720386169,
|
||||
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
|
||||
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-22.11",
|
||||
"ref": "nixos-24.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1728909085,
|
||||
"narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=",
|
||||
"lastModified": 1730602179,
|
||||
"narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8",
|
||||
"rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -643,11 +655,27 @@
|
|||
},
|
||||
"nixpkgs_10": {
|
||||
"locked": {
|
||||
"lastModified": 1728888510,
|
||||
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
|
||||
"lastModified": 1714562304,
|
||||
"narHash": "sha256-Mr3U37Rh6tH0FbaDFu0aZDwk9mPAe7ASaqDOGgLqqLU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
|
||||
"rev": "bcd44e224fd68ce7d269b4f44d24c2220fd821e7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1730531603,
|
||||
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -659,10 +687,10 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1728888510,
|
||||
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
|
||||
"path": "/nix/store/xnjw9gmfmpppdj6bxpw6cfkspc3h6xwl-source",
|
||||
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
|
||||
"lastModified": 1729880355,
|
||||
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
|
||||
"path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source",
|
||||
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
|
@ -672,11 +700,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1709479366,
|
||||
"narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
|
||||
"lastModified": 1728018373,
|
||||
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
|
||||
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -688,10 +716,10 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1728018373,
|
||||
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
|
||||
"path": "/nix/store/sdzpqjwx7pdx6lsq6llyfqqf7hspp83c-source",
|
||||
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
|
||||
"lastModified": 1729880355,
|
||||
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
|
||||
"path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source",
|
||||
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
|
@ -701,10 +729,10 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1728241625,
|
||||
"narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
|
||||
"path": "/nix/store/rs4fjbnw4qx7ns2hzzrz2iz52va7vs5z-source",
|
||||
"rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
|
||||
"lastModified": 1729880355,
|
||||
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
|
||||
"path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source",
|
||||
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
|
@ -730,11 +758,11 @@
|
|||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1728492678,
|
||||
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
|
||||
"lastModified": 1730200266,
|
||||
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
|
||||
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -746,27 +774,11 @@
|
|||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1681303793,
|
||||
"narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
|
||||
"lastModified": 1719082008,
|
||||
"narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1714562304,
|
||||
"narHash": "sha256-Mr3U37Rh6tH0FbaDFu0aZDwk9mPAe7ASaqDOGgLqqLU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bcd44e224fd68ce7d269b4f44d24c2220fd821e7",
|
||||
"rev": "9693852a2070b398ee123a329e68f0dab5526681",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -776,13 +788,28 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1729507178,
|
||||
"narHash": "sha256-3UZqmGSK+uMUGkydhnqng/iaT857JtAxH9DtucTbUQs=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e156ec8b02301cd455ab96bbd53ebd7bf7d1e29d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1729210014,
|
||||
"narHash": "sha256-46JsGJ8/wovNwq4jxlIVHewcel8yHLugACHhASWvNhM=",
|
||||
"lastModified": 1730846050,
|
||||
"narHash": "sha256-G7z96CG11PVoBwZFFaak5jmXLY+z6d9Y1/aJBvy0YeI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "7dced12690c675f0ea371f342e433060846b908a",
|
||||
"rev": "dee01da6357dd27c51d5a59237affd11eaee4a75",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -810,11 +837,11 @@
|
|||
"podman": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1729175227,
|
||||
"narHash": "sha256-UL/G8RrBWLOoJ30QZxT+/88YjIhOFXbkQ/Le7ObVcMY=",
|
||||
"lastModified": 1730837388,
|
||||
"narHash": "sha256-UoLMKEyl/xqBRriQ3AY/ZXX0/A6+NFOI/PpGHeNkZIM=",
|
||||
"owner": "containers",
|
||||
"repo": "podman",
|
||||
"rev": "740f1d1fc710d4560d2463b11333cc9ad68e22bd",
|
||||
"rev": "c0e24c6b60cfae21ab441b40c7ea3d622d09027d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -823,31 +850,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-utils": [
|
||||
"nix-rice",
|
||||
"flake-utils"
|
||||
],
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1682596858,
|
||||
"narHash": "sha256-Hf9XVpqaGqe/4oDGr30W8HlsWvJXtMsEPHDqHZA6dDg=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "fb58866e20af98779017134319b5663b8215d912",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"comfyui": "comfyui",
|
||||
|
@ -881,21 +883,17 @@
|
|||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"helix",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"helix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709604635,
|
||||
"narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=",
|
||||
"lastModified": 1728268235,
|
||||
"narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d",
|
||||
"rev": "25685cc2c7054efc31351c172ae77b21814f2d42",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -912,11 +910,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729045942,
|
||||
"narHash": "sha256-HjmK0x5Zm2TK2vFpC7XBM2e3EDNVnAIuEoU2FkeN8xw=",
|
||||
"lastModified": 1730687492,
|
||||
"narHash": "sha256-xQVadjquBA/tFxDt5A55LJ1D1AvkVWsnrKC2o+pr8F4=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "9de3cea452d2401d6f93c06ad985178a4e11d1fc",
|
||||
"rev": "41814763a2c597755b0755dbe3e721367a5e420f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
10
flake.nix
10
flake.nix
|
@ -102,7 +102,10 @@
|
|||
mapAttrs (name: info:
|
||||
nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = {inherit inputs outputs;};
|
||||
specialArgs = {
|
||||
inherit inputs outputs;
|
||||
mainUser = info.user;
|
||||
};
|
||||
modules =
|
||||
[
|
||||
./system/${name}.nix
|
||||
|
@ -110,7 +113,10 @@
|
|||
{
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
extraSpecialArgs = {inherit inputs outputs;};
|
||||
extraSpecialArgs = {
|
||||
inherit inputs outputs;
|
||||
mainUser = info.user;
|
||||
};
|
||||
users.${info.user}.imports =
|
||||
[
|
||||
flatpaks.homeManagerModules.nix-flatpak
|
||||
|
|
31
flakes/ComfyUI-Plugins/flake.lock
generated
31
flakes/ComfyUI-Plugins/flake.lock
generated
|
@ -1,29 +1,13 @@
|
|||
{
|
||||
"nodes": {
|
||||
"essentials": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1728478639,
|
||||
"narHash": "sha256-JFkrtxLXx9wyJ5ZUlnXX+U5NGh5agiz0VOHQ5SA6jTs=",
|
||||
"owner": "cubiq",
|
||||
"repo": "ComfyUI_essentials",
|
||||
"rev": "f320ada61353c14e9d506592e20397398be6b952",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cubiq",
|
||||
"repo": "ComfyUI_essentials",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gguf": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1728958305,
|
||||
"narHash": "sha256-XJwWx9gm1Qo/B4t7olPajJlPqKJvciTRpB+9fyf8aXQ=",
|
||||
"lastModified": 1729651119,
|
||||
"narHash": "sha256-1TLoQS8rcJ5Y4VcWk3mAGg7/+jnjF/VN9QkhU99nCC4=",
|
||||
"owner": "city96",
|
||||
"repo": "ComfyUI-GGUF",
|
||||
"rev": "68ad5fb2149ead7e4978f83f14e045ecd812a394",
|
||||
"rev": "6561064dcfb3dfa638e3739506acfd34924e1cc5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -34,10 +18,10 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1728888510,
|
||||
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
|
||||
"path": "/nix/store/xnjw9gmfmpppdj6bxpw6cfkspc3h6xwl-source",
|
||||
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
|
||||
"lastModified": 1729880355,
|
||||
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
|
||||
"path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source",
|
||||
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
|
@ -63,7 +47,6 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"essentials": "essentials",
|
||||
"gguf": "gguf",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"openpose": "openpose",
|
||||
|
|
|
@ -15,5 +15,6 @@ pkgs.stdenvNoCC.mkDerivation {
|
|||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r * $out/
|
||||
cp js/* $out/
|
||||
'';
|
||||
}
|
||||
|
|
|
@ -5,13 +5,34 @@
|
|||
comfyui,
|
||||
comfy_dir ? "/run/user/1000/comfyui/",
|
||||
spandrel,
|
||||
plugins ? config.comfyui.plugins,
|
||||
plugins ? config.comfyui.plugins or [],
|
||||
...
|
||||
}: let
|
||||
inherit (pkgs) python3;
|
||||
python = python3.withPackages (
|
||||
ps:
|
||||
with ps; [
|
||||
inherit
|
||||
(pkgs.python3Packages)
|
||||
torch
|
||||
torchsde
|
||||
torchvision
|
||||
torchaudio
|
||||
einops
|
||||
transformers
|
||||
tokenizers
|
||||
sentencepiece
|
||||
safetensors
|
||||
aiohttp
|
||||
pyyaml
|
||||
pillow
|
||||
scipy
|
||||
tqdm
|
||||
psutil
|
||||
kornia
|
||||
soundfile
|
||||
;
|
||||
|
||||
python = python3.buildEnv.override {
|
||||
extraLibs =
|
||||
[
|
||||
torch
|
||||
torchsde
|
||||
torchvision
|
||||
|
@ -31,8 +52,32 @@
|
|||
soundfile
|
||||
|
||||
spandrel
|
||||
] ++ plugins
|
||||
);
|
||||
]
|
||||
++ plugins;
|
||||
};
|
||||
# python = python3.withPackages (
|
||||
# ps:
|
||||
# with ps; [
|
||||
# torch
|
||||
# torchsde
|
||||
# torchvision
|
||||
# torchaudio
|
||||
# einops
|
||||
# transformers
|
||||
# tokenizers
|
||||
# sentencepiece
|
||||
# safetensors
|
||||
# aiohttp
|
||||
# pyyaml
|
||||
# pillow
|
||||
# scipy
|
||||
# tqdm
|
||||
# psutil
|
||||
# kornia
|
||||
# soundfile
|
||||
# spandrel
|
||||
# ]
|
||||
# );
|
||||
in
|
||||
pkgs.stdenvNoCC.mkDerivation {
|
||||
name = "comfyui";
|
||||
|
|
14
flakes/ComfyUI/flake.lock
generated
14
flakes/ComfyUI/flake.lock
generated
|
@ -3,11 +3,11 @@
|
|||
"comfyui": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1729105110,
|
||||
"narHash": "sha256-M/by34k6P4Sj/dfsW1FdVRZmaTHxZ0mMX/cuYXIPeaw=",
|
||||
"lastModified": 1730402285,
|
||||
"narHash": "sha256-Al5oTuy6LsVpfOLHJ6YkY1Suc3HEXc8eR7jKJszli5c=",
|
||||
"owner": "comfyanonymous",
|
||||
"repo": "ComfyUI",
|
||||
"rev": "7390ff3b1ec2e15017ba4a52d6eaabc4aa4636e3",
|
||||
"rev": "cc9cf6d1bd957d764ad418258b61d7e08187573b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -18,10 +18,10 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1728492678,
|
||||
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
|
||||
"path": "/nix/store/60sn02zhawl3kwn0r515zff3h6hg6ydz-source",
|
||||
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
|
||||
"lastModified": 1729880355,
|
||||
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
|
||||
"path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source",
|
||||
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -25,6 +25,7 @@ in {
|
|||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
home.packages = [
|
||||
# pkgs.comfyui
|
||||
(pkgs.comfyui.override {
|
||||
comfy_dir = getStorage;
|
||||
plugins = cfg.plugins;
|
||||
|
|
8
flakes/murex-meat/default.nix
Normal file
8
flakes/murex-meat/default.nix
Normal file
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
pkgs,
|
||||
src,
|
||||
...
|
||||
}:
|
||||
pkgs.stdenvNoCC.mkDerivation {
|
||||
inherit src;
|
||||
}
|
10
flakes/murex-meat/flake.nix
Normal file
10
flakes/murex-meat/flake.nix
Normal file
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
|
||||
outputs = { nixpkgs, ... }: let
|
||||
pkgs = import nixpkgs {};
|
||||
in {
|
||||
|
||||
packages.x86_64-linux.meat = pkgs.callPackage ./default.nix;
|
||||
|
||||
};
|
||||
}
|
138
flakes/murex-meat/meat.mx
Executable file
138
flakes/murex-meat/meat.mx
Executable file
|
@ -0,0 +1,138 @@
|
|||
#!/usr/bin/env murex
|
||||
|
||||
config: set proc force-tty true
|
||||
config: set proc strict-types true
|
||||
|
||||
args meat_args %{
|
||||
AllowAdditional: true
|
||||
Flags: {
|
||||
--all: bool
|
||||
-a: --all
|
||||
}
|
||||
}
|
||||
|
||||
catch {
|
||||
err $meat_args.error
|
||||
exit 1
|
||||
}
|
||||
|
||||
function meat {
|
||||
if { is-null $ENV.FLAKE } {
|
||||
meat_print(NO RECIPE FOUND)
|
||||
exit
|
||||
}
|
||||
$pd = $PWD
|
||||
cd $ENV.FLAKE
|
||||
meat_print "----- MEAT ----------------------------------------" true
|
||||
$a = $args[Additional]
|
||||
if { $a -> len } then {
|
||||
meat_parse_cmd $a
|
||||
} else {
|
||||
meat_print_help
|
||||
}
|
||||
meat_print "---------------------------------------------------" true
|
||||
cd $pd
|
||||
}
|
||||
|
||||
function meat_print (t: str, !title: bool [false]) {
|
||||
if {$title} {
|
||||
out (
|
||||
$t
|
||||
)
|
||||
|
||||
} else {
|
||||
out (
|
||||
$t
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
function meat_parse_cmd (args: json) {
|
||||
out args $args
|
||||
out arglen $args -> count
|
||||
out argscast $args -> cast json
|
||||
out argscast $args -> cast json -> count
|
||||
$cmd = $args[ 0 ]
|
||||
out cmd $cmd
|
||||
if { ${$args -> len} > 1 } then {
|
||||
$opts = ${$args -> ![ 0 ]}
|
||||
}
|
||||
out opts $opts
|
||||
switch $cmd {
|
||||
case "yum" {
|
||||
meat_print (CONSUMING DELICIOUS MEATS..)
|
||||
nh os switch @opts
|
||||
}
|
||||
case "poke" {
|
||||
meat_print (PREPARING SUSPICIOUS MEATS..)
|
||||
nh os test @opts
|
||||
}
|
||||
case "cook" {
|
||||
meat_print (PREPARING MEATS..)
|
||||
nh os build @opts
|
||||
}
|
||||
case "fresh" {
|
||||
meat_print (PROCESSING FRESH MEATS..)
|
||||
meat_do_fresh $opts
|
||||
}
|
||||
case "look" {
|
||||
meat_print (INSPECTING MEAT..)
|
||||
nix flake info @opts
|
||||
}
|
||||
case "gut" {
|
||||
meat_print (CLEANING MEAT STORES..)
|
||||
nh clean all @opts
|
||||
}
|
||||
default { meat_print_help }
|
||||
}
|
||||
}
|
||||
|
||||
function meat_print_help {
|
||||
out ( FRESH - HUNT LATEST MEATS
|
||||
..N - HUNT LATEST SUBMEATS OF N
|
||||
..-A - HUNT ALL SUBMEATS
|
||||
YUM - CONSUME DELICIOUS MEATS
|
||||
COOK - ONLY PREPARE MEATS
|
||||
POKE - TASTE SUSPICIOUS MEATS
|
||||
GUT - CLEAN MEAT STORES
|
||||
LOOK - INSPECT MEAT)
|
||||
}
|
||||
|
||||
function meat_do_fresh (!opts: str) {
|
||||
# handle --all flag
|
||||
if { $GLOBAL.args.flags.all } then {
|
||||
recursive_update $ENV.FLAKE/flakes
|
||||
cd $ENV.FLAKE
|
||||
nix flake update
|
||||
}
|
||||
if { $opts } then {
|
||||
# handle specified subflakes
|
||||
$opts -> foreach subflake {
|
||||
meat_print "GET NEW MEAT FOR $(subflake).."
|
||||
recursive_update $ENV.FLAKE/flakes/$subflake
|
||||
cd $ENV.FLAKE
|
||||
nix flake update $subflake
|
||||
}
|
||||
}
|
||||
# simple update
|
||||
nix flake update
|
||||
}
|
||||
|
||||
function recursive_update (path: str) {
|
||||
if { $path.Exists } {
|
||||
cd $path
|
||||
# update subflakes
|
||||
g */flake.nix -> foreach dir { recursive_update $dir }
|
||||
# update this flake
|
||||
$isflake = ${g flake.nix -> count} > 0
|
||||
if { $isflake } then {
|
||||
nix flake update
|
||||
}
|
||||
} else {
|
||||
err "No such subflake at $path"
|
||||
exit 1
|
||||
}
|
||||
}
|
||||
|
||||
$GLOBAL.args = $meat_args
|
||||
meat
|
42
flakes/murex-module-jump/flake.lock
generated
42
flakes/murex-module-jump/flake.lock
generated
|
@ -1,29 +1,11 @@
|
|||
{
|
||||
"nodes": {
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1728018373,
|
||||
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
|
||||
"path": "/nix/store/sdzpqjwx7pdx6lsq6llyfqqf7hspp83c-source",
|
||||
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
|
||||
"lastModified": 1729880355,
|
||||
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
|
||||
"path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source",
|
||||
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
|
@ -33,7 +15,6 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"src": "src"
|
||||
}
|
||||
|
@ -53,21 +34,6 @@
|
|||
"repo": "murex-module-jump",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
8
flakes/murex-module-starship/flake.lock
generated
8
flakes/murex-module-starship/flake.lock
generated
|
@ -2,10 +2,10 @@
|
|||
"nodes": {
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1728241625,
|
||||
"narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
|
||||
"path": "/nix/store/rs4fjbnw4qx7ns2hzzrz2iz52va7vs5z-source",
|
||||
"rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
|
||||
"lastModified": 1729880355,
|
||||
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
|
||||
"path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source",
|
||||
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -3,8 +3,11 @@
|
|||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
mainUser,
|
||||
...
|
||||
}: {
|
||||
inherit mainUser;
|
||||
|
||||
imports = [
|
||||
./home.nix
|
||||
./util/local-webapp.nix
|
||||
|
@ -15,16 +18,14 @@
|
|||
inputs.comfyui.homeManagerModules.comfyui
|
||||
];
|
||||
|
||||
mainUser = "bolt";
|
||||
|
||||
home.packages = with pkgs; [
|
||||
nicotine-plus
|
||||
];
|
||||
|
||||
programs.comfyui = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
storage = "/home/${config.mainUser}/.local/share/comfyui/";
|
||||
plugins = let
|
||||
plugins = let
|
||||
inherit (pkgs.comfyui-plugins) gguf openpose;
|
||||
in [
|
||||
gguf
|
||||
|
|
|
@ -21,11 +21,12 @@ in {
|
|||
str = builtins.toString;
|
||||
username = config.mainUser;
|
||||
in {
|
||||
image = "mintplexlabs/anythingllm";
|
||||
image = "docker.io/mintplexlabs/anythingllm";
|
||||
devices = ["nvidia.com/gpu=all"];
|
||||
ports = ["${str port}:3001"];
|
||||
autostart = false;
|
||||
networks = ["ollama"];
|
||||
autoStart = false;
|
||||
autoUpdate = "registry";
|
||||
network = ["ollama"];
|
||||
volumes = let
|
||||
home = "/home/${username}";
|
||||
share = "${home}/.local/share/anything-llm";
|
||||
|
@ -45,8 +46,8 @@ in {
|
|||
WHISPER_PROVIDER = "local";
|
||||
TTS_PROVIDER = "native";
|
||||
};
|
||||
unitConfig = {Requires = ["podman-ollama.service"];};
|
||||
extraOptions = [
|
||||
extraConfig.Unit.Requires = ["podman-ollama.service"];
|
||||
extraPodmanArgs = [
|
||||
"--health-cmd"
|
||||
(lib.escapeShellArg "bash -c 'cat < /dev/null > /dev/tcp/localhost/3001'")
|
||||
];
|
||||
|
|
|
@ -53,16 +53,17 @@
|
|||
containers.ollama = let
|
||||
username = config.mainUser;
|
||||
in {
|
||||
image = "ollama/ollama:latest";
|
||||
image = "docker.io/ollama/ollama:latest";
|
||||
devices = ["nvidia.com/gpu=all"];
|
||||
autostart = false;
|
||||
networks = ["ollama"];
|
||||
autoStart = false;
|
||||
autoUpdate = "registry";
|
||||
network = ["ollama"];
|
||||
ports = ["11434:11434"];
|
||||
volumes = [
|
||||
"/home/${username}/.local/share/ollama:/models"
|
||||
];
|
||||
environment.OLLAMA_MODELS = "/models";
|
||||
extraOptions = [
|
||||
extraPodmanArgs = [
|
||||
"--health-cmd"
|
||||
(lib.escapeShellArg "bash -c 'cat < /dev/null > /dev/tcp/localhost/11434'")
|
||||
];
|
||||
|
|
|
@ -28,7 +28,7 @@ in {
|
|||
WEBUI_AUTH = "False";
|
||||
PORT = "${str port}";
|
||||
};
|
||||
autostart = false;
|
||||
autoStart = false;
|
||||
networks = ["ollama"];
|
||||
unitConfig = {Requires = ["podman-ollama.service"];};
|
||||
extraOptions = [
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
rust-lang.rust-analyzer
|
||||
serayuzgur.crates
|
||||
jnoortheen.nix-ide
|
||||
arrterian.nix-env-selector
|
||||
# arrterian.nix-env-selector
|
||||
mkhl.direnv
|
||||
continue.continue
|
||||
# silverquark.dancehelix
|
||||
|
@ -17,7 +17,7 @@
|
|||
"editor.fontFamily" = "${pkgs.rice.fonts.monospace.name}";
|
||||
"editor.fontSize" = 12;
|
||||
"workbench.colorTheme" = "KanagawaTheme";
|
||||
"rust-analyzer.check.overrideCommand" = "clippy";
|
||||
"rust-analyzer.check.overrideCommand" = ["clippy"];
|
||||
"rust-analyzer.debug.engine" = "vadimcn.vscode-lldb";
|
||||
"rust-analyzer.inlayHints.chainingHints.enable" = false;
|
||||
"rust-analyzer.inlayHints.parameterHints.enable" = false;
|
||||
|
|
|
@ -75,9 +75,7 @@
|
|||
req: {
|
||||
name = "${req}";
|
||||
value = {
|
||||
unitConfig = {
|
||||
PartOf = partOf cfg;
|
||||
};
|
||||
extraConfig.Unit.PartOf = partOf cfg;
|
||||
};
|
||||
}
|
||||
)
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
outputs,
|
||||
lib,
|
||||
pkgs,
|
||||
mainUser,
|
||||
...
|
||||
}: {
|
||||
# these settings propagate to home-manager's nixpkgs
|
||||
|
@ -18,6 +19,7 @@
|
|||
outputs.overlays.murex-jump
|
||||
outputs.overlays.comfyui
|
||||
outputs.overlays.comfyui-plugins
|
||||
outputs.overlays.utillinux
|
||||
];
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
|
@ -84,9 +86,6 @@
|
|||
git
|
||||
jujutsu
|
||||
|
||||
# broken \/
|
||||
# libimobiledevice
|
||||
# ifuse
|
||||
];
|
||||
|
||||
services.atuin.enable = true;
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
}: {
|
||||
# perlless activations
|
||||
boot.initrd.systemd.enable = true;
|
||||
# breaks everything
|
||||
# system.etc.overlay = {
|
||||
# enable = lib.mkDefault true;
|
||||
# mutable = true;
|
||||
|
@ -20,7 +21,7 @@
|
|||
environment.defaultPackages = lib.mkDefault [];
|
||||
documentation.info.enable = false;
|
||||
|
||||
# no cppnix
|
||||
# no cppnix .. ?
|
||||
# system.systemBuilderArgs.disallowedRequisites = [pkgs.nix];
|
||||
nix.package = pkgs.lix;
|
||||
system.tools.nixos-option.enable = false;
|
||||
|
|
|
@ -2,13 +2,15 @@
|
|||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
mainUser,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./configuration.nix
|
||||
];
|
||||
|
||||
services.ollama.enable = true;
|
||||
|
||||
system.stateVersion = "22.11"; # Did you read the comment?
|
||||
|
||||
networking.hostName = "quiver";
|
||||
|
@ -30,7 +32,6 @@
|
|||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd" "i2c-dev"];
|
||||
boot.kernelParams = [
|
||||
"nvidia-drm.fbdev=1"
|
||||
"mitigations=off"
|
||||
"acpi_enforce_resources=lax"
|
||||
"preempt=full"
|
||||
|
@ -83,31 +84,15 @@
|
|||
# src = inputs.podman;
|
||||
# };
|
||||
};
|
||||
# docker = {
|
||||
# enable = true;
|
||||
# enableOnBoot = true;
|
||||
# enableNvidia = true;
|
||||
# extraOptions = "--add-runtime nvidia=/run/current-system/sw/bin/nvidia-container-runtime";
|
||||
# };
|
||||
};
|
||||
|
||||
# services.minidlna = {
|
||||
# enable = true;
|
||||
# settings = {
|
||||
# notify_interval = 120;
|
||||
# friendly_name = "PC";
|
||||
# media_dir = ["A,/data/Music/Slsk"];
|
||||
# };
|
||||
# };
|
||||
|
||||
services.xserver.videoDrivers = ["nvidia"];
|
||||
# TODO figure out why i can't resume properly
|
||||
hardware.nvidia = {
|
||||
package = config.boot.kernelPackages.nvidiaPackages.latest;
|
||||
modesetting.enable = true;
|
||||
# powerManagement.enable = true;
|
||||
powerManagement.enable = true;
|
||||
nvidiaPersistenced = true;
|
||||
open = false;
|
||||
# nvidiaPersistenced = true;
|
||||
};
|
||||
programs.xwayland.enable = true;
|
||||
|
||||
|
|
|
@ -7,9 +7,12 @@
|
|||
comfyui-plugins = inputs.comfyui-plugins.overlays.comfyui-plugins;
|
||||
murex = final: prev: {
|
||||
murex = prev.murex.overrideAttrs {
|
||||
version = "6.4.0309-dev";
|
||||
version = "dev-${builtins.toString inputs.murex.lastModifiedDate}";
|
||||
src = inputs.murex;
|
||||
vendorHash = "sha256-NIhg8D8snCNxpb3i2JG5tLcZteYBCGN4QbOowG/vgJE=";
|
||||
};
|
||||
};
|
||||
utillinux = final: prev: {
|
||||
utillinux = prev.util-linux;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue