Compare commits
No commits in common. "6741c18dfd8db6153caceedd0e866464b4f8a038" and "f7c1959973a215f8e545da5d004de59d75958dfb" have entirely different histories.
6741c18dfd
...
f7c1959973
160
flake.lock
160
flake.lock
|
|
@ -20,11 +20,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742213273,
|
||||
"narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=",
|
||||
"lastModified": 1739298463,
|
||||
"narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "aquamarine",
|
||||
"rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf",
|
||||
"rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -69,6 +69,25 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gakuen-cosplay": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs",
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742093995,
|
||||
"narHash": "sha256-9xjCwI87xXYO7FG+Jc9abERmZ3RyECDx8caBIOK/PTw=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "6ad26e18a52e0141824014936a5574dfd91ff6f4",
|
||||
"revCount": 32,
|
||||
"type": "git",
|
||||
"url": "file:///mnt/internal/shared/work/gakuen/projects/cosplayer_submission"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "file:///mnt/internal/shared/work/gakuen/projects/cosplayer_submission"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -98,11 +117,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742569620,
|
||||
"narHash": "sha256-igC2cu+cPRB3E4QwKR+vGagyAtoyB+DrmWwDKm8jkaw=",
|
||||
"lastModified": 1741217763,
|
||||
"narHash": "sha256-g/TrltIjFHIjtzKY5CJpoPANfHQWDD43G5U1a/v5oVg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "8a68f18e96bcab13e4f97bece61e6602298a3141",
|
||||
"rev": "486b066025dccd8af7fbe5dd2cc79e46b88c80da",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -114,8 +133,8 @@
|
|||
"hydractify-bot": {
|
||||
"inputs": {
|
||||
"naersk": "naersk",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"utils": "utils"
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"utils": "utils_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736510643,
|
||||
|
|
@ -147,11 +166,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742215578,
|
||||
"narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=",
|
||||
"lastModified": 1738664950,
|
||||
"narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprcursor",
|
||||
"rev": "2fd36421c21aa87e2fe3bee11067540ae612f719",
|
||||
"rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -199,17 +218,17 @@
|
|||
"hyprlang": "hyprlang",
|
||||
"hyprutils": "hyprutils",
|
||||
"hyprwayland-scanner": "hyprwayland-scanner",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
"systems": "systems_2",
|
||||
"systems": "systems_3",
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742563987,
|
||||
"narHash": "sha256-P7rQo7SClIFU6OkUlnN01OqVWsjTMgmG/8gqhpXHfRI=",
|
||||
"lastModified": 1741218628,
|
||||
"narHash": "sha256-Z+jPT8nijCV1EzCZ5XkLr8x82WPCX/GKk8OKg8Kr+s4=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "c7f0519fafbf334a8f5088a8a0fc385732a24036",
|
||||
"rev": "243376078655f304b01e5097c59108745bbb9da9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -327,11 +346,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741191527,
|
||||
"narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=",
|
||||
"lastModified": 1739048914,
|
||||
"narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"rev": "72df3861f1197e41b078faa3e38eedd60e00018d",
|
||||
"rev": "a7334904d591f38757c46fbe2ab68651877d9099",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -352,11 +371,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741534688,
|
||||
"narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=",
|
||||
"lastModified": 1739891528,
|
||||
"narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3",
|
||||
"rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -377,11 +396,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739870480,
|
||||
"narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=",
|
||||
"lastModified": 1739049028,
|
||||
"narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwayland-scanner",
|
||||
"rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b",
|
||||
"rev": "04146df74a8d5ec0b579657307be01f1e241125f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -392,7 +411,7 @@
|
|||
},
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721727458,
|
||||
|
|
@ -410,6 +429,19 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1741010256,
|
||||
"narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
|
||||
"path": "/nix/store/jk6xpbfh10gz6q5cqw8b2f7xk0pl7hkv-source",
|
||||
"rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 0,
|
||||
"narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
|
||||
|
|
@ -421,7 +453,7 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1729850857,
|
||||
"narHash": "sha256-WvLXzNNnnw+qpFOmgaM3JUlNEH+T4s22b5i2oyyCpXE=",
|
||||
|
|
@ -437,13 +469,13 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1742069588,
|
||||
"narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
|
||||
"lastModified": 1739020877,
|
||||
"narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
|
||||
"rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -453,13 +485,13 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1742422364,
|
||||
"narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
|
||||
"lastModified": 1741010256,
|
||||
"narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
|
||||
"rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -479,11 +511,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742058297,
|
||||
"narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=",
|
||||
"lastModified": 1737465171,
|
||||
"narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a",
|
||||
"rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -495,10 +527,11 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"clipboard-sync": "clipboard-sync",
|
||||
"gakuen-cosplay": "gakuen-cosplay",
|
||||
"home-manager": "home-manager",
|
||||
"hydractify-bot": "hydractify-bot",
|
||||
"hyprland": "hyprland",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"spicetify-nix": "spicetify-nix"
|
||||
}
|
||||
},
|
||||
|
|
@ -507,14 +540,14 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_3"
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742512598,
|
||||
"narHash": "sha256-nFPhSSxrPrpkmFR6vQq8OpUS+lGIAxDCUKg+5/qcnR8=",
|
||||
"lastModified": 1740889006,
|
||||
"narHash": "sha256-A1iyKVvZrLdLwqWPC9OvPjC85ADQn2R1EGfCzJBl+wI=",
|
||||
"owner": "Gerg-L",
|
||||
"repo": "spicetify-nix",
|
||||
"rev": "610654a0afe56766e639077d9d267148667a25e8",
|
||||
"rev": "f8d3757d4ae3af2175a631fb9598a42d30ee75fc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -539,6 +572,21 @@
|
|||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1689347949,
|
||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||
|
|
@ -553,7 +601,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"systems_4": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
|
|
@ -572,6 +620,24 @@
|
|||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
|
|
@ -614,11 +680,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741934139,
|
||||
"narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=",
|
||||
"lastModified": 1737634991,
|
||||
"narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"rev": "150b0b6f52bb422a1b232a53698606fe0320dde0",
|
||||
"rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@
|
|||
hyprland.url = "github:hyprwm/Hyprland";
|
||||
|
||||
hydractify-bot.url = "github:hydractify/hydractify-bot";
|
||||
|
||||
gakuen-cosplay.url = "git+file:///mnt/internal/shared/work/gakuen/projects/cosplayer_submission";
|
||||
};
|
||||
|
||||
outputs =
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
{
|
||||
imports = [
|
||||
./gakuen-cosplay-api.nix
|
||||
./hydractify-bot.nix
|
||||
./openttd.nix
|
||||
./terraria.nix
|
||||
|
|
|
|||
16
hosts/wizdesk/services/home-manager/gakuen-cosplay-api.nix
Normal file
16
hosts/wizdesk/services/home-manager/gakuen-cosplay-api.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{ gakuen-cosplay, pkgs, ... }:
|
||||
|
||||
{
|
||||
systemd.user.services.gakuen-cosplay-api = {
|
||||
Install.WantedBy = [ "default.target" ];
|
||||
|
||||
Unit.Description = "Gakuen Cosplay API";
|
||||
|
||||
Service = {
|
||||
ExecStart = "${gakuen-cosplay.packages.${pkgs.system}.backend}/bin/animegakuen-cosplay-backend";
|
||||
Restart = "on-failure";
|
||||
Type = "simple";
|
||||
WorkingDirectory = "/srv/gakuen_api";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -42,5 +42,16 @@
|
|||
virtualHosts."shoko.thewizard.link".extraConfig = ''
|
||||
reverse_proxy 127.0.0.1:8111
|
||||
'';
|
||||
|
||||
virtualHosts."api.cosplay.thewizard.link".extraConfig = ''
|
||||
reverse_proxy 127.0.0.1:3000
|
||||
'';
|
||||
|
||||
virtualHosts."cosplay.thewizard.link".extraConfig = ''
|
||||
root * /srv/cosplay
|
||||
encode
|
||||
try_files {path} /index.html
|
||||
file_server
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ in
|
|||
# Example windowrule v1
|
||||
# windowrule = float, ^(kitty)$
|
||||
# Example windowrule v2
|
||||
# windowrule = float,class:^(kitty)$,title:^(kitty)$
|
||||
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
|
||||
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
|
||||
|
||||
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
|
||||
|
|
@ -381,38 +381,37 @@ in
|
|||
bind = SHIFT CTRL, F12, pass, ^(com.obsproject.Studio)$
|
||||
|
||||
# Window rules for xwaylandvideobridge
|
||||
windowrule = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$
|
||||
windowrule = noanim,class:^(xwaylandvideobridge)$
|
||||
windowrule = nofocus,class:^(xwaylandvideobridge)$
|
||||
windowrule = noinitialfocus,class:^(xwaylandvideobridge)$
|
||||
windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$
|
||||
windowrulev2 = noanim,class:^(xwaylandvideobridge)$
|
||||
windowrulev2 = nofocus,class:^(xwaylandvideobridge)$
|
||||
windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$
|
||||
|
||||
# Rules for windowkill
|
||||
windowrule = tag +windowkill, class:^(steam_app_2726450)$
|
||||
windowrule = noborder, tag:windowkill
|
||||
windowrule = pin, tag:windowkill
|
||||
windowrule = opacity 0.9, tag:windowkill
|
||||
windowrule = noborder, ^(steam_app_2726450)$
|
||||
windowrule = pin, ^(steam_app_2726450)$
|
||||
windowrule = opacity 0.9, ^(steam_app_2726450)$
|
||||
|
||||
# Rules for Awakened PoE
|
||||
windowrule = tag +poe, class:^(steam_app_238960)$
|
||||
windowrule = allowsinput, tag:poe
|
||||
windowrulev2 = tag +poe, class:^(steam_app_238960)$
|
||||
windowrulev2 = allowsinput, tag:poe
|
||||
|
||||
windowrule = tag +apt, class:^(awakened-poe-trade)$
|
||||
windowrule = float, tag:apt
|
||||
windowrule = noblur, tag:apt
|
||||
windowrule = noborder, tag:apt
|
||||
windowrule = noshadow, tag:apt
|
||||
windowrulev2 = tag +apt, class:^(awakened-poe-trade)$
|
||||
windowrulev2 = float, tag:apt
|
||||
windowrulev2 = noblur, tag:apt
|
||||
windowrulev2 = noborder, tag:apt
|
||||
windowrulev2 = noshadow, tag:apt
|
||||
|
||||
# Rules for anki
|
||||
windowrule = float, class:^(anki)$
|
||||
windowrulev2 = float, class:^(anki)$
|
||||
|
||||
windowrule = tag +gw2, class:^(steam_app_1284210)$
|
||||
windowrule = noblur, tag:gw2
|
||||
windowrule = noborder, tag:gw2
|
||||
windowrulev2 = tag +gw2, class:^(steam_app_1284210)$
|
||||
windowrulev2 = noblur, tag:gw2
|
||||
windowrulev2 = noborder, tag:gw2
|
||||
|
||||
# Rules for godot
|
||||
windowrule = tag +godot, class:^(Godot)$, title:^(.+)$
|
||||
windowrule = center, tag:godot
|
||||
windowrule = size 50% 50%, tag:godot
|
||||
windowrulev2 = tag +godot, class:^(Godot)$, title:^(.+)$
|
||||
windowrulev2 = center, tag:godot
|
||||
windowrulev2 = size 50% 50%, tag:godot
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ in
|
|||
|
||||
# Overwrite the Mesa packages with Hyprland's for consitency
|
||||
hardware.graphics = {
|
||||
package = hyprland-pkgs.mesa;
|
||||
package32 = hyprland-pkgs.pkgsi686Linux.mesa;
|
||||
package = hyprland-pkgs.mesa.drivers;
|
||||
package32 = hyprland-pkgs.pkgsi686Linux.mesa.drivers;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -88,7 +88,10 @@
|
|||
# Personal utilities
|
||||
anki
|
||||
ledger
|
||||
vesktop
|
||||
(vesktop.override {
|
||||
# FIXME: Need to pin until https://github.com/NixOS/nixpkgs/issues/380429 gets resolved.
|
||||
electron = electron_33;
|
||||
})
|
||||
|
||||
# Editing
|
||||
libreoffice
|
||||
|
|
|
|||
Loading…
Reference in a new issue