diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-08-02 10:58:21 +0200 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-08-02 11:06:29 +0200 |
| commit | 5ff4f86757a0c77c340b129d1565a8e9d6f52711 (patch) | |
| tree | 15f73778864c6a2c0302bcc99cd7a773df4f27f0 /flake | |
| parent | fix(modules/system/sound): Remove overloaded `sound` option (diff) | |
| download | nixos-config-5ff4f86757a0c77c340b129d1565a8e9d6f52711.zip | |
fix(modules/home/nvim/plgs/nvim/neorg): Use stable version
The unstable version is missing an lua dependency
Diffstat (limited to '')
| -rw-r--r-- | flake.lock | 8 | ||||
| -rw-r--r-- | flake.nix | 5 | ||||
| -rw-r--r-- | flake/default.nix | 4 | ||||
| -rw-r--r-- | flake/nixosConfigurations/default.nix | 2 |
4 files changed, 13 insertions, 6 deletions
@@ -542,16 +542,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "lastModified": 1722372011, + "narHash": "sha256-B2xRiC3NEJy/82ugtareBkRqEkPGpMyjaLxaR8LBxNs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "rev": "cf05eeada35e122770c5c14add958790fcfcbef5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -3,7 +3,7 @@ inputs = { # base - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # open nixpkgs prs nixpkgs-tfc.url = "github:soispha/nixpkgs/add-termfilechooser"; @@ -240,6 +240,7 @@ # core self, nixpkgs, + nixpkgs-stable, nixpkgs-tfc, nixpkgs-onlykey, # modules @@ -265,6 +266,7 @@ system = "x86_64-linux"; sysLib = shell_library.lib.${system}; + pkgsStable = nixpkgs-stable.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system}; myPkgs = import ./pkgs { inherit sysLib pkgs; @@ -283,6 +285,7 @@ # core self pkgs + pkgsStable myPkgs system sysLib diff --git a/flake/default.nix b/flake/default.nix index 3bd0e6ba..c04be901 100644 --- a/flake/default.nix +++ b/flake/default.nix @@ -2,6 +2,7 @@ # core self, pkgs, + pkgsStable, myPkgs, system, sysLib, @@ -31,6 +32,7 @@ nixosConfigurations = import ./nixosConfigurations { inherit self + pkgsStable myPkgs system nixpkgs_as_input @@ -101,7 +103,7 @@ in { pkgs.git-bug # secrets - ragenix.packages."${system}".default + # ragenix.packages."${system}".default # shell pkgs.shfmt # TODO: Integrate this into nvim <2023-10-31> diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix index 92e1a41e..c15d7fdd 100644 --- a/flake/nixosConfigurations/default.nix +++ b/flake/nixosConfigurations/default.nix @@ -1,6 +1,7 @@ { self, system, + pkgsStable, myPkgs, nixpkgs_as_input, nixpkgs_open_prs, @@ -42,6 +43,7 @@ inherit # extra package sources nixpkgs_open_prs + pkgsStable myPkgs shell_library sysLib |