update lockfile, gitiffy

This commit is contained in:
mtgmonkey 2025-06-18 13:32:49 -04:00
parent a6d6637b3e
commit 3c96c9818c
3 changed files with 89 additions and 20 deletions

96
flake.lock generated Executable file → Normal file
View file

@ -5,17 +5,17 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1749395936, "lastModified": 1749494299,
"narHash": "sha256-tEqZKBzQbENlyIDvVMWcnhifjEQkaEzK3eKDQWCbt58=", "narHash": "sha256-I6/TSz5ciJTEZNFCyrCXWRYqBkNIh3fZy67UErIw3fk=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "36fa8afd57449cacdc0535417c8d20fb6b702348", "rev": "596af4a7318d60816ee995526d571643e21744b5",
"revCount": 9, "revCount": 11,
"type": "git", "type": "git",
"url": "file:///var/lib/git-server/blog.git" "url": "https://git.mtgmonkey.net/Andromeda/blog.git"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "file:///var/lib/git-server/blog.git" "url": "https://git.mtgmonkey.net/Andromeda/blog.git"
} }
}, },
"flake-utils": { "flake-utils": {
@ -36,6 +36,42 @@
"type": "github" "type": "github"
} }
}, },
"jank-client": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1749606892,
"narHash": "sha256-ZGUUWNORko3QFy9p/2mc4voJ65/11Joy6Au79+TwxPw=",
"ref": "refs/heads/main",
"rev": "0e59a339c813bcf1e9969344d8b50ed380231552",
"revCount": 1179,
"type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/jank-client-fork.git"
},
"original": {
"type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/jank-client-fork.git"
}
},
"math-project": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1750258769,
"narHash": "sha256-BazJgo04yFqFfp2AA0Tfba+nBAeaNddQJBdLghVJskk=",
"ref": "refs/heads/master",
"rev": "fa0e8ca47dd5341d24d8aae90a0bc28a689c3d46",
"revCount": 6,
"type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/math-project.git"
},
"original": {
"type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/math-project.git"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1749143949, "lastModified": 1749143949,
@ -53,11 +89,41 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1749373575, "lastModified": 1749285348,
"narHash": "sha256-/3nvhGaUMG1A6zG185QHyTFR2fMiyffxU7VdMYk5qj0=", "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1748889542,
"narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-25.05",
"type": "indirect"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1750259320,
"narHash": "sha256-H8J4H2XCIMEJ5g6fZ179QfQvsc2dUqhqfBjC8RAHNRY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6a8d437617048567166f83b32d07ba73aeb2d125", "rev": "9ba04bda9249d5d5e5238303c9755de5a49a79c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -67,7 +133,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1714253743, "lastModified": 1714253743,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
@ -83,7 +149,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1746141548, "lastModified": 1746141548,
"narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=",
@ -101,7 +167,7 @@
}, },
"noshell": { "noshell": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1717396029, "lastModified": 1717396029,
@ -120,7 +186,9 @@
"root": { "root": {
"inputs": { "inputs": {
"elmskell-blog": "elmskell-blog", "elmskell-blog": "elmskell-blog",
"nixpkgs": "nixpkgs_2", "jank-client": "jank-client",
"math-project": "math-project",
"nixpkgs": "nixpkgs_4",
"noshell": "noshell", "noshell": "noshell",
"spacebar-server": "spacebar-server" "spacebar-server": "spacebar-server"
} }
@ -128,7 +196,7 @@
"spacebar-server": { "spacebar-server": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1748414795, "lastModified": 1748414795,

View file

@ -5,9 +5,9 @@
noshell.url = "github:viperML/noshell"; noshell.url = "github:viperML/noshell";
spacebar-server.url = "github:spacebarchat/server"; spacebar-server.url = "github:spacebarchat/server";
elmskell-blog.url = "git+file:///var/lib/git-server/blog.git"; elmskell-blog.url = "git+https://git.mtgmonkey.net/Andromeda/blog.git";
jank-client.url = "git+file:///var/lib/git-server/jank-client-fork.git"; jank-client.url = "git+https://git.mtgmonkey.net/Andromeda/jank-client-fork.git";
math-project.url = "git+file:///var/lib/git-server/math-project.git"; math-project.url = "git+https://git.mtgmonkey.net/Andromeda/math-project.git";
}; };
outputs = { outputs = {
@ -29,6 +29,7 @@
inherit system; inherit system;
inherit elmskell-blog; inherit elmskell-blog;
inherit spacebar-server; inherit spacebar-server;
inherit math-project;
ssh-pub-keys = import ./ssh-pub-keys.nix; ssh-pub-keys = import ./ssh-pub-keys.nix;
}; };
modules = [ modules = [
@ -46,8 +47,8 @@
noshell.nixosModules.default noshell.nixosModules.default
{programs.noshell.enable = true;} {programs.noshell.enable = true;}
math-project.nixosModules.default math-project.nixosModules.x86_64-linux.default
{programs.math-project.enable = true;} {services.math-project.enable = true;}
./services/math-project.nix ./services/math-project.nix
./configuration.nix ./configuration.nix

View file

@ -42,7 +42,7 @@ in {
systemd.services.math-project = { systemd.services.math-project = {
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
ExecStart = "${lib.getExe math-project}"; ExecStart = "${lib.getExe math-project.packages.x86_64-linux.default}";
RemainAfterExit = true; RemainAfterExit = true;
}; };
}; };