From 6427cf36d8a984edb9a253288936d4198c6f7e45 Mon Sep 17 00:00:00 2001 From: Markus Heurung Date: Fri, 15 Mar 2024 13:51:34 +0100 Subject: [PATCH] switch to unstable packages and do some more nixvim'ing --- flake.lock | 217 +++++++++++++++++++++++++++++------------------------ flake.nix | 8 +- home.nix | 28 ++++--- 3 files changed, 142 insertions(+), 111 deletions(-) diff --git a/flake.lock b/flake.lock index 3090755..694ae1d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,36 +1,49 @@ { "nodes": { - "beautysh": { + "devshell": { "inputs": { + "flake-utils": "flake-utils", "nixpkgs": [ "nixvim", "nixpkgs" - ], - "poetry2nix": "poetry2nix", - "utils": "utils" + ] }, "locked": { - "lastModified": 1680308980, - "narHash": "sha256-aUEHV0jk2qIFP3jlsWYWhBbm+w/N9gzH3e4I5DcdB5s=", - "owner": "lovesegfault", - "repo": "beautysh", - "rev": "9845efc3ea3e86cc0d41465d720a47f521b2799c", + "lastModified": 1710156081, + "narHash": "sha256-4PMY6aumJi5dLFjBzF5O4flKXmadMNq3AGUHKYfchh0=", + "owner": "numtide", + "repo": "devshell", + "rev": "bc68b058dc7e6d4d6befc4ec6c60082b6e844b7d", "type": "github" }, "original": { - "owner": "lovesegfault", - "repo": "beautysh", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, "flake-compat": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -39,6 +52,27 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -62,11 +96,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -84,11 +118,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", "type": "github" }, "original": { @@ -104,119 +138,123 @@ ] }, "locked": { - "lastModified": 1706981411, - "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", + "lastModified": 1710499337, + "narHash": "sha256-FsPpFFw59MFU+E1PD6t9K9it17DaV5nU/+mWEkfS2YE=", "owner": "nix-community", "repo": "home-manager", - "rev": "652fda4ca6dafeb090943422c34ae9145787af37", + "rev": "ca922258e1682b435e632a5ca1910bbbed835345", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "master", "repo": "home-manager", "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710281778, + "narHash": "sha256-bvWr9vvBrAxb44kHM3H3cY/uQg+4pYP1BM/Nu3e/7V8=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "49a266d2ca59df8a03249550e73a54626181b65d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710281379, + "narHash": "sha256-uFo9hxt982L3nFJeweW4Gip2esiGrIQlbvEGrNTh4AY=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "d9ea313bc4851670dc99c5cc979cb79750e7d670", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1710283656, - "narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "51063ed4f2343a59fdeebb279bb81d87d453942b", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.11", + "ref": "nixos-unstable", "type": "indirect" } }, - "nixpkgs-stable": { - "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" - } - }, "nixvim": { "inputs": { - "beautysh": "beautysh", - "flake-utils": "flake-utils", + "devshell": "devshell", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "home-manager": "home-manager_2", + "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1704297403, - "narHash": "sha256-g7+4SiXDGzIlWIfANyH1J5CeEaY+Alah6KOm6IO4nIk=", + "lastModified": 1710491356, + "narHash": "sha256-DeMiM/lgf8HqeAcDU26EeMaoU0phB8mY2RVYBtpvZN0=", "owner": "nix-community", "repo": "nixvim", - "rev": "b3ea5256e07ee9105060cffa075028402946bd63", + "rev": "9f7c78852f37126244b43e71e5158cdc3d70ad0a", "type": "github" }, "original": { "owner": "nix-community", - "ref": "nixos-23.11", "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", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", "gitignore": "gitignore", "nixpkgs": [ "nixvim", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] }, "locked": { - "lastModified": 1703939133, - "narHash": "sha256-Gxe+mfOT6bL7wLC/tuT2F+V+Sb44jNr8YsJ3cyIl4Mo=", + "lastModified": 1708018599, + "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "9d3d7e18c6bc4473d7520200d4ddab12f8402d38", + "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", "type": "github" }, "original": { @@ -261,21 +299,6 @@ "repo": "default", "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" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 258e5d7..db47f51 100644 --- a/flake.nix +++ b/flake.nix @@ -2,13 +2,14 @@ description = "Home Manager configuration of muhh"; inputs = { - nixpkgs.url = "nixpkgs/nixos-23.11"; + nixpkgs.url = "nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-23.11"; + # url = "github:nix-community/home-manager/release-23.11"; + url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; nixvim = { - url = "github:nix-community/nixvim/nixos-23.11"; + url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -17,6 +18,7 @@ self, nixpkgs, home-manager, + nixvim, ... } @ inputs: let inherit (self) outputs; diff --git a/home.nix b/home.nix index b98dea0..49f6c3b 100644 --- a/home.nix +++ b/home.nix @@ -254,6 +254,7 @@ tabstop = 2; }; plugins = { + comment-nvim.enable = true; cmp-cmdline.enable = true; cmp-fish.enable = true; cmp-nvim-lsp.enable = true; @@ -265,6 +266,11 @@ lsp = { enable = true; servers = { + html.enable = true; + jsonls.enable = true; + marksman.enable = true; + solargraph.enable = true; + yamlls.enable = true; }; }; neo-tree = { @@ -274,25 +280,26 @@ enableModifiedMarkers = true; closeIfLastWindow = true; }; + nix.enable = true; noice = { enable = true; }; notify.enable = true; nvim-autopairs.enable = true; nvim-colorizer.enable = true; - /* obsidian = { enable = true; - dir = "~/muhhmory"; - dailyNotes = { - folder = "~/muhhmory/Journal/Daily Pages"; - template = "Daily Page.md"; - }; - templates = { - subdir = "Templates"; + settings = { + dir = "~/muhhMory"; + daily_notes = { + folder = "~/muhhmory/Journal/Daily Pages"; + template = "Daily Page.md"; + }; + templates = { + subdir = "Templates"; + }; }; }; - */ oil.enable = true; surround.enable = true; telescope = { @@ -302,7 +309,7 @@ fzf-native.enable = true; }; }; - # transparent.enable = true; + transparent.enable = true; toggleterm.enable = true; treesitter = { enable = true; @@ -310,7 +317,6 @@ }; }; extraPlugins = with pkgs.vimPlugins; [ - vim-nix ]; }; ripgrep.enable = true;