From 67702255a215276427e6a5373e9f9e0a8fa89f4a Mon Sep 17 00:00:00 2001 From: atagen Date: Wed, 9 Oct 2024 21:34:09 +1100 Subject: [PATCH] fill out murex a bit, cosmic fixes --- flake.lock | 212 +++++++++++++----- flake.nix | 7 +- flakes/murex-module-jump/default.nix | 15 ++ flakes/murex-module-jump/flake.lock | 75 +++++++ flakes/murex-module-jump/flake.nix | 23 ++ flakes/murex-module-starship/default.nix | 16 ++ flakes/murex-module-starship/flake.lock | 41 ++++ flakes/murex-module-starship/flake.nix | 23 ++ .../starship-set-time.patch | 11 + home/modules/cli.nix | 1 + home/programs/murex.nix | 31 +++ home/programs/vscode.nix | 1 + home/util/murex.nix | 8 +- system/configuration.nix | 4 +- system/modules/anal-retentive.nix | 26 +-- system/modules/cosmic.nix | 1 - system/modules/term.nix | 5 +- system/quiver.nix | 5 + util/overlay.nix | 2 + 19 files changed, 426 insertions(+), 81 deletions(-) create mode 100644 flakes/murex-module-jump/default.nix create mode 100644 flakes/murex-module-jump/flake.lock create mode 100644 flakes/murex-module-jump/flake.nix create mode 100644 flakes/murex-module-starship/default.nix create mode 100644 flakes/murex-module-starship/flake.lock create mode 100644 flakes/murex-module-starship/flake.nix create mode 100644 flakes/murex-module-starship/starship-set-time.patch create mode 100644 home/programs/murex.nix diff --git a/flake.lock b/flake.lock index 5726545..95f9fc6 100644 --- a/flake.lock +++ b/flake.lock @@ -173,11 +173,11 @@ }, "flatpaks": { "locked": { - "lastModified": 1721549352, - "narHash": "sha256-nlXJa8RSOX0kykrIYW33ukoHYq+FOSNztHLLgqKwOp8=", + "lastModified": 1728416205, + "narHash": "sha256-t30gsrwiBc2oBsd89DwdsVZuEbMT5ed81PYY57CIOJE=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "dbce39ea8664820ba9037caaf1e2fad365ed6b4b", + "rev": "d65dbf59900de4beaaaba8b42a15994f8433c1bc", "type": "github" }, "original": { @@ -216,11 +216,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1727975286, - "narHash": "sha256-NXHi7FWTV0eRO60Fy6Xfvy+fU8pjnaZWCiFr1dqQfxM=", + "lastModified": 1728372216, + "narHash": "sha256-amGNilpQ/vohlgerF/5D4QNsXCRbh2H06nmWyz/xyS8=", "owner": "helix-editor", "repo": "helix", - "rev": "02b6f1488a4a1438b268f87d96c474a946ea3e5e", + "rev": "761f70d61179f38152e76c1f224589a53b62d00f", "type": "github" }, "original": { @@ -269,11 +269,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1727783747, - "narHash": "sha256-fLiDo55WLgikMaaZcFEpkCkL4fQiV7RNEjRn+LxiYao=", - "rev": "775292766025380d04004e42fefbdb8ca40b3fa3", + "lastModified": 1728425756, + "narHash": "sha256-V+/ErwI9+zrzYAkT+37WWvhyUY6d3T3eIIqLAMkDMOs=", + "rev": "0012887310f24283e8a9ca08e0c2a49219ea4ff5", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/775292766025380d04004e42fefbdb8ca40b3fa3.tar.gz?rev=775292766025380d04004e42fefbdb8ca40b3fa3" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/0012887310f24283e8a9ca08e0c2a49219ea4ff5.tar.gz?rev=0012887310f24283e8a9ca08e0c2a49219ea4ff5" }, "original": { "type": "tarball", @@ -338,8 +338,8 @@ "utils": "utils" }, "locked": { - "lastModified": 1727941610, - "narHash": "sha256-yKbMgIsoVIHpnz/H8PEEOQClmQpw8BPN5vd3fLtrCcg=", + "lastModified": 1728453962, + "narHash": "sha256-aLCM+9PE5xXiFJLM+mfz1gl4WmyFHXs6TxQPHoEsXFQ=", "path": "/home/bolt/code/meat", "type": "path" }, @@ -348,32 +348,48 @@ "type": "path" } }, - "murex": { - "flake": false, + "murex-jump": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "src": "src" + }, "locked": { - "lastModified": 1726693860, - "narHash": "sha256-y+7tRp4JNlefsKnMgU9d3b9pzgBJbSKGI98CzkcOjq8=", - "owner": "lmorg", - "repo": "murex", - "rev": "c03788357164e9846c84d9f777251495d9452a8e", - "type": "github" + "lastModified": 1, + "narHash": "sha256-UDab4bRm6kP80bS6dPrG8VWneYJardggLZydgGMrLN0=", + "path": "./flakes/murex-module-jump", + "type": "path" }, "original": { - "owner": "lmorg", - "repo": "murex", - "type": "github" + "path": "./flakes/murex-module-jump", + "type": "path" + } + }, + "murex-starship": { + "inputs": { + "nixpkgs": "nixpkgs_3", + "src": "src_2" + }, + "locked": { + "lastModified": 1, + "narHash": "sha256-7zMFF6Iv41MxRLwPOXUwGMEtKTmrHTJsB8i9BqEC3+g=", + "path": "./flakes/murex-module-starship", + "type": "path" + }, + "original": { + "path": "./flakes/murex-module-starship", + "type": "path" } }, "nh": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1725746760, - "narHash": "sha256-p38Uini6lChBCF0mZndHXTAy7ZH/OQLY696BFCHg92g=", + "lastModified": 1728371783, + "narHash": "sha256-ufI7115ims2PPxggpWQhigAUrwlwu155wVgngZzzyZ0=", "owner": "viperML", "repo": "nh", - "rev": "7650b372e55a36d7765ee0a5e59b142731bc8b3d", + "rev": "afdff9ab4fdb9c329b5d97c5b742242b97f8754d", "type": "github" }, "original": { @@ -384,14 +400,14 @@ }, "nix-index-database": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1727658919, - "narHash": "sha256-YAePt2GldkkRJ08LvZNHcuS6shIVStj+K+1DZN3gbnM=", + "lastModified": 1728263287, + "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f9fdf8285690a351e8998f1e703ebdf9cdf51dee", + "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", "type": "github" }, "original": { @@ -426,7 +442,7 @@ "inputs": { "flake-parts": "flake-parts", "flake-root": "flake-root", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -446,16 +462,16 @@ "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable_2", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1727998575, - "narHash": "sha256-BJZRVI9tfDSGfN8pmoSE3Ftq/xSL1QKUm8qH72yZ9js=", + "lastModified": 1728443929, + "narHash": "sha256-WFy8+K/bUTXwT9nMPT/Y23dPbW5I2rLEjgTuPC8y3lA=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "ff0af4770a7d7342ed91ef5b96d2cc693bbc1092", + "rev": "a8960f9c66a0c4f2c24ae029da0886df4a68af33", "type": "github" }, "original": { @@ -531,11 +547,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1727672256, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "lastModified": 1728328465, + "narHash": "sha256-a0a0M1TmXMK34y3M0cugsmpJ4FJPT/xsblhpiiX1CXo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "1bfbbbe5bbf888d675397c66bfdb275d0b99361c", "type": "github" }, "original": { @@ -547,11 +563,37 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1725001927, - "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "path": "/nix/store/sdzpqjwx7pdx6lsq6llyfqqf7hspp83c-source", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "path": "/nix/store/sdzpqjwx7pdx6lsq6llyfqqf7hspp83c-source", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1727540905, + "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", + "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", "type": "github" }, "original": { @@ -561,13 +603,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_5": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -577,7 +619,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1681303793, "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", @@ -593,7 +635,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { "lastModified": 1714562304, "narHash": "sha256-Mr3U37Rh6tH0FbaDFu0aZDwk9mPAe7ASaqDOGgLqqLU=", @@ -609,13 +651,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_8": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728241625, + "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", "type": "github" }, "original": { @@ -627,11 +669,11 @@ }, "nur": { "locked": { - "lastModified": 1727988362, - "narHash": "sha256-29EisH8PDWTzSgUKDj6KmyAJcv1eoNdy5Vw6IyGPPN8=", + "lastModified": 1728463642, + "narHash": "sha256-FNhqfE2CdEzIuUrfSr17iWxXz71LIuwog7E5vDbpdbs=", "owner": "nix-community", "repo": "NUR", - "rev": "47d63dcaa78c3b29d0fecc96f07a0103d7a94f1d", + "rev": "9877180a34218c43f504018c7d0dc2b9e4062a91", "type": "github" }, "original": { @@ -640,6 +682,22 @@ "type": "github" } }, + "podman": { + "flake": false, + "locked": { + "lastModified": 1728463205, + "narHash": "sha256-wOAjt5knzVYYBOvV30oQekOjPGcG7iabc7S/HkcqUzY=", + "owner": "containers", + "repo": "podman", + "rev": "3460ec496c8b0becf3160e756b06e662a41e86fc", + "type": "github" + }, + "original": { + "owner": "containers", + "repo": "podman", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -648,7 +706,7 @@ "flake-utils" ], "gitignore": "gitignore", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -674,7 +732,8 @@ "lix-module": "lix-module", "madness": "madness", "meat": "meat", - "murex": "murex", + "murex-jump": "murex-jump", + "murex-starship": "murex-starship", "nh": "nh", "nix-index-database": "nix-index-database", "nix-rice": "nix-rice", @@ -685,6 +744,7 @@ "nixpkgs" ], "nur": "nur", + "podman": "podman", "rust-overlay": [ "nixos-cosmic", "rust-overlay" @@ -724,11 +784,11 @@ ] }, "locked": { - "lastModified": 1727836133, - "narHash": "sha256-JE0zciM5IGWvK8J/pE2VldNBf7oyMH5WrU8tZArefbg=", + "lastModified": 1728354625, + "narHash": "sha256-r+Sa1NRRT7LXKzCaVaq75l1GdZcegODtF06uaxVVVbI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "02321540b0c8000b36889b1b974d1fec585b25a4", + "rev": "d216ade5a0091ce60076bf1f8bc816433a1fc5da", "type": "github" }, "original": { @@ -737,6 +797,38 @@ "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": 1693396396, + "narHash": "sha256-o37H94I8TYaAaGaICmgXdNAzDWlTpWebn33FlTPx8Z8=", + "owner": "orefalo", + "repo": "murex-module-starship", + "rev": "76ea5992cd6b328ceb32d1d6fb690768a745947f", + "type": "github" + }, + "original": { + "owner": "orefalo", + "repo": "murex-module-starship", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index f581de0..3387905 100644 --- a/flake.nix +++ b/flake.nix @@ -55,10 +55,13 @@ inputs.rust-overlay.follows = "rust-overlay"; }; - murex = { + podman = { flake = false; - url = "github:lmorg/murex"; + url = "github:containers/podman"; }; + + murex-jump.url = "path:./flakes/murex-module-jump"; + murex-starship.url = "path:./flakes/murex-module-starship"; }; outputs = { diff --git a/flakes/murex-module-jump/default.nix b/flakes/murex-module-jump/default.nix new file mode 100644 index 0000000..576842c --- /dev/null +++ b/flakes/murex-module-jump/default.nix @@ -0,0 +1,15 @@ +{ + pkgs, + lib, + 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 new file mode 100644 index 0000000..6817778 --- /dev/null +++ b/flakes/murex-module-jump/flake.lock @@ -0,0 +1,75 @@ +{ + "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", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "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" + } + }, + "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", + "version": 7 +} diff --git a/flakes/murex-module-jump/flake.nix b/flakes/murex-module-jump/flake.nix new file mode 100644 index 0000000..43a5acc --- /dev/null +++ b/flakes/murex-module-jump/flake.nix @@ -0,0 +1,23 @@ +{ + description = "Murex Jump module"; + + inputs = { + src = { + flake = false; + url = "github:lmorg/murex-module-jump"; + }; + }; + + outputs = { + self, + nixpkgs, + 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 new file mode 100644 index 0000000..82727e4 --- /dev/null +++ b/flakes/murex-module-starship/default.nix @@ -0,0 +1,16 @@ +{ + pkgs, + lib, + 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 new file mode 100644 index 0000000..d14d10e --- /dev/null +++ b/flakes/murex-module-starship/flake.lock @@ -0,0 +1,41 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "path": "/nix/store/sdzpqjwx7pdx6lsq6llyfqqf7hspp83c-source", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs", + "src": "src" + } + }, + "src": { + "flake": false, + "locked": { + "lastModified": 1693396396, + "narHash": "sha256-o37H94I8TYaAaGaICmgXdNAzDWlTpWebn33FlTPx8Z8=", + "owner": "orefalo", + "repo": "murex-module-starship", + "rev": "76ea5992cd6b328ceb32d1d6fb690768a745947f", + "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 new file mode 100644 index 0000000..2e379be --- /dev/null +++ b/flakes/murex-module-starship/flake.nix @@ -0,0 +1,23 @@ +{ + description = "Murex Starship module"; + + inputs = { + src = { + flake = false; + url = "github:orefalo/murex-module-starship"; + }; + }; + + outputs = { + self, + nixpkgs, + 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 new file mode 100644 index 0000000..a12468f --- /dev/null +++ b/flakes/murex-module-starship/starship-set-time.patch @@ -0,0 +1,11 @@ +--- 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/modules/cli.nix b/home/modules/cli.nix index dcbed32..f165ffb 100644 --- a/home/modules/cli.nix +++ b/home/modules/cli.nix @@ -5,6 +5,7 @@ ../programs/xresources.nix ../programs/helix.nix ../programs/atuin.nix + ../programs/murex.nix ]; home.packages = with pkgs; [ btop diff --git a/home/programs/murex.nix b/home/programs/murex.nix new file mode 100644 index 0000000..97ac552 --- /dev/null +++ b/home/programs/murex.nix @@ -0,0 +1,31 @@ +{pkgs, ...}: { + programs.murex = { + enable = true; + useXdgConfig = true; + direnv = true; + managePlugins = true; + profile = '' + config: set shell auto-cd true + ''; + 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 e17cd3e..356e2ec 100644 --- a/home/programs/vscode.nix +++ b/home/programs/vscode.nix @@ -7,6 +7,7 @@ jnoortheen.nix-ide arrterian.nix-env-selector mkhl.direnv + continue.continue # silverquark.dancehelix # gregoire.dance ]; diff --git a/home/util/murex.nix b/home/util/murex.nix index c885e49..8c7e7e7 100644 --- a/home/util/murex.nix +++ b/home/util/murex.nix @@ -24,6 +24,7 @@ in { type = types.str; default = ""; }; + useXdgConfig = mkEnableOption "override MUREX_{PRELOAD,MODULES,PROFILE} env vars to conform to XDG_CONFIG_HOME"; }; config = { home.file = @@ -47,7 +48,7 @@ in { ".murex_modules/packages.json" = { text = builtins.toJSON (map (plugin: { Protocol = "nix"; - URI = "https://none.thanks/managed.git"; + URI = "nix://managed.git"; Package = plugin.pname; }) cfg.plugins); @@ -62,5 +63,10 @@ in { }; }) 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 ad2e635..e626d4c 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -11,10 +11,10 @@ inputs.nix-rice.overlays.default inputs.helix.overlays.default inputs.nixd.overlays.default - # meat overlay includes this - # inputs.nh.overlays.default outputs.overlays.additions outputs.overlays.rice + outputs.overlays.murex-starship + outputs.overlays.murex-jump ]; config = { allowUnfree = true; diff --git a/system/modules/anal-retentive.nix b/system/modules/anal-retentive.nix index 8851e48..f995c6f 100644 --- a/system/modules/anal-retentive.nix +++ b/system/modules/anal-retentive.nix @@ -4,24 +4,24 @@ ... }: { # perlless activations - boot.initrd.systemd.enable = lib.mkDefault true; - system.etc.overlay.enable = lib.mkDefault true; + boot.initrd.systemd.enable = true; + # system.etc.overlay = { + # enable = lib.mkDefault true; + # mutable = true; + # }; services.userborn.enable = lib.mkDefault true; # misc perl - system.disableInstallerTools = lib.mkDefault true; - programs.less.lessopen = lib.mkDefault null; - programs.command-not-found.enable = lib.mkDefault false; - boot.enableContainers = lib.mkDefault false; - boot.loader.grub.enable = lib.mkDefault false; - environment.defaultPackages = lib.mkDefault lib.mkDefault []; - documentation.info.enable = lib.mkDefault false; - - # dare i remove it? - # environment.systemPackages = [pkgs.nixos-rebuild]; + system.disableInstallerTools = true; + programs.less.lessopen = null; + programs.command-not-found.enable = false; + boot.enableContainers = false; + boot.loader.grub.enable = false; + environment.defaultPackages = lib.mkDefault []; + documentation.info.enable = false; # no cppnix - system.systemBuilderArgs.disallowedRequisites = [pkgs.nix]; + # system.systemBuilderArgs.disallowedRequisites = [pkgs.nix]; nix.package = pkgs.lix; system.tools.nixos-option.enable = false; } diff --git a/system/modules/cosmic.nix b/system/modules/cosmic.nix index e95fd7e..7c58a6f 100644 --- a/system/modules/cosmic.nix +++ b/system/modules/cosmic.nix @@ -4,7 +4,6 @@ }; environment.cosmic.excludePackages = with pkgs; [ cosmic-store - cosmic-files cosmic-edit cosmic-term ]; diff --git a/system/modules/term.nix b/system/modules/term.nix index 6dfa5b0..2d3d059 100644 --- a/system/modules/term.nix +++ b/system/modules/term.nix @@ -1,13 +1,14 @@ {pkgs, ...}: let - inherit (pkgs) murex; + inherit (pkgs) murex zsh; in { environment.pathsToLink = ["/share/zsh"]; programs.zsh.enable = true; environment.systemPackages = [ murex ]; + environment.shells = [murex]; users.defaultUserShell = murex; - # users.defaultUserShell = pkgs.zsh; + # users.defaultUserShell = zsh; console = { font = "Lat2-Terminus16"; }; diff --git a/system/quiver.nix b/system/quiver.nix index a64ee9e..9422a5f 100644 --- a/system/quiver.nix +++ b/system/quiver.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + inputs, ... }: { imports = [ @@ -77,6 +78,10 @@ enable = true; dockerSocket.enable = true; defaultNetwork.settings.dns_enabled = true; + # package = pkgs.podman.overrideAttrs { + # version = "5.3.0-dev"; + # src = inputs.podman; + # }; }; # docker = { # enable = true; diff --git a/util/overlay.nix b/util/overlay.nix index 63b8147..97ffc66 100644 --- a/util/overlay.nix +++ b/util/overlay.nix @@ -1,4 +1,6 @@ {inputs, ...}: { additions = final: _prev: import ../.old/pkgs {pkgs = final;}; rice = import ./rice.nix; + murex-jump = inputs.murex-jump.overlays.murex-jump; + murex-starship = inputs.murex-starship.overlays.murex-starship; }