From 4171e29e6828dc77b8c3a4419e181e7bfebd9677 Mon Sep 17 00:00:00 2001
From: Lyn <lynatic@noreply.git.shibe.pro>
Date: Fri, 6 Sep 2024 05:01:21 +0200
Subject: [PATCH] switched lix to nixpkgs unstable, switched forgejo to
 unstable too

---
 flake.lock             | 37 +++++++++++++++++++++++++++----------
 flake.nix              | 22 +++++++++++-----------
 meta/profiles/base.nix |  2 +-
 services/forgejo.nix   |  1 +
 4 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/flake.lock b/flake.lock
index 60405eb..7ca4cde 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1725001927,
-        "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
+        "lastModified": 1725407940,
+        "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
+        "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3",
         "type": "github"
       },
       "original": {
@@ -32,13 +32,29 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1721466660,
-        "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=",
+        "lastModified": 1725432240,
+        "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100",
+        "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1725194671,
+        "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
         "type": "github"
       },
       "original": {
@@ -51,6 +67,7 @@
     "root": {
       "inputs": {
         "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "sops-nix": "sops-nix"
       }
     },
@@ -60,11 +77,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1723501126,
-        "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
+        "lastModified": 1725540166,
+        "narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
+        "rev": "d9d781523a1463965cd1e1333a306e70d9feff07",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 95cff65..1593567 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,25 +3,25 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     sops-nix.url = "github:Mic92/sops-nix";
-    lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
   };
-  outputs = {self, nixpkgs, lix-module, sops-nix }@inputs: {
+  outputs = {self, nixpkgs, nixpkgs-unstable, sops-nix }@inputs: {
   
   nixosConfigurations = {
     "forgejo" = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
 	modules = [
-          ./hosts/forgenite/default.nix
+          ./hosts/forgenite
           sops-nix.nixosModules.sops
-          lix-module.nixosModules.default
+	  ({lib,config,...}:{
+	    options.inputs = lib.mkOption{type = lib.types.attrs;};
+	    config.inputs = inputs;
+	    options.pkgsInstances = lib.mkOption{type = lib.types.attrs;};
+            config.pkgsInstances = {
+		unstable = import inputs.nixpkgs-unstable{system = config.nixpkgs.system;};
+	    };
+	  })
         ];
-	specialArgs = { 
-		inherit inputs;
-		flake = self;
-	};
     };
   };
 };
diff --git a/meta/profiles/base.nix b/meta/profiles/base.nix
index f86da25..3c101ef 100644
--- a/meta/profiles/base.nix
+++ b/meta/profiles/base.nix
@@ -4,7 +4,7 @@
   ];
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
   nixpkgs.config.allowUnfree = true;
-  
+  nix.package = config.pkgsInstances.unstable.lix;
   environment.variables.EDITOR = "vim";  
   
   time.timeZone = "Europe/Berlin";
diff --git a/services/forgejo.nix b/services/forgejo.nix
index e2e9e31..db1f4f4 100644
--- a/services/forgejo.nix
+++ b/services/forgejo.nix
@@ -2,6 +2,7 @@
 with lib; with builtins; {
   services.forgejo = {
     enable = true;
+    package = config.pkgsInstances.unstable.forgejo;
     settings.server = {
       ROOT_URL = "https://git.shibe.pro";
       DOMAIN = "git.shibe.pro";