flake.lock: Update
Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/05e6ba83eb3585ce0aff7b41e4bd0e317d05ad4a?narHash=sha256-TnZETiQPXbyT5mdCHMOyrJnx2%2BBwroMBRrguciz1vEo%3D' (2024-05-26) → 'github:nix-community/home-manager/0eb314b4f0ba337e88123e0b1e57ef58346aafd9?narHash=sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs%3D' (2024-05-30) • Updated input 'lix': '5986a720d4
.tar.gz?narHash=sha256-VXsSaj3athaUjgbX9bovTNhSOgevU%2B8qWx9pgaQePdE%3D' (2024-05-26) → '3df013597d
.tar.gz?narHash=sha256-3sOBY0cNLgIFNk0YhBw%2Bkz57JLVphHTSypAKnkYz01g%3D' (2024-05-30) • Updated input 'lix-module': '18fa4a89e2
.tar.gz?narHash=sha256-fzY708SyfHwLOFrg5ZU0fXW9mNdvRvqz64jg97vvpJM%3D' (2024-05-23) → 'b4b38e6b5f
.tar.gz?narHash=sha256-joKTxvywYlKspGGKOIXho6oRbggOPyayEqAyuZCavO0%3D' (2024-05-30) • Removed input 'neovim-flake' • Removed input 'neovim-src' • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/2e7d6c568063c83355fe066b8a8917ee758de1b8?narHash=sha256-fe6Z33pbfqu4TI5ijmcaNc5vRBs633tyxJ12HTghy3w%3D' (2024-05-26) → 'github:NixOS/nixos-hardware/8251761f93d6f5b91cee45ac09edb6e382641009?narHash=sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8%3D' (2024-05-29) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/bfb7a882678e518398ce9a31a881538679f6f092?narHash=sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8%3D' (2024-05-24) → 'github:NixOS/nixpkgs/ad57eef4ef0659193044870c731987a6df5cf56b?narHash=sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs%3D' (2024-05-29) • Updated input 'nixvim': 'github:nix-community/nixvim/8212bf1cd2d2dfe6ba521dd8c65a13b67e562d1a?narHash=sha256-Zu0fn7bC%2BM/LwOOkR1RmeoOuCIbvvFwuqTldVBVe4WY%3D' (2024-05-26) → 'github:nix-community/nixvim/6ff3493c9bc85063ae829f0c25c21be3bde5c5b3?narHash=sha256-cKEGHGLaZoiNroMd34RrDgVDB7xgfff7HBShMz7cEy8%3D' (2024-05-30) • Added input 'nixvim/git-hooks': 'github:cachix/git-hooks.nix/0e8fcc54b842ad8428c9e705cb5994eaf05c26a0?narHash=sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA%3D' (2024-05-20) • Added input 'nixvim/git-hooks/flake-compat': 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33?narHash=sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U%3D' (2023-10-04) • Added input 'nixvim/git-hooks/gitignore': 'github:hercules-ci/gitignore.nix/637db329424fd7e46cf4185293b9cc8c88c95394?narHash=sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs%3D' (2024-02-28) • Added input 'nixvim/git-hooks/gitignore/nixpkgs': follows 'nixvim/git-hooks/nixpkgs' • Added input 'nixvim/git-hooks/nixpkgs': follows 'nixvim/nixpkgs' • Added input 'nixvim/git-hooks/nixpkgs-stable': follows 'nixvim/nixpkgs' • Removed input 'nixvim/pre-commit-hooks' • Updated input 'stylix': 'github:jalil-salame/stylix/e5a4701b7d96c4909105a4c2366e4af3f188f802?narHash=sha256-u8enWMWhynbYlEFuVtTghwk1%2BLu8iT4tBoVWZxWCe/g%3D' (2024-05-24) → 'github:jalil-salame/stylix/036128f2517b1ff7d33d04773f48ea98d680128f?narHash=sha256-5ZHVsIg5akOIWImypmQMX/fXZZf3/7tzqJICLteFGZc%3D' (2024-05-27)
This commit is contained in:
parent
ded9630aff
commit
3d703f40df
3 changed files with 76 additions and 115 deletions
162
flake.lock
162
flake.lock
|
@ -158,6 +158,22 @@
|
|||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1673956053,
|
||||
|
@ -260,10 +276,38 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"git-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716213921,
|
||||
"narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"pre-commit-hooks",
|
||||
"nixvim",
|
||||
"git-hooks",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
|
@ -305,11 +349,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716711219,
|
||||
"narHash": "sha256-TnZETiQPXbyT5mdCHMOyrJnx2+BwroMBRrguciz1vEo=",
|
||||
"lastModified": 1717097707,
|
||||
"narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "05e6ba83eb3585ce0aff7b41e4bd0e317d05ad4a",
|
||||
"rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -341,11 +385,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1716718600,
|
||||
"narHash": "sha256-VXsSaj3athaUjgbX9bovTNhSOgevU+8qWx9pgaQePdE=",
|
||||
"rev": "5986a720d47041b79ead2d1f58a172f410d29db5",
|
||||
"lastModified": 1717106031,
|
||||
"narHash": "sha256-3sOBY0cNLgIFNk0YhBw+kz57JLVphHTSypAKnkYz01g=",
|
||||
"rev": "3df013597d7a2b5e400839e6625c05bd47de4dca",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/5986a720d47041b79ead2d1f58a172f410d29db5.tar.gz"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/3df013597d7a2b5e400839e6625c05bd47de4dca.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
@ -366,57 +410,24 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716506851,
|
||||
"narHash": "sha256-fzY708SyfHwLOFrg5ZU0fXW9mNdvRvqz64jg97vvpJM=",
|
||||
"rev": "18fa4a89e208cb8e881f5f71c75bbd4c1c2fd37d",
|
||||
"lastModified": 1717036776,
|
||||
"narHash": "sha256-joKTxvywYlKspGGKOIXho6oRbggOPyayEqAyuZCavO0=",
|
||||
"rev": "b4b38e6b5fe18da9464f291ae5fbf2ea9acb9ccb",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/18fa4a89e208cb8e881f5f71c75bbd4c1c2fd37d.tar.gz"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b4b38e6b5fe18da9464f291ae5fbf2ea9acb9ccb.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
|
||||
}
|
||||
},
|
||||
"neovim-flake": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1716672993,
|
||||
"narHash": "sha256-KISj1WGeeEb6d2rYFRGYHYiDvNJN1JtRKU2+jE32LMQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "neovim-nightly-overlay",
|
||||
"rev": "0f91f34a626baade98dfa091cc7a023266644d91",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "neovim-nightly-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"neovim-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1715862872,
|
||||
"narHash": "sha256-FCOipXHkAbkuFw9JjEpOIJ8BkyMkjkI0Dp+SzZ4yZlw=",
|
||||
"owner": "neovim",
|
||||
"repo": "neovim",
|
||||
"rev": "27fb62988e922c2739035f477f93cc052a4fee1e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "neovim",
|
||||
"ref": "v0.10.0",
|
||||
"repo": "neovim",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1716715385,
|
||||
"narHash": "sha256-fe6Z33pbfqu4TI5ijmcaNc5vRBs633tyxJ12HTghy3w=",
|
||||
"lastModified": 1716987116,
|
||||
"narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "2e7d6c568063c83355fe066b8a8917ee758de1b8",
|
||||
"rev": "8251761f93d6f5b91cee45ac09edb6e382641009",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -427,11 +438,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1716509168,
|
||||
"narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
|
||||
"lastModified": 1716948383,
|
||||
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bfb7a882678e518398ce9a31a881538679f6f092",
|
||||
"rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -451,6 +462,7 @@
|
|||
],
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-root": "flake-root",
|
||||
"git-hooks": "git-hooks",
|
||||
"home-manager": [
|
||||
"home-manager"
|
||||
],
|
||||
|
@ -458,17 +470,14 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"pre-commit-hooks": [
|
||||
"pre-commit-hooks"
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716733566,
|
||||
"narHash": "sha256-Zu0fn7bC+M/LwOOkR1RmeoOuCIbvvFwuqTldVBVe4WY=",
|
||||
"lastModified": 1717100844,
|
||||
"narHash": "sha256-cKEGHGLaZoiNroMd34RrDgVDB7xgfff7HBShMz7cEy8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "8212bf1cd2d2dfe6ba521dd8c65a13b67e562d1a",
|
||||
"rev": "6ff3493c9bc85063ae829f0c25c21be3bde5c5b3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -477,34 +486,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
"stylix",
|
||||
"flake-compat"
|
||||
],
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716213921,
|
||||
"narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"audiomenu": "audiomenu",
|
||||
|
@ -514,12 +495,9 @@
|
|||
"jpassmenu": "jpassmenu",
|
||||
"lix": "lix",
|
||||
"lix-module": "lix-module",
|
||||
"neovim-flake": "neovim-flake",
|
||||
"neovim-src": "neovim-src",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixvim": "nixvim",
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
"stylix": "stylix",
|
||||
"systems": "systems"
|
||||
}
|
||||
|
@ -533,7 +511,7 @@
|
|||
"base16-kitty": "base16-kitty",
|
||||
"base16-tmux": "base16-tmux",
|
||||
"base16-vim": "base16-vim",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"gnome-shell": "gnome-shell",
|
||||
"home-manager": [
|
||||
"home-manager"
|
||||
|
@ -543,11 +521,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716584337,
|
||||
"narHash": "sha256-u8enWMWhynbYlEFuVtTghwk1+Lu8iT4tBoVWZxWCe/g=",
|
||||
"lastModified": 1716800695,
|
||||
"narHash": "sha256-5ZHVsIg5akOIWImypmQMX/fXZZf3/7tzqJICLteFGZc=",
|
||||
"owner": "jalil-salame",
|
||||
"repo": "stylix",
|
||||
"rev": "e5a4701b7d96c4909105a4c2366e4af3f188f802",
|
||||
"rev": "036128f2517b1ff7d33d04773f48ea98d680128f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
27
flake.nix
27
flake.nix
|
@ -14,14 +14,6 @@
|
|||
url = "github:jalil-salame/audiomenu";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
neovim-src = {
|
||||
url = "github:neovim/neovim/v0.10.0";
|
||||
flake = false;
|
||||
};
|
||||
neovim-flake = {
|
||||
url = "github:nix-community/neovim-nightly-overlay";
|
||||
flake = false;
|
||||
};
|
||||
# Lix
|
||||
lix = {
|
||||
url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
|
||||
|
@ -56,7 +48,6 @@
|
|||
nix-darwin.follows = ""; # disable MacOS stuff
|
||||
home-manager.follows = "home-manager";
|
||||
flake-compat.follows = "stylix/flake-compat";
|
||||
pre-commit-hooks.follows = "pre-commit-hooks";
|
||||
};
|
||||
};
|
||||
# For deduplication
|
||||
|
@ -72,14 +63,6 @@
|
|||
nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
pre-commit-hooks = {
|
||||
url = "github:cachix/pre-commit-hooks.nix";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
nixpkgs-stable.follows = "nixpkgs";
|
||||
flake-compat.follows = "stylix/flake-compat";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Flake outputs that other flakes can use
|
||||
|
@ -92,8 +75,8 @@
|
|||
jpassmenu,
|
||||
audiomenu,
|
||||
nixvim,
|
||||
neovim-flake,
|
||||
neovim-src,
|
||||
# neovim-flake,
|
||||
# neovim-src,
|
||||
lix,
|
||||
lix-module,
|
||||
...
|
||||
|
@ -176,9 +159,9 @@
|
|||
jpassmenu = jpassmenu.overlays.default;
|
||||
audiomenu = audiomenu.overlays.default;
|
||||
# FIXME: remove once merged in nixpkgs
|
||||
neovim-nightly = final: prev: {
|
||||
neovim = final.callPackage (neovim-flake + "/flake/packages/neovim.nix") {inherit neovim-src;};
|
||||
};
|
||||
# neovim-nightly = final: prev: {
|
||||
# neovim = final.callPackage (neovim-flake + "/flake/packages/neovim.nix") {inherit neovim-src;};
|
||||
# };
|
||||
};
|
||||
|
||||
# Nix files formatter (run `nix fmt`)
|
||||
|
|
|
@ -17,7 +17,7 @@ in {
|
|||
(lib.optionalAttrs canSetAsDefault {defaultEditor = lib.mkDefault true;})
|
||||
(lib.optionalAttrs notStandalone {enable = lib.mkDefault true;})
|
||||
(lib.mkIf cfg.enable {
|
||||
package = pkgs.neovim;
|
||||
# package = pkgs.neovim;
|
||||
globals.mapleader = " ";
|
||||
# Appearance
|
||||
colorschemes.gruvbox = {
|
||||
|
|
Loading…
Reference in a new issue