Flake : Use stable and master nixpkgs.
This commit is contained in:
parent
46b11cf4c2
commit
0b37fca821
|
@ -2,7 +2,7 @@
|
|||
# 1. You need to change PSQL tables owner from root to onlyoffice, too. They don't do that automatically for some reason.
|
||||
# 2. TODO: Generate JWT secret at /var/lib/onlyoffice/jwt, i.e. 9wLfMGha1YrfvWpb5hyYjZf8pvJQ3swS
|
||||
# See https://git.voronind.com/voronind/nixos/issues/74
|
||||
{ container, pkgs, util, ... } @args: let
|
||||
{ container, pkgs, util, lib, ... } @args: let
|
||||
cfg = container.config.office;
|
||||
in {
|
||||
systemd.tmpfiles.rules = container.mkContainerDir cfg [
|
||||
|
|
34
flake.lock
34
flake.lock
|
@ -341,6 +341,38 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgsMaster": {
|
||||
"locked": {
|
||||
"lastModified": 1718911369,
|
||||
"narHash": "sha256-6hQfF7h56BB7FEM1amkFklmldw52C8Zt2YJ7TsYQVBQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a8e819d72379c40c713d4583f7bd83267ba69065",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "master",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgsStable": {
|
||||
"locked": {
|
||||
"lastModified": 1717786204,
|
||||
"narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1717298511,
|
||||
|
@ -770,6 +802,8 @@
|
|||
"nix-on-droid": "nix-on-droid",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgsJobber": "nixpkgsJobber",
|
||||
"nixpkgsMaster": "nixpkgsMaster",
|
||||
"nixpkgsStable": "nixpkgsStable",
|
||||
"nvimAlign": "nvimAlign",
|
||||
"nvimAutoclose": "nvimAutoclose",
|
||||
"nvimBufferline": "nvimBufferline",
|
||||
|
|
|
@ -8,6 +8,8 @@
|
|||
# Manual: https://nixos.org/manual/nixos/stable
|
||||
# Search: https://search.nixos.org/packages and https://search.nixos.org/options
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nixpkgsStable.url = "github:nixos/nixpkgs/051f920625ab5aabe37c920346e3e69d7d34400e";
|
||||
nixpkgsMaster.url = "github:nixos/nixpkgs/master";
|
||||
|
||||
# This thing manages user's /home directroies. Because NixOS only manages system itself.
|
||||
# Homepage: https://github.com/nix-community/home-manager
|
||||
|
@ -126,7 +128,7 @@
|
|||
# Here you see a set of inputs we defined above, like nixpkgs, home-manager and so on.
|
||||
# `...` at the end of a set means "ignore other arguments provided to this function".
|
||||
# @inputs means aliasing all the inputs to the `inputs` name, so we can pass them all at once later.
|
||||
outputs = { self, nixpkgs, nix-on-droid, home-manager, stylix, poetry2nixJobber, nixpkgsJobber, ... } @inputs: {
|
||||
outputs = { self, nixpkgs, nixpkgsStable, nixpkgsMaster, nix-on-droid, home-manager, stylix, poetry2nixJobber, nixpkgsJobber, ... } @inputs: {
|
||||
# Constant values.
|
||||
const = {
|
||||
droidStateVersion = "22.11";
|
||||
|
@ -185,6 +187,8 @@
|
|||
config = self.nixosConfigurations.${hostname}.config;
|
||||
|
||||
pkgsJobber = nixpkgsJobber.legacyPackages.${system}.pkgs;
|
||||
pkgsStable = nixpkgsJobber.legacyPackages.${system}.pkgs;
|
||||
pkgsMaster = nixpkgsJobber.legacyPackages.${system}.pkgs;
|
||||
in {
|
||||
const = self.const; # Constant values.
|
||||
flake = self; # This Flake itself.
|
||||
|
@ -196,6 +200,9 @@
|
|||
util = import ./part/Util.nix { inherit pkgs lib; }; # Util functions.
|
||||
wallpaper = import ./part/Wallpaper.nix { inherit pkgs; }; # Wallpaper.
|
||||
|
||||
# Stable and Master pkgs.
|
||||
inherit pkgsStable pkgsMaster;
|
||||
|
||||
# Stuff for Jobber container, skip this part.
|
||||
inherit poetry2nixJobber pkgsJobber;
|
||||
};
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
, util
|
||||
, poetry2nixJobber
|
||||
, pkgsJobber
|
||||
, pkgsMaster
|
||||
, pkgsStable
|
||||
, ... }: let
|
||||
args = let
|
||||
storage = "/storage/hot/container";
|
||||
|
@ -29,6 +31,7 @@
|
|||
in {
|
||||
inherit storage domain host pkgs const lib config util media externalInterface;
|
||||
inherit poetry2nixJobber pkgsJobber;
|
||||
inherit pkgsMaster pkgsStable;
|
||||
|
||||
container = import ../../container args;
|
||||
};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... } @args: let
|
||||
{ pkgs, pkgsStable, pkgsMaster, ... } @args: let
|
||||
mangohud = import ./mangohud args;
|
||||
in {
|
||||
imports = [
|
||||
|
|
Loading…
Reference in a new issue