Compare commits
7 commits
d816faa25b
...
f30afe506b
Author | SHA1 | Date | |
---|---|---|---|
f30afe506b | |||
4f7479490e | |||
9765b6142a | |||
63b1e0e8cc | |||
4ae1433fce | |||
9f59290f50 | |||
63f6aa75be |
6 changed files with 69 additions and 43 deletions
9
.envrc
9
.envrc
|
@ -1 +1,10 @@
|
|||
# update repo
|
||||
if has jj; then
|
||||
jj git fetch
|
||||
elif has gix; then
|
||||
gix fetch
|
||||
elif has git; then
|
||||
git fetch
|
||||
fi
|
||||
|
||||
use flake
|
||||
|
|
|
@ -1,24 +1,22 @@
|
|||
{ inputs, ... }:
|
||||
let
|
||||
standalone = ../nvim/standalone.nix;
|
||||
in
|
||||
{
|
||||
flake.overlays.nixvim = inputs.nixvim.overlays.default;
|
||||
|
||||
perSystem =
|
||||
{ pkgs, system, ... }:
|
||||
{
|
||||
# Check standalone nvim build
|
||||
checks.nvim = inputs.nixvim.lib.${system}.check.mkTestDerivationFromNixvimModule {
|
||||
let
|
||||
nixvimLib = inputs.nixvim.lib.${system};
|
||||
nixvim = inputs.nixvim.legacyPackages.${system};
|
||||
module = {
|
||||
inherit pkgs;
|
||||
module = ../nvim/standalone.nix;
|
||||
};
|
||||
in
|
||||
{
|
||||
# Check standalone nvim build
|
||||
checks.nvim = nixvimLib.check.mkTestDerivationFromNixvimModule module;
|
||||
|
||||
# Nvim standalone module
|
||||
packages.nvim = inputs.nixvim.legacyPackages.${system}.makeNixvimWithModule {
|
||||
inherit pkgs;
|
||||
module = standalone;
|
||||
};
|
||||
|
||||
packages.nvim = nixvim.makeNixvimWithModule module;
|
||||
};
|
||||
}
|
||||
|
|
18
flake.lock
generated
18
flake.lock
generated
|
@ -260,11 +260,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1728067476,
|
||||
"narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=",
|
||||
"lastModified": 1728500571,
|
||||
"narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030",
|
||||
"rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -292,11 +292,11 @@
|
|||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728145679,
|
||||
"narHash": "sha256-qd1nr2b+WUiyzJva650LBX/3hDBru0ZSVxKHSm1BE0w=",
|
||||
"lastModified": 1728603032,
|
||||
"narHash": "sha256-RAKCcBXqF/xOaf7fR11dnIZwZ8SDyNcK3MyVgD0l1xQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "6594472fd275f6dcf5a9fba4a83d2f7fa2cf2b8a",
|
||||
"rev": "5cd8c9cf3104027b42ffe531fb68463ecb08ebc9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -388,11 +388,11 @@
|
|||
},
|
||||
"unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1728018373,
|
||||
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
|
||||
"lastModified": 1728492678,
|
||||
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
|
||||
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (helpers) mkRaw;
|
||||
inherit (helpers) mkRaw enableExceptInTests;
|
||||
in
|
||||
{
|
||||
config.plugins = {
|
||||
|
@ -160,15 +160,19 @@ in
|
|||
};
|
||||
};
|
||||
gitsigns.enable = true;
|
||||
image.enable = enableExceptInTests;
|
||||
jupytext = {
|
||||
enable = true;
|
||||
settings.custom_language_formatting.python = {
|
||||
extension = "md";
|
||||
style = "markdown";
|
||||
force_ft = "markdown";
|
||||
};
|
||||
};
|
||||
lint = {
|
||||
enable = true;
|
||||
lintersByFt = {
|
||||
rust = [ "typos" ];
|
||||
latex = [
|
||||
"chktex"
|
||||
"typos"
|
||||
];
|
||||
markdown = [ "typos" ];
|
||||
latex = [ "chktex" ];
|
||||
nix = [ "statix" ];
|
||||
sh = [ "dash" ];
|
||||
zsh = [ "zsh" ];
|
||||
|
@ -177,14 +181,16 @@ in
|
|||
lsp = {
|
||||
enable = true;
|
||||
servers = {
|
||||
bashls.enable = true;
|
||||
bashls.package = pkgs.unstable.bash-language-server;
|
||||
bashls = {
|
||||
enable = true;
|
||||
package = pkgs.unstable.bash-language-server;
|
||||
};
|
||||
# clangd.enable = true; # Adds ~2GiB
|
||||
html.enable = true;
|
||||
# html.enable = true; # Not writing html
|
||||
jsonls.enable = true;
|
||||
marksman.enable = true;
|
||||
nixd.enable = true;
|
||||
nil-ls = {
|
||||
nil_ls = {
|
||||
enable = true;
|
||||
settings.nix.flake = {
|
||||
autoArchive = true;
|
||||
|
@ -192,12 +198,11 @@ in
|
|||
};
|
||||
};
|
||||
pyright.enable = true;
|
||||
# ruff-lsp.enable = true;
|
||||
ruff.enable = true;
|
||||
taplo.enable = true;
|
||||
# texlab.enable = true; # Not writing TeX rn
|
||||
typos-lsp.enable = true;
|
||||
typst-lsp.enable = true;
|
||||
typos_lsp.enable = true;
|
||||
# typst_lsp.enable = true; # Not using it either
|
||||
};
|
||||
};
|
||||
lspkind = {
|
||||
|
@ -214,6 +219,15 @@ in
|
|||
enable = true;
|
||||
settings.update_events = "TextChanged,TextChangedI";
|
||||
};
|
||||
molten = {
|
||||
enable = true;
|
||||
settings = {
|
||||
image_provider = "image.nvim";
|
||||
virt_text_output = true;
|
||||
molten_auto_open_output = false;
|
||||
molten_virt_lines_off_by_1 = true;
|
||||
};
|
||||
};
|
||||
noice = {
|
||||
enable = true;
|
||||
lsp.override = {
|
||||
|
@ -245,6 +259,7 @@ in
|
|||
mode = "virtualtext";
|
||||
};
|
||||
};
|
||||
otter.enable = true;
|
||||
rustaceanvim = {
|
||||
enable = true;
|
||||
# Install through rustup
|
||||
|
@ -260,6 +275,7 @@ in
|
|||
treesitter = {
|
||||
enable = true;
|
||||
settings = {
|
||||
highlight.enable = true;
|
||||
indent.enable = true;
|
||||
incremental_election.enable = true;
|
||||
};
|
||||
|
|
|
@ -61,6 +61,7 @@
|
|||
pkgs.unstable.taplo
|
||||
pkgs.unstable.typos
|
||||
pkgs.unstable.yamlfmt
|
||||
(pkgs.unstable.python3.withPackages (p: [ p.jupytext ]))
|
||||
];
|
||||
extraConfigLuaPre =
|
||||
# lua
|
||||
|
|
|
@ -74,15 +74,17 @@ in
|
|||
};
|
||||
|
||||
environment.etc = keysFromGithub;
|
||||
services.openssh.authorizedKeysFiles = builtins.map (path: "/etc/${path}") (
|
||||
builtins.attrNames keysFromGithub
|
||||
);
|
||||
|
||||
# Enable printer autodiscovery if printing is enabled
|
||||
services.avahi = {
|
||||
inherit (config.services.printing) enable;
|
||||
nssmdns4 = true;
|
||||
openFirewall = true;
|
||||
services = {
|
||||
# Enable printer autodiscovery if printing is enabled
|
||||
avahi = {
|
||||
inherit (config.services.printing) enable;
|
||||
nssmdns4 = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
openssh.authorizedKeysFiles = builtins.map (path: "/etc/${path}") (
|
||||
builtins.attrNames keysFromGithub
|
||||
);
|
||||
jupyter.enable = cfg.dev.enable;
|
||||
};
|
||||
users.defaultUserShell = pkgs.zsh;
|
||||
# Open ports for spotifyd
|
||||
|
|
Loading…
Add table
Reference in a new issue