mirror of
https://github.com/kennethnym/freya
synced 2026-07-02 14:21:14 +01:00
Compare commits
1 Commits
dev/nvim
...
feat/upgra
| Author | SHA1 | Date | |
|---|---|---|---|
|
f94ac4931e
|
19
.nvim.lua
19
.nvim.lua
@@ -1,19 +0,0 @@
|
|||||||
local ok, conform = pcall(require, "conform")
|
|
||||||
if not ok then
|
|
||||||
vim.notify("conform.nvim not loaded", vim.log.levels.WARN)
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
conform.setup({
|
|
||||||
formatters_by_ft = {
|
|
||||||
javascript = { "oxfmt" },
|
|
||||||
javascriptreact = { "oxfmt" },
|
|
||||||
typescript = { "oxfmt" },
|
|
||||||
typescriptreact = { "oxfmt" },
|
|
||||||
json = { "oxfmt" },
|
|
||||||
jsonc = { "oxfmt" },
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
vim.lsp.enable("tsgo")
|
|
||||||
vim.lsp.enable("oxlint")
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
// Folder-specific settings
|
|
||||||
//
|
|
||||||
// For a full list of overridable settings, and general information on folder-specific settings,
|
|
||||||
// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
|
|
||||||
{
|
|
||||||
"languages": {
|
|
||||||
"TypeScript": {
|
|
||||||
"formatter": { "language_server": { "name": "oxfmt" } }
|
|
||||||
},
|
|
||||||
"TSX": {
|
|
||||||
"formatter": { "language_server": { "name": "oxfmt" } }
|
|
||||||
},
|
|
||||||
"JavaScript": {
|
|
||||||
"formatter": { "language_server": { "name": "oxfmt" } }
|
|
||||||
},
|
|
||||||
"JSX": {
|
|
||||||
"formatter": { "language_server": { "name": "oxfmt" } }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
18
flake.nix
18
flake.nix
@@ -53,10 +53,9 @@
|
|||||||
# so source-only edits do not force Bun to reinstall.
|
# so source-only edits do not force Bun to reinstall.
|
||||||
dependencySource = lib.fileset.toSource {
|
dependencySource = lib.fileset.toSource {
|
||||||
root = ./.;
|
root = ./.;
|
||||||
fileset = lib.fileset.fileFilter
|
fileset = lib.fileset.fileFilter (
|
||||||
(
|
file: file.name == "bun.lock" || file.name == "package.json" || file.name == "bunfig.toml"
|
||||||
file: file.name == "bun.lock" || file.name == "package.json" || file.name == "bunfig.toml"
|
) ./.;
|
||||||
) ./.;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Checks run against a clean source tree, even when using `path:.`.
|
# Checks run against a clean source tree, even when using `path:.`.
|
||||||
@@ -93,12 +92,10 @@
|
|||||||
lib.mapAttrs mkBunScript scripts;
|
lib.mapAttrs mkBunScript scripts;
|
||||||
mkBunApps =
|
mkBunApps =
|
||||||
commands:
|
commands:
|
||||||
lib.mapAttrs
|
lib.mapAttrs (name: command: {
|
||||||
(name: command: {
|
type = "app";
|
||||||
type = "app";
|
program = "${command}/bin/${name}";
|
||||||
program = "${command}/bin/${name}";
|
}) commands;
|
||||||
})
|
|
||||||
commands;
|
|
||||||
mkBunNodeModules =
|
mkBunNodeModules =
|
||||||
system: pkgs:
|
system: pkgs:
|
||||||
pkgs.stdenvNoCC.mkDerivation {
|
pkgs.stdenvNoCC.mkDerivation {
|
||||||
@@ -258,7 +255,6 @@
|
|||||||
pkg-config
|
pkg-config
|
||||||
postgresql
|
postgresql
|
||||||
python3
|
python3
|
||||||
typescript-go
|
|
||||||
watchman
|
watchman
|
||||||
];
|
];
|
||||||
linuxPackages = with pkgs; [
|
linuxPackages = with pkgs; [
|
||||||
|
|||||||
Reference in New Issue
Block a user