From d429476553b7418eb01fb5bd67e65f401ec4221b Mon Sep 17 00:00:00 2001 From: atagen Date: Sun, 23 Feb 2025 16:23:14 +1100 Subject: [PATCH] post murex --- flake.lock | 248 +++------- flake.nix | 18 +- flakes/comfyui/flake.lock | 6 +- flakes/comfyui/flake.nix | 1 + flakes/murex-module-jump/default.nix | 14 - flakes/murex-module-jump/flake.lock | 41 -- flakes/murex-module-jump/flake.nix | 23 - flakes/murex-module-starship/default.nix | 15 - flakes/murex-module-starship/flake.lock | 41 -- flakes/murex-module-starship/flake.nix | 23 - .../starship-set-time.patch | 11 - home/home.nix | 7 +- home/modules/cli.nix | 5 +- home/modules/creative.nix | 3 +- home/modules/dev.nix | 1 + home/programs/atuin.nix | 3 +- home/programs/kitty.nix | 2 +- home/programs/murex.nix | 88 ---- home/programs/vscode.nix | 9 +- home/util/containers.nix | 456 +++++++++--------- home/util/murex.nix | 85 ---- system/configuration.nix | 37 +- system/modules/culr.nix | 3 +- system/modules/sound.nix | 3 +- system/modules/sydney.nix | 3 +- system/modules/systemdboot.nix | 3 +- system/modules/term.nix | 15 +- system/quiver.nix | 8 +- util/overlay.nix | 9 - 29 files changed, 341 insertions(+), 840 deletions(-) delete mode 100644 flakes/murex-module-jump/default.nix delete mode 100644 flakes/murex-module-jump/flake.lock delete mode 100644 flakes/murex-module-jump/flake.nix delete mode 100644 flakes/murex-module-starship/default.nix delete mode 100644 flakes/murex-module-starship/flake.lock delete mode 100644 flakes/murex-module-starship/flake.nix delete mode 100644 flakes/murex-module-starship/starship-set-time.patch delete mode 100644 home/programs/murex.nix delete mode 100644 home/util/murex.nix diff --git a/flake.lock b/flake.lock index af1f25d..be0b776 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "cachyos": { "locked": { - "lastModified": 1737400770, - "narHash": "sha256-m7LBy3Ikj1ZAl2JGXBjLcUykyxybuBfzeATigqkpYVk=", + "lastModified": 1738971536, + "narHash": "sha256-X+zFt0Hn82sXkzdTQ5mBk2UXDjyHqAg0QykG8stivMU=", "owner": "drakon64", "repo": "nixos-cachyos-kernel", - "rev": "9ee0ce62ad8d2f5364ed6559072331413ce329af", + "rev": "3ba8e09228837952d62419aa85652f02f4475cb0", "type": "github" }, "original": { @@ -24,7 +24,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-i6ugvJwvTJ0EgpECbueonyaOdzNXFZOMXkOaVGPoOcQ=", + "narHash": "sha256-D42CCiTeYTyVERflL0WkWrz0LmkoXmUIsGAd9RSZIW0=", "path": "./flakes/comfyui", "type": "path" }, @@ -44,7 +44,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-5/wjRO28BxAijRKtVyQ1+h6q6/IefLqdWWtStzSFONo=", + "narHash": "sha256-q/vKhxywSAPm1cwYIMs+s6kcY8mUdhXMH//PwBP1k3s=", "path": "./flakes/comfyui-plugins", "type": "path" }, @@ -56,11 +56,11 @@ "comfyui_2": { "flake": false, "locked": { - "lastModified": 1738409722, - "narHash": "sha256-x9gVw07sPF6SSJE/idOYZVWbJDpDHGr+m77CPd0z+Ho=", + "lastModified": 1739165060, + "narHash": "sha256-DLiv96ynd+p4lXgvNMqgSklWFciLX+l+nXlu5MYVrg8=", "owner": "comfyanonymous", "repo": "ComfyUI", - "rev": "9e1d301129db2507e6681a83d845186802e4ba22", + "rev": "4027466c802d174d76347726d74de73c39acedb3", "type": "github" }, "original": { @@ -104,15 +104,14 @@ "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" - ], - "ocaml-overlay": "ocaml-overlay" + ] }, "locked": { - "lastModified": 1734161460, - "narHash": "sha256-SvUAmX5y1BchyEVWw8Cb9O/K5dxZzQeUjyGY14RLuwQ=", + "lastModified": 1738972869, + "narHash": "sha256-meaUvbOADLsUCsAT/vMecmfVpq0Jqypynq8hCUl9Mps=", "ref": "refs/heads/master", - "rev": "5a164045f541d720984fec81b70488308412a703", - "revCount": 67, + "rev": "40feebba44d4722706b66ac51e1997cb630c09c9", + "revCount": 68, "type": "git", "url": "https://git.atagen.co/atagen/culr" }, @@ -361,11 +360,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1738463065, - "narHash": "sha256-lQ5MecgzpOLXtt3JfjyRCM9xQ4X3c8yiVNztPMhbCb0=", + "lastModified": 1739223361, + "narHash": "sha256-MmuW2nMRw2PTpNOestOpB1Lb4XBQgZyoa5q5t/VH53o=", "owner": "helix-editor", "repo": "helix", - "rev": "70d452db3e0890e13f8ce9d88b861fa39fb6d95c", + "rev": "35faa73be114cde7bad22fd1c548bad35383a64b", "type": "github" }, "original": { @@ -401,11 +400,11 @@ ] }, "locked": { - "lastModified": 1738448366, - "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", + "lastModified": 1739233400, + "narHash": "sha256-fldFwXHP9Ndy/ADMDWNTpfWNsLdhZ8PP4DQyr1Igfo4=", "owner": "nix-community", "repo": "home-manager", - "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", + "rev": "ba4a1a110204c27805d1a1b5c8b24b3a0da4d063", "type": "github" }, "original": { @@ -422,11 +421,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1738370606, - "narHash": "sha256-yIPWsq34x4ebbQVoH0FaP6BJzkrPR9MftKzY+rY5Fqo=", + "lastModified": 1738859373, + "narHash": "sha256-/ckqUSy2S75aPuZWJkE9jvxu3THvQyKrK0gYR6l1Gp0=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "dd36891f5b99c6dce787f63a5cfc47e109cc54e2", + "rev": "75375aa341ec154345a7f41d210c952d4ffe2002", "type": "github" }, "original": { @@ -454,11 +453,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1738446528, - "narHash": "sha256-NYL/r7EXSyYP7nXuYGvGYMI9QtztGjVaKKofBt/pCv8=", - "rev": "a51380645f61b33d37a536b596d16c481f7b84a6", + "lastModified": 1739192059, + "narHash": "sha256-r40TUIL6zij0kWBpqKyI7O2brT3Myaa3aAGamkZEvfc=", + "rev": "3bca42eb0049772d9079f29f25186575f8e5a4ae", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/a51380645f61b33d37a536b596d16c481f7b84a6.tar.gz?rev=a51380645f61b33d37a536b596d16c481f7b84a6" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/3bca42eb0049772d9079f29f25186575f8e5a4ae.tar.gz?rev=3bca42eb0049772d9079f29f25186575f8e5a4ae" }, "original": { "type": "tarball", @@ -517,15 +516,14 @@ ], "nixpkgs": [ "nixpkgs" - ], - "ocaml-overlay": "ocaml-overlay_2" + ] }, "locked": { - "lastModified": 1734161475, - "narHash": "sha256-dlcFOJ6U3fGvPK5YOGtFyhOffuEqdvHU2JSjX3mOUc0=", + "lastModified": 1738972856, + "narHash": "sha256-MsdhIWg/CgbgdJv9Zf8Be3uHr8sB/I2LGBmKQa1PWdA=", "ref": "refs/heads/master", - "rev": "405c2209d939faa7bb53b517714841a5ab460c6c", - "revCount": 34, + "rev": "01aa149c2f5358fb54407678641ef7644056aa3a", + "revCount": 35, "type": "git", "url": "https://git.atagen.co/atagen/meat" }, @@ -534,59 +532,6 @@ "url": "https://git.atagen.co/atagen/meat" } }, - "murex": { - "flake": false, - "locked": { - "lastModified": 1738023202, - "narHash": "sha256-CPjassvyzEI54+s/Dts0h16E956gvAq0H3mbZlqqCMg=", - "owner": "lmorg", - "repo": "murex", - "rev": "ac86be87ab04bf4188e7ea85076637494f5afb47", - "type": "github" - }, - "original": { - "owner": "lmorg", - "ref": "develop", - "repo": "murex", - "type": "github" - } - }, - "murex-jump": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "src": "src" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-H7gJSiSOxLBudoKsLAsE7B+JwFFutiELr6LwAv36BAc=", - "path": "./flakes/murex-module-jump", - "type": "path" - }, - "original": { - "path": "./flakes/murex-module-jump", - "type": "path" - } - }, - "murex-starship": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "src": "src_2" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-uOr5lrHfnVaNFLaASe0UJ5SEIn5zvGEAjsqFy/f6b2g=", - "path": "./flakes/murex-module-starship", - "type": "path" - }, - "original": { - "path": "./flakes/murex-module-starship", - "type": "path" - } - }, "naersk": { "inputs": { "nixpkgs": "nixpkgs_2" @@ -610,11 +555,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1737535280, - "narHash": "sha256-gNmu5trAOoWOo1nlSr0i0BOw4AnVmsbI1eG0WjMdvZU=", + "lastModified": 1738579718, + "narHash": "sha256-HcNEFumdZ4Y59CBB1h1IzOyPxwn0u/Wson6hhzItXCA=", "owner": "viperML", "repo": "nh", - "rev": "245b2a1743a7b7f559d428090630b2b56c25949f", + "rev": "8ef70b642b8351c010a48f43dda6a1ebf038f5d9", "type": "github" }, "original": { @@ -653,11 +598,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1738459562, - "narHash": "sha256-yc31wSweci8ZJhfoIk4GQQ3T8PaYc1F29u9poaN/XnE=", + "lastModified": 1739206396, + "narHash": "sha256-dfU3l47sxFQbqLe5R9um//V5hplv/MhSwsZJR7JzBrg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b195c4f59e460128ce192e1c6aa856011abc2d5f", + "rev": "9f15e7ace2dea798ce3490d2f723095ad4cce0d4", "type": "github" }, "original": { @@ -686,11 +631,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738404307, - "narHash": "sha256-BFtfL5kZbIsDAMgbVP5E0HbqDapYWw4NBw1xS0AOCCc=", + "lastModified": 1739201373, + "narHash": "sha256-6upEicgdJH3JaS1oXS+wsgLToU14XL8/aOyL2KcS3KY=", "owner": "YaLTeR", "repo": "niri", - "rev": "32ad545f842f4c176548e30d183d10e0a2bab752", + "rev": "20769b4c2f843566880f020f117e7bde36edc332", "type": "github" }, "original": { @@ -704,11 +649,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1738466368, - "narHash": "sha256-PZhUjtvQZOH3PO0EYdTpQvcqkgkq1NkP2A6w9SPHYsk=", + "lastModified": 1739071773, + "narHash": "sha256-/Ak+Quinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "46a8f5fc9552b776bfc5c5c96ea3bede33f68f52", + "rev": "895d81b6228bbd50a6ef22f5a58a504ca99763ea", "type": "github" }, "original": { @@ -747,11 +692,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1738460950, - "narHash": "sha256-VnojfvmXvLmEddGj+5pGg8UiQY1REHl0apB0R51wylw=", + "lastModified": 1739238493, + "narHash": "sha256-rk89UVGqLwts2c05TMpigB+zL2mhIYn33YUC69v7dxk=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "66dd0a10ed193f204a7e0f9853bdc21f94dd838f", + "rev": "eca81883cfad1f52a52d09025d10f5907200ea06", "type": "github" }, "original": { @@ -805,11 +750,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1738277201, - "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", + "lastModified": 1739055578, + "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", + "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", "type": "github" }, "original": { @@ -853,11 +798,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -931,11 +876,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -947,11 +892,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -992,48 +937,6 @@ "type": "github" } }, - "ocaml-overlay": { - "inputs": { - "nixpkgs": [ - "culr", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734156418, - "narHash": "sha256-7I6hKojqDm0Z+q9ZvDk8R5J/TfoPbprmVquwfQIzQrg=", - "owner": "nix-ocaml", - "repo": "nix-overlays", - "rev": "3bd751c1d602713195432d4818b35d29c4b1dccc", - "type": "github" - }, - "original": { - "owner": "nix-ocaml", - "repo": "nix-overlays", - "type": "github" - } - }, - "ocaml-overlay_2": { - "inputs": { - "nixpkgs": [ - "meat", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734156418, - "narHash": "sha256-7I6hKojqDm0Z+q9ZvDk8R5J/TfoPbprmVquwfQIzQrg=", - "owner": "nix-ocaml", - "repo": "nix-overlays", - "rev": "3bd751c1d602713195432d4818b35d29c4b1dccc", - "type": "github" - }, - "original": { - "owner": "nix-ocaml", - "repo": "nix-overlays", - "type": "github" - } - }, "openpose": { "flake": false, "locked": { @@ -1064,9 +967,6 @@ "lix-module": "lix-module", "madness": "madness", "meat": "meat", - "murex": "murex", - "murex-jump": "murex-jump", - "murex-starship": "murex-starship", "nh": "nh", "nil": "nil", "niri": "niri", @@ -1139,38 +1039,6 @@ "type": "github" } }, - "src": { - "flake": false, - "locked": { - "lastModified": 1689498584, - "narHash": "sha256-p2K56xPgXk/GJICExd20YQCycmZsa2TGG2wZgE56vC4=", - "owner": "lmorg", - "repo": "murex-module-jump", - "rev": "eb0839ba10a45796e1c24067163e590b6f9b1ec2", - "type": "github" - }, - "original": { - "owner": "lmorg", - "repo": "murex-module-jump", - "type": "github" - } - }, - "src_2": { - "flake": false, - "locked": { - "lastModified": 1728530583, - "narHash": "sha256-E7oGk2CV/nZuCL2n14RqCxKbJ3zddb+3itR59HgXNaU=", - "owner": "orefalo", - "repo": "murex-module-starship", - "rev": "42b1b13bfbd65c5fe405a3a4ff1c5790b778c78c", - "type": "github" - }, - "original": { - "owner": "orefalo", - "repo": "murex-module-starship", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index b6701be..8a2a271 100644 --- a/flake.nix +++ b/flake.nix @@ -56,21 +56,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - murex = { - url = "github:lmorg/murex/develop"; - flake = false; - }; - - murex-jump = { - url = "path:./flakes/murex-module-jump"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - murex-starship = { - url = "path:./flakes/murex-module-starship"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - niri = { url = "github:sodiboo/niri-flake"; }; @@ -101,13 +86,12 @@ ... }@inputs: let - inherit self; create = import ./util/create.nix { + inherit self; inherit nixpkgs home-manager inputs - self ; system = "x86_64-linux"; sharedModules = [ diff --git a/flakes/comfyui/flake.lock b/flakes/comfyui/flake.lock index 29e6952..805bbb0 100644 --- a/flakes/comfyui/flake.lock +++ b/flakes/comfyui/flake.lock @@ -3,11 +3,11 @@ "comfyui": { "flake": false, "locked": { - "lastModified": 1738409722, - "narHash": "sha256-x9gVw07sPF6SSJE/idOYZVWbJDpDHGr+m77CPd0z+Ho=", + "lastModified": 1739165060, + "narHash": "sha256-DLiv96ynd+p4lXgvNMqgSklWFciLX+l+nXlu5MYVrg8=", "owner": "comfyanonymous", "repo": "ComfyUI", - "rev": "9e1d301129db2507e6681a83d845186802e4ba22", + "rev": "4027466c802d174d76347726d74de73c39acedb3", "type": "github" }, "original": { diff --git a/flakes/comfyui/flake.nix b/flakes/comfyui/flake.nix index 25ac064..58b690f 100644 --- a/flakes/comfyui/flake.nix +++ b/flakes/comfyui/flake.nix @@ -19,6 +19,7 @@ outputs = { + self, nixpkgs, comfyui, }: diff --git a/flakes/murex-module-jump/default.nix b/flakes/murex-module-jump/default.nix deleted file mode 100644 index a3a6ece..0000000 --- a/flakes/murex-module-jump/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - pkgs, - src, - ... -}: -pkgs.stdenvNoCC.mkDerivation { - pname = "murex-module-jump"; - version = "0.1.0"; - inherit src; - installPhase = '' - mkdir -p $out - cp -r ./* $out - ''; -} diff --git a/flakes/murex-module-jump/flake.lock b/flakes/murex-module-jump/flake.lock deleted file mode 100644 index 046d557..0000000 --- a/flakes/murex-module-jump/flake.lock +++ /dev/null @@ -1,41 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", - "path": "/nix/store/hjb1rqv2mfs5ny47amj2gsc8xk05x5g6-source", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs", - "src": "src" - } - }, - "src": { - "flake": false, - "locked": { - "lastModified": 1689498584, - "narHash": "sha256-p2K56xPgXk/GJICExd20YQCycmZsa2TGG2wZgE56vC4=", - "owner": "lmorg", - "repo": "murex-module-jump", - "rev": "eb0839ba10a45796e1c24067163e590b6f9b1ec2", - "type": "github" - }, - "original": { - "owner": "lmorg", - "repo": "murex-module-jump", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flakes/murex-module-jump/flake.nix b/flakes/murex-module-jump/flake.nix deleted file mode 100644 index f86ab4e..0000000 --- a/flakes/murex-module-jump/flake.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - description = "Murex Jump module"; - - inputs = { - src = { - flake = false; - url = "github:lmorg/murex-module-jump"; - }; - }; - - outputs = - { - src, - ... - }: - { - overlays.murex-jump = final: _prev: { - murex-jump = final.callPackage ./default.nix { - inherit src; - }; - }; - }; -} diff --git a/flakes/murex-module-starship/default.nix b/flakes/murex-module-starship/default.nix deleted file mode 100644 index 72ceae4..0000000 --- a/flakes/murex-module-starship/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - pkgs, - src, - ... -}: -pkgs.stdenvNoCC.mkDerivation { - pname = "murex-module-starship"; - version = "0.1.0"; - inherit src; - # patches = [./starship-set-time.patch]; - installPhase = '' - mkdir -p $out - cp -r ./* $out - ''; -} diff --git a/flakes/murex-module-starship/flake.lock b/flakes/murex-module-starship/flake.lock deleted file mode 100644 index 97ba082..0000000 --- a/flakes/murex-module-starship/flake.lock +++ /dev/null @@ -1,41 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", - "path": "/nix/store/hjb1rqv2mfs5ny47amj2gsc8xk05x5g6-source", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs", - "src": "src" - } - }, - "src": { - "flake": false, - "locked": { - "lastModified": 1728530583, - "narHash": "sha256-E7oGk2CV/nZuCL2n14RqCxKbJ3zddb+3itR59HgXNaU=", - "owner": "orefalo", - "repo": "murex-module-starship", - "rev": "42b1b13bfbd65c5fe405a3a4ff1c5790b778c78c", - "type": "github" - }, - "original": { - "owner": "orefalo", - "repo": "murex-module-starship", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flakes/murex-module-starship/flake.nix b/flakes/murex-module-starship/flake.nix deleted file mode 100644 index 6b22b96..0000000 --- a/flakes/murex-module-starship/flake.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - description = "Murex Starship module"; - - inputs = { - src = { - flake = false; - url = "github:orefalo/murex-module-starship"; - }; - }; - - outputs = - { - src, - ... - }: - { - overlays.murex-starship = final: _prev: { - murex-starship = final.callPackage ./default.nix { - inherit src; - }; - }; - }; -} diff --git a/flakes/murex-module-starship/starship-set-time.patch b/flakes/murex-module-starship/starship-set-time.patch deleted file mode 100644 index a12468f..0000000 --- a/flakes/murex-module-starship/starship-set-time.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/starship.mx 2024-10-09 21:00:49.550098036 +1100 -+++ b/starship.mx 2024-10-09 21:00:56.186187476 +1100 -@@ -44,7 +44,7 @@ - } - - event onPrompt starship=after { -- ENV.STARSHIP_START_TIME = datetime(--in {now} --out {unix}) -+ datetime --in {now} --out {unix} -> cast int -> set ENV.STARSHIP_START_TIME - } - - config set shell hint-text-func { diff --git a/home/home.nix b/home/home.nix index 2759720..5a65b1a 100644 --- a/home/home.nix +++ b/home/home.nix @@ -17,7 +17,6 @@ in ./modules/theming.nix ./modules/niri.nix ./util/ez.nix - ./util/murex.nix ./util/name.nix inputs.nix-index-database.hmModules.nix-index inputs.ironbar.homeManagerModules.default @@ -93,7 +92,7 @@ in # programs.nix-index.enable = true; systemd.user.startServices = "sd-switch"; - ezServices = { - ckb-next = "${getExe pkgs.ckb-next} -c -b"; - }; + # ezServices = { + # ckb-next = "${getExe pkgs.ckb-next} -c -b"; + # }; } diff --git a/home/modules/cli.nix b/home/modules/cli.nix index c6c10f2..cd1b01f 100644 --- a/home/modules/cli.nix +++ b/home/modules/cli.nix @@ -2,11 +2,10 @@ { imports = [ ../programs/kitty.nix - ../programs/zsh.nix + # ../programs/zsh.nix # ../programs/xresources.nix ../programs/helix.nix - # ../programs/atuin.nix - ../programs/murex.nix + ../programs/atuin.nix ]; home.packages = with pkgs; [ btop diff --git a/home/modules/creative.nix b/home/modules/creative.nix index ac666cd..e420aa3 100644 --- a/home/modules/creative.nix +++ b/home/modules/creative.nix @@ -1,5 +1,4 @@ -_: -{ +_: { # imports = [ # ../util/flatpak.nix # ]; diff --git a/home/modules/dev.nix b/home/modules/dev.nix index e739628..82ff6d6 100644 --- a/home/modules/dev.nix +++ b/home/modules/dev.nix @@ -55,6 +55,7 @@ nix-direnv = { enable = true; }; + enableFishIntegration = true; }; programs.git = { diff --git a/home/programs/atuin.nix b/home/programs/atuin.nix index 215d861..2189c60 100644 --- a/home/programs/atuin.nix +++ b/home/programs/atuin.nix @@ -1,5 +1,4 @@ -_: -{ +_: { programs.atuin = { enable = true; enableZshIntegration = true; diff --git a/home/programs/kitty.nix b/home/programs/kitty.nix index 67f8494..20d528f 100644 --- a/home/programs/kitty.nix +++ b/home/programs/kitty.nix @@ -37,7 +37,7 @@ in color14 = bright.cyan; color15 = bright.white; sync_to_monitor = "yes"; - # shell = "elvish"; + shell = "fish"; }; }; } diff --git a/home/programs/murex.nix b/home/programs/murex.nix deleted file mode 100644 index cadaf37..0000000 --- a/home/programs/murex.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ pkgs, ... }: -{ - programs.murex = { - enable = true; - direnv = true; - managePlugins = true; - profile = '' - config: set shell auto-cd true - config: set proc force-tty true - - function fresh { - clear - echo - ~/.nix/header.sh - } - - function mnt { - mount -> column -t -> culr -t 80 -o roygbiv-split - } - - function la_culr (!path: str) { - if { is-null $path } { - eza -lha --group-directories-first --icons --color=always -> culr -t 80 -o roygbiv-split - } else { - eza -lha --group-directories-first --icons --color=always $path -> culr -t 80 -o roygbiv-split - } - } - - function ls_culr (!path: str) { - if { is-null $path } { - eza -lh --group-directories-first --icons --color=always -> culr -t 80 -o roygbiv-split - } else { - eza -lh --group-directories-first --icons --color=always $path -> culr -t 80 -o roygbiv-split - } - } - - function ps_culr (!cmd: str) { - if { is-null $cmd } { - ps ww | culr -t 80 -o roygbiv-split - } else { - ps ww$cmd | culr -t 80 -o roygbiv-split - } - } - - alias gs=git status - alias gcl=git clone - alias ga=git add - alias gcb=git checkout -b - alias gco=git checkout - alias gl=git pull - alias gp=git push - alias gd=git diff - alias gcam=git commit -am - alias gcm=git commit -m - alias gr=git restore - alias gm=git merge - alias l=ls_culr - alias la=la_culr - alias p=ps_culr - alias z=j - - fresh - ''; - plugins = - let - inherit (pkgs) - murex-jump - murex-starship - ; - in - [ - murex-jump - murex-starship - ]; - }; - - programs.starship = { - enable = true; - }; - - home.packages = - let - inherit (pkgs) jump; - in - [ - jump - ]; -} diff --git a/home/programs/vscode.nix b/home/programs/vscode.nix index 202a89b..bd859ab 100644 --- a/home/programs/vscode.nix +++ b/home/programs/vscode.nix @@ -9,15 +9,17 @@ mkhl.direnv barbosshack.crates-io vadimcn.vscode-lldb - kamadorueda.alejandra kend.dancehelixkey hikionori.kanagawa-vscode-theme + dbaeumer.vscode-eslint + ms-vscode.extension-test-runner ]; mutableExtensionsDir = false; userSettings = { "window.titleBarStyle" = "custom"; "editor.fontFamily" = "${pkgs.rice.fonts.monospace.name}"; "editor.fontSize" = 12; + "editor.formatOnSave" = true; "workbench.colorTheme" = "KanagawaTheme"; "rust-analyzer.debug.engine" = "vadimcn.vscode-lldb"; "rust-analyzer.inlayHints.chainingHints.enable" = false; @@ -25,6 +27,11 @@ "rust-analyzer.inlayHints.typeHints.enable" = false; "nix.enableLanguageServer" = true; "nix.serverPath" = "nil"; + "nix.serverSettings" = { + nil.formatting.command = [ + "nixfmt" + ]; + }; }; }; } diff --git a/home/util/containers.nix b/home/util/containers.nix index 7231899..4f7a0e8 100644 --- a/home/util/containers.nix +++ b/home/util/containers.nix @@ -5,251 +5,249 @@ ... }: let - containerOptions = - _: - { - options = { - pullPolicy = mkOption { - type = with types; str; - description = "Podman container pulling policy"; - default = "newer"; - }; - image = mkOption { - type = with types; str; - description = "OCI image to run."; - example = "library/hello-world"; - }; + containerOptions = _: { + options = { + pullPolicy = mkOption { + type = with types; str; + description = "Podman container pulling policy"; + default = "newer"; + }; + image = mkOption { + type = with types; str; + description = "OCI image to run."; + example = "library/hello-world"; + }; - imageFile = mkOption { - type = with types; nullOr package; - default = null; - description = '' - Path to an image file to load before running the image. This can - be used to bypass pulling the image from the registry. + imageFile = mkOption { + type = with types; nullOr package; + default = null; + description = '' + Path to an image file to load before running the image. This can + be used to bypass pulling the image from the registry. - The `image` attribute must match the name and - tag of the image contained in this file, as they will be used to - run the container with that image. If they do not match, the - image will be pulled from the registry as usual. - ''; - example = literalExpression "pkgs.dockerTools.buildImage {...};"; - }; + The `image` attribute must match the name and + tag of the image contained in this file, as they will be used to + run the container with that image. If they do not match, the + image will be pulled from the registry as usual. + ''; + example = literalExpression "pkgs.dockerTools.buildImage {...};"; + }; - login = { - username = mkOption { - type = with types; nullOr str; - default = null; - description = "Username for login."; - }; - - passwordFile = mkOption { - type = with types; nullOr str; - default = null; - description = "Path to file containing password."; - example = "/etc/nixos/dockerhub-password.txt"; - }; - - registry = mkOption { - type = with types; nullOr str; - default = null; - description = "Registry where to login to."; - example = "https://docker.pkg.github.com"; - }; - }; - - cmd = mkOption { - type = with types; listOf str; - default = [ ]; - description = "Commandline arguments to pass to the image's entrypoint."; - example = literalExpression '' - ["--port=9000"] - ''; - }; - - labels = mkOption { - type = with types; attrsOf str; - default = { }; - description = "Labels to attach to the container at runtime."; - example = literalExpression '' - { - "traefik.https.routers.example.rule" = "Host(`example.container`)"; - } - ''; - }; - - entrypoint = mkOption { - type = with types; nullOr str; - description = "Override the default entrypoint of the image."; - default = null; - example = "/bin/my-app"; - }; - - environment = mkOption { - type = with types; attrsOf str; - default = { }; - description = "Environment variables to set for this container."; - example = literalExpression '' - { - DATABASE_HOST = "db.example.com"; - DATABASE_PORT = "3306"; - } - ''; - }; - - environmentFiles = mkOption { - type = with types; listOf path; - default = [ ]; - description = "Environment files for this container."; - example = literalExpression '' - [ - /path/to/.env - /path/to/.env.secret - ] - ''; - }; - - log-driver = mkOption { - type = types.str; - default = "journald"; - description = '' - Logging driver for the container. The default of - `"journald"` means that the container's logs will be - handled as part of the systemd unit. - - For more details and a full list of logging drivers, refer to podman documentation. - - For Docker: - [Docker engine documentation](https://docs.docker.com/engine/reference/run/#logging-drivers---log-driver) - - For Podman: - Refer to the docker-run(1) man page. - ''; - }; - - ports = mkOption { - type = with types; listOf str; - default = [ ]; - description = '' - Network ports to publish from the container to the outer host. - - Valid formats: - - `::` - - `::` - - `:` - - `` - - Both `hostPort` and `containerPort` can be specified as a range of - ports. When specifying ranges for both, the number of container - ports in the range must match the number of host ports in the - range. Example: `1234-1236:1234-1236/tcp` - - When specifying a range for `hostPort` only, the `containerPort` - must *not* be a range. In this case, the container port is published - somewhere within the specified `hostPort` range. - Example: `1234-1236:1234/tcp` - - Refer to the - [Docker engine documentation](https://docs.docker.com/engine/reference/run/#expose-incoming-ports) for full details. - ''; - example = literalExpression '' - [ - "8080:9000" - ] - ''; - }; - - user = mkOption { + login = { + username = mkOption { type = with types; nullOr str; default = null; - description = '' - Override the username or UID (and optionally groupname or GID) used - in the container. - ''; - example = "nobody:nogroup"; + description = "Username for login."; }; - volumes = mkOption { - type = with types; listOf str; - default = [ ]; - description = '' - List of volumes to attach to this container. - - Note that this is a list of `"src:dst"` strings to - allow for `src` to refer to `/nix/store` paths, which - would be difficult with an attribute set. There are - also a variety of mount options available as a third - field; please refer to the - [docker engine documentation](https://docs.docker.com/engine/reference/run/#volume-shared-filesystems) for details. - ''; - example = literalExpression '' - [ - "volume_name:/path/inside/container" - "/path/on/host:/path/inside/container" - ] - ''; - }; - - workdir = mkOption { + passwordFile = mkOption { type = with types; nullOr str; default = null; - description = "Override the default working directory for the container."; - example = "/var/lib/hello_world"; + description = "Path to file containing password."; + example = "/etc/nixos/dockerhub-password.txt"; }; - dependsOn = mkOption { - type = with types; listOf str; - default = [ ]; - description = '' - Define which other containers this one depends on. They will be added to both After and Requires for the unit. - - Use the same name as the attribute under `virtualisation.oci-containers.containers`. - ''; - example = literalExpression '' - containers = { - node1 = {}; - node2 = { - dependsOn = [ "node1" ]; - } - } - ''; - }; - - hostname = mkOption { + registry = mkOption { type = with types; nullOr str; default = null; - description = "The hostname of the container."; - example = "hello-world"; - }; - - preRunExtraOptions = mkOption { - type = with types; listOf str; - default = [ ]; - description = "Extra options for podman that go before the `run` argument."; - example = [ - "--runtime" - "runsc" - ]; - }; - - extraOptions = mkOption { - type = with types; listOf str; - default = [ ]; - description = "Extra options for podman run`."; - example = literalExpression '' - ["--network=host"] - ''; - }; - - autoStart = mkOption { - type = types.bool; - default = false; - description = '' - When enabled, the container is automatically started on boot. - If this option is set to false, the container has to be started on-demand via its service. - ''; + description = "Registry where to login to."; + example = "https://docker.pkg.github.com"; }; }; + + cmd = mkOption { + type = with types; listOf str; + default = [ ]; + description = "Commandline arguments to pass to the image's entrypoint."; + example = literalExpression '' + ["--port=9000"] + ''; + }; + + labels = mkOption { + type = with types; attrsOf str; + default = { }; + description = "Labels to attach to the container at runtime."; + example = literalExpression '' + { + "traefik.https.routers.example.rule" = "Host(`example.container`)"; + } + ''; + }; + + entrypoint = mkOption { + type = with types; nullOr str; + description = "Override the default entrypoint of the image."; + default = null; + example = "/bin/my-app"; + }; + + environment = mkOption { + type = with types; attrsOf str; + default = { }; + description = "Environment variables to set for this container."; + example = literalExpression '' + { + DATABASE_HOST = "db.example.com"; + DATABASE_PORT = "3306"; + } + ''; + }; + + environmentFiles = mkOption { + type = with types; listOf path; + default = [ ]; + description = "Environment files for this container."; + example = literalExpression '' + [ + /path/to/.env + /path/to/.env.secret + ] + ''; + }; + + log-driver = mkOption { + type = types.str; + default = "journald"; + description = '' + Logging driver for the container. The default of + `"journald"` means that the container's logs will be + handled as part of the systemd unit. + + For more details and a full list of logging drivers, refer to podman documentation. + + For Docker: + [Docker engine documentation](https://docs.docker.com/engine/reference/run/#logging-drivers---log-driver) + + For Podman: + Refer to the docker-run(1) man page. + ''; + }; + + ports = mkOption { + type = with types; listOf str; + default = [ ]; + description = '' + Network ports to publish from the container to the outer host. + + Valid formats: + - `::` + - `::` + - `:` + - `` + + Both `hostPort` and `containerPort` can be specified as a range of + ports. When specifying ranges for both, the number of container + ports in the range must match the number of host ports in the + range. Example: `1234-1236:1234-1236/tcp` + + When specifying a range for `hostPort` only, the `containerPort` + must *not* be a range. In this case, the container port is published + somewhere within the specified `hostPort` range. + Example: `1234-1236:1234/tcp` + + Refer to the + [Docker engine documentation](https://docs.docker.com/engine/reference/run/#expose-incoming-ports) for full details. + ''; + example = literalExpression '' + [ + "8080:9000" + ] + ''; + }; + + user = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Override the username or UID (and optionally groupname or GID) used + in the container. + ''; + example = "nobody:nogroup"; + }; + + volumes = mkOption { + type = with types; listOf str; + default = [ ]; + description = '' + List of volumes to attach to this container. + + Note that this is a list of `"src:dst"` strings to + allow for `src` to refer to `/nix/store` paths, which + would be difficult with an attribute set. There are + also a variety of mount options available as a third + field; please refer to the + [docker engine documentation](https://docs.docker.com/engine/reference/run/#volume-shared-filesystems) for details. + ''; + example = literalExpression '' + [ + "volume_name:/path/inside/container" + "/path/on/host:/path/inside/container" + ] + ''; + }; + + workdir = mkOption { + type = with types; nullOr str; + default = null; + description = "Override the default working directory for the container."; + example = "/var/lib/hello_world"; + }; + + dependsOn = mkOption { + type = with types; listOf str; + default = [ ]; + description = '' + Define which other containers this one depends on. They will be added to both After and Requires for the unit. + + Use the same name as the attribute under `virtualisation.oci-containers.containers`. + ''; + example = literalExpression '' + containers = { + node1 = {}; + node2 = { + dependsOn = [ "node1" ]; + } + } + ''; + }; + + hostname = mkOption { + type = with types; nullOr str; + default = null; + description = "The hostname of the container."; + example = "hello-world"; + }; + + preRunExtraOptions = mkOption { + type = with types; listOf str; + default = [ ]; + description = "Extra options for podman that go before the `run` argument."; + example = [ + "--runtime" + "runsc" + ]; + }; + + extraOptions = mkOption { + type = with types; listOf str; + default = [ ]; + description = "Extra options for podman run`."; + example = literalExpression '' + ["--network=host"] + ''; + }; + + autoStart = mkOption { + type = types.bool; + default = false; + description = '' + When enabled, the container is automatically started on boot. + If this option is set to false, the container has to be started on-demand via its service. + ''; + }; }; + }; mkService = name: container: diff --git a/home/util/murex.nix b/home/util/murex.nix deleted file mode 100644 index c1d61a4..0000000 --- a/home/util/murex.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - lib, - config, - ... -}: -let - inherit (lib) - mkEnableOption - mkOption - mkIf - types - ; - inherit (builtins) listToAttrs; - cfg = config.programs.murex; -in -{ - options.programs.murex = { - enable = mkEnableOption "murex shell"; - managePlugins = mkEnableOption "plugin management"; - direnv = mkEnableOption "direnv integration"; - plugins = mkOption { - type = with types; listOf package; - default = [ ]; - }; - profile = mkOption { - type = types.str; - default = ""; - }; - preload = mkOption { - type = types.str; - default = ""; - }; - useXdgConfig = mkEnableOption "override MUREX_{PRELOAD,MODULES,PROFILE} env vars to conform to XDG_CONFIG_HOME"; - }; - config = mkIf cfg.enable { - home.file = - let - plugins = listToAttrs ( - map (plugin: { - name = ".murex_modules/${plugin.pname}"; - value = { - recursive = true; - source = plugin; - }; - }) cfg.plugins - ); - in - lib.mergeAttrs plugins { - ".murex_preload" = { - text = cfg.preload; - executable = true; - enable = cfg.preload != ""; - }; - ".murex_profile" = { - text = - cfg.profile - + ( - if cfg.direnv then - '' - direnv hook murex -> source - '' - else - "" - ); - executable = true; - enable = cfg.direnv || cfg.profile != ""; - }; - ".murex_modules/packages.json" = { - text = builtins.toJSON ( - map (plugin: { - Protocol = "nix"; - URI = "nix://managed.git"; - Package = plugin.pname; - }) cfg.plugins - ); - enable = cfg.managePlugins && (cfg.plugins != [ ]); - }; - }; - home.sessionVariables = mkIf cfg.useXdgConfig { - MUREX_PRELOAD = "$XDG_CONFIG_HOME/murex/"; - MUREX_MODULES = "$XDG_CONFIG_HOME/murex/"; - MUREX_PROFILE = "$XDG_CONFIG_HOME/murex/"; - }; - }; -} diff --git a/system/configuration.nix b/system/configuration.nix index b57a59e..2a77c97 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -16,12 +16,8 @@ in inputs.nix-rice.overlays.default inputs.helix.overlays.default inputs.nil.overlays.nil - # inputs.nixd.overlays.default inputs.niri.overlays.niri self.overlays.rice - self.overlays.murex - self.overlays.murex-starship - self.overlays.murex-jump self.overlays.comfyui self.overlays.comfyui-plugins ]; @@ -75,24 +71,23 @@ in boot.tmp.useTmpfs = true; - services.udev.extraHwdb = '' - evdev:atkbd:* - KEYBOARD_KEY_3a=esc - ''; - # services.xserver.xkb.options = "caps:swapescape"; - services.xserver.xkb.extraLayouts."swap" = { - description = "caps swap"; - languages = [ "eng" ]; - symbolsFile = pkgs.writeText "keyboard" '' - xkb_symbols - { - include "us(basic)" + # services.udev.extraHwdb = '' + # evdev:atkbd:* + # KEYBOARD_KEY_3a=esc + # ''; + services.xserver.xkb.options = "caps:swapescape"; + # services.xserver.xkb.extraLayouts."swap" = { + # description = "caps swap"; + # languages = [ "eng" ]; + # symbolsFile = pkgs.writeText "keyboard" '' + # xkb_symbols + # { + # include "us(basic)" - key {[ Escape ]}; - } - ''; - }; - services.kmscon.useXkbConfig = true; + # key {[ Escape ]}; + # } + # ''; + # }; console.useXkbConfig = true; services.libinput.enable = true; diff --git a/system/modules/culr.nix b/system/modules/culr.nix index c395688..a27758c 100644 --- a/system/modules/culr.nix +++ b/system/modules/culr.nix @@ -1,5 +1,4 @@ -_: -{ +_: { programs.culr = { enable = true; pattern = "rainbow-split"; diff --git a/system/modules/sound.nix b/system/modules/sound.nix index 83aac05..19c9744 100644 --- a/system/modules/sound.nix +++ b/system/modules/sound.nix @@ -1,5 +1,4 @@ -_: -{ +_: { security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/system/modules/sydney.nix b/system/modules/sydney.nix index 7e51e93..b04dc0d 100644 --- a/system/modules/sydney.nix +++ b/system/modules/sydney.nix @@ -1,5 +1,4 @@ -_: -{ +_: { time.timeZone = "Australia/Sydney"; time.hardwareClockInLocalTime = false; i18n.defaultLocale = "en_AU.UTF-8"; diff --git a/system/modules/systemdboot.nix b/system/modules/systemdboot.nix index 7d17942..317e507 100644 --- a/system/modules/systemdboot.nix +++ b/system/modules/systemdboot.nix @@ -1,5 +1,4 @@ -_: -{ +_: { boot.loader.systemd-boot.consoleMode = "max"; boot.loader.timeout = 3; boot.loader.systemd-boot.enable = true; diff --git a/system/modules/term.nix b/system/modules/term.nix index 8d2cf08..845d3de 100644 --- a/system/modules/term.nix +++ b/system/modules/term.nix @@ -1,17 +1,18 @@ { pkgs, ... }: let - inherit (pkgs) murex zsh elvish; + inherit (pkgs) fish elvish; in { - environment.pathsToLink = [ "/share/zsh" ]; - programs.zsh.enable = true; + programs.fish = { + enable = true; + }; + programs.autojump.enable = true; environment.systemPackages = [ - murex elvish + fish ]; - environment.shells = [ murex ]; - users.defaultUserShell = murex; - # users.defaultUserShell = zsh; + environment.shells = [ elvish ]; + users.defaultUserShell = elvish; console = { font = "Lat2-Terminus16"; }; diff --git a/system/quiver.nix b/system/quiver.nix index bc95449..b97766b 100644 --- a/system/quiver.nix +++ b/system/quiver.nix @@ -122,7 +122,7 @@ # motherboard = "amd"; # }; - hardware.ckb-next.enable = true; + # hardware.ckb-next.enable = true; environment.systemPackages = builtins.attrValues { inherit (pkgs) wl-clipboard @@ -131,6 +131,10 @@ ; }; programs.fuse.userAllowOther = true; + services.libinput.mouse = { + accelProfile = "flat"; + accelSpeed = 0.0; + }; fileSystems = { "/" = { @@ -166,7 +170,7 @@ }; services.open-webui = { - enable = true; + enable = false; port = 8088; environment = { DO_NOT_TRACK = "True"; diff --git a/util/overlay.nix b/util/overlay.nix index b1d072c..0d10306 100644 --- a/util/overlay.nix +++ b/util/overlay.nix @@ -4,15 +4,6 @@ }: { rice = import ./rice.nix; - inherit (inputs.murex-jump.overlays) murex-jump; - inherit (inputs.murex-starship.overlays) murex-starship; inherit (inputs.comfyui.overlays) comfyui; inherit (inputs.comfyui-plugins.overlays) comfyui-plugins; - murex = _final: prev: { - murex = prev.murex.overrideAttrs { - version = "dev-${builtins.toString inputs.murex.lastModifiedDate}"; - src = inputs.murex; - vendorHash = "sha256-+V9rvWTtMtszR8JmTrntEy+CsAZsKYRblHsp6iaPuUs="; - }; - }; }