kiri/lux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: kiri/lux:2af142ffa78b4473da26fd44475f0bde75e3e6c5
Branches Tags
kiri/lux:main
...
compare: kiri/lux:main
Branches Tags
kiri/lux:main

22 Commits
2af142ffa7 ... main

Author SHA1 Message Date
kiri 9aa6d64771 updates 2026-08-12 11:47:07 +02:00
kiri 710c36a126 updates 2026-08-05 17:06:25 +02:00
kiri 99c605c09d updates 2026-08-05 17:05:44 +02:00
kiri 79a3fe3fc5 feat: helix updates 2026-07-29 19:37:29 +02:00
kiri 627d5c5952 feat: helix updates 2026-07-27 16:50:11 +02:00
kiri b061203715 feat: add tailwindcss and fix oxfmt 2026-07-26 21:06:04 +02:00
kiri 9ab0525b5e feat: small changes 2026-07-26 12:03:53 +02:00
kiri 8e2bfc551e chore: remove old inputs 2026-07-26 11:28:44 +02:00
kiri 66d0a1fddd feat: optimise store async instead 2026-07-26 11:24:13 +02:00
kiri e6ae751ff2 feat: add helix master cache 2026-07-26 11:22:45 +02:00
kiri cc6dc0d872 fix: forgot to remove devenv hook 2026-07-26 11:18:50 +02:00
kiri ed6af93008 feat: set helix as default editor 2026-07-26 11:17:46 +02:00
kiri 16f465a6e8 feat: swap devenv for direnv 2026-07-26 11:17:34 +02:00
kiri 11b1256771 feat: fix printing 2026-07-26 11:12:37 +02:00
kiri 57389d9109 feat: helix updates 2026-07-26 09:40:20 +02:00
kiri 067d1bbf12 feat: editor updates 2026-07-25 22:16:38 +02:00
kiri 91f7290955 feat: helix changes 2026-07-25 19:05:54 +02:00
kiri bcb3f65595 feat: update helix config 2026-07-25 18:16:29 +02:00
kiri c835106100 chore: update inputs 2026-07-25 13:23:48 +02:00
kiri 00c223fe65 feat: add npm globally 2026-07-23 16:32:24 +02:00
kiri 7306acca10 chore: update inputs 2026-07-23 16:31:48 +02:00
kiri 398988c314 fix: @attach keyword properly highlighted for svelte 2026-07-23 11:52:46 +02:00
12 changed files with 348 additions and 824 deletions
Expand all files Collapse all files
flake.lock
Generated
+96 -388
View File
@@ -1,30 +1,5 @@
{ {
"nodes": { "nodes": {
"blueprint": {
"inputs": {
"nixpkgs": [
"llm-agents",
"nixpkgs"
],
"systems": [
"llm-agents",
"systems"
]
},
"locked": {
"lastModified": 1776249299,
"narHash": "sha256-Dt9t1TGRmJFc0xVYhttNBD6QsAgHOHCArqGa0AyjrJY=",
"owner": "numtide",
"repo": "blueprint",
"rev": "56131e8628f173d24a27f6d27c0215eff57e40dd",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "blueprint",
"type": "github"
}
},
"bun2nix": { "bun2nix": {
"inputs": { "inputs": {
"flake-parts": [ "flake-parts": [
@@ -45,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1782772816, "lastModified": 1784665499,
"narHash": "sha256-s9BuFv0mRuZx9C1MF8qPHRdcAK14ONi0A5m6E2wqOoM=", "narHash": "sha256-9BMxlTxCCDAeoNLtb1a/st7udtTIJep+wpUzquA29VU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "bun2nix", "repo": "bun2nix",
"rev": "5a39d717029e94163ac223aee8d5c9946cafed1c", "rev": "0f2a1f0b6f42cebe3b149bf62d38754c5e0e9729",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -58,83 +33,6 @@
"type": "github" "type": "github"
} }
}, },
"cachix": {
"inputs": {
"devenv": [
"devenv"
],
"flake-compat": [
"devenv",
"flake-compat"
],
"git-hooks": [
"devenv",
"git-hooks"
],
"nixpkgs": [
"devenv",
"nixpkgs"
]
},
"locked": {
"lastModified": 1777487137,
"narHash": "sha256-TuvKVBX60mqyMT6OB5JqVEh1YIWtFMR/igLCaCdC9tw=",
"owner": "cachix",
"repo": "cachix",
"rev": "a66a440c321d35f7193472c317f42a55ccd1cb93",
"type": "github"
},
"original": {
"owner": "cachix",
"ref": "latest",
"repo": "cachix",
"type": "github"
}
},
"crate2nix": {
"flake": false,
"locked": {
"lastModified": 1772186516,
"narHash": "sha256-8s28pzmQ6TOIUzznwFibtW1CMieMUl1rYJIxoQYor58=",
"owner": "rossng",
"repo": "crate2nix",
"rev": "ba5dd398e31ee422fbe021767eb83b0650303a6e",
"type": "github"
},
"original": {
"owner": "rossng",
"repo": "crate2nix",
"rev": "ba5dd398e31ee422fbe021767eb83b0650303a6e",
"type": "github"
}
},
"devenv": {
"inputs": {
"cachix": "cachix",
"crate2nix": "crate2nix",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"ghostty": "ghostty",
"git-hooks": "git-hooks",
"nix": "nix",
"nixd": "nixd",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1783538213,
"narHash": "sha256-jNjKlmrejUrBgVAeiavlMLlkmC7ZEv1D9nhfuwMW5Q8=",
"owner": "cachix",
"repo": "devenv",
"rev": "d1fb321e73048d0e1e2b523580268ebb3df2ae90",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "devenv",
"type": "github"
}
},
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -163,11 +61,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1781164160, "lastModified": 1784365424,
"narHash": "sha256-dxo3aPnfaQJt9K/3NhgKfu2Q9B42z4d4Or9Izoug+68=", "narHash": "sha256-kJO1Tww/GkvLq5amrV4BKidYGr5YumM+cH/xYALAiw4=",
"owner": "abenz1267", "owner": "abenz1267",
"repo": "elephant", "repo": "elephant",
"rev": "3296842820d04d5ec774afc7528492fcbb3c01f2", "rev": "23f37238367355cf46843015ad5e94706200176a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -176,35 +74,16 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": "nixpkgs-lib"
"devenv",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1778716662, "lastModified": 1782949081,
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -234,62 +113,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_3": { "helix": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1769996383, "lastModified": 1784822617,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "narHash": "sha256-IYDL6Vnf13Sa+wbeXZTAxvdLA4h8Ew5ha0spcJy/Yk0=",
"owner": "hercules-ci", "owner": "helix-editor",
"repo": "flake-parts", "repo": "helix",
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "rev": "079a789e8cb08ead67f19e1971a1b7438b37354b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hercules-ci", "owner": "helix-editor",
"repo": "flake-parts", "repo": "helix",
"type": "github"
}
},
"ghostty": {
"flake": false,
"locked": {
"lastModified": 1782866021,
"narHash": "sha256-BOLtzL5iAHmtCOg9/DXtcfw+K86QWol088K72chJB04=",
"owner": "ghostty-org",
"repo": "ghostty",
"rev": "e1d31deaaed21aa9225afca78d778fb373c95852",
"type": "github"
},
"original": {
"owner": "ghostty-org",
"repo": "ghostty",
"type": "github"
}
},
"git-hooks": {
"inputs": {
"flake-compat": [
"devenv",
"flake-compat"
],
"nixpkgs": [
"devenv",
"nixpkgs"
]
},
"locked": {
"lastModified": 1782908218,
"narHash": "sha256-wLMOrPgVyeF3XmP+qfYcLqnVdTxikdcSvbIY7rA9jTA=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "9f7e99119ece7705299595299f3b031f39356de1",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github" "type": "github"
} }
}, },
@@ -300,11 +139,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1783689750, "lastModified": 1784913159,
"narHash": "sha256-iMO/Ypany7DPXD6D7sQgH7METtEUihnOvdb+A9ehn8k=", "narHash": "sha256-JWq0BfjO4ktpH5USfQNQzdvHpIDT8fSKD5K7LvdMRFs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "79e6082586b3680ff32c8e75127545058f074fa4", "rev": "079a3b5d1aa6a719920a51316253b7d6dd22738d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -315,11 +154,11 @@
}, },
"import-tree": { "import-tree": {
"locked": { "locked": {
"lastModified": 1778781969, "lastModified": 1784254960,
"narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=", "narHash": "sha256-iI88R3wHz8wTKQb5orvpc51L/Xr64AJyxid/0MKa/b8=",
"owner": "vic", "owner": "vic",
"repo": "import-tree", "repo": "import-tree",
"rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274", "rev": "4ebb10ae17d5f1ad366e7aef5b92cb8eecf24f69",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -330,21 +169,20 @@
}, },
"llm-agents": { "llm-agents": {
"inputs": { "inputs": {
"blueprint": "blueprint",
"bun2nix": "bun2nix", "bun2nix": "bun2nix",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_2", "systems": "systems_2",
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1783669679, "lastModified": 1784961014,
"narHash": "sha256-WDGDMsPXxceC0k1ktqcobmwE4GCTrzzULUKlp1CzSKQ=", "narHash": "sha256-Ot9VI5fn7odhq1Him2pRjdFkLAm9CUTUqUz///pTFF8=",
"owner": "numtide", "owner": "numtide",
"repo": "llm-agents.nix", "repo": "llm-agents.nix",
"rev": "6e9f6664e72433966557ab83a7c3e8c0bbf64a44", "rev": "d8b00961d99eb93ec852f29ed8be290573cc88e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -353,40 +191,21 @@
"type": "github" "type": "github"
} }
}, },
"lux-pkgs": {
"inputs": {
"flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1772315038,
"narHash": "sha256-YL6NQd97AiZGe/Q4ZWxZaguKVHL0pfNvP/Cqgl/oh4g=",
"ref": "refs/heads/main",
"rev": "d7660146e70475c096bed703e4dad687a58e13dc",
"revCount": 1,
"type": "git",
"url": "ssh://gitea@orion/kiri/lux-pkgs"
},
"original": {
"type": "git",
"url": "ssh://gitea@orion/kiri/lux-pkgs"
}
},
"niri": { "niri": {
"inputs": { "inputs": {
"niri-stable": "niri-stable", "niri-stable": "niri-stable",
"niri-unstable": "niri-unstable", "niri-unstable": "niri-unstable",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-stable": "xwayland-satellite-stable",
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1783526091, "lastModified": 1784874881,
"narHash": "sha256-Zkkil0e8Wg5BcBmJkWJwBXlETefYQbYKw72xJUIBPLE=", "narHash": "sha256-u4jhSIf/Un0qZB+Cn3hTTaHSI20XeAxYbA5o4faqdJs=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "a24d4c0dce53fd8dbeb9ad20411e282c7b9875f1", "rev": "ef7a2a3d719af46b906c22a3ebfb7d65627b2cd2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -415,11 +234,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1783522755, "lastModified": 1784570726,
"narHash": "sha256-dI0HkX1djETia7cD/Y64h8BNIsSOfTRMzfNum2J6UhE=", "narHash": "sha256-9EMn69JBcFWFgUM7f0VBAX+jBby5b9H3M59U75+5yI4=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "0777769e719b7c9b7c980d4ea66288bfbb4da5b3", "rev": "7f26c3ee804fb6ed458ef7fb0e3c794f14e0b3bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -428,46 +247,6 @@
"type": "github" "type": "github"
} }
}, },
"nix": {
"inputs": {
"flake-compat": [
"devenv",
"flake-compat"
],
"flake-parts": [
"devenv",
"flake-parts"
],
"git-hooks-nix": [
"devenv",
"git-hooks"
],
"nixpkgs": [
"devenv",
"nixpkgs"
],
"nixpkgs-23-11": [
"devenv"
],
"nixpkgs-regression": [
"devenv"
]
},
"locked": {
"lastModified": 1782407171,
"narHash": "sha256-xem+4ncdQCTFJsQ4PrVuyVmi3j4w/Yqg298hBUzVejA=",
"owner": "cachix",
"repo": "nix",
"rev": "782ac1b155679b065ec945ae50d0fa1d495883b7",
"type": "github"
},
"original": {
"owner": "cachix",
"ref": "devenv-2.34",
"repo": "nix",
"type": "github"
}
},
"nix-index-database": { "nix-index-database": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -475,11 +254,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1783414108, "lastModified": 1784440659,
"narHash": "sha256-RY8e+gR2/DhXsYDxGDL6Hhe9+POD9u4+llwxMBqMQDs=", "narHash": "sha256-Q5kNLlWngt7TaIIZoxDKWMHjiSaNRVqr70FqWCRRfr4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "96d6de10eb281b98f5cfcd1841394c03da5df77c", "rev": "4f8d52a3598b0dc7db7a5e7b419e3edd9d1ecfdb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -508,42 +287,16 @@
"type": "github" "type": "github"
} }
}, },
"nixd": {
"inputs": {
"flake-parts": [
"devenv",
"flake-parts"
],
"nixpkgs": [
"devenv",
"nixpkgs"
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1780381423,
"narHash": "sha256-S1BIJiQF4lRtJUKak0e97JwNvbe69/LW78YJJuB18Qk=",
"owner": "nix-community",
"repo": "nixd",
"rev": "0e07c08c448a2995e7793d1098437b29bbe80b02",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixd",
"type": "github"
}
},
"nixos-hardware": { "nixos-hardware": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1783673680, "lastModified": 1784723954,
"narHash": "sha256-ardRVG+ipnyyxVdIsbLMy5foO6gDqN/yIi8v10HTJqs=", "narHash": "sha256-1CfD8ZUjCkTgjsneLZ/lxCHhgDfqxxE7/GX0MmsgiqA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "0b655af52b5b89bcceb88737efdc3a7498e751ee", "rev": "a017f5b72210026af5b3ac5949f08d94380a6fbd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -554,31 +307,28 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"inputs": {
"nixpkgs-src": "nixpkgs-src"
},
"locked": { "locked": {
"lastModified": 1782132010, "lastModified": 1784796856,
"narHash": "sha256-ZnAVHdVrotp80iIMm5CSR1fdxPlw7Uwmwxb+O/wsgZ8=", "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=",
"owner": "cachix", "owner": "nixos",
"repo": "devenv-nixpkgs", "repo": "nixpkgs",
"rev": "12866ae2dddbc0ab8b329915f8072bb9c75bde89", "rev": "e2587caef70cea85dd97d7daab492899902dbf5d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "cachix", "owner": "nixos",
"ref": "rolling", "ref": "nixos-unstable",
"repo": "devenv-nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1769909678, "lastModified": 1782614948,
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "72716169fe93074c333e8d0173151350670b824c", "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -587,23 +337,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-src": {
"flake": false,
"locked": {
"lastModified": 1781607440,
"narHash": "sha256-rxO+uc/KFbSJp+pgyXRuAX6QlG9hJdnt0BXpEQRXY+U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3e41b24abd260e8f71dbe2f5737d24122f972158",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1782847189, "lastModified": 1782847189,
@@ -620,29 +353,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1772173633, "lastModified": 1784856561,
"narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=", "narHash": "sha256-J+Bx1Z6Oeoj2FgnBhRMKyUhhtDoOpTgXYaVLZpDjW4A=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c0f3d81a7ddbc2b1332be0d8481a672b4f6004d6", "rev": "597283ad8aa0b331c788e97c4c262d58877074ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixos-26.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1783224372, "lastModified": 1784796856,
"narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d407951447dcd00442e97087bf374aad70c04cea", "rev": "e2587caef70cea85dd97d7daab492899902dbf5d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -652,7 +385,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1767892417, "lastModified": 1767892417,
"narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
@@ -665,26 +398,26 @@
"url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1783279667, "lastModified": 1784812282,
"narHash": "sha256-2l8yOB5aYd+05Q9V9Y1YhgbSa1j1o5QX+nvYs5FL80A=", "narHash": "sha256-kj0RWcISiimYMfvVVXk4O9z73XHY/tPSVYZ24imKdP8=",
"rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", "rev": "6d12004108e0e4a5cfa4bd83b14477f040b15773",
"type": "tarball", "type": "tarball",
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1028110.f205b5574fd0/nixexprs.tar.xz" "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1040448.6d12004108e0/nixexprs.tar.xz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
} }
}, },
"nixpkgs_6": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1783224372, "lastModified": 1784356753,
"narHash": "sha256-FGQ8TfSm9WviNE/fQAWsKs+y4GkX8fU4EScewpw54Y8=", "narHash": "sha256-zupdTm41be2fY8cexroEOGjopl3F2Gqs3gk7ieqaM3s=",
"rev": "d407951447dcd00442e97087bf374aad70c04cea", "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a",
"type": "tarball", "type": "tarball",
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1027867.d407951447dc/nixexprs.tar.xz" "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1036777.61b7c44c4073/nixexprs.tar.xz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@@ -693,14 +426,14 @@
}, },
"noctalia": { "noctalia": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1783689056, "lastModified": 1784944609,
"narHash": "sha256-K9/7C/Dwwe80jF1xhbV8/rHzJsujXulA1vFftgyF6Ok=", "narHash": "sha256-+TlclUP7Q2ylQ8Uh9M35U1ftuGdp++/QfnX9I3V3VeI=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia", "repo": "noctalia",
"rev": "1b7a17a5df40cf782dbb92f37c94516932427f56", "rev": "8fc7fac1fd637f0027ce1b3cc9544d053cfd8f2c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -711,22 +444,19 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"devenv": "devenv",
"disko": "disko", "disko": "disko",
"elephant": "elephant", "elephant": "elephant",
"flake-parts": [ "flake-parts": "flake-parts",
"lux-pkgs", "helix": "helix",
"flake-parts"
],
"home-manager": "home-manager", "home-manager": "home-manager",
"import-tree": "import-tree", "import-tree": "import-tree",
"llm-agents": "llm-agents", "llm-agents": "llm-agents",
"lux-pkgs": "lux-pkgs",
"niri": "niri", "niri": "niri",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-wrapper-modules": "nix-wrapper-modules", "nix-wrapper-modules": "nix-wrapper-modules",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable_2",
"noctalia": "noctalia", "noctalia": "noctalia",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"walker": "walker" "walker": "walker"
@@ -735,16 +465,16 @@
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"devenv", "helix",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1782875958, "lastModified": 1775358767,
"narHash": "sha256-5eqDcnBjb1424HRQdnhuhNOBZguq1Z2tqSa2OMF/m2c=", "narHash": "sha256-f2eC+WIfhjevCPQILuV08i/kmKZzYZpUvkom/33VxCA=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "13139aefa973f3d96c60c0fbab801de058ae25ca", "rev": "20fd44bc663daa53a2575e01293e24e681d62244",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -819,28 +549,6 @@
} }
}, },
"treefmt-nix": { "treefmt-nix": {
"inputs": {
"nixpkgs": [
"devenv",
"nixd",
"nixpkgs"
]
},
"locked": {
"lastModified": 1780220602,
"narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "db947814a175b7ca6ded66e21383d938df01c227",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"llm-agents", "llm-agents",
@@ -848,11 +556,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1780220602, "lastModified": 1784369104,
"narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", "narHash": "sha256-47cxbcZODibHv3rELFQ9vZly0vUNkND/atn/U7HLeb0=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "db947814a175b7ca6ded66e21383d938df01c227", "rev": "df3c0640565d04a0261253cdd89fce78ec50168a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -872,11 +580,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1781164128, "lastModified": 1784217994,
"narHash": "sha256-xPcYrHdDXWykIi5/XXkLvliBArRnfzvs+atB9El1qhI=", "narHash": "sha256-gxHJsrJZo2qbKK47Kf/9ho3i/HhRwkL8XvPnczGPd9E=",
"owner": "abenz1267", "owner": "abenz1267",
"repo": "walker", "repo": "walker",
"rev": "aa1e4b7d59237e8c43dde58636bae476f23d9bfb", "rev": "42b3ed88abf50bc52638fb2835b7f17e3ea3ac4c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -905,11 +613,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1781226823, "lastModified": 1784679892,
"narHash": "sha256-28696iIw8uE0ZUyFTtzhEM8xMh85clCYypMxkvUi+sc=", "narHash": "sha256-Mb7jpqnrcYCfNSItIkkHpuR3YxWFxPuIBfcwNKlRBkk=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "8575d0ef55d70f9b4c46b6bffb3accf912217e1e", "rev": "8d135d3b2854b30fd01ea6cd6c27e523dd50a839",
"type": "github" "type": "github"
}, },
"original": { "original": {
flake.nix
+3 -4
View File
@@ -6,8 +6,8 @@
url = "github:nix-community/disko"; url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
devenv.url = "github:cachix/devenv"; flake-parts.url = "github:hercules-ci/flake-parts";
flake-parts.follows = "lux-pkgs/flake-parts"; helix.url = "github:helix-editor/helix";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -24,6 +24,7 @@
}; };
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"; nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-26.05";
noctalia.url = "github:noctalia-dev/noctalia"; noctalia.url = "github:noctalia-dev/noctalia";
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
@@ -43,8 +44,6 @@
inputs.elephant.follows = "elephant"; inputs.elephant.follows = "elephant";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
lux-pkgs.url = "git+ssh://gitea@orion/kiri/lux-pkgs";
}; };
outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules); outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules);
modules/capabilities/ai.nix
+1 -1
View File
@@ -8,7 +8,7 @@ in
{ {
home-manager.sharedModules = [ hmModules.ai ]; home-manager.sharedModules = [ hmModules.ai ];
nixpkgs.overlays = [ inputs.llm-agents.overlays.default ]; nixpkgs.overlays = [ inputs.llm-agents.overlays.shared-nixpkgs ];
nix.settings = { nix.settings = {
extra-substituters = [ "https://cache.numtide.com" ]; extra-substituters = [ "https://cache.numtide.com" ];
modules/capabilities/dev-tools.nix
+22 -6
View File
@@ -2,6 +2,14 @@
{ {
flake.modules.homeManager.dev-tools = flake.modules.homeManager.dev-tools =
{ config, pkgs, ... }: { config, pkgs, ... }:
let
stablePkgs = import inputs.nixpkgs-stable {
inherit (pkgs.stdenv.hostPlatform) system;
config = {
inherit (pkgs.config) allowUnfree;
};
};
in
{ {
home.sessionVariables.CARGO_HOME = "${config.xdg.dataHome}/cargo"; home.sessionVariables.CARGO_HOME = "${config.xdg.dataHome}/cargo";
home.packages = with pkgs; [ home.packages = with pkgs; [
@@ -10,16 +18,13 @@
usql usql
posting posting
resterm resterm
inputs.devenv.packages.${pkgs.stdenv.hostPlatform.system}.default
kubectl kubectl
mongodb-compass stablePkgs.mongodb-compass
scc scc
nodejs
mariadb
]; ];
programs.zsh.initContent = ''
eval "$(devenv hook zsh)"
'';
programs.lazygit = { programs.lazygit = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
@@ -30,8 +35,19 @@
programs.bun.enable = true; programs.bun.enable = true;
programs.ripgrep.enable = true; programs.ripgrep.enable = true;
programs.k9s.enable = true; programs.k9s.enable = true;
programs.direnv = {
enable = true;
nix-direnv.enable = true;
config.global = {
hide_env_diff = true;
log_format = "↳ %s";
};
};
}; };
flake.modules.nixos.openvpn = { flake.modules.nixos.openvpn = {
programs.openvpn3.enable = true; programs.openvpn3.enable = true;
services.resolved.enable = true;
}; };
} }
modules/capabilities/helix.nix
+155 -410
View File
@@ -1,467 +1,212 @@
{ config, ... }: { inputs, ... }:
let
account = config.facts.account;
in
{ {
flake.modules.nixos.helix = {
nix.settings = {
extra-substituters = [ "https://helix.cachix.org" ];
extra-trusted-public-keys = [
"helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
];
};
};
flake.modules.homeManager.helix = flake.modules.homeManager.helix =
{ { pkgs, ... }:
lib,
osConfig,
pkgs,
...
}:
let let
indent = { svelteLanguageServer = pkgs.svelte-language-server.overrideAttrs (
tab-width = 2; finalAttrs: previousAttrs: {
unit = " "; version = "0.18.3";
};
oxfmt = { pnpmWorkspaces = [
name = "oxfmt"; "svelte-language-server..."
only-features = [ "format" ]; "typescript-svelte-plugin..."
};
oxlint = {
name = "oxlint";
only-features = [
"code-action"
"diagnostics"
];
};
webLanguageServers = [
oxfmt
"vtsls"
oxlint
"tailwindcss-ls"
]; ];
markupLanguageServers = primary: [ src = pkgs.fetchFromGitHub {
oxfmt owner = "sveltejs";
primary repo = "language-tools";
"tailwindcss-ls" tag = "svelte-language-server@${finalAttrs.version}";
"emmet-ls" hash = "sha256-FTOkJPXbsG6R53yr4n0/IR2lzFCovrdV0+epOi07lBQ=";
]; };
ruffFormatter = pkgs.writeShellApplication { pnpmDeps = pkgs.fetchPnpmDeps {
name = "helix-ruff-format"; inherit (finalAttrs)
runtimeInputs = [ pkgs.ruff ]; pname
text = '' version
if (( $# != 1 )); then src
echo "usage: helix-ruff-format <filename>" >&2 pnpmWorkspaces
exit 2 ;
fi pnpm = pkgs.pnpm_10;
fetcherVersion = 3;
hash = "sha256-fY3hrCkr/soJk1gp39/jec8lT2ZJI27xRBCZi006oWA=";
};
filename=$1 buildPhase = builtins.replaceStrings
ruff check \ [ "pnpm run --filter=svelte-language-server... build" ]
--fix \ [ ''
--force-exclude \ pnpm run --filter=svelte-language-server... build
--exit-zero \ pnpm --filter=typescript-svelte-plugin exec tsc \
--no-cache \ -p ./ \
--stdin-filename "$filename" \ --pretty false \
- \ --types node \
| ruff format \ --typeRoots ../../node_modules/.pnpm/node_modules/@types
--force-exclude \ '' ]
--stdin-filename "$filename" \ previousAttrs.buildPhase;
- \
| ruff check \ installPhase = builtins.replaceStrings
--fix \ [ "pnpm install --filter=svelte-language-server..." ]
--force-exclude \ [ "pnpm install --filter=svelte-language-server... --filter=typescript-svelte-plugin..." ]
--select=I001 \ previousAttrs.installPhase;
--exit-zero \
--no-cache \ postInstall = (previousAttrs.postInstall or "") + ''
--stdin-filename "$filename" \ substituteInPlace \
- "$out/lib/node_modules/svelte-language-server/packages/language-server/node_modules/@vscode/emmet-helper/lib/cjs/emmetHelper.js" \
--replace-fail \
"'jsx.enabled': syntax === 'jsx'," \
"'jsx.enabled': syntax === 'jsx' || syntax === 'html',"
ln -s ../packages/typescript-plugin \
"$out/lib/node_modules/svelte-language-server/node_modules/typescript-svelte-plugin"
ln -s ../packages/language-server/node_modules/svelte \
"$out/lib/node_modules/svelte-language-server/node_modules/svelte"
''; '';
}; }
);
in in
{ {
programs.helix = { programs.helix = {
enable = true; enable = true;
defaultEditor = true;
package = inputs.helix.packages.${pkgs.stdenv.hostPlatform.system}.default;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
ripgrep vtsls
fd svelteLanguageServer
wl-clipboard tailwindcss-language-server
stylua
taplo
yamlfmt
lua-language-server
nixd nixd
nixfmt nixfmt
dafny oxfmt
vscode-langservers-extracted
tailwindcss-language-server simple-completion-language-server
odin
ols
rust-analyzer rust-analyzer
rustfmt rustfmt
astro-language-server cargo
tinymist
typstyle
ty
ruff
vtsls
pkgs.oxlint
pkgs.oxfmt
emmet-language-server
svelte-language-server
]; ];
settings = { settings = {
theme = "lux-kanagawa"; theme = "kanagawa-custom";
editor = { editor = {
scrolloff = 10;
default-yank-register = "+";
cursorline = true;
completion-timeout = 5;
color-modes = true;
popup-border = "all";
file-picker.hidden = false;
indent-guides.render = true;
inline-diagnostics.cursor-line = "hint";
lsp.display-inlay-hints = true;
soft-wrap.enable = true; soft-wrap.enable = true;
lsp = {
statusline = { auto-document-highlight = true;
left = [ display-inlay-hints = false;
"mode" };
"spinner" rainbow-brackets = true;
"version-control" line-number = "relative";
"file-name" cursorline = true;
"read-only-indicator" gutters = [
"file-modification-indicator" "code-action-hint"
];
right = [
"diagnostics" "diagnostics"
"selections" "spacer"
"position-percentage" "line-numbers"
"position" "spacer"
"file-type" "diff"
]; ];
separator = ""; color-modes = true;
mode = { cursor-shape = {
normal = "NORMAL"; insert = "bar";
insert = "INSERT"; normal = "block";
select = "SELECT"; select = "underline";
};
diagnostics = [
"error"
"warning"
"info"
"hint"
];
workspace-diagnostics = [
"error"
"warning"
"info"
"hint"
];
};
whitespace = {
render = {
tab = "all";
nbsp = "all";
nnbsp = "all";
};
characters = {
tab = "»";
nbsp = "␣";
}; };
}; };
}; };
keys = { themes.kanagawa-custom = {
insert."C-g" = "signature_help";
normal = {
esc = [
"collapse_selection"
"keep_primary_selection"
];
"C-h" = "jump_view_left";
"C-j" = "jump_view_down";
"C-k" = "jump_view_up";
"C-l" = "jump_view_right";
"[".h = "goto_prev_change";
"]".h = "goto_next_change";
g.I = "goto_implementation";
space = {
space = "buffer_picker";
f = ":format";
q = "diagnostics_picker";
"/" = "search";
b.d = ":buffer-close";
c.a = "code_action";
d.s = "symbol_picker";
h.r = ":reset-diff-change";
r.n = "rename_symbol";
t.h = ":toggle lsp.display-inlay-hints";
s = {
f = "file_picker";
g = "global_search";
d = "diagnostics_picker";
r = "last_picker";
"/" = "global_search";
};
};
};
};
};
themes.lux-kanagawa = {
inherits = "kanagawa"; inherits = "kanagawa";
"ui.gutter" = { "ui.highlight".underline = {
fg = "sumiInk6"; color = "dragonBlue";
style = "line";
}; };
}; };
languages = { languages = {
language-server = { language-server.scls = {
dafny = { command = "simple-completion-language-server";
command = "dafny"; environment.SNIPPETS_PATH = "${pkgs.vimPlugins.friendly-snippets}/snippets";
args = [ "server" ];
}; };
emmet-ls = { language-server.vtsls.config.vtsls = {
command = "emmet-language-server"; autoUseWorkspaceTsdk = true;
args = [ "--stdio" ]; tsserver.globalPlugins = [
}; {
name = "typescript-svelte-plugin";
lua-language-server = { location = "${svelteLanguageServer}/lib/node_modules/svelte-language-server";
config.Lua = { enableForWorkspaceTypeScriptVersions = true;
runtime.version = "LuaJIT"; }
signatureHelp.enable = true;
diagnostics.globals = [ "vim" ];
telemetry.enable = false;
completion.callSnippet = "Replace";
hint.enable = true;
};
};
nixd = {
config.nixd = {
nixpkgs.expr = "import ${pkgs.path} {}";
options = {
nixos.expr = ''(builtins.getFlake "path://${account.nixosConfigurationPath}").nixosConfigurations.${osConfig.facts.machine.name}.options'';
home-manager.expr = ''(builtins.getFlake "path://${account.nixosConfigurationPath}").nixosConfigurations.${osConfig.facts.machine.name}.options.home-manager.users.type.getSubOptions []'';
};
formatting.command = [ "nixfmt" ];
};
};
oxfmt = {
command = "oxfmt";
args = [ "--lsp" ];
required-root-patterns = [
".oxfmtrc.json"
".oxfmtrc.jsonc"
"oxfmt.config.ts"
"package.json"
"vite.config.ts"
]; ];
}; };
oxlint = {
command = "oxlint";
args = [ "--lsp" ];
required-root-patterns = [
".oxlintrc.json"
".oxlintrc.jsonc"
"oxlint.config.ts"
"package.json"
"vite.config.ts"
];
};
tinymist = {
config.formatterMode = "typstyle";
};
vtsls = {
command = "vtsls";
args = [ "--stdio" ];
config.vtsls.autoUseWorkspaceTsdk = true;
};
};
language = [ language = [
{ {
name = "lua"; name = "javascript";
language-servers = [
"vtsls"
"scls"
];
auto-format = true; auto-format = true;
}
{
name = "jsx";
language-servers = [
"vtsls"
"scls"
];
auto-format = true;
}
{
name = "typescript";
language-servers = [
"vtsls"
"scls"
];
auto-format = true;
}
{
name = "tsx";
language-servers = [
"vtsls"
"scls"
];
auto-format = true;
}
{
name = "svelte";
formatter = { formatter = {
command = "stylua"; command = "${pkgs.coreutils}/bin/env";
args = [ args = [
"--indent-type" "NODE_PATH=%{workspace_directory}/node_modules"
"Spaces" "oxfmt"
"--indent-width" "--stdin-filepath=%{buffer_name}"
"2"
"--search-parent-directories"
"--respect-ignores"
"--stdin-filepath"
"%{buffer_name}"
"-"
]; ];
}; };
auto-format = true;
language-servers = [
"scls"
"svelteserver"
"tailwindcss-ls"
];
} }
{ {
name = "nix"; name = "nix";
auto-format = true; auto-format = true;
language-servers = [ "nixd" ];
}
{
name = "dafny";
scope = "source.dafny";
injection-regex = "dafny";
file-types = [
"dfy"
"dafny"
];
roots = [ ".git" ];
comment-token = "//";
block-comment-tokens = {
start = "/*";
end = "*/";
};
inherit indent;
auto-format = true;
language-servers = [ "dafny" ];
}
{
name = "json";
language-servers = [
oxfmt
"vscode-json-language-server"
];
}
{
name = "jsonc";
language-servers = [
oxfmt
"vscode-json-language-server"
];
}
{
name = "javascript";
auto-format = true;
language-servers = webLanguageServers;
}
{
name = "jsx";
auto-format = true;
language-servers = webLanguageServers ++ [ "emmet-ls" ];
}
{
name = "typescript";
auto-format = true;
language-servers = webLanguageServers;
}
{
name = "tsx";
auto-format = true;
language-servers = webLanguageServers ++ [ "emmet-ls" ];
}
{
name = "css";
language-servers = markupLanguageServers "vscode-css-language-server";
}
{
name = "scss";
language-servers = markupLanguageServers "vscode-css-language-server";
}
{
name = "less";
scope = "source.css.less";
injection-regex = "less";
file-types = [ "less" ];
grammar = "css";
block-comment-tokens = {
start = "/*";
end = "*/";
};
inherit indent;
auto-format = true;
language-servers = markupLanguageServers "vscode-css-language-server";
}
{
name = "html";
language-servers = markupLanguageServers "vscode-html-language-server";
} }
{ {
name = "rust"; name = "rust";
inherit indent;
}
{
name = "python";
inherit indent;
auto-format = true; auto-format = true;
language-servers = [
"ty"
"ruff"
];
formatter = {
command = lib.getExe ruffFormatter;
args = [ "%{buffer_name}" ];
};
}
{
name = "astro";
auto-format = true;
language-servers = [
"astro-ls"
oxlint
"tailwindcss-ls"
"emmet-ls"
];
}
{
name = "svelte";
auto-format = true;
language-servers = [
oxfmt
"svelteserver"
oxlint
"tailwindcss-ls"
"emmet-ls"
];
}
{
name = "typst";
auto-format = true;
}
{
name = "toml";
auto-format = true;
language-servers = [ "taplo" ];
formatter = {
command = "taplo";
args = [
"format"
"--stdin-filepath"
"%{buffer_name}"
"-"
];
};
}
{
name = "yaml";
auto-format = true;
language-servers = [ ];
formatter = {
command = "yamlfmt";
args = [ "-" ];
};
} }
]; ];
}; };
modules/capabilities/keyring.nix
+5
View File
@@ -0,0 +1,5 @@
{
flake.modules.homeManager.keyring = {
services.gnome-keyring.enable = true;
};
}
modules/capabilities/neovim/default.nix
+44 -2
View File
@@ -18,6 +18,48 @@ in
osConfig, osConfig,
... ...
}: }:
let
nvimTreesitter = pkgs.vimPlugins.nvim-treesitter;
svelteLanguageServer = pkgs.svelte-language-server.overrideAttrs (
finalAttrs: _: {
version = "0.18.3";
src = pkgs.fetchFromGitHub {
owner = "sveltejs";
repo = "language-tools";
tag = "svelte-language-server@${finalAttrs.version}";
hash = "sha256-FTOkJPXbsG6R53yr4n0/IR2lzFCovrdV0+epOi07lBQ=";
};
pnpmDeps = pkgs.fetchPnpmDeps {
inherit (finalAttrs)
pname
version
src
pnpmWorkspaces
;
pnpm = pkgs.pnpm_10;
fetcherVersion = 3;
hash = "sha256-fY3hrCkr/soJk1gp39/jec8lT2ZJI27xRBCZi006oWA=";
};
}
);
svelteGrammar = nvimTreesitter.builtGrammars.svelte.overrideAttrs (_: {
version = "0.0.0+rev=c2457b9";
src = pkgs.fetchFromGitHub {
owner = "m4rch3n1ng";
repo = "tree-sitter-svelte";
rev = "c2457b99a5b8ee38e14928dceeb246a61c097b77";
hash = "sha256-RIAe30TTzZhHuXxC2VRVk/X73Qm1u2LWOW3AsnUfRzI=";
};
});
nvimTreesitterWithAllGrammars = nvimTreesitter.withPlugins (
_:
map (
grammar: if grammar == nvimTreesitter.builtGrammars.svelte then svelteGrammar else grammar
) nvimTreesitter.allGrammars
);
in
{ {
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";
@@ -62,7 +104,7 @@ in
oxlint oxlint
oxfmt oxfmt
emmet-language-server emmet-language-server
svelte-language-server svelteLanguageServer
]; ];
specs = { specs = {
@@ -74,7 +116,7 @@ in
data = with pkgs.vimPlugins; [ data = with pkgs.vimPlugins; [
plenary-nvim plenary-nvim
kanagawa-nvim kanagawa-nvim
nvim-treesitter.withAllGrammars nvimTreesitterWithAllGrammars
nvim-treesitter-textobjects nvim-treesitter-textobjects
rainbow-delimiters-nvim rainbow-delimiters-nvim
]; ];
modules/capabilities/neovim/lua-config/queries/svelte/highlights.scm
+3
View File
@@ -0,0 +1,3 @@
; extends
("attach") @keyword
modules/capabilities/nix.nix
-1
View File
@@ -17,7 +17,6 @@ in
settings = { settings = {
trusted-users = [ "@wheel" ]; trusted-users = [ "@wheel" ];
use-xdg-base-directories = true; use-xdg-base-directories = true;
auto-optimise-store = true;
experimental-features = [ experimental-features = [
"nix-command" "nix-command"
modules/capabilities/printing.nix
+10 -3
View File
@@ -2,13 +2,20 @@
flake.modules.nixos.printing = flake.modules.nixos.printing =
{ pkgs, ... }: { pkgs, ... }:
{ {
services.printing = { programs.system-config-printer.enable = true;
services = {
printing = {
enable = true; enable = true;
browsed.enable = true;
drivers = with pkgs; [ drivers = with pkgs; [
cups-filters
cups-browsed
cnijfilter2 cnijfilter2
]; ];
}; };
avahi = {
enable = true;
nssmdns4 = true;
};
};
}; };
} }
modules/profiles/host-base.nix
+1 -1
View File
@@ -15,6 +15,7 @@ in
nixosModules.nix nixosModules.nix
nixosModules.locale-nl nixosModules.locale-nl
nixosModules.sops-password nixosModules.sops-password
nixosModules.helix
]; ];
home-manager = { home-manager = {
@@ -26,7 +27,6 @@ in
hmModules.syncthing hmModules.syncthing
hmModules.shell hmModules.shell
hmModules.helix hmModules.helix
hmModules.neovim
]; ];
}; };
modules/profiles/workstation-base.nix
+1 -1
View File
@@ -51,7 +51,6 @@ in
homeModules.primary-launcher-walker homeModules.primary-launcher-walker
homeModules.default-image-viewer-imv homeModules.default-image-viewer-imv
homeModules.default-document-viewer-sioyek homeModules.default-document-viewer-sioyek
homeModules.default-editor-neovim
homeModules.email homeModules.email
homeModules.mpv homeModules.mpv
homeModules.nix homeModules.nix
@@ -62,6 +61,7 @@ in
homeModules.primary-terminal-kitty homeModules.primary-terminal-kitty
homeModules.terminal-foot homeModules.terminal-foot
homeModules.noctalia homeModules.noctalia
homeModules.keyring
{ {
programs.discord = { programs.discord = {
enable = true; enable = true;