who the fuck knows how i fucked up nvim that bad

This commit is contained in:
Anish Lakhwara 2022-12-07 16:52:34 +10:00
parent 38ded2454c
commit fc1586165a
2 changed files with 56 additions and 53 deletions

View file

@ -1,52 +1,52 @@
{ self, config, lib, pkgs, ... }:
let inherit (lib) fileContents;
in
{ {
imports = [ ../../users/anish ]; description = "Your new nix config";
inputs = {
# Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
fonts = { # Home manager
fonts = with pkgs; [ powerline-fonts dejavu_fonts ]; home-manager.url = "github:nix-community/home-manager";
fontconfig.defaultFonts = { home-manager.inputs.nixpkgs.follows = "nixpkgs";
monospace = [ "DejaVu Sans Mono for Powerline" ]; hardware.url = "github:nixos/nixos-hardware";
sansSerif = [ "DejaVu Sans" ];
# Tools
agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs";
deploy-rs.url = "github:serokell/deploy-rs";
deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
# Packages
poonam.url = "git+ssh://gitea@git.sealight.xyz/aynish/kitaab?ref=main";
basant.url = "git+ssh://gitea@git.sealight.xyz/aynish/basant?ref=main";
basant.inputs.nixpkgs.follows = "nixpkgs";
basant.inputs.poonam.follows = "poonam";
grasp.url = "git+ssh://gitea@git.sealight.xyz/aynish/grasp.git?ref=main";
grasp.inputs.nixpkgs.follows = "nixpkgs";
# Others
nur.url = "github:nix-community/NUR";
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
}; };
eww = {
url = "github:elkowar/eww";
inputs.nixpkgs.follows = "nixpkgs";
inputs.rust-overlay.follows = "rust-overlay";
};
tidalcycles.url = "github:mitchmindtree/tidalcycles.nix";
tidalcycles.inputs.nixpkgs.follows = "unstable";
# TODO hundred rabbits software
# TODO needs secrets
# dhyan.url = "git+ssh://gitea@git.sealight.xyz/aynish/dhyan?ref=main";
# dhyan.inputs.nixpkgs.follows = "nixpkgs";
# TODO needs secrets
# muneem.url = "git+ssh://gitea@git.sealight.xyz/aynish/muneem?ref=main";
# muneem.inputs.nixpkgs.follows = "nixpkgs";
}; };
nix = { outputs =
settings = {
sandbox = true;
trusted-users = [ "root" "@wheel" ];
allowed-users = [ "@wheel" ];
auto-optimise-store = true;
system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
};
gc.automatic = true;
optimise.automatic = true;
extraOptions = ''
min-free = 536870912
keep-outputs = true
keep-derivations = true
fallback = true
'';
};
environment.systemPackages = with pkgs; [
pinentry_gnome
cached-nix-shell
];
# For rage encryption, all hosts need a ssh key pair
services.openssh = {
enable = true;
openFirewall = lib.mkDefault false;
};
# programs.gnupg.agent.enable = true;
# programs.gnupg.agent.pinentryFlavor = "curses";
services.earlyoom.enable = true;
}
{ self { self
, nixpkgs , nixpkgs
, unstable , unstable

View file

@ -144,6 +144,8 @@ let
pynvim pynvim
six six
pylsp-mypy pylsp-mypy
#pyls-isort
#pyls-black
black black
isort isort
# other python packages you want # other python packages you want
@ -537,17 +539,18 @@ in
require("luasnip.loaders.from_vscode").lazy_load() require("luasnip.loaders.from_vscode").lazy_load()
-- null-ls -- null-ls
local null_ls = require("null-ls") -- being very janky
null_ls.setup({ -- local null_ls = require("null-ls")
sources = { -- null_ls.setup({
null_ls.builtins.code_actions.statix, -- sources = {
null_ls.builtins.diagnostics.shellcheck, -- null_ls.builtins.code_actions.statix,
-- null_ls.builtins.diagnostics.clj_kondo, -- null_ls.builtins.diagnostics.shellcheck,
null_ls.builtins.formatting.isort, -- -- null_ls.builtins.diagnostics.clj_kondo,
null_ls.builtins.formatting.black, -- null_ls.builtins.formatting.isort,
null_ls.builtins.code_actions.proselint, -- null_ls.builtins.formatting.black,
}, -- null_ls.builtins.code_actions.proselint,
}) -- },
-- })
-- Setup lspconfig -- Setup lspconfig
require("lsp-format").setup {} require("lsp-format").setup {}