From eef0fdcd1458f0d7a23b76c135aae810d03b1545 Mon Sep 17 00:00:00 2001 From: htran Date: Tue, 17 Oct 2023 16:16:42 -0700 Subject: [PATCH] feat: update everything, congratz on having your first change on nixpkgs merged Hung --- flake.lock | 107 +++++++++++--------------- flake.nix | 9 +-- native_configs/neovim/init.lua | 14 ++-- nix-conf/home-manager/base/neovim.nix | 4 - 4 files changed, 56 insertions(+), 78 deletions(-) diff --git a/flake.lock b/flake.lock index 8cd8f59..214d381 100644 --- a/flake.lock +++ b/flake.lock @@ -124,11 +124,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1695195896, - "narHash": "sha256-pq9q7YsGXnQzJFkR5284TmxrLNFc0wo4NQ/a5E93CQU=", + "lastModified": 1695973661, + "narHash": "sha256-BP2H4c42GThPIhERtTpV1yCtwQHYHEKdRu7pjrmQAwo=", "owner": "numtide", "repo": "devshell", - "rev": "05d40d17bf3459606316e3e9ec683b784ff28f16", + "rev": "cd4e2fda3150dd2f689caeac07b7f47df5197c31", "type": "github" }, "original": { @@ -223,11 +223,11 @@ "flake-compat": { "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": { @@ -308,11 +308,11 @@ ] }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "type": "github" }, "original": { @@ -738,11 +738,11 @@ ] }, "locked": { - "lastModified": 1689397210, - "narHash": "sha256-fVxZnqxMbsDkB4GzGAs/B41K0wt/e+B/fLxmTFF/S20=", + "lastModified": 1697031886, + "narHash": "sha256-oTMPX8dGC7yxSwrbF4NuPNQsUEcHB1dusW2yEbFD5zg=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "0a63bfa3f00a3775ea3a6722b247880f1ffe91ce", + "rev": "178b36dc3a75c96efc25477d45eafc37ba1fafc3", "type": "github" }, "original": { @@ -758,11 +758,11 @@ ] }, "locked": { - "lastModified": 1695550077, - "narHash": "sha256-xoxR/iY69/3lTnnZDP6gf3J46DUKPcf+Y1jH03tfZXE=", + "lastModified": 1697522715, + "narHash": "sha256-QXk+nnQtdfsShjXCYmH6aq3wVQqsQD8h5VIDFIust8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "a88df2fb101778bfd98a17556b3a2618c6c66091", + "rev": "132f9851858986d78db0b08157256384bbc5738c", "type": "github" }, "original": { @@ -875,11 +875,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1695509205, - "narHash": "sha256-nV3opNLzLMfzL0yI+xnIeNIOnvOI467CiABxHTQUrwY=", + "lastModified": 1697481695, + "narHash": "sha256-BLlCecLvZzjYEHrhKfPLieeR81vN0lSca8U3B2LOpjQ=", "owner": "neovim", "repo": "neovim", - "rev": "bc0bf9d030bbcb01db69c44cf88b95ca41dd3065", + "rev": "a63c67005b9ea17214d86391e2fd649658c1bdec", "type": "github" }, "original": { @@ -898,16 +898,15 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1695547357, - "narHash": "sha256-qUux0nBmgj7a12elGxA3YJ6TlaVT7owiddKJtRn6W2Y=", - "owner": "pegasust", + "lastModified": 1697500878, + "narHash": "sha256-Pck1H0xNMKdTym6y6104xZSVpzfAl+4JK8fYgXkIEN0=", + "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "70f1a201c9c1cbedf278448d288550a961fbd4c4", + "rev": "a9e95d82084980df9055501520b19cb5da26cec5", "type": "github" }, "original": { - "owner": "pegasust", - "ref": "darwin-fix", + "owner": "nix-community", "repo": "neovim-nightly-overlay", "type": "github" } @@ -965,15 +964,15 @@ "nix-index-database": { "inputs": { "nixpkgs": [ - "nixpkgs-latest" + "nixpkgs" ] }, "locked": { - "lastModified": 1695526222, - "narHash": "sha256-/NwZz3QcVplrfiDKk1thYg1EIHLSNucVHNUi2uwO3RI=", + "lastModified": 1697340827, + "narHash": "sha256-XlrR68N7jyaZ0bs8TPrhqcWG0IPG3pbjrKzJMpYOsos=", "owner": "mic92", "repo": "nix-index-database", - "rev": "25d6369c232bbea1ec1f90226fd17982e7a0a647", + "rev": "29977d0796c058bbcfb2df5b18eb5badf1711007", "type": "github" }, "original": { @@ -1124,21 +1123,6 @@ "type": "github" } }, - "nixpkgs-latest": { - "locked": { - "lastModified": 1695597504, - "narHash": "sha256-CKhj6wOKqndfHsDg8CKVBbpJWG8zHRZRLi7MnOatf0U=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7a862f0a660d5bd850457a0ad7772e1672109ccd", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "dir": "lib", @@ -1193,16 +1177,16 @@ }, "nixpkgs-vimplugins": { "locked": { - "lastModified": 1695583468, - "narHash": "sha256-NRbfULcsDKXH4I5qKkqaXsBTqJQswDgasHDbhoDvPOE=", - "owner": "cornedor", + "lastModified": 1697492162, + "narHash": "sha256-h1siDXoYbFGAkavTEJGM4iIIo45J1/m08xRwuQFWeik=", + "owner": "GaetanLepage", "repo": "nixpkgs", - "rev": "dc8c9800fa19a9c44fe15507d9700d8ff1dc507c", + "rev": "286239a21c3588ef15e9c178268d108e03c23bf9", "type": "github" }, "original": { - "owner": "cornedor", - "ref": "update-vim-plugins", + "owner": "GaetanLepage", + "ref": "vim-plugins-update", "repo": "nixpkgs", "type": "github" } @@ -1240,11 +1224,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1695360818, - "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", + "lastModified": 1697059129, + "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f", + "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", "type": "github" }, "original": { @@ -1352,16 +1336,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1695522709, - "narHash": "sha256-hBFukNXDOrpI1CVVonImgyYPdQp+Fja6NmCIufbmvR4=", - "owner": "pegasust", + "lastModified": 1697379843, + "narHash": "sha256-RcnGuJgC2K/UpTy+d32piEoBXq2M+nVFzM3ah/ZdJzg=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "6f6aeebec7d4413e9b10aa3f7fe2f6df917762d9", + "rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d", "type": "github" }, "original": { - "owner": "pegasust", - "ref": "liblpeg", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -1649,7 +1633,6 @@ "nix-boost": "nix-boost", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs_12", - "nixpkgs-latest": "nixpkgs-latest", "nixpkgs-vimplugins": "nixpkgs-vimplugins", "sg-nvim": "sg-nvim", "std": "std_2" @@ -1859,11 +1842,11 @@ "yants": "yants_2" }, "locked": { - "lastModified": 1694941922, - "narHash": "sha256-gSuhf+qC3jvOb8am+CTPtIJUH1W3PnU8nzmGVJ2t5eA=", + "lastModified": 1695893106, + "narHash": "sha256-sUHZO7v65zT8HyQ6gZqp18HX8PgTRIhtX1xSg+/I+7M=", "owner": "divnix", "repo": "std", - "rev": "01adf87cf1ed37bcd72a90f2a4e385d76c81c825", + "rev": "c5d97ddcd1bd33e87a7271ead97464f20f447058", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9af0ec3..f534850 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ description = "My personal configuration in Nix (and some native configurations)"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-latest.url = "github:nixos/nixpkgs"; + # nixpkgs-latest.url = "github:nixos/nixpkgs"; # deploy-rs.url = "github:serokell/deploy-rs"; std = { url = "github:divnix/std"; @@ -18,8 +18,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; neovim-nightly-overlay = { - # need to pin this until darwin build is successful again. - url = "github:pegasust/neovim-nightly-overlay/darwin-fix"; + url = "github:nix-community/neovim-nightly-overlay"; }; nix-boost = { url = "git+https://git.pegasust.com/pegasust/nix-boost?ref=bleed"; @@ -31,9 +30,9 @@ nix-index-database = { url = "github:mic92/nix-index-database"; # Should show the latest nixpkgs whenever possible - inputs.nixpkgs.follows = "nixpkgs-latest"; + inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs-vimplugins.url = "github:cornedor/nixpkgs/update-vim-plugins"; + nixpkgs-vimplugins.url = "github:GaetanLepage/nixpkgs/vim-plugins-update"; sg-nvim = { url = "git+https://github.com/pegasust/sg.nvim?ref=sg-cody-discover"; }; diff --git a/native_configs/neovim/init.lua b/native_configs/neovim/init.lua index da32b33..93f1511 100644 --- a/native_configs/neovim/init.lua +++ b/native_configs/neovim/init.lua @@ -319,14 +319,14 @@ end -- Comment.nvim require('Comment').setup() --- lukas-reineke/indent-blankline.nvim -vim.opt.list = true -vim.opt.listchars:append "space:⋅" -vim.opt.listchars:append "eol:↴" +-- -- lukas-reineke/indent-blankline.nvim +-- vim.opt.list = true +-- vim.opt.listchars:append "space:⋅" +-- vim.opt.listchars:append "eol:↴" -require("indent_blankline").setup { - show_end_of_line = true, - space_char_blankline = " ", +require("ibl").setup { + -- show_end_of_line = true, + -- space_char_blankline = " ", } -- User command that transform into 2-spaces by translating to tabstop diff --git a/nix-conf/home-manager/base/neovim.nix b/nix-conf/home-manager/base/neovim.nix index a61f7f0..6ca7336 100644 --- a/nix-conf/home-manager/base/neovim.nix +++ b/nix-conf/home-manager/base/neovim.nix @@ -23,10 +23,6 @@ pkgs.fzf # file name fuzzy search pkgs.ripgrep # content fuzzy search pkgs.fd # Required by a Telescope plugin (?) - pkgs.rnix-lsp # doesn't work, Mason just installs it using cargo - pkgs.rust4cargo - pkgs.nickel - pkgs.nls pkgs.go # doesn't work, Mason installs from runtime path