From b7d9e0ba7ebe29f8bcd46848147bce392b9d3a45 Mon Sep 17 00:00:00 2001 From: Deepak Mallubhotla Date: Sat, 23 Sep 2023 16:05:57 +0000 Subject: [PATCH] feat: adds lsp nix stuff and gpg stuff for config --- home/deepak/home.nix | 9 ++++++++- hosts/hosts.nix | 2 ++ hosts/maxos/configuration.nix | 2 +- hosts/nixosWSL/configuration.nix | 11 ++++++++++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/home/deepak/home.nix b/home/deepak/home.nix index a731fc7..47739de 100644 --- a/home/deepak/home.nix +++ b/home/deepak/home.nix @@ -12,6 +12,9 @@ pkgs.eza pkgs.fd pkgs.ripgrep + + # lsps + pkgs.nil ] ++ pkgs.lib.optionals specialArgs.withGUI [ pkgs.discord pkgs.obsidian @@ -37,7 +40,7 @@ userName = "Deepak Mallubhotla"; userEmail = "dmallubhotla+github@gmail.com"; signing = { - key = "976F3357369149AB"; + key = specialArgs.gitSigningKey; signByDefault = true; }; extraConfig = { @@ -57,10 +60,14 @@ # plenary and stuff for telescope plenary-nvim telescope-nvim telescope-file-browser-nvim ctrlp-vim + # lsp stuff + nvim-lspconfig ]; extraConfig = '' inoremap jj inoremap kk + lua << EOF + require'lspconfig'.nil_ls.setup{} ''; }; diff --git a/hosts/hosts.nix b/hosts/hosts.nix index c45a96c..e056dc1 100644 --- a/hosts/hosts.nix +++ b/hosts/hosts.nix @@ -11,6 +11,7 @@ home-manager.extraSpecialArgs = { inherit mysd; withGUI = true; + gitSigningKey = "976F3357369149AB"; }; home-manager.useGlobalPkgs = true; home-manager.users.deepak = { @@ -28,6 +29,7 @@ home-manager.extraSpecialArgs = { inherit mysd; withGUI = false; + gitSigningKey = "8F904A3FC7021497"; }; home-manager.useGlobalPkgs = true; home-manager.users.deepak = { diff --git a/hosts/maxos/configuration.nix b/hosts/maxos/configuration.nix index 903dcc6..ad0bb1f 100644 --- a/hosts/maxos/configuration.nix +++ b/hosts/maxos/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ pkgs, ... }: let custom-fonts = import ../../fonts { inherit pkgs; }; diff --git a/hosts/nixosWSL/configuration.nix b/hosts/nixosWSL/configuration.nix index 3945de8..f891f25 100644 --- a/hosts/nixosWSL/configuration.nix +++ b/hosts/nixosWSL/configuration.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, modulesPath, ... }: +{ pkgs, modulesPath, ... }: { imports = [ @@ -49,8 +49,17 @@ wget vim git + pinentry + pinentry-curses + gnupg ]; + programs.gnupg.agent = { + enable = true; + pinentryFlavor = "curses"; + enableSSHSupport = true; + }; + environment.variables = { DPK_NIX_CONF_DIR = "/mnt/d/Projects/nixconf"; };