kitchen/rice
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: update to 22.11

Browse source
This commit is contained in:
buffet 2022-12-02 16:55:53 +00:00
parent 9675234d6e
commit c820c191fd
4 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
flake.lock
View file

@ -56,19 +56,20 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1667907331, "lastModified": 1669724862,
"narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", "narHash": "sha256-GwLonjmyhnTGQRNfKcUCgMSKYj49ZehjjJulaM/yH18=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5", "rev": "e891b060e7d11bb8f7dedb86a41d804891a6f5a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-22.05", "ref": "release-22.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -106,27 +107,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1669418739, "lastModified": 1669834992,
"narHash": "sha256-T86oFvcUIRwHWBWUt7WjaP4BP/3lDGbv5AppQSI1FkI=", "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "695b3515251873e0a7e2021add4bba643c56cde3", "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-22.05", "ref": "nixos-22.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1669616578, "lastModified": 1669805596,
"narHash": "sha256-uwecFtN1CMoUEaIKiGxK1t6h7RZUtZn5gmcInoptSl8=", "narHash": "sha256-g1CPQZ+1jGhY4bsjppk+gH5jfzzqmPlqGHg0zSYS3Hw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "1d081971f9b7ae7f902628e30c7c6e58c3c4e8d6", "rev": "c81b1e527f3a220abfa9bf8096153d52784c5007",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,6 +147,21 @@
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nur": "nur" "nur": "nur"
} }
},
"utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

4
flake.nix
View file

@ -1,7 +1,7 @@
{ {
inputs = { inputs = {
impermanence.url = "github:nix-community/impermanence"; impermanence.url = "github:nix-community/impermanence";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
agenix = { agenix = {
@ -20,7 +20,7 @@
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-22.05"; url = "github:nix-community/home-manager/release-22.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

11
programs/nvim.nix
View file

@ -13,10 +13,11 @@
in { in {
enable = true; enable = true;
plugins = let plugins = let
buildPlugin = name: buildPlugin = pname:
pkgs.vimUtils.buildNeovimPluginFrom2Nix { pkgs.vimUtils.buildVimPluginFrom2Nix {
inherit name; inherit pname;
src = inputs."${name}"; version = "unknown";
src = inputs."${pname}";
}; };
buildPlugins = names: lib.attrsets.genAttrs names buildPlugin; buildPlugins = names: lib.attrsets.genAttrs names buildPlugin;
plugins = buildPlugins [ plugins = buildPlugins [
@ -225,7 +226,7 @@
in '' in ''
lua <<EOF lua <<EOF
local lspconfig = require 'lspconfig' local lspconfig = require 'lspconfig'
local caps = require 'cmp_nvim_lsp'.update_capabilities( local caps = require 'cmp_nvim_lsp'.default_capabilities(
vim.lsp.protocol.make_client_capabilities() vim.lsp.protocol.make_client_capabilities()
) )
${serverConfigs} ${serverConfigs}

6
system.nix
View file

@ -34,9 +34,11 @@
}; };
nix = { nix = {
autoOptimiseStore = true;
trustedUsers = ["root" "buffet"];
registry.nixpkgs.flake = nixpkgs; registry.nixpkgs.flake = nixpkgs;
settings = {
auto-optimise-store = true;
trusted-users = ["root" "buffet"];
};
gc = { gc = {
automatic = true; automatic = true;