make grasp work

This commit is contained in:
Anish Lakhwara 2023-04-27 16:14:01 +10:00
parent 70e8fa79bd
commit f8acfda6e5
5 changed files with 56 additions and 15 deletions

View file

@ -210,6 +210,21 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"locked": { "locked": {
"lastModified": 1676283394, "lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
@ -224,7 +239,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": { "flake-utils_4": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -239,6 +254,28 @@
"type": "github" "type": "github"
} }
}, },
"grasp": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1682572739,
"narHash": "sha256-V96pdeui9TGspoOZuXrTkYFG/6rLmWVVLRMU5+rENT4=",
"ref": "main",
"rev": "db31d3d4b7ae9351b0449ed3803f470aaa5d2135",
"revCount": 136,
"type": "git",
"url": "ssh://gitea@git.sealight.xyz/aynish/grasp.git"
},
"original": {
"ref": "main",
"type": "git",
"url": "ssh://gitea@git.sealight.xyz/aynish/grasp.git"
}
},
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1677232326, "lastModified": 1677232326,
@ -277,7 +314,7 @@
}, },
"llamacpp": { "llamacpp": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"unstable" "unstable"
] ]
@ -423,6 +460,7 @@
"basant": "basant", "basant": "basant",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"eww": "eww", "eww": "eww",
"grasp": "grasp",
"hardware": "hardware", "hardware": "hardware",
"home-manager": "home-manager", "home-manager": "home-manager",
"llamacpp": "llamacpp", "llamacpp": "llamacpp",
@ -438,7 +476,7 @@
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]

View file

@ -24,8 +24,8 @@
basant.url = "git+ssh://gitea@git.sealight.xyz/aynish/basant?ref=main"; basant.url = "git+ssh://gitea@git.sealight.xyz/aynish/basant?ref=main";
basant.inputs.nixpkgs.follows = "nixpkgs"; basant.inputs.nixpkgs.follows = "nixpkgs";
basant.inputs.poonam.follows = "poonam"; basant.inputs.poonam.follows = "poonam";
# grasp.url = "git+ssh://gitea@git.sealight.xyz/aynish/grasp.git?ref=main"; grasp.url = "git+ssh://gitea@git.sealight.xyz/aynish/grasp.git?ref=main";
# grasp.inputs.nixpkgs.follows = "nixpkgs"; grasp.inputs.nixpkgs.follows = "nixpkgs";
# Matrix # Matrix
nix-matrix-appservices.url = "gitlab:coffeetables/nix-matrix-appservices"; nix-matrix-appservices.url = "gitlab:coffeetables/nix-matrix-appservices";
# Others # Others
@ -61,7 +61,7 @@
, deploy-rs , deploy-rs
, agenix , agenix
, basant , basant
# , grasp , grasp
, nix-matrix-appservices , nix-matrix-appservices
, nur , nur
, tidalcycles , tidalcycles
@ -226,7 +226,7 @@
self.nixosModules.wallabag self.nixosModules.wallabag
self.nixosModules.gonic self.nixosModules.gonic
self.nixosModules.ulogger-server self.nixosModules.ulogger-server
# grasp.nixosModule grasp.nixosModule
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;

View file

@ -19,17 +19,13 @@
../profiles/wallabag ../profiles/wallabag
../profiles/finance ../profiles/finance
../profiles/sync/website ../profiles/sync/website
../profiles/grasp
# ../profiles/archivebox # ../profiles/archivebox
../profiles/woodpecker-agent ../profiles/woodpecker-agent
../profiles/jellyfin ../profiles/jellyfin
../profiles/ulogger-server ../profiles/ulogger-server
]; ];
# Something broke when manually updating grasp...
# services.grasp.enable = true;
# services.grasp.path = "/home/anish/kitaab/grasp/grasp.wiki";
# services.grasp.user = "anish";
# Backups # Backups
age.secrets.borg-password.file = "${self}/secrets/borg-password.age"; age.secrets.borg-password.file = "${self}/secrets/borg-password.age";
services.postgresqlBackup = { services.postgresqlBackup = {

View file

@ -27,6 +27,7 @@
"cal.mossnet.lan" "cal.mossnet.lan"
"archive.mossnet.lan" "archive.mossnet.lan"
"tracks.mossnet.lan" "tracks.mossnet.lan"
"grasp.mossnet.lan"
]; ];
"192.168.1.226" = [ "192.168.1.226" = [
"df-web.lan" "df-web.lan"

View file

@ -1,6 +1,12 @@
{ ... }: { ... }:
{ {
services."grasp".enable = true; services.grasp = {
services."grasp".path = "/home/anish/kitaab/grasp"; enable = true;
services."grasp".user = "anish"; path = "/home/anish/kitaab/grasp";
user = "anish";
};
services.nginx.virtualHosts."grasp.mossnet.lan" = {
locations."/".proxyPass = "http://localhost:12212";
};
} }