diff --git a/flake.lock b/flake.lock index 90a9d764..c8af6def 100644 --- a/flake.lock +++ b/flake.lock @@ -210,6 +210,21 @@ } }, "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": { "lastModified": 1676283394, "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", @@ -224,7 +239,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -239,6 +254,28 @@ "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": { "locked": { "lastModified": 1677232326, @@ -277,7 +314,7 @@ }, "llamacpp": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "unstable" ] @@ -423,6 +460,7 @@ "basant": "basant", "deploy-rs": "deploy-rs", "eww": "eww", + "grasp": "grasp", "hardware": "hardware", "home-manager": "home-manager", "llamacpp": "llamacpp", @@ -438,7 +476,7 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 3c669ac2..702d509c 100644 --- a/flake.nix +++ b/flake.nix @@ -24,8 +24,8 @@ basant.url = "git+ssh://gitea@git.sealight.xyz/aynish/basant?ref=main"; basant.inputs.nixpkgs.follows = "nixpkgs"; basant.inputs.poonam.follows = "poonam"; - # grasp.url = "git+ssh://gitea@git.sealight.xyz/aynish/grasp.git?ref=main"; - # grasp.inputs.nixpkgs.follows = "nixpkgs"; + grasp.url = "git+ssh://gitea@git.sealight.xyz/aynish/grasp.git?ref=main"; + grasp.inputs.nixpkgs.follows = "nixpkgs"; # Matrix nix-matrix-appservices.url = "gitlab:coffeetables/nix-matrix-appservices"; # Others @@ -61,7 +61,7 @@ , deploy-rs , agenix , basant - # , grasp + , grasp , nix-matrix-appservices , nur , tidalcycles @@ -226,7 +226,7 @@ self.nixosModules.wallabag self.nixosModules.gonic self.nixosModules.ulogger-server - # grasp.nixosModule + grasp.nixosModule home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/hosts/box/default.nix b/hosts/box/default.nix index 31c5fd8d..382dd635 100644 --- a/hosts/box/default.nix +++ b/hosts/box/default.nix @@ -19,17 +19,13 @@ ../profiles/wallabag ../profiles/finance ../profiles/sync/website + ../profiles/grasp # ../profiles/archivebox ../profiles/woodpecker-agent ../profiles/jellyfin ../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 age.secrets.borg-password.file = "${self}/secrets/borg-password.age"; services.postgresqlBackup = { diff --git a/hosts/profiles/dns/default.nix b/hosts/profiles/dns/default.nix index 604d7218..18662b26 100644 --- a/hosts/profiles/dns/default.nix +++ b/hosts/profiles/dns/default.nix @@ -27,6 +27,7 @@ "cal.mossnet.lan" "archive.mossnet.lan" "tracks.mossnet.lan" + "grasp.mossnet.lan" ]; "192.168.1.226" = [ "df-web.lan" diff --git a/hosts/profiles/grasp/default.nix b/hosts/profiles/grasp/default.nix index e01057d3..af65ae07 100644 --- a/hosts/profiles/grasp/default.nix +++ b/hosts/profiles/grasp/default.nix @@ -1,6 +1,12 @@ { ... }: { - services."grasp".enable = true; - services."grasp".path = "/home/anish/kitaab/grasp"; - services."grasp".user = "anish"; + services.grasp = { + enable = true; + path = "/home/anish/kitaab/grasp"; + user = "anish"; + }; + + services.nginx.virtualHosts."grasp.mossnet.lan" = { + locations."/".proxyPass = "http://localhost:12212"; + }; }