From d0bd1ca8fa351b12854c9c80b238d938123af349 Mon Sep 17 00:00:00 2001 From: "Alexander \"PapaTutuWawa" Date: Tue, 18 Jul 2023 21:46:28 +0200 Subject: [PATCH] nvim: Configure it with everything needed for LazyVim --- flake.lock | 101 +++++++++++++++++++--------- hosts/miku.nix | 1 + modules/default.nix | 1 + modules/programs/neovim/default.nix | 28 ++++++++ 4 files changed, 98 insertions(+), 33 deletions(-) create mode 100644 modules/programs/neovim/default.nix diff --git a/flake.lock b/flake.lock index 2edff5f..0bddacc 100644 --- a/flake.lock +++ b/flake.lock @@ -21,14 +21,15 @@ "emacs": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1681550392, - "narHash": "sha256-2ZC8ZDGZ4SCgN0jXStY6ScwcgR9KjN3DFJImVdTLhI8=", + "lastModified": 1689700121, + "narHash": "sha256-YoKqbhyIQUCF7hGQNABMvcSfc9IgIFyxa6ZRInD5W+Q=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0dfa16169942b7e524a353b07f8643d57524a6e6", + "rev": "bb06a68dba7b316472dab0a7255a3ea21be45812", "type": "github" }, "original": { @@ -59,12 +60,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -75,14 +79,14 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -171,11 +175,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1681468923, - "narHash": "sha256-+X2oO4juRVhQRs002mn8km6PODccIRiz09c2K1xtSpY=", + "lastModified": 1689495092, + "narHash": "sha256-yZu2j5FpLZEPhJQQutMCPTxa1VMigLPabLYvLTq6ASM=", "owner": "nix-community", "repo": "home-manager", - "rev": "17198cf5ae27af5b647c7dac58d935a7d0dbd189", + "rev": "2f84579a70b8c74e5ebb37299a0c3ba279f09382", "type": "github" }, "original": { @@ -383,11 +387,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1680876084, - "narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=", + "lastModified": 1689320556, + "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2", + "rev": "d4ea64f2063820120c05f6ba93ee02e6d4671d6b", "type": "github" }, "original": { @@ -415,11 +419,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1673540789, - "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", + "lastModified": 1689534811, + "narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", + "rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222", "type": "github" }, "original": { @@ -429,6 +433,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1689605451, + "narHash": "sha256-u2qp2k9V1smCfk6rdUcgMKvBj3G9jVvaPHyeXinjN9E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "53657afe29748b3e462f1f892287b7e254c26d77", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1649408932, @@ -447,11 +467,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1680487167, - "narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=", + "lastModified": 1689373857, + "narHash": "sha256-mtBksyvhhT98Zsm9tYHuMKuLwUKDwv+BGTl6K5nOGhY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "53dad94e874c9586e71decf82d972dfb640ef044", + "rev": "dfdbcc428f365071f0ca3888f6ec8c25c3792885", "type": "github" }, "original": { @@ -463,11 +483,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1681465517, - "narHash": "sha256-EasJh15/jcJNAHtq2SGbiADRXteURAnQbj1NqBoKkzU=", + "lastModified": 1689534811, + "narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "abe7316dd51a313ce528972b104f4f04f56eefc4", + "rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222", "type": "github" }, "original": { @@ -569,11 +589,11 @@ }, "nur": { "locked": { - "lastModified": 1681541221, - "narHash": "sha256-lt+iea1TlHzWGfbShveXj6FOE8FXC5nHnBOjz8ftfHM=", + "lastModified": 1689705562, + "narHash": "sha256-5++xa1AWV9tl8LWGdKzVaRNcdjM5Svhyv4Bjhfwk3B8=", "owner": "nix-community", "repo": "nur", - "rev": "425b65fc5dca82de0d628b43638ee93599660f57", + "rev": "092ea7443f334c362cc5429612846f6193a7de11", "type": "github" }, "original": { @@ -624,11 +644,11 @@ "rnix-lsp": "rnix-lsp_2" }, "locked": { - "lastModified": 1680620959, - "narHash": "sha256-P0tG2Js4xq0UIVaso7HeTZugQ7bn8ZDNE+zXtSWSvWI=", + "lastModified": 1683784900, + "narHash": "sha256-h+n0rS4nBFBqlMd1ktn+8UypNP3gQ91e+i/e1zHhbTg=", "ref": "refs/heads/master", - "rev": "319f35d1900fef34581e0380178beb7fa86be700", - "revCount": 123, + "rev": "3a0f186fca0a88e0a2fd002eabedb418cf9a6f6a", + "revCount": 124, "type": "git", "url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git" }, @@ -775,6 +795,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tablet-mode": { "inputs": { "flake-utils": "flake-utils_4", diff --git a/hosts/miku.nix b/hosts/miku.nix index a31be70..becf399 100644 --- a/hosts/miku.nix +++ b/hosts/miku.nix @@ -72,6 +72,7 @@ enable = true; output = "DP-2"; }; + neovim.enable = true; #xournalpp.enable = true; zsh.enable = true; direnv.enable = true; diff --git a/modules/default.nix b/modules/default.nix index a042298..bc48634 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -13,6 +13,7 @@ ./programs/sddm ./programs/gnome-terminal ./programs/mpv + ./programs/neovim ./programs/git ./programs/sway ./programs/swaync diff --git a/modules/programs/neovim/default.nix b/modules/programs/neovim/default.nix new file mode 100644 index 0000000..26c6191 --- /dev/null +++ b/modules/programs/neovim/default.nix @@ -0,0 +1,28 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.ptw.programs.neovim; +in { + options.ptw.programs.neovim = { + enable = lib.mkEnableOption "Enable and configure neovim using HomeManager"; + }; + + config = lib.mkIf cfg.enable { + home-manager.users."${config.ptw.system.singleUser}" = { + programs.neovim = { + enable = true; + extraPackages = with pkgs; [ + # For telescope-nvim + fd + lazygit + fish + tree-sitter gcc + nodejs_20 + + # Clipboard + wl-clipboard + ]; + }; + }; + }; +}