frero/nixos
1
1
Fork 0
mirror of https://github.com/fredrikr79/nixos.git synced 2026-01-11 09:23:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

typstfmt deprecated

Browse Source
This commit is contained in:
Fredrik Robertsen
2025-02-06 13:14:58 +01:00
parent ee47fa7989
commit 9c701c67b6
2 changed files with 60 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
flake.lock generated
View File

@@ -8,11 +8,11 @@
]
},
"locked": {
"lastModified": 1728330715,
"narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
"lastModified": 1735644329,
"narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
"owner": "numtide",
"repo": "devshell",
"rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
"rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
"type": "github"
},
"original": {
@@ -23,12 +23,12 @@
},
"flake-compat": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"revCount": 57,
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"revCount": 69,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
},
"original": {
"type": "tarball",
@@ -43,11 +43,11 @@
]
},
"locked": {
"lastModified": 1727826117,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"lastModified": 1736143030,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
"type": "github"
},
"original": {
@@ -84,15 +84,14 @@
"nixpkgs": [
"nixvim",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable"
]
},
"locked": {
"lastModified": 1728092656,
"narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=",
"lastModified": 1737465171,
"narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
"rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
"type": "github"
},
"original": {
@@ -130,11 +129,11 @@
]
},
"locked": {
"lastModified": 1736421950,
"narHash": "sha256-RyrX0WFXxFrYvzHNLTIyuk3NcNl3UBykuYru/P0zW5E=",
"lastModified": 1738275749,
"narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d4aebb947a301b8da8654a804979a738c5c5da50",
"rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9",
"type": "github"
},
"original": {
@@ -151,11 +150,11 @@
]
},
"locked": {
"lastModified": 1736421950,
"narHash": "sha256-RyrX0WFXxFrYvzHNLTIyuk3NcNl3UBykuYru/P0zW5E=",
"lastModified": 1738275749,
"narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d4aebb947a301b8da8654a804979a738c5c5da50",
"rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9",
"type": "github"
},
"original": {
@@ -200,11 +199,11 @@
]
},
"locked": {
"lastModified": 1727999297,
"narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=",
"lastModified": 1738277753,
"narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b",
"rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9",
"type": "github"
},
"original": {
@@ -215,11 +214,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1736496189,
"narHash": "sha256-gjw43Gld9sEEALfCRo8pFXPpNWR8Th6pgd7faZNO6LQ=",
"lastModified": 1738342376,
"narHash": "sha256-ipYO/UVD5ghNYmtR7oFpPMKep+6Tnc9oJjhbDKIZpS8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "04a9216b7da6f69b5e9b039d40334e2a91469479",
"rev": "da266ea1ed2379206577303730b51457be1382d3",
"type": "github"
},
"original": {
@@ -228,22 +227,6 @@
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1735563628,
"narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": {
"inputs": {
"devshell": "devshell",
@@ -259,11 +242,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1736430661,
"narHash": "sha256-0dabFSGqcPo47WfgPRM5usnVXaGMdYvPlDJ5PeIqjr4=",
"lastModified": 1738325616,
"narHash": "sha256-Khti8mGVd4WiYmLp3TVMgzuy2BtREcD1mh9ECarQK7k=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "67de84848e43ca6a5025e4f8eddc2f6684a51f2b",
"rev": "eb611349a70df9f87001752aa7c49e9672099415",
"type": "github"
},
"original": {
@@ -282,11 +265,11 @@
]
},
"locked": {
"lastModified": 1735854821,
"narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=",
"lastModified": 1737924095,
"narHash": "sha256-9RO/IlxiE7bpY7GYsdDMNB533PnDOBo9UvYyXXqlN4c=",
"owner": "NuschtOS",
"repo": "search",
"rev": "836908e3bddd837ae0f13e215dd48767aee355f0",
"rev": "5efc9c966bb9bdad07a3c28667eac38b758c6f18",
"type": "github"
},
"original": {
@@ -326,11 +309,11 @@
]
},
"locked": {
"lastModified": 1727984844,
"narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
"lastModified": 1738070913,
"narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
"rev": "bebf27d00f7d10ba75332a0541ac43676985dea3",
"type": "github"
},
"original": {
@@ -342,11 +325,11 @@
"vi-xournalpp": {
"flake": false,
"locked": {
"lastModified": 1705575782,
"narHash": "sha256-eob2sApbY8JJORarZaOjnbdZIejpCm67eQZBIWsFYGo=",
"lastModified": 1732626314,
"narHash": "sha256-SMwNaZ5joosyMre6ZiB5nSjDJWFvPZ77//VPvaSRpUY=",
"owner": "raw-bacon",
"repo": "vi-xournalpp",
"rev": "7ed1e646280b345de0ea8ea5c5976f586c6fb8a9",
"rev": "43126b1d2f2cce3f509c265d6ec7c09ccffc8e3b",
"type": "github"
},
"original": {

32
home.nix
View File

@@ -37,11 +37,12 @@ in
redshift
pandoc
typst
# typstfmt
typstyle
uiua386
uiua
byzanz
python3Packages.mdformat
typstfmt
prismlauncher # minecraft
ghc
monocraft
@@ -262,7 +263,7 @@ in
updatetime = 50;
textwidth = 0;
textwidth = 80;
formatoptions = "tcqjn1"; # auto-format
colorcolumn = "81";
wrap = false;
@@ -275,14 +276,15 @@ in
conform-nvim = {
enable = true;
# deprecated
# formatOnSave = {
# timeoutMs = 500;
# lspFallback = true;
# };
settings = {
format_on_save = {
timeoutMs = 500;
lspFallback = true;
};
};
formattersByFt = {
typst = ["typstfmt"];
typst = ["typstyle "]; #"typstfmt"];
python = ["black"];
markdown = ["prettier"];
};
@@ -292,8 +294,12 @@ in
command = "prettier";
filetypes = ["markdown"];
};
typstfmt = {
command = "typstfmt";
# typstfmt = {
# command = "typstfmt";
# filetypes = ["typst"];
# };
typstyle = {
command = "typstyle";
filetypes = ["typst"];
};
black = {
@@ -439,10 +445,13 @@ in
"$\{workspaceFolder}/"
];
# formatterMode = "typstfmt";
formatterMode = "typstyle";
};
};
clangd.enable = true;
vtsls.enable = true;
marksman.enable = true;
uiua.enable = true;
};
};
@@ -502,7 +511,7 @@ in
sleuth.enable = true;
hardtime.enable = true;
# hardtime.enable = true; # the dark souls of vim
diffview = {
enable = true;
@@ -572,6 +581,7 @@ in
suspend = "systemctl suspend";
logout = "sudo pkill -u fredrikr";
lock = "/home/fredrikr/.logout.sh";
n = "nvim";
};
defaultKeymap = "viins";