Add factorio mod zips
This commit is contained in:
niten
parent
59fee96327
commit
3346628501
|
|
@ -49,6 +49,13 @@ with lib; {
|
|||
options = [ "subvol=@state" "noexec" "noatime" "nodiratime" ];
|
||||
neededForBoot = true;
|
||||
};
|
||||
|
||||
"/var/lib/private" = {
|
||||
device = "/dev/disk/by-label/limina-data";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@var-private" "noexec" "noatime" "nodiratime" ];
|
||||
neededForBoot = true;
|
||||
};
|
||||
};
|
||||
|
||||
swapDevices = [{ device = "/dev/disk/by-label/limina-swap"; }];
|
||||
|
|
|
|||
|
|
@ -76,4 +76,19 @@ in {
|
|||
# Due to rollback, sudo will lecture after every reboot
|
||||
Defaults lecture = never
|
||||
'';
|
||||
|
||||
fudo = {
|
||||
secrets = {
|
||||
secret-group = "fudo-secrets";
|
||||
secret-users = [ "niten" ];
|
||||
secret-paths = [ "/state/secrets" ];
|
||||
};
|
||||
|
||||
minecraft-clj = {
|
||||
enable = true;
|
||||
state-directory = "/state/services/minecraft-clj";
|
||||
admins = [ "fudoniten" ];
|
||||
worlds = { REPLand = { allocated-memory = 16; }; };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,14 +45,6 @@ in {
|
|||
# document-root = "/state/gemini/root";
|
||||
# # textfiles-archive = "${pkgs.textfiles}";
|
||||
# slynk-port = 4005;
|
||||
|
||||
# # feeds = {
|
||||
# # viator = {
|
||||
# # title = "viator's phlog";
|
||||
# # path = "/home/viator/gemini-public/feed/";
|
||||
# # url = "gemini://informis.land/user/viator/feed/";
|
||||
# # };
|
||||
# # };
|
||||
# };
|
||||
|
||||
fudo = {
|
||||
|
|
|
|||
|
|
@ -55,18 +55,18 @@ in {
|
|||
{
|
||||
destination = "10.0.0.10:25565";
|
||||
proto = "tcp";
|
||||
sourcePort = "25565";
|
||||
sourcePort = 25565;
|
||||
}
|
||||
{
|
||||
destination = "10.0.0.10:25565";
|
||||
proto = "udp";
|
||||
sourcePort = "25565";
|
||||
sourcePort = 25565;
|
||||
}
|
||||
# Factorio
|
||||
{
|
||||
destination = "10.0.0.10:34197";
|
||||
proto = "udp";
|
||||
sourcePort = "34197";
|
||||
sourcePort = 34197;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ in {
|
|||
mattermost-auth-token-file = host-secrets.pricebot-auth-token.target-file;
|
||||
monitors = {
|
||||
btc = {
|
||||
mattermost-channel-id = "3m4bsxcrwbrmpqd4yawwh98q8o";
|
||||
mattermost-channel-id = "f7iem9t3qbbczjyuq4waj1s3ua";
|
||||
notify-user = "niten";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,156 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
# gdiw = let
|
||||
# version = "0.17.5";
|
||||
# sha256 = "0kg1jz26gpmldajckb47vgk9v6z6w0sf1lykl2pvjh0nq4mfl252";
|
||||
# in pkgs.stdenv.mkDerivation {
|
||||
# inherit version;
|
||||
# pname = "gdiw";
|
||||
# src = pkgs.fetchurl {
|
||||
# inherit sha256;
|
||||
# url =
|
||||
# "https://github.com/DaCyclops/GDIW/archive/refs/tags/${version}.zip";
|
||||
# };
|
||||
# deps = [ ];
|
||||
# phases = [ "installPhase" ];
|
||||
# installPhase = ''
|
||||
# mkdir $out
|
||||
# cp $src $out/GDIW_${version}.zip
|
||||
# '';
|
||||
# };
|
||||
|
||||
# bottleneck = let
|
||||
# version = "0.11.7";
|
||||
# sha256 = "0mvk0wciqpggjc0vzhb7g0a0cxq0wdzvzwrbqvagr6y02j4h3y1n";
|
||||
# in pkgs.stdenv.mkDerivation {
|
||||
# inherit version;
|
||||
# pname = "bottleneck";
|
||||
# src = pkgs.fetchurl {
|
||||
# inherit sha256;
|
||||
# url =
|
||||
# "https://github.com/troelsbjerre/Bottleneck/archive/refs/tags/${version}.zip";
|
||||
# };
|
||||
# deps = [ ];
|
||||
# phases = [ "installPhase" ];
|
||||
# installPhase = ''
|
||||
# mkdir $out
|
||||
# cp $src $out/Bottleneck_${version}.zip
|
||||
# '';
|
||||
# };
|
||||
|
||||
# even-distribution = let
|
||||
# version = "1.0.10";
|
||||
# commit-hash = "2f65d82a4da606b82bc597fce2695e7c512ebbfe";
|
||||
# sha256 = "05y1j8mq2nm163h014510bkv0w06hn97z5v2kay36ilj0rzdpi6j";
|
||||
# in pkgs.stdenv.mkDerivation {
|
||||
# inherit version;
|
||||
# pname = "even-distribution";
|
||||
|
||||
# src = pkgs.fetchurl {
|
||||
# inherit sha256;
|
||||
# url =
|
||||
# "https://github.com/321freddy/even-distribution/archive/${commit-hash}.zip";
|
||||
# };
|
||||
# deps = [ ];
|
||||
# phases = [ "installPhase" ];
|
||||
# installPhase = ''
|
||||
# mkdir $out
|
||||
# cp $src $out/even-distribution_${version}.zip
|
||||
# '';
|
||||
# };
|
||||
|
||||
# mkPlugin = { name, version, url, sha256, deps ? [ ] }:
|
||||
# let
|
||||
# fetchurl-auth = { name, url, sha256 }:
|
||||
# lib.overrideDerivation (pkgs.fetchurl {
|
||||
# inherit name url sha256;
|
||||
# curlOpts = [
|
||||
# "--get"
|
||||
# "-L"
|
||||
# "-H"
|
||||
# "Accept:application/octet-stream"
|
||||
# "--data-urlencode"
|
||||
# "username@username"
|
||||
# "--data-urlencode"
|
||||
# "token@token"
|
||||
# ];
|
||||
|
||||
# }) (_:
|
||||
# let
|
||||
# username = "Exceeding9987";
|
||||
# token =
|
||||
# lib.readFile config.fudo.secrets.files.blobs."factorio-token.txt";
|
||||
# in {
|
||||
# preHook = if username != "" && token != "" then ''
|
||||
# echo -n "${username}" >username
|
||||
# echo -n "${token}" >token
|
||||
# '' else ''
|
||||
# # Deliberately failing since username/token was not provided, so we can't fetch.
|
||||
# # We can't use builtins.throw since we want the result to be used if the tar is in the store already.
|
||||
# exit 1
|
||||
# '';
|
||||
# });
|
||||
# in pkgs.stdenv.mkDerivation {
|
||||
# inherit version deps;
|
||||
# pname = name;
|
||||
# src = fetchurl-auth { inherit name url sha256; };
|
||||
# phases = [ "installPhase" ];
|
||||
# installPhase = ''
|
||||
# mkdir $out
|
||||
# cp $src $out/${name}_${version}.zip
|
||||
# '';
|
||||
# };
|
||||
|
||||
mods = let
|
||||
modFromFile = file:
|
||||
pkgs.stdenv.mkDerivation {
|
||||
name = baseNameOf file;
|
||||
src = file;
|
||||
phases = [ "installPhase" ];
|
||||
installPhase = "cp $src $out";
|
||||
};
|
||||
modzip = filename: modFromFile (../../../static/factorio + "/${filename}");
|
||||
in {
|
||||
advanced-autonomous-industries = modzip "aai-industry_0.5.19.zip";
|
||||
alien-biomes = modzip "alien-biomes_0.6.7.zip";
|
||||
aircraft = modzip "Aircraft_1.8.4.zip";
|
||||
armored-biters = modzip "ArmoredBiters_1.1.6.zip";
|
||||
bobs-enemies = modzip "bobenemies_1.1.5.zip";
|
||||
bottleneck = modzip "Bottleneck_0.11.7.zip";
|
||||
bullet-trails = modzip "bullet-trails_0.6.2.zip";
|
||||
even-distribution = modzip "even-distribution_1.0.10.zip";
|
||||
flow-control = modzip "Flow Control_3.1.3.zip";
|
||||
fluid-must-flow = modzip "FluidMustFlow_1.3.1.zip";
|
||||
gdiw = modzip "GDIW_0.17.5.zip";
|
||||
hovercrafts = modzip "Hovercrafts_1.2.2.zip";
|
||||
industrial-revolution-2 = modzip "IndustrialRevolution_2.3.2.zip";
|
||||
krastorio2 = modzip "Krastorio2_1.3.6.zip";
|
||||
larger-lamps = modzip "DeadlockLargerLamp_1.5.0.zip";
|
||||
miniloader = modzip "miniloader_1.15.6.zip";
|
||||
planet-imaging-satellite = modzip "planetImagingSatellite_1.0.3.zip";
|
||||
rampant = modzip "Rampant_3.1.2.zip";
|
||||
recipe-book = modzip "RecipeBook_3.4.5.zip";
|
||||
space-exploration = modzip "space-exploration_0.6.89.zip";
|
||||
stackers = modzip "deadlock-beltboxes-loaders_2.4.2.zip";
|
||||
trees = modzip "trees_4.5.1.zip";
|
||||
vehicle-snap = modzip "VehicleSnap_1.18.4.zip";
|
||||
};
|
||||
|
||||
in {
|
||||
config.services.factorio = {
|
||||
enable = true;
|
||||
public = false;
|
||||
port = 34197;
|
||||
lan = false;
|
||||
game-name = "Fudo Factorio";
|
||||
description = "Fudo Factorio Server";
|
||||
admins = [ "fudoniten" "arkayuu" ];
|
||||
openFirewall = true;
|
||||
autosave-interval = 10;
|
||||
loadLatestSave = true;
|
||||
package = pkgs.factorio-headless-experimental;
|
||||
# mods = [ bottleneck gdiw ];
|
||||
mods = with mods; [ bottleneck gdiw ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
config.fudo.minecraft-server = {
|
||||
enable = true;
|
||||
package = pkgs.minecraft-current;
|
||||
data-dir = "/state/minecraft/data";
|
||||
world-name = "selbyland";
|
||||
game-mode = "creative";
|
||||
difficulty = 0;
|
||||
allow-cheats = true;
|
||||
allocated-memory = 14;
|
||||
};
|
||||
}
|
||||
|
|
@ -154,13 +154,13 @@ in {
|
|||
|
||||
logging.loki.state-directory = "/state/services/loki";
|
||||
|
||||
selby-forum = {
|
||||
enable = true;
|
||||
state-directory = "/state/services/selby-forum";
|
||||
legacy-forum-data = files.blobs."selby-forum-2021-12-14.clean";
|
||||
external-interface = "extif0";
|
||||
mail.host = "mail.fudo.org";
|
||||
};
|
||||
# selby-forum = {
|
||||
# enable = true;
|
||||
# state-directory = "/state/services/selby-forum";
|
||||
# legacy-forum-data = files.blobs."selby-forum-2021-12-14.clean";
|
||||
# external-interface = "extif0";
|
||||
# mail.host = "mail.fudo.org";
|
||||
# };
|
||||
};
|
||||
|
||||
# dns.state-directory = "/state/nsd";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
with lib; {
|
||||
fudo = {
|
||||
slynk.enable = true;
|
||||
wallfly.location = "office";
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@ in {
|
|||
wallfly.location = "office";
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [ opencv-java ];
|
||||
|
||||
networking = {
|
||||
interfaces.intif0.useDHCP = true;
|
||||
firewall.enable = false;
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@ in {
|
|||
wallfly.location = "family_room";
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [ opencv-java ];
|
||||
|
||||
networking = {
|
||||
interfaces.intif0.useDHCP = true;
|
||||
firewall.enable = false;
|
||||
|
|
|
|||
|
|
@ -88,4 +88,13 @@ in {
|
|||
services.flatpak.enable = enable-gui;
|
||||
|
||||
fonts.fontDir.enable = enable-gui;
|
||||
|
||||
# Stupid hack
|
||||
home-manager.users.jasper.home.packages = let
|
||||
factorio = pkgs.factorio.override {
|
||||
username = "Exceeding9987";
|
||||
token = lib.removeSuffix "\n"
|
||||
(readFile config.fudo.secrets.files.blobs."factorio-token.txt");
|
||||
};
|
||||
in [ factorio ];
|
||||
}
|
||||
|
|
|
|||
157
flake.lock
157
flake.lock
|
|
@ -4,7 +4,7 @@
|
|||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 0,
|
||||
"narHash": "sha256-bzJh3skCEKFM7KO9N6icOJsRqXmjbSo1s8uNh3t9mYI=",
|
||||
"narHash": "sha256-Eju+PnIrgZwO9YXdqiCk+p5z3lXza/IIloltIcNBfwk=",
|
||||
"path": "/state/secrets/blobs",
|
||||
"type": "path"
|
||||
},
|
||||
|
|
@ -260,11 +260,11 @@
|
|||
"ws-butler": "ws-butler"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1657364333,
|
||||
"narHash": "sha256-PiNZ6Kk/JedMTRDxAmvLkf/O34QRPep7I3ItMEYVllw=",
|
||||
"lastModified": 1664622347,
|
||||
"narHash": "sha256-pJTnEG68PhrXjpkfz/784BlcxaHgV06b1cUVGRxhMdw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-doom-emacs",
|
||||
"rev": "a59295c11efb6377b0c5eb4c8259bb49d94ec1d5",
|
||||
"rev": "b65e204ce9d20b376acc38ec205d08007eccdaef",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -276,11 +276,11 @@
|
|||
"doom-emacs_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1657023376,
|
||||
"narHash": "sha256-huKtA8twjW3GkfA6NRvCjWMWUEN58ju4sL89rRQxOes=",
|
||||
"lastModified": 1660901074,
|
||||
"narHash": "sha256-3apl0eQlfBj3y0gDdoPp2M6PXYnhxs0QWOHp8B8A9sc=",
|
||||
"owner": "doomemacs",
|
||||
"repo": "doomemacs",
|
||||
"rev": "9ec60d9ab9eb5d9b098e2452395156b622cce624",
|
||||
"rev": "c44bc81a05f3758ceaa28921dd9c830b9c571e61",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -293,11 +293,11 @@
|
|||
"doom-snippets": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1655900328,
|
||||
"narHash": "sha256-fEYwFxW2sdzNK14DrS92OCGy8KDPZKewrHljnE/RlzQ=",
|
||||
"lastModified": 1662645711,
|
||||
"narHash": "sha256-XKpPCtECGZQ5bFPPDUX3oAltXOJNwAI/OktxiLnADRE=",
|
||||
"owner": "doomemacs",
|
||||
"repo": "snippets",
|
||||
"rev": "6b2bd5a77c536ed414794ecf71d37a60ebd4663e",
|
||||
"rev": "03a62fe7edf7e87fdbd925713fbd3bf292d14b00",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -309,11 +309,11 @@
|
|||
"emacs-overlay": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1657275959,
|
||||
"narHash": "sha256-pg8FB1DRImBpqXHCp/0Y7bIphpVqGmkWgWOcFDMwdTg=",
|
||||
"lastModified": 1664478431,
|
||||
"narHash": "sha256-XTPklm/+e2UfIitB0+s/fKTheMJSw3G1p+t0SsBCuo4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "22448c09bae21969ca14d1558a120dafe9853c73",
|
||||
"rev": "6c78924bc5b6daaf98c0dbe63bdfcf80e6433f4b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -481,11 +481,11 @@
|
|||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1656928814,
|
||||
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
|
||||
"lastModified": 1659877975,
|
||||
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
|
||||
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -579,11 +579,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1660764393,
|
||||
"narHash": "sha256-CX5FT8wzgXhy42EdkDzyZpuWATtJ3l3UzlJzuWuzb/I=",
|
||||
"lastModified": 1662665220,
|
||||
"narHash": "sha256-nFIPsBwT9/vgM8+mRJQpVPaabUKkN5BUYF8+nfvOuaY=",
|
||||
"ref": "master",
|
||||
"rev": "f0dc6216744338a53d196b07812a54c38cc5b729",
|
||||
"revCount": 104,
|
||||
"rev": "0375d2c98014f0923d2cde2d1ae186533052d02c",
|
||||
"revCount": 105,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/entities.git"
|
||||
},
|
||||
|
|
@ -603,11 +603,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1660588007,
|
||||
"narHash": "sha256-k5berFrNMPPEOHdOCPFSfHuCyvKAkTiFNohPZWE6Sio=",
|
||||
"lastModified": 1666377418,
|
||||
"narHash": "sha256-/nx0Ui2CA52wm5hHP7GmeVNIwFQOCyPk/1s8HPbVFIY=",
|
||||
"ref": "master",
|
||||
"rev": "0d1f7cfb5850544cd1bc2b2c877f2c8b461cef25",
|
||||
"revCount": 209,
|
||||
"rev": "804ef2cc23ad82c6b416cae972c61eebd0896c46",
|
||||
"revCount": 238,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/home.git"
|
||||
},
|
||||
|
|
@ -633,23 +633,26 @@
|
|||
},
|
||||
"fudo-lib_2": {
|
||||
"locked": {
|
||||
"lastModified": 1661186654,
|
||||
"narHash": "sha256-c7eFfTIWl36og96mHwUY6jQ2aY11sSOafqa3FRoDZtY=",
|
||||
"path": "/state/fudo-lib",
|
||||
"type": "path"
|
||||
"lastModified": 1663264893,
|
||||
"narHash": "sha256-5qb0+YAHnZTfSHyN/IrvR3O6XQ04GfYQy/Lywad/mAo=",
|
||||
"ref": "master",
|
||||
"rev": "ff1aa983bf2584f57de02cd0c3fbc6f228111203",
|
||||
"revCount": 89,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/lib.git"
|
||||
},
|
||||
"original": {
|
||||
"path": "/state/fudo-lib",
|
||||
"type": "path"
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/lib.git"
|
||||
}
|
||||
},
|
||||
"fudo-pkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1655577860,
|
||||
"narHash": "sha256-6OlBGH8TXCuPBakj/hB+o5turzroOysbb+Z1rJYuM3w=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "445d96e405308f19d0d1021f11b55fd2d6b35e0f",
|
||||
"revCount": 55,
|
||||
"lastModified": 1663789893,
|
||||
"narHash": "sha256-hJ070rVUmRNrnzbN8OoKmjWhsTkHWvAhHZo/YdUTTOo=",
|
||||
"ref": "master",
|
||||
"rev": "bcecb878116a0f3cb1f12262d6f58d8a3ce083e4",
|
||||
"revCount": 65,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/pkgs.git"
|
||||
},
|
||||
|
|
@ -660,11 +663,11 @@
|
|||
},
|
||||
"fudo-pkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1660763786,
|
||||
"narHash": "sha256-/7cfxh5dgIe6DLcTpSAXhZgN3A57k6oH+19TijH9Ebw=",
|
||||
"lastModified": 1663789893,
|
||||
"narHash": "sha256-hJ070rVUmRNrnzbN8OoKmjWhsTkHWvAhHZo/YdUTTOo=",
|
||||
"ref": "master",
|
||||
"rev": "8c2cf13b06e3f3142b5133b4bffa4a7768685b8a",
|
||||
"revCount": 57,
|
||||
"rev": "bcecb878116a0f3cb1f12262d6f58d8a3ce083e4",
|
||||
"revCount": 65,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/pkgs.git"
|
||||
},
|
||||
|
|
@ -688,8 +691,8 @@
|
|||
"ssh-keypairs": "ssh-keypairs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1656718094,
|
||||
"narHash": "sha256-yDpEBjY1j5AvrnE4qHamorrJRuSApN+tHwjhYYJXjQ0=",
|
||||
"lastModified": 1665447952,
|
||||
"narHash": "sha256-QgkvQIONER5HdRY5Vz3YmJ4U6N4obOkVJdE22kV6WL0=",
|
||||
"path": "/state/secrets",
|
||||
"type": "path"
|
||||
},
|
||||
|
|
@ -748,11 +751,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1656169755,
|
||||
"narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
|
||||
"lastModified": 1665996265,
|
||||
"narHash": "sha256-/k9og6LDBQwT+f/tJ5ClcWiUl8kCX5m6ognhsAxOiCY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
|
||||
"rev": "b81e128fc053ab3159d7b464d9b7dedc9d6a6891",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -778,11 +781,11 @@
|
|||
"niten-doom-config": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1657421724,
|
||||
"narHash": "sha256-7cPjq6qHc32mtyZehVjl6mSTT2OIwrNY02JvFzwg150=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "f5f64049e4d782cd7ad2527165f520f4b0dac0d2",
|
||||
"revCount": 55,
|
||||
"lastModified": 1666377366,
|
||||
"narHash": "sha256-IOyfNAYrY8o5LWWYVFc8wI9sKcCD6fwLtzd2qUgAQZc=",
|
||||
"ref": "master",
|
||||
"rev": "97042208eaecd09bad17c28119d7963466878a22",
|
||||
"revCount": 62,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/niten/doom-emacs.git"
|
||||
},
|
||||
|
|
@ -839,11 +842,11 @@
|
|||
},
|
||||
"nixpkgsUnstable": {
|
||||
"locked": {
|
||||
"lastModified": 1661088761,
|
||||
"narHash": "sha256-5DGKX81wIPAAiLwUmUYECpA3vop94AHHR7WmGXSsQok=",
|
||||
"lastModified": 1666447894,
|
||||
"narHash": "sha256-i9WHX4w/et4qPMzEXd9POmnO0/bthjr7R4cblKNHGms=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a7855f2235a1876f97473a76151fec2afa02b287",
|
||||
"rev": "95aeaf83c247b8f5aa561684317ecd860476fcd6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -899,11 +902,11 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1661094678,
|
||||
"narHash": "sha256-RtaVb6SqfrgCi20gdju1ogS3u1ocyLnhsgolazrCwL0=",
|
||||
"lastModified": 1666401273,
|
||||
"narHash": "sha256-AG3MoIjcWwz1SPjJ2nymWu4NmeVj9P40OpB1lsmxFtg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "23534df34c1c499a6c82ce690df06d8c6e4e759d",
|
||||
"rev": "3933d8bb9120573c0d8d49dc5e890cb211681490",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -977,11 +980,11 @@
|
|||
"org": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1657029612,
|
||||
"narHash": "sha256-enwqnerhZVpyQbeX0uKdZ4IVmZieq9ZgCbkDWy1HlNQ=",
|
||||
"lastModified": 1664493874,
|
||||
"narHash": "sha256-8zLosjfQX0aR5HprtCeiSqN1pfB+GEUF9AULk6WRcR4=",
|
||||
"owner": "emacs-straight",
|
||||
"repo": "org-mode",
|
||||
"rev": "71359820221ec18d27fab28403d4fd3537ca0491",
|
||||
"rev": "fe1f4f2ccf040deff9c57288d987f17cc2da321f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -993,11 +996,11 @@
|
|||
"org-contrib": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1652646857,
|
||||
"narHash": "sha256-IWIShWyVnbwXqGLQaDNvJ0KoepxhIrXWTjPyGPEkQ14=",
|
||||
"lastModified": 1664301003,
|
||||
"narHash": "sha256-8CAq/EB52RMQHNLZM0uc/1N5gKTfxGhf7WFt9sMKoD8=",
|
||||
"owner": "emacsmirror",
|
||||
"repo": "org-contrib",
|
||||
"rev": "c1e0980fd7a57ca2042fd78acfb1dfb5c3bc03fa",
|
||||
"rev": "aa104c0bbc3113f6d3d167b20bd8d6bf6a285f0f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1045,11 +1048,11 @@
|
|||
"utils": "utils_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1661185834,
|
||||
"narHash": "sha256-VhfI2Jw6PFjTKbLUzIid8YK29j7mPYJ7u9GaSbwwLX4=",
|
||||
"lastModified": 1661201877,
|
||||
"narHash": "sha256-aA2DKV24Gq2oRb6Tnvq+IBfkTJZNXx5n5E7ELLgFdbU=",
|
||||
"ref": "master",
|
||||
"rev": "903d1b81d11f7181943b46a6685add810716e2be",
|
||||
"revCount": 39,
|
||||
"rev": "9269eb1a7e9f1b177d0ab3382c4c641b5bb2bbfa",
|
||||
"revCount": 44,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-public/pricebot.git"
|
||||
},
|
||||
|
|
@ -1074,11 +1077,11 @@
|
|||
"revealjs": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1653993278,
|
||||
"narHash": "sha256-X43lsjoLBWmttIKj9Jzut0UP0dZlsue3fYbJ3++ojbU=",
|
||||
"lastModified": 1664012352,
|
||||
"narHash": "sha256-Pu5p6HqIO2wvWiTEhsQyIuwlWEIa1GjO3EDXosznyYE=",
|
||||
"owner": "hakimel",
|
||||
"repo": "reveal.js",
|
||||
"rev": "039972c730690af7a83a5cb832056a7cc8b565d7",
|
||||
"rev": "468132320d6e072abd1297d7cc24766a2b7a832d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1148,8 +1151,8 @@
|
|||
"service-secrets": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1655662910,
|
||||
"narHash": "sha256-2p17wcdrfUerirVBaQ+jjXTrlPAbUDC6hqn+89WFeQs=",
|
||||
"lastModified": 1661209454,
|
||||
"narHash": "sha256-+vSD+aI2BUEGFAD5yBcSBZ/Vv9KSQ/KF5WFdId3Qc80=",
|
||||
"path": "/state/secrets/service-secrets",
|
||||
"type": "path"
|
||||
},
|
||||
|
|
@ -1190,11 +1193,11 @@
|
|||
"ts-fold": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1657091443,
|
||||
"narHash": "sha256-yr/aW7sYoOxajVb2gTgRrwaDwwg2gtHuP3wdrwjiaxo=",
|
||||
"lastModified": 1663136308,
|
||||
"narHash": "sha256-FI25RLoHqhcjA2qel75LVmQH4rTkKiAUR2w9QODT1XM=",
|
||||
"owner": "jcs-elpa",
|
||||
"repo": "ts-fold",
|
||||
"rev": "dcd5b9fe5c2cb72261ff6c714beb8d0198b8522b",
|
||||
"rev": "c3da5520b988720f7f6e9e5e11b60746598112e0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1300,11 +1303,11 @@
|
|||
"utils": "utils_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1656718212,
|
||||
"narHash": "sha256-q4StE5titkXrnvMp9GGPhXWdzZ6CT8X7iwhClu/iRXQ=",
|
||||
"lastModified": 1664215454,
|
||||
"narHash": "sha256-pKzJQ4mmUThFY7po+c6bYXbz2RZT9QkxazW94bYF/II=",
|
||||
"ref": "master",
|
||||
"rev": "6c17df68507acebd7a809fc48cda1b2315971650",
|
||||
"revCount": 11,
|
||||
"rev": "90ba657a24c7ab3032ce4e54faea2a8163ce1091",
|
||||
"revCount": 14,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-public/wallfly.git"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@
|
|||
build-timestamp = concat-timestamp latest-modified-timestamp;
|
||||
in { config, ... }: {
|
||||
imports = [
|
||||
fudo-home.nixosModule
|
||||
fudo-home.nixosModules.default
|
||||
fudo-secrets.nixosModule
|
||||
fudo-lib.nixosModule
|
||||
fudo-entities.nixosModule
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
with lib;
|
||||
let
|
||||
nixos-version = "21.05";
|
||||
nixos-version = "22.05";
|
||||
|
||||
pkgs = import <nixpkgs> {
|
||||
config = {
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue