From 3f6585f532f3fe1f59e104e080107c924ee6ee1f Mon Sep 17 00:00:00 2001 From: janabhumi Date: Sun, 18 Sep 2022 18:29:40 +0300 Subject: [PATCH] home: add nil and vnetod --- flake.lock | 74 ++++++++++++++++++++++++++-------------- flake.nix | 15 +++++++- home/home.nix | 3 +- outputs/home.nix | 2 ++ system/configuration.nix | 6 ++-- 5 files changed, 68 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 46d17ee..80631d2 100644 --- a/flake.lock +++ b/flake.lock @@ -58,23 +58,22 @@ }, "myneovim": { "inputs": { - "nil": "nil", "nixpkgs": [ "nixpkgs" ], "utils": "utils_2" }, "locked": { - "lastModified": 1663509296, - "narHash": "sha256-ZZV+3Uuqv676YPE8opx220g7e9Mlr+7uejea8iMDh84=", + "lastModified": 1663511911, + "narHash": "sha256-Gk6VCSYkpOXmFhgCVIcJzNNaox3siQ4wlno7uCoep+s=", "ref": "refs/heads/main", - "rev": "3f758841b5fad14371f4d9e2f7e9b0ad177aa4e7", - "revCount": 22, + "rev": "05553b6fa077a3286b01169abd6d149deb7773b0", + "revCount": 24, "type": "git", "url": "https://git.pleshevski.ru/mynix/neovim" }, "original": { - "rev": "3f758841b5fad14371f4d9e2f7e9b0ad177aa4e7", + "rev": "05553b6fa077a3286b01169abd6d149deb7773b0", "type": "git", "url": "https://git.pleshevski.ru/mynix/neovim" } @@ -82,7 +81,9 @@ "nil": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "rust-overlay": "rust-overlay" }, "locked": { @@ -100,22 +101,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1662096612, - "narHash": "sha256-R+Q8l5JuyJryRPdiIaYpO5O3A55rT+/pItBrKcy7LM4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "21de2b973f9fee595a7a1ac4693efff791245c34", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1663087123, "narHash": "sha256-cNIRkF/J4mRxDtNYw+9/fBNq/NOA2nCuPOa3EdIyeDs=", @@ -136,18 +121,18 @@ "dedsec-grub-theme": "dedsec-grub-theme", "home-manager": "home-manager", "myneovim": "myneovim", - "nixpkgs": "nixpkgs_2" + "nil": "nil", + "nixpkgs": "nixpkgs", + "vnetod": "vnetod" } }, "rust-overlay": { "inputs": { "flake-utils": [ - "myneovim", "nil", "flake-utils" ], "nixpkgs": [ - "myneovim", "nil", "nixpkgs" ] @@ -195,6 +180,43 @@ "repo": "flake-utils", "type": "github" } + }, + "utils_3": { + "locked": { + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "vnetod": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils_3" + }, + "locked": { + "lastModified": 1663511714, + "narHash": "sha256-hus+SMFRN6Or+Hr09bEokO5zwVPeexujey6S0MRUBu8=", + "ref": "refs/heads/main", + "rev": "21e9e89de2af212ca9dec914011cfde7e48f8de6", + "revCount": 33, + "type": "git", + "url": "https://git.pleshevski.ru/pleshevskiy/vnetod" + }, + "original": { + "rev": "21e9e89de2af212ca9dec914011cfde7e48f8de6", + "type": "git", + "url": "https://git.pleshevski.ru/pleshevskiy/vnetod" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 96f530d..88d076c 100644 --- a/flake.nix +++ b/flake.nix @@ -12,8 +12,21 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + # nix lsp + nil = { + url = "github:oxalica/nil"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + # my neovim configuration myneovim = { - url = "git+https://git.pleshevski.ru/mynix/neovim?rev=3f758841b5fad14371f4d9e2f7e9b0ad177aa4e7"; + url = "git+https://git.pleshevski.ru/mynix/neovim?rev=05553b6fa077a3286b01169abd6d149deb7773b0"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + # tool to change .env faster + vnetod = { + url = "git+https://git.pleshevski.ru/pleshevskiy/vnetod?rev=21e9e89de2af212ca9dec914011cfde7e48f8de6"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/home/home.nix b/home/home.nix index 0835e9c..f08da56 100644 --- a/home/home.nix +++ b/home/home.nix @@ -34,10 +34,11 @@ in xh # friendly and fast tool for sending HTTP requests fd # a simple, fast and user-friendly alternative to find bat # a cat clone with syntax highlighting and git integration - ripgrep + ripgrep # a fuzzy finder # nix nixpkgs-fmt + nil # lsp server # browser librewolf # a fork of firefox, focused on privacy, security and freedom diff --git a/outputs/home.nix b/outputs/home.nix index 1370bdb..b4fefa5 100644 --- a/outputs/home.nix +++ b/outputs/home.nix @@ -8,6 +8,8 @@ let overlays = [ inputs.myneovim.overlays.${system} + inputs.vnetod.overlays.${system} + (f: p: { nil = inputs.nil.packages.${system}.nil; }) ]; }; in diff --git a/system/configuration.nix b/system/configuration.nix index d31600a..d243732 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -142,16 +142,14 @@ in registry = let - repo = name: "https://git.pleshevski.ru/${name}"; + gitple = "https://git.pleshevski.ru"; mkRegistry = id: url: { from = { type = "indirect"; inherit id; }; to = { type = "git"; inherit url; }; }; in { - templates = mkRegistry "tmpl" "${repo "mynix"}/templates"; - vnetod = mkRegistry "vnetod" "${repo "pleshevskiy"}/vnetod"; - tas = mkRegistry "tas" "${repo "pleshevskiy"}/tas"; + templates = mkRegistry "tmpl" "${gitple}/mynix/templates"; }; };