From fc1586165a9ab749e8cbe71272343e88c5a7df43 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Wed, 7 Dec 2022 16:52:34 +1000 Subject: [PATCH] who the fuck knows how i fucked up nvim that bad --- flake.nix | 84 +++++++++++++++++----------------- home/profiles/nvim/default.nix | 25 +++++----- 2 files changed, 56 insertions(+), 53 deletions(-) diff --git a/flake.nix b/flake.nix index 9d744754..9c032bac 100644 --- a/flake.nix +++ b/flake.nix @@ -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 = { - fonts = with pkgs; [ powerline-fonts dejavu_fonts ]; - fontconfig.defaultFonts = { - monospace = [ "DejaVu Sans Mono for Powerline" ]; - sansSerif = [ "DejaVu Sans" ]; + # Home manager + home-manager.url = "github:nix-community/home-manager"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; + hardware.url = "github:nixos/nixos-hardware"; + + # 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"; }; - }; - - nix = { - settings = { - sandbox = true; - trusted-users = [ "root" "@wheel" ]; - allowed-users = [ "@wheel" ]; - auto-optimise-store = true; - system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; + eww = { + url = "github:elkowar/eww"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.rust-overlay.follows = "rust-overlay"; }; - gc.automatic = true; - optimise.automatic = true; - extraOptions = '' - min-free = 536870912 - keep-outputs = true - keep-derivations = true - fallback = true - ''; + 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"; }; - 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; -} + outputs = { self , nixpkgs , unstable diff --git a/home/profiles/nvim/default.nix b/home/profiles/nvim/default.nix index d0d6b8de..e43482e6 100644 --- a/home/profiles/nvim/default.nix +++ b/home/profiles/nvim/default.nix @@ -144,6 +144,8 @@ let pynvim six pylsp-mypy + #pyls-isort + #pyls-black black isort # other python packages you want @@ -537,17 +539,18 @@ in require("luasnip.loaders.from_vscode").lazy_load() -- null-ls - local null_ls = require("null-ls") - null_ls.setup({ - sources = { - null_ls.builtins.code_actions.statix, - null_ls.builtins.diagnostics.shellcheck, - -- null_ls.builtins.diagnostics.clj_kondo, - null_ls.builtins.formatting.isort, - null_ls.builtins.formatting.black, - null_ls.builtins.code_actions.proselint, - }, - }) + -- being very janky + -- local null_ls = require("null-ls") + -- null_ls.setup({ + -- sources = { + -- null_ls.builtins.code_actions.statix, + -- null_ls.builtins.diagnostics.shellcheck, + -- -- null_ls.builtins.diagnostics.clj_kondo, + -- null_ls.builtins.formatting.isort, + -- null_ls.builtins.formatting.black, + -- null_ls.builtins.code_actions.proselint, + -- }, + -- }) -- Setup lspconfig require("lsp-format").setup {}