diff options
| -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 | ||||
| -rw-r--r-- | modules/home/conf/nvim/plgs/neorg/default.nix | 3 | ||||
| -rw-r--r-- | modules/system/home-manager/default.nix | 2 |
6 files changed, 17 insertions, 7 deletions
diff --git a/flake.lock b/flake.lock index fa10057d..22269de9 100644 --- a/flake.lock +++ b/flake.lock @@ -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" } diff --git a/flake.nix b/flake.nix index 6bd2395c..1860c601 100644 --- a/flake.nix +++ b/flake.nix @@ -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 diff --git a/modules/home/conf/nvim/plgs/neorg/default.nix b/modules/home/conf/nvim/plgs/neorg/default.nix index 8d8015da..7d61ce09 100644 --- a/modules/home/conf/nvim/plgs/neorg/default.nix +++ b/modules/home/conf/nvim/plgs/neorg/default.nix @@ -1,5 +1,6 @@ -{...}: { +{pkgsStable, ...}: { programs.nixvim.plugins.neorg = { + package = pkgsStable.vimPlugins.neorg; enable = true; lazyLoading = true; diff --git a/modules/system/home-manager/default.nix b/modules/system/home-manager/default.nix index 23ba1a25..c3d65c0e 100644 --- a/modules/system/home-manager/default.nix +++ b/modules/system/home-manager/default.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + pkgsStable, nixpkgs_open_prs, sysLib, # extra information @@ -32,6 +33,7 @@ in { extraSpecialArgs = { inherit nixpkgs_open_prs + pkgsStable sysLib # extra information |