From 235efa07e8efcf055620fe3e4c1ff461c681b987 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Tue, 4 Jun 2024 21:21:38 +0200 Subject: [PATCH] Update system to NixOS 24.05 --- flake.lock | 46 ++++++++++++++++----------------- flake.nix | 6 ++--- home-manager/default.nix | 2 +- home-manager/neovim/default.nix | 2 +- 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index eac2b56..ede4485 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1715290355, - "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", + "lastModified": 1716561646, + "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", "owner": "ryantm", "repo": "agenix", - "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", + "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", "type": "github" }, "original": { @@ -87,11 +87,11 @@ ] }, "locked": { - "lastModified": 1716431128, - "narHash": "sha256-t3T8HlX3udO6f4ilLcN+j5eC3m2gqsouzSGiriKK6vk=", + "lastModified": 1717490821, + "narHash": "sha256-CivVhYExnMJ2afm+o1ogB231pKW/azhUghMI53MHmOM=", "owner": "nix-community", "repo": "disko", - "rev": "7ffc4354dfeb37c8c725ae1465f04a9b45ec8606", + "rev": "a838e83e21502a211b83373109a260e5ef5fbcf1", "type": "github" }, "original": { @@ -184,16 +184,16 @@ ] }, "locked": { - "lastModified": 1715381426, - "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", + "lastModified": 1717527182, + "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", "owner": "nix-community", "repo": "home-manager", - "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", + "rev": "845a5c4c073f74105022533907703441e0464bc3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -247,11 +247,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1715148395, - "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", + "lastModified": 1717515267, + "narHash": "sha256-3d/rDckP583688YqVPc6SyXTy2gHpma0HzCv3idi1OE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", + "rev": "82b2e20fbffe6a5f0555701af136ad3e734a5faa", "type": "github" }, "original": { @@ -263,16 +263,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715218190, - "narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=", + "lastModified": 1717281328, + "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a9960b98418f8c385f52de3b09a63f9c561427a", + "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -295,11 +295,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1715316543, - "narHash": "sha256-4XOPcWmyH77Gd+cvVr2Hp7PHAlNAesvsLtHHbqy8xfA=", + "lastModified": 1717399147, + "narHash": "sha256-eCWaE/q1VItpFAxxLVt171MdtDcjEnwi6QB/yuF73JU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c669412a552f31c45adad47894e7fd6a8698e53f", + "rev": "4a4ecb0ab415c9fccfb005567a215e6a9564cdf5", "type": "github" }, "original": { @@ -311,11 +311,11 @@ }, "nur": { "locked": { - "lastModified": 1715420683, - "narHash": "sha256-v+A+m2CDKjy4YNfn2Glv1eyctmbr7BQD8zWqTYIehHs=", + "lastModified": 1717521378, + "narHash": "sha256-3UMMPUmY+sqGXuz+cZg5Ul7x8awrgrXmVg9L/Tv91QM=", "owner": "nix-community", "repo": "NUR", - "rev": "0bfd4330d5355eb44693f34c0e6507f29b158d22", + "rev": "9a42df165c2851b40e9288564e09b0aa54dda5f5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f1bd0aa..1519c12 100644 --- a/flake.nix +++ b/flake.nix @@ -2,13 +2,13 @@ description = "My NixOS configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nur.url = "github:nix-community/NUR"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager?ref=release-23.11"; + url = "github:nix-community/home-manager?ref=release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -77,8 +77,6 @@ }; in { - formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt; - nixosConfigurations = { x260 = mkNixosSystem ({ pkgs, lib, ... }: { imports = [ nixos-hardware.nixosModules.lenovo-thinkpad-x260 ]; diff --git a/home-manager/default.nix b/home-manager/default.nix index 3fc2ce7..aecde83 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -34,7 +34,7 @@ unstable.impression poppler_utils # For pdfunite silicon - unstable.dbeaver + unstable.dbeaver-bin unstable.wireshark units btrfs-progs diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix index 29023f2..009e1f2 100644 --- a/home-manager/neovim/default.nix +++ b/home-manager/neovim/default.nix @@ -14,7 +14,7 @@ neofetch gopls terraform-ls - nixfmt + nixfmt-classic stylua black nixpkgs-fmt