From 113392c78eb4c289f584a0f02fe9eeb5df1185bc Mon Sep 17 00:00:00 2001 From: muon Date: Mon, 22 Dec 2025 17:17:12 +0000 Subject: [PATCH 1/6] Add fwupd --- hosts/muvo/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/muvo/home.nix b/hosts/muvo/home.nix index 9ba0dcb..c6ab0ad 100644 --- a/hosts/muvo/home.nix +++ b/hosts/muvo/home.nix @@ -25,6 +25,7 @@ in { pulseaudio pavucontrol alsa-utils + fwupd ]; # Hardware preferences From 15d1a89310211623474e0a409b40313cbd225e45 Mon Sep 17 00:00:00 2001 From: muon Date: Mon, 22 Dec 2025 17:21:30 +0000 Subject: [PATCH 2/6] Add fwupd service --- hosts/muvo/configuration.nix | 1 + hosts/muvo/home.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/muvo/configuration.nix b/hosts/muvo/configuration.nix index 5c20a37..8dd880b 100644 --- a/hosts/muvo/configuration.nix +++ b/hosts/muvo/configuration.nix @@ -59,6 +59,7 @@ in { powerManagement.enable = true; services.thermald.enable = true; services.tlp.enable = true; + services.fwupd.enable = true; ## Mouse services.libinput.mouse.accelProfile = "flat"; diff --git a/hosts/muvo/home.nix b/hosts/muvo/home.nix index c6ab0ad..9ba0dcb 100644 --- a/hosts/muvo/home.nix +++ b/hosts/muvo/home.nix @@ -25,7 +25,6 @@ in { pulseaudio pavucontrol alsa-utils - fwupd ]; # Hardware preferences From 76d16b1348f3cc1c7f545b6e4b103329efd478fe Mon Sep 17 00:00:00 2001 From: muon Date: Mon, 22 Dec 2025 17:33:30 +0000 Subject: [PATCH 3/6] Fix warnings --- modules/home/desktop/i3.nix | 2 +- modules/home/terminal/development.nix | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/home/desktop/i3.nix b/modules/home/desktop/i3.nix index e04e7dc..65395a1 100644 --- a/modules/home/desktop/i3.nix +++ b/modules/home/desktop/i3.nix @@ -174,7 +174,7 @@ in workspaceNumbers = true; trayOutput = "primary"; } - // config.lib.stylix.i3.bar; + // config.stylix.targets.i3.exportedBarConfig; in [stylix_bar]; }; }; diff --git a/modules/home/terminal/development.nix b/modules/home/terminal/development.nix index d822b98..3fee90a 100644 --- a/modules/home/terminal/development.nix +++ b/modules/home/terminal/development.nix @@ -226,17 +226,17 @@ in { enableExtraDiagnostics = true; nix.enable = true; - nix.lsp.server = "nixd"; + nix.lsp.servers = ["nixd"]; markdown.enable = true; bash.enable = true; rust.enable = true; - rust.crates.enable = true; + rust.extensions.crates-nvim.enable = true; python.enable = true; - python.lsp.server = "pyright"; + python.lsp.servers = ["pyright"]; # python.lsp.package = [(lib.getExe pkgs.ruff) "server"]; - python.format.type = "ruff"; + python.format.type = ["ruff" "black"]; clang = { enable = true; @@ -273,9 +273,7 @@ in { note_id_func = lib.generators.mkLuaInline - /* - lua - */ + # lua '' function(title) local suffix = "" From 85c51ff9d0615ad62f27675de61d23f56e0f9641 Mon Sep 17 00:00:00 2001 From: muon Date: Mon, 22 Dec 2025 18:18:26 +0000 Subject: [PATCH 4/6] Refactor terminal development --- modules/home/terminal/WGSL.lock | 1727 ---------------------- modules/home/terminal/default.nix | 18 +- modules/home/terminal/development.nix | 410 +---- modules/home/terminal/helix/default.nix | 91 ++ modules/home/terminal/nvim/default.nix | 144 ++ modules/home/terminal/nvim/obsidian.nix | 123 ++ modules/home/terminal/zellij/default.nix | 104 ++ 7 files changed, 484 insertions(+), 2133 deletions(-) delete mode 100644 modules/home/terminal/WGSL.lock create mode 100644 modules/home/terminal/helix/default.nix create mode 100644 modules/home/terminal/nvim/default.nix create mode 100644 modules/home/terminal/nvim/obsidian.nix create mode 100644 modules/home/terminal/zellij/default.nix diff --git a/modules/home/terminal/WGSL.lock b/modules/home/terminal/WGSL.lock deleted file mode 100644 index 55c6dca..0000000 --- a/modules/home/terminal/WGSL.lock +++ /dev/null @@ -1,1727 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "always-assert" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4436e0292ab1bb631b42973c61205e704475fe8126af845c8d923c0996328127" -dependencies = [ - "log", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base_db" -version = "0.0.0" -dependencies = [ - "once_cell", - "pretty_assertions", - "regex", - "rowan", - "rustc-hash", - "salsa", - "syntax", - "tracing", - "vfs", -] - -[[package]] -name = "beef" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "countme" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dissimilar" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" - -[[package]] -name = "drop_bomb" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "encode_unicode" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "expect-test" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3" -dependencies = [ - "dissimilar", - "once_cell", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fst" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - -[[package]] -name = "hir" -version = "0.0.0" -dependencies = [ - "base_db", - "either", - "hir_def", - "hir_ty", - "la-arena", - "smallvec", - "syntax", - "tracing", -] - -[[package]] -name = "hir_def" -version = "0.0.0" -dependencies = [ - "base_db", - "either", - "la-arena", - "rowan", - "rustc-hash", - "salsa", - "smallvec", - "smol_str", - "syntax", - "tracing", -] - -[[package]] -name = "hir_ty" -version = "0.0.0" -dependencies = [ - "base_db", - "either", - "hir_def", - "itertools", - "la-arena", - "rustc-hash", - "salsa", - "smallvec", -] - -[[package]] -name = "ide" -version = "0.0.0" -dependencies = [ - "base_db", - "expect-test", - "hir", - "hir_def", - "hir_ty", - "ide_completion", - "itertools", - "lsp-types 0.93.2", - "naga 0.11.1", - "naga 0.12.3", - "naga 0.13.0", - "naga 0.14.0", - "naga 0.14.1", - "rowan", - "salsa", - "smol_str", - "syntax", - "tracing", - "vfs", - "wgsl_formatter", -] - -[[package]] -name = "ide_completion" -version = "0.0.0" -dependencies = [ - "always-assert", - "base_db", - "either", - "hir", - "hir_def", - "hir_ty", - "itertools", - "rowan", - "syntax", - "text-edit", - "tracing", -] - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" -dependencies = [ - "equivalent", - "hashbrown 0.14.1", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi 0.3.3", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "jod-thread" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae" - -[[package]] -name = "la-arena" -version = "0.3.1" -source = "git+https://github.com/rust-analyzer/rust-analyzer?rev=8a23314#8a2331450a2fa269aa60818b224a2beaef7d7198" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lexopt" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478ee9e62aaeaf5b140bd4138753d1f109765488581444218d3ddda43234f3e8" - -[[package]] -name = "lexopt" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401" - -[[package]] -name = "libc" -version = "0.2.149" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" - -[[package]] -name = "linux-raw-sys" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" - -[[package]] -name = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "logos" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf8b031682c67a8e3d5446840f9573eb7fe26efe7ec8d195c9ac4c0647c502f1" -dependencies = [ - "logos-derive", -] - -[[package]] -name = "logos-derive" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d849148dbaf9661a6151d1ca82b13bb4c4c128146a88d05253b38d4e2f496c" -dependencies = [ - "beef", - "fnv", - "proc-macro2", - "quote", - "regex-syntax 0.6.29", - "syn 1.0.109", -] - -[[package]] -name = "lsp-server" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f70570c1c29cf6654029b8fe201a5507c153f0d85be6f234d471d756bc36775a" -dependencies = [ - "crossbeam-channel", - "log", - "serde", - "serde_json", -] - -[[package]] -name = "lsp-types" -version = "0.93.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be6e9c7e2d18f651974370d7aff703f9513e0df6e464fd795660edc77e6ca51" -dependencies = [ - "bitflags 1.3.2", - "serde", - "serde_json", - "serde_repr", - "url", -] - -[[package]] -name = "lsp-types" -version = "0.94.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" -dependencies = [ - "bitflags 1.3.2", - "serde", - "serde_json", - "serde_repr", - "url", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miow" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "naga" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c3d4269bcb7d50121097702fde1afb75f4ea8083aeb7a55688dcf289a853271" -dependencies = [ - "bit-set", - "bitflags 1.3.2", - "codespan-reporting", - "hexf-parse", - "indexmap 1.9.3", - "log", - "num-traits", - "rustc-hash", - "termcolor", - "thiserror", - "unicode-xid", -] - -[[package]] -name = "naga" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" -dependencies = [ - "bit-set", - "bitflags 1.3.2", - "codespan-reporting", - "hexf-parse", - "indexmap 1.9.3", - "log", - "num-traits", - "rustc-hash", - "termcolor", - "thiserror", - "unicode-xid", -] - -[[package]] -name = "naga" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e" -dependencies = [ - "bit-set", - "bitflags 2.4.1", - "codespan-reporting", - "hexf-parse", - "indexmap 1.9.3", - "log", - "num-traits", - "rustc-hash", - "termcolor", - "thiserror", - "unicode-xid", -] - -[[package]] -name = "naga" -version = "0.14.0" -source = "git+https://github.com/gfx-rs/naga?rev=d0f28c0b1a3c772e55e68db1c47eff5131cb6732#d0f28c0b1a3c772e55e68db1c47eff5131cb6732" -dependencies = [ - "bit-set", - "bitflags 2.4.1", - "codespan-reporting", - "hexf-parse", - "indexmap 2.0.2", - "log", - "num-traits", - "rustc-hash", - "termcolor", - "thiserror", - "unicode-xid", -] - -[[package]] -name = "naga" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cd05939c491da968a42986204b7431678be21fdcd4b10cc84997ba130ada5a4" -dependencies = [ - "bit-set", - "bitflags 2.4.1", - "codespan-reporting", - "hexf-parse", - "indexmap 2.0.2", - "log", - "num-traits", - "rustc-hash", - "termcolor", - "thiserror", - "unicode-xid", -] - -[[package]] -name = "nohash-hasher" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.3", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "pad" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.8", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "smallvec", - "windows-targets", -] - -[[package]] -name = "parser" -version = "0.0.0" -dependencies = [ - "drop_bomb", - "logos", - "rowan", -] - -[[package]] -name = "paths" -version = "0.0.0" -source = "git+https://github.com/rust-analyzer/rust-analyzer?rev=8a23314#8a2331450a2fa269aa60818b224a2beaef7d7198" - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - -[[package]] -name = "prettydiff" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff1fec61082821f8236cf6c0c14e8172b62ce8a72a0eedc30d3b247bb68dc11" -dependencies = [ - "ansi_term", - "pad", - "prettytable-rs", - "structopt", -] - -[[package]] -name = "prettytable-rs" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" -dependencies = [ - "csv", - "encode_unicode", - "is-terminal", - "lazy_static", - "term", - "unicode-width", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.1", - "regex-syntax 0.8.0", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.0", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3cbb081b9784b07cceb8824c8583f86db4814d172ab043f3c23f7dc600bf83d" - -[[package]] -name = "rowan" -version = "0.15.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "906057e449592587bf6724f00155bf82a6752c868d78a8fb3aa41f4e6357cfe8" -dependencies = [ - "countme", - "hashbrown 0.12.3", - "memoffset", - "rustc-hash", - "text-size", -] - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustix" -version = "0.38.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "salsa" -version = "0.17.0-pre.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b223dccb46c32753144d0b51290da7230bb4aedcd8379d6b4c9a474c18bf17a" -dependencies = [ - "crossbeam-utils", - "indexmap 1.9.3", - "lock_api", - "log", - "oorandom", - "parking_lot 0.11.2", - "rustc-hash", - "salsa-macros", - "smallvec", -] - -[[package]] -name = "salsa-macros" -version = "0.17.0-pre.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac6c2e352df550bf019da7b16164ed2f7fa107c39653d1311d1bba42d1582ff7" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "serde" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "serde_json" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "smol_str" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9" -dependencies = [ - "serde", -] - -[[package]] -name = "stdx" -version = "0.0.0" -source = "git+https://github.com/rust-analyzer/rust-analyzer?rev=8a23314#8a2331450a2fa269aa60818b224a2beaef7d7198" -dependencies = [ - "always-assert", - "crossbeam-channel", - "jod-thread", - "libc", - "miow", - "winapi", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syntax" -version = "0.0.0" -dependencies = [ - "either", - "itertools", - "rowan", - "wgsl_parser", -] - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "text-edit" -version = "0.0.0" -source = "git+https://github.com/rust-analyzer/rust-analyzer?rev=8a23314#8a2331450a2fa269aa60818b224a2beaef7d7198" -dependencies = [ - "itertools", - "text-size", -] - -[[package]] -name = "text-size" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tools" -version = "0.0.0" -dependencies = [ - "anyhow", - "lexopt 0.2.1", - "serde_json", - "xshell", -] - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "url" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "vfs" -version = "0.0.0" -source = "git+https://github.com/rust-analyzer/rust-analyzer?rev=8a23314#8a2331450a2fa269aa60818b224a2beaef7d7198" -dependencies = [ - "fst", - "indexmap 2.0.2", - "nohash-hasher", - "paths", - "rustc-hash", - "stdx", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wgsl_analyzer" -version = "0.0.0" -dependencies = [ - "anyhow", - "base_db", - "crossbeam-channel", - "dissimilar", - "hir", - "hir_def", - "hir_ty", - "ide", - "ide_completion", - "itertools", - "lsp-server", - "lsp-types 0.94.1", - "parking_lot 0.12.1", - "paths", - "rustc-hash", - "salsa", - "serde", - "serde_json", - "text-edit", - "threadpool", - "tracing", - "tracing-subscriber", - "vfs", -] - -[[package]] -name = "wgsl_formatter" -version = "0.1.0" -dependencies = [ - "anyhow", - "dissimilar", - "expect-test", - "rowan", - "syntax", - "wgsl_parser", -] - -[[package]] -name = "wgsl_parser" -version = "0.0.0" -dependencies = [ - "expect-test", - "logos", - "parser", - "rowan", -] - -[[package]] -name = "wgslfmt" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt 0.3.0", - "prettydiff", - "wgsl_formatter", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "xshell" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2107fe03e558353b4c71ad7626d58ed82efaf56c54134228608893c77023ad" -dependencies = [ - "xshell-macros", -] - -[[package]] -name = "xshell-macros" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2c411759b501fb9501aac2b1b2d287a6e93e5bdcf13c25306b23e1b716dd0e" - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/modules/home/terminal/default.nix b/modules/home/terminal/default.nix index 82727d0..3c3eebf 100644 --- a/modules/home/terminal/default.nix +++ b/modules/home/terminal/default.nix @@ -1,6 +1,18 @@ -{ pkgs, lib, osConfig, ... }: { - imports = - [ ./shell.nix ./emulator.nix ./development.nix ./tools.nix ./yazi.nix ]; +{ + lib, + osConfig, + ... +}: { + imports = [ + ./shell.nix + ./emulator.nix + ./development.nix + ./tools.nix + ./yazi.nix + ./helix + ./nvim + ./zellij + ]; config = lib.mkIf osConfig.mods.desktop.enable { mods.terminal.emulator.enable = lib.mkDefault true; diff --git a/modules/home/terminal/development.nix b/modules/home/terminal/development.nix index 3fee90a..61d9fbe 100644 --- a/modules/home/terminal/development.nix +++ b/modules/home/terminal/development.nix @@ -18,21 +18,11 @@ in { imports = [inputs.nvf.homeManagerModules.default]; config = lib.mkIf config.mods.terminal.development.enable { - home.packages = with pkgs; [ - # Nix - nil - - # Rust - rust-analyzer - lldb_18 - - # Shaders - glsl_analyzer - wgsl-analyzer - - # Python - black - ]; + mods = { + nvim.enable = true; + helix.enable = true; + zellij.enable = true; + }; programs.direnv = { enable = true; @@ -40,393 +30,7 @@ in { enableZshIntegration = lib.mkIf config.mods.terminal.zsh.enable true; }; - programs.zellij = { - settings = { - default_mode._args = ["locked"]; - show_startup_tips._args = [false]; - show_release_notes._args = [false]; - }; - - extraConfig = builtins.readFile ./zellij/config.kdl; - - layouts = { - dev = { - layout = { - _children = [ - { - default_tab_template = { - _children = [ - { - pane = { - size = 1; - borderless = true; - plugin = { - location = "zellij:tab-bar"; - }; - }; - } - {"children" = {};} - { - pane = { - size = 1; - borderless = true; - plugin = { - location = "zellij:status-bar"; - }; - }; - } - ]; - }; - } - { - tab = { - _props = { - name = "project"; - focus = true; - }; - _children = [ - { - pane = { - command = "zsh"; - args = ["-c" "direnv exec . nvim"]; - }; - } - ]; - }; - } - { - tab = { - _props = { - name = "test"; - }; - _children = [ - { - pane = {}; - } - ]; - }; - } - { - tab = { - _props = { - name = "git"; - }; - _children = [ - { - pane = { - command = "lazygit"; - }; - } - ]; - }; - } - ]; - }; - }; - }; - }; - - home.sessionVariables.EDITOR = "hx"; - programs.zsh.sessionVariables.EDITOR = "hx"; - - programs.helix = { - enable = true; - package = pkgs.evil-helix; - - settings = { - keys.normal = { - "esc" = ["collapse_selection" "keep_primary_selection"]; - "Z" = { - "Q" = ":quit!"; - "Z" = ":write-quit!"; - }; - "V" = ["select_mode" "extend_to_line_bounds"]; - }; - editor = { - line-number = "relative"; - completion-replace = true; - bufferline = "always"; - rulers = [80]; - soft-wrap.enable = true; - indent-guides.render = true; - cursor-shape = { - normal = "block"; - insert = "bar"; - select = "underline"; - }; - }; - }; - - languages.language-server = { - glsl.command = "${pkgs.glsl_analyzer}/bin/glsl_analyzer"; - wgsl.command = "${pkgs.wgsl-analyzer}/bin/wgsl-analyzer"; - }; - - languages.language = [ - { - name = "nix"; - auto-format = true; - formatter.command = "${pkgs.nixfmt-classic}/bin/nixfmt"; - } - { - name = "rust"; - auto-format = true; - formatter.command = "rustfmt"; - } - { - name = "glsl"; - language-servers = ["glsl"]; - } - { - name = "wgsl"; - language-servers = ["wgsl"]; - } - { - name = "python"; - auto-format = true; - formatter = { - command = "${pkgs.black}/bin/black"; - args = ["-" "--quiet" "--line-length=79"]; - }; - } - ]; - }; - - programs.nvf = { - enable = true; - settings = { - vim = { - viAlias = false; - vimAlias = true; - lsp = { - enable = true; - formatOnSave = true; - }; - - keymaps = [ - { - key = "w"; - mode = ["n"]; - action = ":w"; - silent = true; - desc = "Save file"; - } - { - key = "gd"; - mode = "n"; - silent = true; - action = "lua vim.lsp.buf.definition()"; - desc = "Go to Definition"; - } - ]; - - languages = { - enableFormat = true; - enableTreesitter = true; - enableExtraDiagnostics = true; - - nix.enable = true; - nix.lsp.servers = ["nixd"]; - - markdown.enable = true; - bash.enable = true; - rust.enable = true; - rust.extensions.crates-nvim.enable = true; - - python.enable = true; - python.lsp.servers = ["pyright"]; - # python.lsp.package = [(lib.getExe pkgs.ruff) "server"]; - python.format.type = ["ruff" "black"]; - - clang = { - enable = true; - cHeader = true; - }; - }; - - statusline.lualine.enable = true; - telescope.enable = true; - autocomplete.nvim-cmp.enable = true; - autopairs.nvim-autopairs.enable = true; - tabline.nvimBufferline.enable = true; - treesitter.context.enable = true; - dashboard.alpha.enable = true; - comments.comment-nvim.enable = true; - - options = { - tabstop = 2; - shiftwidth = 0; - conceallevel = 2; - }; - - notes = { - obsidian = lib.mkIf config.mods.obsidian.enable { - enable = true; - setupOpts = { - workspaces = [ - { - name = "agentic"; - path = "~/work/vaults/agentic"; - } - ]; - completion.nvim_cmp = true; - - note_id_func = - lib.generators.mkLuaInline - # lua - '' - function(title) - local suffix = "" - if title ~= nil then - -- If title is given, transform it into valid file name. - suffix = title:gsub(" ", "-"):gsub("[^A-Za-z0-9-]", ""):lower() - else - -- If title is nil, just add 4 random uppercase letters to the suffix. - for _ = 1, 4 do - suffix = suffix .. string.char(math.random(65, 90)) - end - end - return tostring(os.date("%Y%m%d%H%M%S")) .. "-" .. suffix - end - ''; - - ui = { - enable = true; - update_debounce = 200; - max_file_length = 5000; - checkboxes = { - " " = { - char = "󰄱"; - hl_group = "ObsidianTodo"; - }; - "x" = { - char = ""; - hl_group = "ObsidianDone"; - }; - ">" = { - char = ""; - hl_group = "ObsidianRightArrow"; - }; - "~" = { - char = "󰰱"; - hl_group = "ObsidianTilde"; - }; - "!" = { - char = ""; - hl_group = "ObsidianImportant"; - }; - }; - bullets = { - char = "•"; - hl_group = "ObsidianBullet"; - }; - external_link_icon = { - char = ""; - hl_group = "ObsidianExtLinkIcon"; - }; - reference_text = {hl_group = "ObsidianRefText";}; - highlight_text = {hl_group = "ObsidianHighlightText";}; - tags = {hl_group = "ObsidianTag";}; - block_ids = {hl_group = "ObsidianBlockID";}; - hl_groups = { - ObsidianTodo = { - bold = true; - fg = "#f78c6c"; - }; - ObsidianDone = { - bold = true; - fg = "#89ddff"; - }; - ObsidianRightArrow = { - bold = true; - fg = "#f78c6c"; - }; - ObsidianTilde = { - bold = true; - fg = "#ff5370"; - }; - ObsidianImportant = { - bold = true; - fg = "#d73128"; - }; - ObsidianBullet = { - bold = true; - fg = "#89ddff"; - }; - ObsidianRefText = { - underline = true; - fg = "#c792ea"; - }; - ObsidianExtLinkIcon = {fg = "#c792ea";}; - ObsidianTag = { - italic = true; - fg = "#89ddff"; - }; - ObsidianBlockID = { - italic = true; - fg = "#89ddff"; - }; - ObsidianHighlightText = {bg = "#75662e";}; - }; - }; - }; - }; - todo-comments.enable = true; - }; - - spellcheck = {enable = true;}; - - binds = { - whichKey.enable = true; - cheatsheet.enable = true; - }; - - git = { - enable = true; - gitsigns.enable = true; - gitsigns.codeActions.enable = - false; # throws an annoying debug message - }; - - terminal = { - toggleterm = { - enable = true; - lazygit.enable = true; - }; - }; - - utility = { - diffview-nvim.enable = true; - surround.enable = true; - # multicursors.enable = true; - undotree.enable = true; - - motion = { - hop.enable = true; - leap.enable = true; - }; - }; - - visuals = { - nvim-web-devicons.enable = true; - nvim-cursorline.enable = true; - cinnamon-nvim.enable = true; - fidget-nvim.enable = true; - - highlight-undo.enable = true; - indent-blankline.enable = true; - }; - - ui = { - borders.enable = true; - noice.enable = true; - colorizer.enable = true; - illuminate.enable = true; - smartcolumn.enable = true; - fastaction.enable = true; - }; - }; - }; - }; + home.sessionVariables.EDITOR = "nvim"; + programs.zsh.sessionVariables.EDITOR = "nvim"; }; } diff --git a/modules/home/terminal/helix/default.nix b/modules/home/terminal/helix/default.nix new file mode 100644 index 0000000..36f2b17 --- /dev/null +++ b/modules/home/terminal/helix/default.nix @@ -0,0 +1,91 @@ +{ + pkgs, + lib, + config, + inputs, + ... +}: { + options.mods.helix.enable = + lib.mkEnableOption "enables helix"; + + config = lib.mkIf config.mods.terminal.development.enable { + home.packages = with pkgs; [ + # Nix + nil + + # Rust + rust-analyzer + lldb_18 + + # Shaders + glsl_analyzer + wgsl-analyzer + + # Python + black + ]; + + programs.helix = { + enable = true; + package = pkgs.evil-helix; + + settings = { + keys.normal = { + "esc" = ["collapse_selection" "keep_primary_selection"]; + "Z" = { + "Q" = ":quit!"; + "Z" = ":write-quit!"; + }; + "V" = ["select_mode" "extend_to_line_bounds"]; + }; + editor = { + line-number = "relative"; + completion-replace = true; + bufferline = "always"; + rulers = [80]; + soft-wrap.enable = true; + indent-guides.render = true; + cursor-shape = { + normal = "block"; + insert = "bar"; + select = "underline"; + }; + }; + }; + + languages.language-server = { + glsl.command = "${pkgs.glsl_analyzer}/bin/glsl_analyzer"; + wgsl.command = "${pkgs.wgsl-analyzer}/bin/wgsl-analyzer"; + }; + + languages.language = [ + { + name = "nix"; + auto-format = true; + formatter.command = "${pkgs.nixfmt-classic}/bin/nixfmt"; + } + { + name = "rust"; + auto-format = true; + formatter.command = "rustfmt"; + } + { + name = "glsl"; + language-servers = ["glsl"]; + } + { + name = "wgsl"; + language-servers = ["wgsl"]; + } + { + name = "python"; + auto-format = true; + formatter = { + command = "${pkgs.black}/bin/black"; + args = ["-" "--quiet" "--line-length=79"]; + }; + } + ]; + }; + }; +} diff --git a/modules/home/terminal/nvim/default.nix b/modules/home/terminal/nvim/default.nix new file mode 100644 index 0000000..08c3e38 --- /dev/null +++ b/modules/home/terminal/nvim/default.nix @@ -0,0 +1,144 @@ +{ + lib, + config, + inputs, + ... +}: { + options.mods.nvim.enable = + lib.mkEnableOption "enables nvim"; + + imports = [ + inputs.nvf.homeManagerModules.default + ./obsidian.nix + ]; + + config = lib.mkIf config.mods.nvim.enable { + programs.nvf = { + enable = true; + settings = { + vim = { + viAlias = false; + vimAlias = true; + lsp = { + enable = true; + formatOnSave = true; + }; + + keymaps = [ + { + key = "w"; + mode = ["n"]; + action = ":w"; + silent = true; + desc = "Save file"; + } + { + key = "q"; + mode = ["n"]; + action = ":q"; + silent = false; + desc = "Quit"; + } + { + key = "gd"; + mode = "n"; + silent = true; + action = "lua vim.lsp.buf.definition()"; + desc = "Go to Definition"; + } + ]; + + languages = { + enableFormat = true; + enableTreesitter = true; + enableExtraDiagnostics = true; + + nix.enable = true; + nix.lsp.servers = ["nixd"]; + + markdown.enable = true; + bash.enable = true; + rust.enable = true; + rust.extensions.crates-nvim.enable = true; + + python = { + enable = true; + lsp.servers = ["pyright"]; + format.type = ["ruff" "black"]; + }; + + clang = { + enable = true; + cHeader = true; + }; + }; + + statusline.lualine.enable = true; + telescope.enable = true; + autocomplete.nvim-cmp.enable = true; + autopairs.nvim-autopairs.enable = true; + tabline.nvimBufferline.enable = true; + treesitter.context.enable = true; + dashboard.alpha.enable = true; + comments.comment-nvim.enable = true; + notes.todo-comments.enable = true; + + clipboard = { + enable = true; + providers.xclip.enable = true; + }; + + options = { + tabstop = 2; + shiftwidth = 0; + conceallevel = 2; + }; + + spellcheck = {enable = true;}; + + binds = { + whichKey.enable = true; + cheatsheet.enable = true; + }; + + git = { + enable = true; + gitsigns.enable = true; + gitsigns.codeActions.enable = + false; # throws an annoying debug message + }; + + utility = { + diffview-nvim.enable = true; + surround.enable = true; + undotree.enable = true; + + motion = { + hop.enable = true; + leap.enable = true; + }; + }; + + visuals = { + nvim-web-devicons.enable = true; + nvim-cursorline.enable = true; + cinnamon-nvim.enable = true; + fidget-nvim.enable = true; + + highlight-undo.enable = true; + indent-blankline.enable = true; + }; + + ui = { + borders.enable = true; + noice.enable = true; + colorizer.enable = true; + illuminate.enable = true; + smartcolumn.enable = true; + fastaction.enable = true; + }; + }; + }; + }; + }; +} diff --git a/modules/home/terminal/nvim/obsidian.nix b/modules/home/terminal/nvim/obsidian.nix new file mode 100644 index 0000000..9030f55 --- /dev/null +++ b/modules/home/terminal/nvim/obsidian.nix @@ -0,0 +1,123 @@ +{ + lib, + config, + ... +}: { + options.mods.obsidian.enable = + lib.mkEnableOption "enables obsidian"; + + config = lib.mkIf config.obsidian.enable { + programs.nvf.settings.vim.notes.obsidian = { + enable = true; + setupOpts = { + workspaces = [ + { + name = "agentic"; + path = "~/work/vaults/agentic"; + } + ]; + completion.nvim_cmp = true; + + note_id_func = + lib.generators.mkLuaInline + # lua + '' + function(title) + local suffix = "" + if title ~= nil then + -- If title is given, transform it into valid file name. + suffix = title:gsub(" ", "-"):gsub("[^A-Za-z0-9-]", ""):lower() + else + -- If title is nil, just add 4 random uppercase letters to the suffix. + for _ = 1, 4 do + suffix = suffix .. string.char(math.random(65, 90)) + end + end + return tostring(os.date("%Y%m%d%H%M%S")) .. "-" .. suffix + end + ''; + + ui = { + enable = true; + update_debounce = 200; + max_file_length = 5000; + checkboxes = { + " " = { + char = "󰄱"; + hl_group = "ObsidianTodo"; + }; + "x" = { + char = ""; + hl_group = "ObsidianDone"; + }; + ">" = { + char = ""; + hl_group = "ObsidianRightArrow"; + }; + "~" = { + char = "󰰱"; + hl_group = "ObsidianTilde"; + }; + "!" = { + char = ""; + hl_group = "ObsidianImportant"; + }; + }; + bullets = { + char = "•"; + hl_group = "ObsidianBullet"; + }; + external_link_icon = { + char = ""; + hl_group = "ObsidianExtLinkIcon"; + }; + reference_text = {hl_group = "ObsidianRefText";}; + highlight_text = {hl_group = "ObsidianHighlightText";}; + tags = {hl_group = "ObsidianTag";}; + block_ids = {hl_group = "ObsidianBlockID";}; + hl_groups = { + ObsidianTodo = { + bold = true; + fg = "#f78c6c"; + }; + ObsidianDone = { + bold = true; + fg = "#89ddff"; + }; + ObsidianRightArrow = { + bold = true; + fg = "#f78c6c"; + }; + ObsidianTilde = { + bold = true; + fg = "#ff5370"; + }; + ObsidianImportant = { + bold = true; + fg = "#d73128"; + }; + ObsidianBullet = { + bold = true; + fg = "#89ddff"; + }; + ObsidianRefText = { + underline = true; + fg = "#c792ea"; + }; + ObsidianExtLinkIcon = {fg = "#c792ea";}; + ObsidianTag = { + italic = true; + fg = "#89ddff"; + }; + ObsidianBlockID = { + italic = true; + fg = "#89ddff"; + }; + ObsidianHighlightText = {bg = "#75662e";}; + }; + }; + }; + }; + todo-comments.enable = true; + }; +} diff --git a/modules/home/terminal/zellij/default.nix b/modules/home/terminal/zellij/default.nix new file mode 100644 index 0000000..e72ca74 --- /dev/null +++ b/modules/home/terminal/zellij/default.nix @@ -0,0 +1,104 @@ +{ + pkgs, + lib, + config, + inputs, + ... +}: let + zellij-muon = pkgs.zellij.overrideAttrs (previousAttrs: { + patches = previousAttrs.patches ++ [./zellij/floating_fix.patch]; + }); +in { + options.mods.zellij.enable = + lib.mkEnableOption "enables zellij"; + + imports = [inputs.nvf.homeManagerModules.default]; + + config = lib.mkIf config.mods.terminal.development.enable { + programs.zellij = { + settings = { + default_mode._args = ["locked"]; + show_startup_tips._args = [false]; + show_release_notes._args = [false]; + }; + + extraConfig = builtins.readFile ./config.kdl; + + layouts = { + dev = { + layout = { + _children = [ + { + default_tab_template = { + _children = [ + { + pane = { + size = 1; + borderless = true; + plugin = { + location = "zellij:tab-bar"; + }; + }; + } + {"children" = {};} + { + pane = { + size = 1; + borderless = true; + plugin = { + location = "zellij:status-bar"; + }; + }; + } + ]; + }; + } + { + tab = { + _props = { + name = "project"; + focus = true; + }; + _children = [ + { + pane = { + command = "zsh"; + args = ["-c" "direnv exec . nvim"]; + }; + } + ]; + }; + } + { + tab = { + _props = { + name = "test"; + }; + _children = [ + { + pane = {}; + } + ]; + }; + } + { + tab = { + _props = { + name = "git"; + }; + _children = [ + { + pane = { + command = "lazygit"; + }; + } + ]; + }; + } + ]; + }; + }; + }; + }; + }; +} From 9b930ea0e088917656e1c9949e2d9517ab911118 Mon Sep 17 00:00:00 2001 From: muon Date: Mon, 22 Dec 2025 18:27:52 +0000 Subject: [PATCH 5/6] Fix errors --- hosts/muho/home.nix | 16 ++++++++++------ modules/home/terminal/development.nix | 5 ----- modules/home/terminal/nvim/default.nix | 2 +- modules/home/terminal/nvim/obsidian.nix | 3 +-- modules/home/terminal/zellij/default.nix | 2 -- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/hosts/muho/home.nix b/hosts/muho/home.nix index 28de781..84075d4 100644 --- a/hosts/muho/home.nix +++ b/hosts/muho/home.nix @@ -1,5 +1,10 @@ -{ pkgs, lib, osConfig, sources, ... }: -let cfg = osConfig.mods; +{ + pkgs, + lib, + osConfig, + ... +}: let + cfg = osConfig.mods; in { # Modules mods.xdg.enable = true; @@ -12,6 +17,7 @@ in { mods.desktop.development.enable = false; mods.desktop.productivity.enable = false; mods.desktop.media.enable = false; + mods.obsidian.enable = false; # Hardware preferences @@ -37,10 +43,8 @@ in { }; profiles.default = { fingerprint = { - "${cfg.monitors.primary.name}" = - "00ffffffffffff004c2d850433324d431a120103803420782aee91a3544c99260f5054bfef80714f8100814081809500a940b30001011a3680a070381f403020350006202000001a000000fd00384b1e5111000a202020202020000000fc0053796e634d61737465720a2020000000ff004831414b3530303030300a202000e9"; - "${cfg.monitors.secondary.name}" = - "00ffffffffffff00410cca140101010134100103804728788a288e9e5548972416484badce0031594559615981800101010101010101a91a00a05000163030203700c48e21000018662150b051001b3040703600c48e21000018000000fc005068696c697073545620283529000000fd002f551f500e000a2020202020200156020323714f930414051f10121103020116150706230907078301000066030c00100080011d00bc52d01e20b8285540c48e2100001a011d007251d01e206e285500c48e2100001e011d80d0721c1620102c2580c48e2100009e011d8018711c1620582c2500c48e2100009ef33980d072382d40102c4580c48e2100001e0000f2"; + "${cfg.monitors.primary.name}" = "00ffffffffffff004c2d850433324d431a120103803420782aee91a3544c99260f5054bfef80714f8100814081809500a940b30001011a3680a070381f403020350006202000001a000000fd00384b1e5111000a202020202020000000fc0053796e634d61737465720a2020000000ff004831414b3530303030300a202000e9"; + "${cfg.monitors.secondary.name}" = "00ffffffffffff00410cca140101010134100103804728788a288e9e5548972416484badce0031594559615981800101010101010101a91a00a05000163030203700c48e21000018662150b051001b3040703600c48e21000018000000fc005068696c697073545620283529000000fd002f551f500e000a2020202020200156020323714f930414051f10121103020116150706230907078301000066030c00100080011d00bc52d01e20b8285540c48e2100001a011d007251d01e206e285500c48e2100001e011d80d0721c1620102c2580c48e2100009e011d8018711c1620582c2500c48e2100009ef33980d072382d40102c4580c48e2100001e0000f2"; }; config = { "${cfg.monitors.primary.name}" = cfg.monitors.primary.config; diff --git a/modules/home/terminal/development.nix b/modules/home/terminal/development.nix index 61d9fbe..89392a4 100644 --- a/modules/home/terminal/development.nix +++ b/modules/home/terminal/development.nix @@ -12,11 +12,6 @@ in { options.mods.terminal.development.enable = lib.mkEnableOption "enables cli editor"; - options.mods.obsidian.enable = - lib.mkEnableOption "enables obsidian"; - - imports = [inputs.nvf.homeManagerModules.default]; - config = lib.mkIf config.mods.terminal.development.enable { mods = { nvim.enable = true; diff --git a/modules/home/terminal/nvim/default.nix b/modules/home/terminal/nvim/default.nix index 08c3e38..7e16002 100644 --- a/modules/home/terminal/nvim/default.nix +++ b/modules/home/terminal/nvim/default.nix @@ -17,7 +17,7 @@ enable = true; settings = { vim = { - viAlias = false; + viAlias = true; vimAlias = true; lsp = { enable = true; diff --git a/modules/home/terminal/nvim/obsidian.nix b/modules/home/terminal/nvim/obsidian.nix index 9030f55..5ece63b 100644 --- a/modules/home/terminal/nvim/obsidian.nix +++ b/modules/home/terminal/nvim/obsidian.nix @@ -6,7 +6,7 @@ options.mods.obsidian.enable = lib.mkEnableOption "enables obsidian"; - config = lib.mkIf config.obsidian.enable { + config = lib.mkIf config.mods.obsidian.enable { programs.nvf.settings.vim.notes.obsidian = { enable = true; setupOpts = { @@ -118,6 +118,5 @@ }; }; }; - todo-comments.enable = true; }; } diff --git a/modules/home/terminal/zellij/default.nix b/modules/home/terminal/zellij/default.nix index e72ca74..58b9eef 100644 --- a/modules/home/terminal/zellij/default.nix +++ b/modules/home/terminal/zellij/default.nix @@ -12,8 +12,6 @@ in { options.mods.zellij.enable = lib.mkEnableOption "enables zellij"; - imports = [inputs.nvf.homeManagerModules.default]; - config = lib.mkIf config.mods.terminal.development.enable { programs.zellij = { settings = { From 74900b3734acdb6212578cae810377097e77c8db Mon Sep 17 00:00:00 2001 From: muon Date: Mon, 22 Dec 2025 18:42:06 +0000 Subject: [PATCH 6/6] Add mini --- modules/home/terminal/nvim/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/home/terminal/nvim/default.nix b/modules/home/terminal/nvim/default.nix index 7e16002..c859e37 100644 --- a/modules/home/terminal/nvim/default.nix +++ b/modules/home/terminal/nvim/default.nix @@ -79,7 +79,6 @@ autopairs.nvim-autopairs.enable = true; tabline.nvimBufferline.enable = true; treesitter.context.enable = true; - dashboard.alpha.enable = true; comments.comment-nvim.enable = true; notes.todo-comments.enable = true; @@ -88,6 +87,12 @@ providers.xclip.enable = true; }; + mini = { + ai.enable = true; + comment.enable = true; + surround.enable = true; + }; + options = { tabstop = 2; shiftwidth = 0;