From 6721068e213244be43974bf135df812f9e60c79d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Gro=C3=9Fmann?= Date: Wed, 25 Oct 2023 00:21:15 +0200 Subject: [PATCH] feat: boilerplate for nixvim --- flake.lock | 248 ++++++++++++++++++++++++- flake.nix | 7 + users/common/programs/nvim/default.nix | 10 +- 3 files changed, 257 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 0145015..9fdf044 100644 --- a/flake.lock +++ b/flake.lock @@ -201,6 +201,29 @@ "type": "github" } }, + "beautysh": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "poetry2nix": "poetry2nix", + "utils": "utils" + }, + "locked": { + "lastModified": 1680308980, + "narHash": "sha256-aUEHV0jk2qIFP3jlsWYWhBbm+w/N9gzH3e4I5DcdB5s=", + "owner": "lovesegfault", + "repo": "beautysh", + "rev": "9845efc3ea3e86cc0d41465d720a47f521b2799c", + "type": "github" + }, + "original": { + "owner": "lovesegfault", + "repo": "beautysh", + "type": "github" + } + }, "crane": { "inputs": { "flake-compat": [ @@ -400,6 +423,22 @@ "type": "github" } }, + "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -521,6 +560,42 @@ "inputs": { "systems": "systems_5" }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "inputs": { + "systems": "systems_7" + }, "locked": { "lastModified": 1685518550, "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", @@ -612,6 +687,28 @@ } }, "gitignore_3": { + "inputs": { + "nixpkgs": [ + "nixvim", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_4": { "inputs": { "nixpkgs": [ "pre-commit-hooks", @@ -904,6 +1001,22 @@ "type": "github" } }, + "nixpkgs-stable_4": { + "locked": { + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-wayland": { "inputs": { "flake-compat": "flake-compat_3", @@ -1010,6 +1123,56 @@ "type": "github" } }, + "nixvim": { + "inputs": { + "beautysh": "beautysh", + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks": "pre-commit-hooks_2" + }, + "locked": { + "dirtyRev": "0c5dcb56d105addedd001f043e6a32ab9f1abe92-dirty", + "dirtyShortRev": "0c5dcb5-dirty", + "lastModified": 1698063089, + "narHash": "sha256-I5OoIAjcC5Xx/mW7EB9wqOPf5kkX92Z2E3U+SKizwpM=", + "type": "git", + "url": "file:///home/patrick/repos/nix/nixvim" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, + "poetry2nix": { + "inputs": { + "flake-utils": [ + "nixvim", + "beautysh", + "utils" + ], + "nixpkgs": [ + "nixvim", + "beautysh", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658665240, + "narHash": "sha256-/wkx7D7enyBPRjIkK0w7QxLQhzEkb3UxNQnjyc3FTUI=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "8b8edc85d24661d5a6d0d71d6a7011f3e699780f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -1072,15 +1235,40 @@ "pre-commit-hooks_2": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": [ - "flake-utils" - ], + "flake-utils": "flake-utils_6", "gitignore": "gitignore_3", "nixpkgs": [ + "nixvim", "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable_3" }, + "locked": { + "lastModified": 1697746376, + "narHash": "sha256-gu77VkgdfaHgNCVufeb6WP9oqFLjwK4jHcoPZmBVF3E=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "8cc349bfd082da8782b989cad2158c9ad5bd70fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_3": { + "inputs": { + "flake-compat": "flake-compat_5", + "flake-utils": [ + "flake-utils" + ], + "gitignore": "gitignore_4", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_4" + }, "locked": { "lastModified": 1696846637, "narHash": "sha256-0hv4kbXxci2+pxhuXlVgftj/Jq79VSmtAyvfabCCtYk=", @@ -1111,10 +1299,11 @@ "nixpkgs": "nixpkgs", "nixpkgs-wayland": "nixpkgs-wayland", "nixseparatedebuginfod": "nixseparatedebuginfod", - "pre-commit-hooks": "pre-commit-hooks_2", + "nixvim": "nixvim", + "pre-commit-hooks": "pre-commit-hooks_3", "spicetify-nix": "spicetify-nix", "stylix": "stylix", - "systems": "systems_6", + "systems": "systems_8", "templates": "templates", "wired-notify": "wired-notify" } @@ -1146,7 +1335,7 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_7", "nixpkgs": "nixpkgs_4" }, "locked": { @@ -1173,7 +1362,7 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_5" }, @@ -1281,6 +1470,36 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "templates": { "locked": { "lastModified": 1696855554, @@ -1318,6 +1537,21 @@ "type": "github" } }, + "utils": { + "locked": { + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "wired-notify": { "inputs": { "alejandra": "alejandra", diff --git a/flake.nix b/flake.nix index a6c91eb..2a3298a 100644 --- a/flake.nix +++ b/flake.nix @@ -84,6 +84,11 @@ }; spicetify-nix.url = "github:the-argus/spicetify-nix"; + + nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { @@ -96,6 +101,7 @@ devshell, nixpkgs-wayland, wired-notify, + nixvim, ... } @ inputs: let inherit (nixpkgs) lib; @@ -140,6 +146,7 @@ devshell.overlays.default agenix-rekey.overlays.default wired-notify.overlays.default + nixvim.overlays.default ]; inherit system; config.allowUnfree = true; diff --git a/users/common/programs/nvim/default.nix b/users/common/programs/nvim/default.nix index 102e333..dc20df3 100644 --- a/users/common/programs/nvim/default.nix +++ b/users/common/programs/nvim/default.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + lib, + ... +}: { programs.neovim = { enable = true; viAlias = true; @@ -29,4 +33,8 @@ ".local/state/nvim" ".cache/nvim" ]; + home.shellAliases.nixvim = lib.getExe (pkgs.nixvim.makeNixvim { + colorscheme = "onedark"; + colorschemes.onedark.enable = true; + }); }