From f93c1ba9c755bbe934cc7a0447329d6549d14f61 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sun, 17 Sep 2023 23:40:32 +0100
Subject: [PATCH] unstable by default
Switch back to using `nixpkgs-unstable` by default and using
`nixpkgs-2305` when needed, such as for `exa` which is no longer
maintained and available.
In a future commit, I'll switch to `eza` which is the recommended alternative.
https://github.com/eza-community/eza
---
flake.lock | 48 ++++++++++++-------------
flake.nix | 6 ++--
system/shared/home-manager-packages.nix | 4 +--
system/shared/home-manager.nix | 8 ++---
4 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/flake.lock b/flake.lock
index 84ab812f..99532b88 100644
--- a/flake.lock
+++ b/flake.lock
@@ -24,27 +24,43 @@
]
},
"locked": {
- "lastModified": 1694465129,
- "narHash": "sha256-8BQiuobMrCfCbGM7w6Snx+OBYdtTIm0+cGVaKwQ5BFg=",
+ "lastModified": 1694643239,
+ "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "9787dffff5d315c9593d3f9fb0f9bf2097e1b57b",
+ "rev": "d9b88b43524db1591fb3d9410a21428198d75d49",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-23.05",
+ "ref": "master",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
- "lastModified": 1694753796,
- "narHash": "sha256-QPE7dqcicQH/nq9aywVXJWWtci4FvxHaM+BSIEbGBvA=",
+ "lastModified": 1694767346,
+ "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "360a7d31c30abefdc490d203f80e3221b7a24af2",
+ "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs-2305": {
+ "locked": {
+ "lastModified": 1694937365,
+ "narHash": "sha256-iHZSGrb9gVpZRR4B2ishUN/1LRKWtSHZNO37C8z1SmA=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "5d017a8822e0907fb96f7700a319f9fe2434de02",
"type": "github"
},
"original": {
@@ -72,28 +88,12 @@
"type": "github"
}
},
- "nixpkgs-unstable": {
- "locked": {
- "lastModified": 1694767346,
- "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"root": {
"inputs": {
"flake-parts": "flake-parts",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
- "nixpkgs-unstable": "nixpkgs-unstable"
+ "nixpkgs-2305": "nixpkgs-2305"
}
}
},
diff --git a/flake.nix b/flake.nix
index ea410f49..f637c010 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,9 +1,9 @@
{
inputs = {
home-manager.inputs.nixpkgs.follows = "nixpkgs";
- home-manager.url = "github:nix-community/home-manager/release-23.05";
- nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
- nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
+ home-manager.url = "github:nix-community/home-manager/master";
+ nixpkgs-2305.url = "github:nixos/nixpkgs/nixos-23.05";
+ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
};
outputs = inputs@{ flake-parts, self, ... }:
diff --git a/system/shared/home-manager-packages.nix b/system/shared/home-manager-packages.nix
index a255266c..9a16a345 100644
--- a/system/shared/home-manager-packages.nix
+++ b/system/shared/home-manager-packages.nix
@@ -7,7 +7,7 @@ with pkgs; [
delta
dog
doppler
- exa
+ inputs.nixpkgs-2305.legacyPackages."${system}".exa
fd
file
fzf
@@ -18,7 +18,6 @@ with pkgs; [
gnupg
htop
inotify-tools
- inputs.nixpkgs-unstable.legacyPackages."${system}".rustywind
jq
just
lua
@@ -39,6 +38,7 @@ with pkgs; [
pv
python3Full
ripgrep
+ rustywind
terraform
tldr
tmuxinator
diff --git a/system/shared/home-manager.nix b/system/shared/home-manager.nix
index 47fa5632..30da7204 100644
--- a/system/shared/home-manager.nix
+++ b/system/shared/home-manager.nix
@@ -525,7 +525,6 @@ in
customVim.vim-textobj-xmlattr
customVim.vim-visual-star-search
- inputs.nixpkgs-unstable.legacyPackages."${system}".vimPlugins.refactoring-nvim
vimPlugins.comment-nvim
vimPlugins.dial-nvim
vimPlugins.gitsigns-nvim
@@ -533,6 +532,7 @@ in
vimPlugins.impatient-nvim
vimPlugins.indent-blankline-nvim
vimPlugins.nvim-web-devicons
+ vimPlugins.refactoring-nvim
vimPlugins.rest-nvim
vimPlugins.splitjoin-vim
vimPlugins.todo-comments-nvim
@@ -570,9 +570,9 @@ in
vimPlugins.nvim-treesitter-textobjects
# LSP
- inputs.nixpkgs-unstable.legacyPackages."${system}".vimPlugins.nvim-lspconfig
- vimPlugins.null-ls-nvim
vimPlugins.lsp-status-nvim
+ vimPlugins.null-ls-nvim
+ vimPlugins.nvim-lspconfig
# Completion
vimPlugins.cmp-buffer
@@ -634,8 +634,8 @@ in
# Language servers
ansible-language-server
- inputs.nixpkgs-unstable.legacyPackages."${system}".nixd
lua-language-server
+ nixd
nodePackages.intelephense
nodePackages."@astrojs/language-server"
nodePackages."@tailwindcss/language-server"