Compare commits
8 Commits
6cd9476375
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
03ef37c25b
|
|||
|
42ab91df33
|
|||
|
95f49c0d05
|
|||
|
afff0c28b2
|
|||
|
f5ffc18de3
|
|||
|
bdaf004472
|
|||
|
e6ebf14016
|
|||
|
90c7861da6
|
@@ -28,10 +28,12 @@ Color Scheme: [Tokyo Night](https://github.com/folke/tokyonight.nvim)<br>
|
||||
[mkdnflow](https://github.com/jakewvincent/mkdnflow.nvim)<br>
|
||||
[hml](https://github.com/mawkler/hml.nvim)<br>
|
||||
[typst-preview](https://github.com/al-kot/typst-preview.nvim)<br>
|
||||
[Oil](https://github.com/stevearc/oil.nvim)<br>
|
||||
|
||||
### LSP
|
||||
[lspconfig](https://github.com/neovim/nvim-lspconfig/)<br>
|
||||
[typos-lsp](https://github.com/tekumara/typos-lsp)<br>
|
||||
[markdown_oxide](https://github.com/Feel-ix-343/markdown-oxide)<br>
|
||||
[ltex](https://valentjn.github.io/ltex/)<br>
|
||||
|
||||
[nixd](https://github.com/nix-community/nixd)<br>
|
||||
[pyright](https://github.com/microsoft/pyright)<br>
|
||||
|
||||
41
config.nix
41
config.nix
@@ -1,4 +1,4 @@
|
||||
{ pkgs, pkgs-unstable, inputs, ... }:
|
||||
{ pkgs, lib, inputs, light ? false, ... }:
|
||||
{
|
||||
colorschemes.tokyonight.enable = true;
|
||||
|
||||
@@ -109,12 +109,14 @@
|
||||
|
||||
neo-tree = {
|
||||
enable = true;
|
||||
closeIfLastWindow = true;
|
||||
settings = {
|
||||
close_if_last_window = true;
|
||||
filesystem = {
|
||||
filteredItems = {
|
||||
filtered_items = {
|
||||
visible = true;
|
||||
hideDotfiles = false;
|
||||
hideGitignored = false;
|
||||
hide_dotfiles = false;
|
||||
hide_gItignored = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -149,11 +151,18 @@
|
||||
comment.enable = true;
|
||||
sleuth.enable = true;
|
||||
|
||||
rustaceanvim = {
|
||||
oil = {
|
||||
enable = true;
|
||||
settings = {
|
||||
default_file_explorer = false;
|
||||
};
|
||||
};
|
||||
|
||||
rustaceanvim = {
|
||||
enable = !light;
|
||||
settings = {
|
||||
server = {
|
||||
cmd = [ "${pkgs-unstable.rust-analyzer}/bin/rust-analyzer" ];
|
||||
cmd = [ "${pkgs.rust-analyzer}/bin/rust-analyzer" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -162,6 +171,7 @@
|
||||
mkdnflow = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
mappings = {
|
||||
MkdnEnter = {
|
||||
key = "<CR>";
|
||||
@@ -169,9 +179,10 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
lsp = {
|
||||
enable = true;
|
||||
enable = !light;
|
||||
|
||||
keymaps.diagnostic = {
|
||||
"<leader>j" = "goto_next";
|
||||
@@ -189,6 +200,10 @@
|
||||
enable = true;
|
||||
installGhc = false;
|
||||
};
|
||||
|
||||
pyright.enable = true;
|
||||
|
||||
nixd.enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -199,12 +214,12 @@
|
||||
src = inputs.hml;
|
||||
})
|
||||
|
||||
(pkgs.vimUtils.buildVimPlugin {
|
||||
(lib.mkIf (!light) (pkgs.vimUtils.buildVimPlugin {
|
||||
name = "typst-preview";
|
||||
src = inputs.typst-preview;
|
||||
})
|
||||
}))
|
||||
|
||||
pkgs.vimPlugins.haskell-tools-nvim
|
||||
(lib.mkIf (!light) pkgs.vimPlugins.haskell-tools-nvim)
|
||||
];
|
||||
|
||||
extraConfigLua = ''
|
||||
@@ -251,6 +266,10 @@
|
||||
action = "<Cmd>Neotree toggle right<CR>";
|
||||
key = "<leader>f";
|
||||
}
|
||||
{
|
||||
action = "<Cmd>Oil<CR>";
|
||||
key = "<leader>g";
|
||||
}
|
||||
{
|
||||
action = "<Cmd>Neogit<CR>";
|
||||
key = "<C-g>";
|
||||
|
||||
113
flake.lock
generated
113
flake.lock
generated
@@ -8,11 +8,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754487366,
|
||||
"narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
|
||||
"lastModified": 1769996383,
|
||||
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
|
||||
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -39,24 +39,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hml": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@@ -73,46 +55,18 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ixx": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754860581,
|
||||
"narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "ixx",
|
||||
"rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"ref": "v0.1.1",
|
||||
"repo": "ixx",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1755704039,
|
||||
"narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=",
|
||||
"lastModified": 1773821835,
|
||||
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545",
|
||||
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.05",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -123,15 +77,14 @@
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nuschtosSearch": "nuschtosSearch",
|
||||
"systems": "systems_3"
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755900473,
|
||||
"narHash": "sha256-UxpKQvD3dTT4/ueJBDccmHeHfnuUD+864Mzu8GPJZig=",
|
||||
"lastModified": 1772402258,
|
||||
"narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "18a1b5126f917fbcd65397b9ee429387fdbd51a6",
|
||||
"rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -140,29 +93,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nuschtosSearch": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"ixx": "ixx",
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755555503,
|
||||
"narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
@@ -202,29 +132,14 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"typst-preview": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1755810917,
|
||||
"narHash": "sha256-hE5HPsuskOSqJ1KYp9/eCL5K90fRhMBe6t+skr+wyrI=",
|
||||
"lastModified": 1765797220,
|
||||
"narHash": "sha256-/zrxxTsw1R2phmTgW8fD8UWaMEMxNsYA3TYbmWQRGDw=",
|
||||
"owner": "al-kot",
|
||||
"repo": "typst-preview.nvim",
|
||||
"rev": "8759307163ef59698ff443e3784ad6a7af4ea484",
|
||||
"rev": "59028097432682e8f619ed61b24333c6e5f79a97",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
22
flake.nix
22
flake.nix
@@ -1,7 +1,6 @@
|
||||
{
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
|
||||
@@ -21,17 +20,13 @@
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, nixvim, ... }@inputs:
|
||||
outputs = { self, nixpkgs, flake-utils, nixvim, ... }@inputs:
|
||||
flake-utils.lib.eachDefaultSystem (system:
|
||||
let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
};
|
||||
|
||||
pkgs-unstable = import nixpkgs-unstable {
|
||||
inherit system;
|
||||
};
|
||||
|
||||
nixvimLib = nixvim.lib.${system};
|
||||
|
||||
nixvimModule = import ./config.nix;
|
||||
@@ -39,7 +34,16 @@
|
||||
nvim = nixvim.legacyPackages.${system}.makeNixvimWithModule {
|
||||
module = nixvimModule;
|
||||
extraSpecialArgs = {
|
||||
inherit inputs pkgs-unstable;
|
||||
inherit inputs;
|
||||
light = false;
|
||||
};
|
||||
};
|
||||
|
||||
nvim-light = nixvim.legacyPackages.${system}.makeNixvimWithModule {
|
||||
module = nixvimModule;
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
light = true;
|
||||
};
|
||||
};
|
||||
in
|
||||
@@ -50,6 +54,8 @@
|
||||
|
||||
packages.default = nvim;
|
||||
|
||||
packages.light = nvim-light;
|
||||
|
||||
packages.neovide = pkgs.stdenv.mkDerivation {
|
||||
name = "neovide";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user