about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-08-02 10:58:21 +0200
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-08-02 11:06:29 +0200
commit5ff4f86757a0c77c340b129d1565a8e9d6f52711 (patch)
tree15f73778864c6a2c0302bcc99cd7a773df4f27f0
parentfix(modules/system/sound): Remove overloaded `sound` option (diff)
downloadnixos-config-5ff4f86757a0c77c340b129d1565a8e9d6f52711.tar.gz
nixos-config-5ff4f86757a0c77c340b129d1565a8e9d6f52711.zip
fix(modules/home/nvim/plgs/nvim/neorg): Use stable version
The unstable version is missing an lua dependency
-rw-r--r--flake.lock8
-rw-r--r--flake.nix5
-rw-r--r--flake/default.nix4
-rw-r--r--flake/nixosConfigurations/default.nix2
-rw-r--r--modules/home/conf/nvim/plgs/neorg/default.nix3
-rw-r--r--modules/system/home-manager/default.nix2
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