updates for nixneovim... truly awful change
This commit is contained in:
parent
adc33619d1
commit
3e60505726
2 changed files with 48 additions and 65 deletions
90
nix/home-manager/flake.lock
generated
90
nix/home-manager/flake.lock
generated
|
|
@ -60,24 +60,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"haumea": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
|
|
@ -104,11 +86,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717525419,
|
||||
"narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=",
|
||||
"lastModified": 1717931644,
|
||||
"narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "a7117efb3725e6197dd95424136f79147aa35e5b",
|
||||
"rev": "3d65009effd77cb0d6e7520b68b039836a7606cf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -135,7 +117,6 @@
|
|||
"nix-github-actions": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixneovim",
|
||||
"nixneovimplugins",
|
||||
"poetry2nix",
|
||||
"nixpkgs"
|
||||
|
|
@ -162,11 +143,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717744769,
|
||||
"narHash": "sha256-1usk5faO+KRn/03xKW3G3ex9/wHeLfwKTa7x8QNcygc=",
|
||||
"lastModified": 1717919703,
|
||||
"narHash": "sha256-4i/c31+dnpv6KdUA3BhbMDS9Lvg/CDin78caYJlq0bY=",
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "4ac3639cebb6286f1a68d015b80e9e0c6c869ce6",
|
||||
"rev": "a157a81d0a4bc909b2b6666dd71909bcdc8cd0d6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -177,13 +158,17 @@
|
|||
},
|
||||
"nixneovim": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"haumea": "haumea",
|
||||
"home-manager": [
|
||||
"home-manager"
|
||||
],
|
||||
"nix-flake-tests": "nix-flake-tests",
|
||||
"nixneovimplugins": "nixneovimplugins",
|
||||
"nixneovimplugins": [
|
||||
"nixneovimplugins"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
|
|
@ -191,11 +176,11 @@
|
|||
"nmt": "nmt"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717708860,
|
||||
"narHash": "sha256-3+MR+o9sOm4UApr60N78YV34hX6w1Fw5/uQPnVdJR7I=",
|
||||
"lastModified": 1717926434,
|
||||
"narHash": "sha256-Z+cDe1hKWNfLMg5Z/lNDhOZliikAk2gIVVfUSOINSxM=",
|
||||
"owner": "nixneovim",
|
||||
"repo": "nixneovim",
|
||||
"rev": "6c516111b4bbe346d1f603b9d0cf0a5bde22dadb",
|
||||
"rev": "cb4fd66896d7e0092e30176d4f352667514993ad",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -207,26 +192,24 @@
|
|||
"nixneovimplugins": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"nixneovim",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixneovim",
|
||||
"nixpkgs"
|
||||
],
|
||||
"poetry2nix": "poetry2nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717621372,
|
||||
"narHash": "sha256-u/U455J7V5EO6qkZq64T++pxUyns8n670lJV+5pOH7U=",
|
||||
"owner": "nixneovim",
|
||||
"repo": "nixneovimplugins",
|
||||
"rev": "c911cb5d23260f89886a2359038f79fb19fde137",
|
||||
"lastModified": 1717942814,
|
||||
"narHash": "sha256-hH5+LhWSxuL7t6sLmabXsfdUd5g8l/Gv0cvFzX35rFQ=",
|
||||
"owner": "NixNeovim",
|
||||
"repo": "NixNeovimPlugins",
|
||||
"rev": "dfd59a15374e4e4103b7bba84e39b31009a9a8ad",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixneovim",
|
||||
"repo": "nixneovimplugins",
|
||||
"owner": "NixNeovim",
|
||||
"repo": "NixNeovimPlugins",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -247,11 +230,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1717860395,
|
||||
"narHash": "sha256-+uQusqUAk1spCPSgPKSdn8iZNtBHp8lHSWyM3vH6iII=",
|
||||
"lastModified": 1717959626,
|
||||
"narHash": "sha256-TG2kNyQVDTxCTL1DCJAgyQLbBBY+hj7fGnqVgY1ktpY=",
|
||||
"owner": "nixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2c32ee395b21b9735d0c25490f080796e7d66abc",
|
||||
"rev": "74fa5706cb0a5526d383d2e68eee7e66141f04f2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -296,13 +279,11 @@
|
|||
"poetry2nix": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"nixneovim",
|
||||
"nixneovimplugins",
|
||||
"flake-utils"
|
||||
],
|
||||
"nix-github-actions": "nix-github-actions",
|
||||
"nixpkgs": [
|
||||
"nixneovim",
|
||||
"nixneovimplugins",
|
||||
"nixpkgs"
|
||||
]
|
||||
|
|
@ -324,9 +305,11 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"flake-utils": "flake-utils",
|
||||
"home-manager": "home-manager",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixneovim": "nixneovim",
|
||||
"nixneovimplugins": "nixneovimplugins",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"zjstatus": "zjstatus"
|
||||
}
|
||||
|
|
@ -388,25 +371,12 @@
|
|||
"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"
|
||||
}
|
||||
},
|
||||
"zjstatus": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
inputs = {
|
||||
# Specify the source of Home Manager and Nixpkgs.
|
||||
nixpkgs.url = "github:nixOS/nixpkgs";
|
||||
flake-utils.url = "github:numtide/flake-utils"; # not directly used, but common source for the several flakes that do use it
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -22,12 +23,22 @@
|
|||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
home-manager.follows = "home-manager";
|
||||
flake-utils.follows = "flake-utils";
|
||||
nixneovimplugins.follows = "nixneovimplugins";
|
||||
};
|
||||
};
|
||||
nixneovimplugins = {
|
||||
url = "github:NixNeovim/NixNeovimPlugins";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
flake-utils.follows = "flake-utils";
|
||||
};
|
||||
};
|
||||
zjstatus = {
|
||||
url = "github:dj95/zjstatus";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
flake-utils.follows = "flake-utils";
|
||||
};
|
||||
};
|
||||
fenix = {
|
||||
|
|
@ -44,6 +55,7 @@
|
|||
home-manager,
|
||||
nix-index-database,
|
||||
nixneovim,
|
||||
nixneovimplugins,
|
||||
zjstatus,
|
||||
fenix,
|
||||
...
|
||||
|
|
@ -57,10 +69,10 @@
|
|||
inherit system;
|
||||
config = {allowUnfree = true;};
|
||||
overlays = [
|
||||
nixneovim.overlays.default
|
||||
(_final: prev: {
|
||||
zjstatus = zjstatus.packages.${prev.system}.default;
|
||||
})
|
||||
nixneovimplugins.overlays.default
|
||||
fenix.overlays.default
|
||||
];
|
||||
}
|
||||
|
|
@ -68,11 +80,12 @@
|
|||
|
||||
homeManagerConfigs = forAllSystems (
|
||||
system: {
|
||||
pkgs = pkgs."${system}";
|
||||
pkgs = pkgs.${system};
|
||||
modules = [
|
||||
{
|
||||
imports = [nixneovim.nixosModules.default];
|
||||
home.packages = [];
|
||||
imports = [
|
||||
nixneovim.nixosModules.${system}.homeManager
|
||||
];
|
||||
}
|
||||
nix-index-database.hmModules.nix-index
|
||||
./home.nix
|
||||
|
|
@ -80,7 +93,7 @@
|
|||
}
|
||||
);
|
||||
in {
|
||||
# formatter."${system}" = pkgs.alejandra;
|
||||
formatter = forAllSystems (system: pkgs.${system}.alejandra);
|
||||
homeConfigurations.aarch64-darwin-acicchetti = home-manager.lib.homeManagerConfiguration homeManagerConfigs."aarch64-darwin";
|
||||
homeConfigurations.x86_64-linux-acicchetti = home-manager.lib.homeManagerConfiguration homeManagerConfigs."x86_64-linux";
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue