From c58cba2068a938bb64b84fdcb27db006e8fc6d86 Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Tue, 10 Oct 2023 22:04:19 +0200 Subject: [PATCH] refactor: simplify flake template --- templates/default/.nvim.lua | 25 +++++++++++++++++++++---- templates/default/default.nix | 10 ---------- templates/default/flake.nix | 4 ---- templates/default/shell.nix | 10 ---------- 4 files changed, 21 insertions(+), 28 deletions(-) delete mode 100644 templates/default/default.nix delete mode 100644 templates/default/shell.nix diff --git a/templates/default/.nvim.lua b/templates/default/.nvim.lua index 5e015631..03a9802e 100644 --- a/templates/default/.nvim.lua +++ b/templates/default/.nvim.lua @@ -1,5 +1,22 @@ -local lsp = require("konrad.lsp") -lsp.add("nil_ls") +require("konrad.lsp").setup({ + -- "ansiblels", + -- efm = { + -- 'black' + -- 'stylua' + -- }, + -- "gopls", + -- "jsonls", + -- "lua_ls", + "nil_ls", + -- "omnisharp", + -- "pyright", + -- "rust_analyzer", + -- "terraformls", + -- "yamlls", +}) -local null = require("null-ls") -lsp.add("null-ls", null.builtins.formatting.nixpkgs_fmt) +-- require("konrad.dap").setup({ +-- "cs", +-- "go", +-- "python", +-- }) diff --git a/templates/default/default.nix b/templates/default/default.nix deleted file mode 100644 index 2cccff28..00000000 --- a/templates/default/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -(import - ( - let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in - fetchTarball { - url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; - sha256 = lock.nodes.flake-compat.locked.narHash; - } - ) - { src = ./.; } -).defaultNix diff --git a/templates/default/flake.nix b/templates/default/flake.nix index f6ddbe36..9df55b3c 100644 --- a/templates/default/flake.nix +++ b/templates/default/flake.nix @@ -4,10 +4,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - flake-compat = { - url = "github:edolstra/flake-compat"; - flake = false; - }; }; outputs = { self, nixpkgs, nixpkgs-unstable, ... }: diff --git a/templates/default/shell.nix b/templates/default/shell.nix deleted file mode 100644 index 6234bb4d..00000000 --- a/templates/default/shell.nix +++ /dev/null @@ -1,10 +0,0 @@ -(import - ( - let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in - fetchTarball { - url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; - sha256 = lock.nodes.flake-compat.locked.narHash; - } - ) - { src = ./.; } -).shellNix