From 471b4079a86d68eb5fdf8cb80bf0d884179736eb Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Sat, 8 May 2021 07:44:58 +0300 Subject: [PATCH] feat: add nix-eval-lsp, fix lib compat --- flake.lock | 42 ++++++++++++++++++++++++++-------- flake.nix | 5 ++++ users/profiles/git/default.nix | 2 +- 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index ddbb357..a6d6bfb 100644 --- a/flake.lock +++ b/flake.lock @@ -118,11 +118,11 @@ ] }, "locked": { - "lastModified": 1620337456, - "narHash": "sha256-w4Z6NYNYI3v++Pmqs4j1pPGdWJEyjGQat5rYxkhncMI=", + "lastModified": 1620423550, + "narHash": "sha256-sCUnGE28hagq2nVvypGqxMRz7AiW7ewEQ8j7WTlpm7c=", "owner": "nix-community", "repo": "home-manager", - "rev": "86944b0fb15f89bc1173efabbce556260a410154", + "rev": "b2dec35b86e8488831734ff7936589d710b47420", "type": "github" }, "original": { @@ -151,6 +151,29 @@ "type": "github" } }, + "nixEvalLsp": { + "inputs": { + "flake-utils": [ + "utils" + ], + "nixpkgs": [ + "nixos" + ] + }, + "locked": { + "lastModified": 1620425733, + "narHash": "sha256-j9kxjjvpIyetyDDgamMolKpEShyPU7dsioBUbTXQeRU=", + "owner": "aaronjanse", + "repo": "nix-eval-lsp", + "rev": "9251960d255044d59204e73b3051b06d3f746f67", + "type": "github" + }, + "original": { + "owner": "aaronjanse", + "repo": "nix-eval-lsp", + "type": "github" + } + }, "nixos": { "locked": { "lastModified": 1620340338, @@ -198,11 +221,11 @@ }, "nur": { "locked": { - "lastModified": 1620381151, - "narHash": "sha256-hAF1h1EdK8CvWxRISoJe8B1OnqSjAmNbbkwy72YVaoc=", + "lastModified": 1620447594, + "narHash": "sha256-2p/gl5ivKUzqxzq2LYCG50oU32fdjX/F4evTB0kkWuM=", "owner": "nix-community", "repo": "NUR", - "rev": "a9f9fc6250811b5f66e2edea4155c0a1b51461d5", + "rev": "0f4c0edeab78c9c164218c9394a62a76f4a48474", "type": "github" }, "original": { @@ -212,11 +235,11 @@ }, "override": { "locked": { - "lastModified": 1620381554, - "narHash": "sha256-ju8UcSZyY2/jLg4f0eSwb2NefCLBWeFQCem2tmaiKKc=", + "lastModified": 1620447662, + "narHash": "sha256-PP6AsJuRUKPfCoIkG5hvaSnZtkJuQSggMayLkRHSHD4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb4372d68fc3df484d4858ad8b0b59e09415c3b9", + "rev": "f06e5060a58b33edc703ee6ddb9073860549e21b", "type": "github" }, "original": { @@ -265,6 +288,7 @@ "flake-compat": "flake-compat", "home": "home", "naersk": "naersk", + "nixEvalLsp": "nixEvalLsp", "nixos": "nixos", "nixos-hardware": "nixos-hardware", "nixosPersistence": "nixosPersistence", diff --git a/flake.nix b/flake.nix index 19a7b71..a64ab42 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,11 @@ pkgs.url = "path:./pkgs"; pkgs.inputs.nixpkgs.follows = "nixos"; nixosPersistence.url = "github:nix-community/impermanence"; + nixEvalLsp = { + url = "github:aaronjanse/nix-eval-lsp"; + inputs.nixpkgs.follows = "nixos"; + inputs.flake-utils.follows = "utils"; + }; }; outputs = inputs@{ self, pkgs, digga, nixos, ci-agent, home, nixos-hardware, nur, ... }: diff --git a/users/profiles/git/default.nix b/users/profiles/git/default.nix index 5b70e61..09c2243 100644 --- a/users/profiles/git/default.nix +++ b/users/profiles/git/default.nix @@ -33,7 +33,7 @@ rh1rd = "hard HEAD~1"; # logging - lg = + l = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"; plog = "log --graph --pretty='format:%C(red)%d%C(reset) %C(yellow)%h%C(reset) %ar %C(green)%aN%C(reset) %s'";