diff --git a/flake.lock b/flake.lock index 5eea97f..f198699 100755 --- a/flake.lock +++ b/flake.lock @@ -51,22 +51,6 @@ "type": "github" } }, - "base16-schemes": { - "flake": false, - "locked": { - "lastModified": 1696158499, - "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", - "owner": "tinted-theming", - "repo": "base16-schemes", - "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-schemes", - "type": "github" - } - }, "base16-vim": { "flake": false, "locked": { @@ -84,19 +68,19 @@ "type": "github" } }, - "dirt-samples-src": { - "flake": false, + "den": { "locked": { - "lastModified": 1698439458, - "narHash": "sha256-Mp8qBpsOvW9Zguv95Kv7EU6S3ICaF2aO02Wz6xGURtE=", - "owner": "tidalcycles", - "repo": "dirt-samples", - "rev": "9a6dff8f9ec3cd55b287290cf04e01afa6b8f532", + "lastModified": 1779284890, + "narHash": "sha256-M13hhd4qXKrAyqfTFFP8ov1dNu6acHyeQdUj/V5dj3g=", + "owner": "vic", + "repo": "den", + "rev": "8f1a59448043677ac8bc7854348c1b8ee6889c0b", "type": "github" }, "original": { - "owner": "tidalcycles", - "repo": "dirt-samples", + "owner": "vic", + "ref": "v0.17.0", + "repo": "den", "type": "github" } }, @@ -152,7 +136,7 @@ }, "flake-parts_2": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { "lastModified": 1772408722, @@ -169,27 +153,6 @@ } }, "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -228,24 +191,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -361,6 +306,21 @@ "type": "github" } }, + "import-tree": { + "locked": { + "lastModified": 1788467110, + "narHash": "sha256-ljEMTXP/rH0tOvDzc9gzwww6KcHRPRnEHzd9lK48V7s=", + "owner": "vic", + "repo": "import-tree", + "rev": "eb1b52eaecc57f7c136d07ae8a93e724dfecac46", + "type": "github" + }, + "original": { + "owner": "vic", + "repo": "import-tree", + "type": "github" + } + }, "musnix": { "inputs": { "nixpkgs": "nixpkgs" @@ -437,25 +397,6 @@ "type": "github" } }, - "nix-colors": { - "inputs": { - "base16-schemes": "base16-schemes", - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1707825078, - "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", - "owner": "misterio77", - "repo": "nix-colors", - "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", - "type": "github" - }, - "original": { - "owner": "misterio77", - "repo": "nix-colors", - "type": "github" - } - }, "nix-gaming": { "inputs": { "flake-parts": "flake-parts_2", @@ -508,21 +449,6 @@ } }, "nixpkgs-lib_2": { - "locked": { - "lastModified": 1697935651, - "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_3": { "locked": { "lastModified": 1772328832, "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", @@ -586,22 +512,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1772736753, - "narHash": "sha256-au/m3+EuBLoSzWUCb64a/MZq6QUtOV8oC0D9tY2scPQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "917fec990948658ef1ccd07cef2a1ef060786846", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1767767207, "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", @@ -617,43 +527,22 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { - "lastModified": 1772950627, - "narHash": "sha256-NjdYpWuoWsH/fbbB5cPLmA2GW8nrGrYNohhgW7SoEDw=", + "lastModified": 1788431191, + "narHash": "sha256-MFClkboDeW56feBCAeAV3Z3J2quGSZFlAOXQ4JjIlIA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "902def17058290d43414ead808eb7c6de113f02e", + "rev": "9b9402b959a2276982ddd5ad3652a38b97f7c40b", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixvim": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1772402258, - "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, "noctalia": { "inputs": { "nixpkgs": [ @@ -723,39 +612,19 @@ }, "root": { "inputs": { + "den": "den", "flake-parts": "flake-parts", "flake-utils": "flake-utils", "hardware": "hardware", "home-manager": "home-manager", + "import-tree": "import-tree", "musnix": "musnix", "niri": "niri", - "nix-colors": "nix-colors", "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs_3", - "nixvim": "nixvim", "noctalia": "noctalia", - "sops-nix": "sops-nix", "stylix": "stylix", - "sygil-plymouth": "sygil-plymouth", - "tidalcycles": "tidalcycles" - } - }, - "sops-nix": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1772944399, - "narHash": "sha256-xTzsSd3r5HBeufSZ3fszAn0ldfKctvsYG7tT2YJg5gY=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "c8e69670b316d6788e435a3aa0bda74eb1b82cc0", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" + "wrapper-modules": "wrapper-modules" } }, "stylix": { @@ -765,11 +634,11 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems_3", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -790,41 +659,6 @@ "type": "github" } }, - "superdirt-src": { - "flake": false, - "locked": { - "lastModified": 1697377840, - "narHash": "sha256-9qU9CHYAXbN1IE3xXDqGipuroifVaSVXj3c/cDfwM80=", - "owner": "musikinformatik", - "repo": "superdirt", - "rev": "c7f32998572984705d340e7c1b9ed9ad998a39b6", - "type": "github" - }, - "original": { - "owner": "musikinformatik", - "repo": "superdirt", - "type": "github" - } - }, - "sygil-plymouth": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1772454301, - "narHash": "sha256-Zg41iK9lja4RmY7yTNxCeG9KvBBJe0eS8yl7YJ0pjUA=", - "ref": "refs/heads/main", - "rev": "7377e583d87b306e36a0bbf57292dd7c44e8a39f", - "revCount": 55, - "type": "git", - "url": "https://codeberg.org/serenity-F/sygil-plymouth" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/serenity-F/sygil-plymouth" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -855,78 +689,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "tidal-src": { - "flake": false, - "locked": { - "lastModified": 1712519522, - "narHash": "sha256-LbvxQmVxHElidCgvt+w0g1k+QQbNLebK46vtRCgsLeQ=", - "owner": "tidalcycles", - "repo": "tidal", - "rev": "88f09edf6bef2228d5f530dea872b08a9d803066", - "type": "github" - }, - "original": { - "owner": "tidalcycles", - "ref": "v1.9.5", - "repo": "tidal", - "type": "github" - } - }, - "tidalcycles": { - "inputs": { - "dirt-samples-src": "dirt-samples-src", - "nixpkgs": [ - "nixpkgs" - ], - "superdirt-src": "superdirt-src", - "tidal-src": "tidal-src", - "vim-tidal-src": "vim-tidal-src", - "vowel-src": "vowel-src" - }, - "locked": { - "lastModified": 1730626669, - "narHash": "sha256-nFyZrvTPn9OM9UZmuAwy3e1Ba0ZuYc2FaDCOOhGtqg4=", - "owner": "mitchmindtree", - "repo": "tidalcycles.nix", - "rev": "0db0918e7a3d3c30ed7a6e81dc9d4e3832870ac4", - "type": "github" - }, - "original": { - "owner": "mitchmindtree", - "repo": "tidalcycles.nix", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1008,35 +770,21 @@ "type": "github" } }, - "vim-tidal-src": { - "flake": false, + "wrapper-modules": { + "inputs": { + "nixpkgs": "nixpkgs_5" + }, "locked": { - "lastModified": 1685703852, - "narHash": "sha256-8gyk17YLeKpLpz3LRtxiwbpsIbZka9bb63nK5/9IUoA=", - "owner": "tidalcycles", - "repo": "vim-tidal", - "rev": "e440fe5bdfe07f805e21e6872099685d38e8b761", + "lastModified": 1788981141, + "narHash": "sha256-7xWS16u13YGlRNKWaAPzRbEyh4OLOXJe31k7h4AnXNU=", + "owner": "BirdeeHub", + "repo": "nix-wrapper-modules", + "rev": "1db3c116a6aa61823f8d8f3c47c306846428fc54", "type": "github" }, "original": { - "owner": "tidalcycles", - "repo": "vim-tidal", - "type": "github" - } - }, - "vowel-src": { - "flake": false, - "locked": { - "lastModified": 1641306144, - "narHash": "sha256-zfF6cvAGDNYWYsE8dOIo38b+dIymd17Pexg0HiPFbxM=", - "owner": "supercollider-quarks", - "repo": "vowel", - "rev": "ab59caa870201ecf2604b3efdd2196e21a8b5446", - "type": "github" - }, - "original": { - "owner": "supercollider-quarks", - "repo": "vowel", + "owner": "BirdeeHub", + "repo": "nix-wrapper-modules", "type": "github" } }, diff --git a/modules/features/terminal/default.nix b/modules/features/terminal/default.nix index f121351..bbc0de1 100644 --- a/modules/features/terminal/default.nix +++ b/modules/features/terminal/default.nix @@ -1,4 +1,9 @@ -{ self, inputs, ... }: +{ + self, + inputs, + config, + ... +}: # let bindings let