chore: fix some errors and update lock file

Nixvim: switch to Rustaceanvim
Pkgs: add lazygit
This commit is contained in:
Zhongheng Liu 2024-11-01 22:06:20 +02:00
commit 3c9a9d42cf
Signed by: steven
GPG key ID: DC8F48E7B4C40905
5 changed files with 69 additions and 38 deletions

89
flake.lock generated
View file

@ -259,11 +259,11 @@
]
},
"locked": {
"lastModified": 1729104314,
"narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
"lastModified": 1730302582,
"narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
"rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
"type": "github"
},
"original": {
@ -318,11 +318,11 @@
]
},
"locked": {
"lastModified": 1729414726,
"narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=",
"lastModified": 1730450782,
"narHash": "sha256-0AfApF8aexgB6o34qqLW2cCX4LaWJajBVdU6ddiWZBM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "fe56302339bb28e3471632379d733547caec8103",
"rev": "8ca921e5a806b5b6171add542defe7bdac79d189",
"type": "github"
},
"original": {
@ -339,11 +339,11 @@
]
},
"locked": {
"lastModified": 1729260213,
"narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=",
"lastModified": 1730016908,
"narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "09a0c0c02953318bf94425738c7061ffdc4cba75",
"rev": "e83414058edd339148dc142a8437edb9450574c8",
"type": "github"
},
"original": {
@ -373,6 +373,34 @@
"type": "github"
}
},
"ixx": {
"inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"nixvim",
"nuschtosSearch",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729544999,
"narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "65c207c92befec93e22086da9456d3906a4e999c",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.0.5",
"repo": "ixx",
"type": "github"
}
},
"lix": {
"flake": false,
"locked": {
@ -416,11 +444,11 @@
]
},
"locked": {
"lastModified": 1728901530,
"narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=",
"lastModified": 1730184279,
"narHash": "sha256-6OB+WWR6gnaWiqSS28aMJypKeK7Pjc2Wm6L0MtOrTuA=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6",
"rev": "b379bd4d872d159e5189053ce9a4adf86d56db4b",
"type": "github"
},
"original": {
@ -431,11 +459,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1729256560,
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"lastModified": 1730200266,
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
"type": "github"
},
"original": {
@ -476,11 +504,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1729438888,
"narHash": "sha256-TGTDOX2/5OIoSzlcRReVn4BbbfL6Ami/eassiPPGqNA=",
"lastModified": 1730368298,
"narHash": "sha256-5z4pDqRSSovXPPtN1BNEJOkGoCd/XSYuCWh8AsvoTio=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "47b563d4e1410bff6a9481b3dd8b01b1e5ed70d2",
"rev": "42ea1626cb002fa759a6b1e2841bfc80a4e59615",
"type": "github"
},
"original": {
@ -492,17 +520,18 @@
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_2",
"ixx": "ixx",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1728905062,
"narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=",
"lastModified": 1730337772,
"narHash": "sha256-uTxvqDohfG85+zldO5Tf1B+fuAF8ZhMouNwG5S6OAnA=",
"owner": "NuschtOS",
"repo": "search",
"rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84",
"rev": "4e0a7a95a3df3333771abc4df6a656e7baf67106",
"type": "github"
},
"original": {
@ -529,11 +558,11 @@
]
},
"locked": {
"lastModified": 1729397826,
"narHash": "sha256-PKiCeeV0D8qBRVzlGlx3DE+/0WU8U8maMjB2rRJMBBA=",
"lastModified": 1730434620,
"narHash": "sha256-TRMTZ9nAU31tGTPQpf4ylUYDW+JfpYFbBQrZYf1/xj4=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "1a8fa34b656d67c1d7d4c2b76cba03bf4d65dee4",
"rev": "defcdbfdf0890df65685e25e8920d68035cb7720",
"type": "github"
},
"original": {
@ -559,11 +588,11 @@
"tinted-tmux": "tinted-tmux"
},
"locked": {
"lastModified": 1729380793,
"narHash": "sha256-TV6NYBUqTHI9t5fqNu4Qyr4BZUD2yGxAn3E+d5/mqaI=",
"lastModified": 1729963473,
"narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=",
"owner": "danth",
"repo": "stylix",
"rev": "fb9399b7e2c855f42dae76a363bab28d4f24aa8d",
"rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b",
"type": "github"
},
"original": {
@ -674,11 +703,11 @@
]
},
"locked": {
"lastModified": 1729242555,
"narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=",
"lastModified": 1730321837,
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5",
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
"type": "github"
},
"original": {

View file

@ -13,15 +13,11 @@
enable = true;
extraOptions = {
home-manager = {
expr = "(builtins.getFlake \"/home/stvnliu/nix-conf/\").homeConfigurations.\"stvnliu@nixos-msi\".options";
expr = ''
(builtins.getFlake "/home/stvnliu/nix-conf/").homeConfigurations."stvnliu@nixos-msi".options'';
};
};
};
rust_analyzer = {
enable = true;
installRustc = true;
installCargo = true;
};
ts_ls.enable = true;
};
keymaps.lspBuf = {
@ -33,7 +29,11 @@
};
};
lsp-lines.enable = true;
rust-tools.enable = true;
rustaceanvim = {
enable = true;
# rust-tools.enable = true;
};
};
diagnostics.virtual_lines.only_current_line = true;
}

View file

@ -14,5 +14,6 @@
glow
tmux
ranger
lazygit
];
}

View file

@ -1,4 +1,5 @@
{pkgs}: {
gil = "${pkgs.lazygit}/bin/lazygit";
cd = "z";
cdi = "zi";
ls = "${pkgs.lsd}/bin/lsd";

View file

@ -6,7 +6,7 @@
vistafonts
vistafonts-chs
noto-fonts
noto-fonts-cjk
noto-fonts-cjk-sans
noto-fonts-emoji
liberation_ttf
mplus-outline-fonts.githubRelease