Compare commits
No commits in common. "0d15ad2786840c1d199e5824aa6360534be3910c" and "321d2420dbcf761908d94b12730e37e0a97efa3b" have entirely different histories.
0d15ad2786
...
321d2420db
22
flake.lock
22
flake.lock
|
@ -16,7 +16,7 @@
|
|||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"coop-fd": {
|
||||
"coop-ofd": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"flake-compat": "flake-compat",
|
||||
|
@ -25,32 +25,32 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715464067,
|
||||
"narHash": "sha256-TlG5vT+473QV2IHTpRe43K8TF2kboWCjiIsa63pEzNo=",
|
||||
"lastModified": 1712785740,
|
||||
"narHash": "sha256-5r88elsHgFXDdr/NOwK+2oKMfrFqcXV4tQPhVXTLI0E=",
|
||||
"owner": "chayleaf",
|
||||
"repo": "coop-fd",
|
||||
"rev": "0ac65ba71562f83e70d1c778191b0b70cd97ce88",
|
||||
"repo": "coop-ofd",
|
||||
"rev": "348dbe813090de3c3b694695699439893df8ad62",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "chayleaf",
|
||||
"repo": "coop-fd",
|
||||
"repo": "coop-ofd",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"coop-fd",
|
||||
"coop-ofd",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715274763,
|
||||
"narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=",
|
||||
"lastModified": 1700327093,
|
||||
"narHash": "sha256-OgYvlBABxJYWhZ/HBd0bPVcIEkT+xDhDCpRYqtVhYWY=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5",
|
||||
"rev": "ae7cd510e508ee03d792005c2f1c0a3ff25ecb80",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -385,7 +385,7 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"coop-fd": "coop-fd",
|
||||
"coop-ofd": "coop-ofd",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"home-manager": "home-manager",
|
||||
"impermanence": "impermanence",
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
url = "github:oxalica/rust-overlay";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
coop-fd = {
|
||||
url = "github:chayleaf/coop-fd";
|
||||
coop-ofd = {
|
||||
url = "github:chayleaf/coop-ofd";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
home-manager = {
|
||||
|
@ -60,7 +60,7 @@
|
|||
# --impure required for developing
|
||||
# it takes the paths for modules from filesystem as opposed to flake inputs
|
||||
dev = {
|
||||
# coop-fd = true;
|
||||
# coop-ofd = true;
|
||||
# home-manager = true;
|
||||
# mobile-nixos = true;
|
||||
# nixos-router = true;
|
||||
|
|
|
@ -155,8 +155,6 @@
|
|||
CLOSE_WIN = "quit";
|
||||
"CLOSE_WIN {encode}" = "quit 4";
|
||||
"Ctrl+w" = ''set hwdec "no"'';
|
||||
"[" = "multiply speed 1/1.1";
|
||||
"]" = "multiply speed 1.1";
|
||||
# T = "script-binding generate-thumbnails";
|
||||
};
|
||||
config = {
|
||||
|
|
|
@ -17,7 +17,7 @@ let
|
|||
withQt5 = false;
|
||||
};
|
||||
in {
|
||||
imports = [ inputs.coop-fd.nixosModules.default ];
|
||||
imports = [ inputs.coop-ofd.nixosModules.default ];
|
||||
|
||||
# a bunch of services for personal use not intended for the public
|
||||
# TODO: keycloakify this
|
||||
|
@ -45,7 +45,7 @@ in {
|
|||
# services.keycloak.plugins = [ pkgs.keycloak.plugins.keycloak-metrics-spi ];
|
||||
services.keycloak.settings.metrics-enabled = true;
|
||||
|
||||
services.coop-fd = {
|
||||
services.coop-ofd = {
|
||||
enable = true;
|
||||
config.listener = "127.0.0.1:25783";
|
||||
};
|
||||
|
@ -74,7 +74,7 @@ in {
|
|||
proxyWebsockets = true;
|
||||
};
|
||||
locations."/money/" = {
|
||||
proxyPass = "http://${config.services.coop-fd.config.listener}/";
|
||||
proxyPass = "http://${config.services.coop-ofd.config.listener}/";
|
||||
};
|
||||
};
|
||||
services.nginx.virtualHosts."hydra.${cfg.domainName}" = {
|
||||
|
|
|
@ -76,8 +76,8 @@ in {
|
|||
{ directory = /var/cache/sccache; user = "root"; group = "nixbld"; mode = "0770"; }
|
||||
] ++ lib.optionals config.services.certspotter.enable [
|
||||
{ directory = /var/lib/certspotter; user = "certspotter"; group = "certspotter"; mode = "0755"; }
|
||||
] ++ lib.optionals (config.services.coop-fd.enable or false) [
|
||||
{ directory = /var/lib/private/coop-fd; mode = "0750"; defaultPerms.mode = "0700"; }
|
||||
] ++ lib.optionals (config.services.coop-ofd.enable or false) [
|
||||
{ directory = /var/lib/private/coop-ofd; mode = "0750"; defaultPerms.mode = "0700"; }
|
||||
] ++ lib.optionals config.services.dovecot2.enable [
|
||||
{ directory = /var/lib/dhparams; user = "root"; group = "root"; mode = "0755"; }
|
||||
{ directory = /var/lib/dovecot; user = "root"; group = "root"; mode = "0755"; }
|
||||
|
|
Loading…
Reference in a new issue