1
Fork 0

Compare commits

...

4 commits

5 changed files with 20 additions and 17 deletions

View file

@ -491,11 +491,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1728792245, "lastModified": 1731556998,
"narHash": "sha256-u3DIFQ26jtO9kgxSXMVYYdjSF8VArR0jA0N7ns1wWoo=", "narHash": "sha256-/x/j+JHTMVFLWDpWClFw3IpzJiVkHTWL5z138Jj2ec4=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "8064396aa8c2491dcecbedf9c71140936f032056", "rev": "47a8f584cbd9f26ca18e905ec37799838babcc29",
"revCount": 3842, "revCount": 3905,
"type": "git", "type": "git",
"url": "https://gitlab.com/rycee/nur-expressions" "url": "https://gitlab.com/rycee/nur-expressions"
}, },

View file

@ -1,5 +1,5 @@
{ {
"catppuccin": { "branch": "main", "commit": "4fd72a9ab64b393c2c22b168508fd244877fec96" }, "catppuccin": { "branch": "main", "commit": "9703f227bfab20d04bcee62d2f08f1795723b4ae" },
"clipboard-image": { "branch": "main", "commit": "4ab6f7f1fa4ea97866c0e0f6160f6a36ef174438" }, "clipboard-image": { "branch": "main", "commit": "4ab6f7f1fa4ea97866c0e0f6160f6a36ef174438" },
"cmp": { "branch": "main", "commit": "7e348da6e5085ac447144a2ef4b637220ba27209" }, "cmp": { "branch": "main", "commit": "7e348da6e5085ac447144a2ef4b637220ba27209" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
@ -21,7 +21,6 @@
"hyprland": { "branch": "main", "commit": "71760fe0cad972070657b0528f48456f7e0027b2" }, "hyprland": { "branch": "main", "commit": "71760fe0cad972070657b0528f48456f7e0027b2" },
"idris": { "branch": "main", "commit": "8bff02984a33264437e70fd9fff4359679d910da" }, "idris": { "branch": "main", "commit": "8bff02984a33264437e70fd9fff4359679d910da" },
"indent-blankline": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "indent-blankline": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
"just": { "branch": "main", "commit": "cd11f4bb51ae576daae48a27c1c0f98afd59e52c" },
"lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" }, "lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" },
"lean": { "branch": "main", "commit": "182703184edb866d7bfe878be358295e189c8223" }, "lean": { "branch": "main", "commit": "182703184edb866d7bfe878be358295e189c8223" },
"live-command": { "branch": "main", "commit": "d460067d47948725a6f25b20f31ea8bbfdfe4622" }, "live-command": { "branch": "main", "commit": "d460067d47948725a6f25b20f31ea8bbfdfe4622" },
@ -43,6 +42,7 @@
"nui": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nui": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
"null-ls": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "null-ls": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
"obsidian": { "branch": "main", "commit": "6ddc2d4dbe044b8e114c52633c04391077f1f734" },
"plenary": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "plenary": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
"purescript": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" }, "purescript": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" },
"quicker.nvim": { "branch": "master", "commit": "183041a46d6c908eefb1c23ea02cce9c8f41256e" }, "quicker.nvim": { "branch": "master", "commit": "183041a46d6c908eefb1c23ea02cce9c8f41256e" },

View file

@ -62,7 +62,7 @@ exec = systemctl --user import-environment PATH && systemctl --user restart xdg-
# {{{ Automatically move stuff to workspaces # {{{ Automatically move stuff to workspaces
windowrulev2 = workspace 2 silent, title:^(.*Firefox.*)$ windowrulev2 = workspace 2 silent, title:^(.*Firefox.*)$
windowrulev2 = workspace 3 silent, title:^(.*(Disc|WebC)ord.*)$ windowrulev2 = workspace 3 silent, title:^(.*(Disc|WebC)ord.*)$
windowrulev2 = workspace 3 silent, title:^(.*Vesktop.*)$ windowrulev2 = workspace 3 silent, title:^(.*(V|v)esktop.*)$
windowrulev2 = workspace 3 silent, title:^(.*Element.*)$ windowrulev2 = workspace 3 silent, title:^(.*Element.*)$
windowrulev2 = workspace 6 silent, title:^(.*(S|s)pot(ify)?.*)$ windowrulev2 = workspace 6 silent, title:^(.*(S|s)pot(ify)?.*)$
windowrulev2 = workspace 7 silent, class:^(.*Obsidian.*)$ windowrulev2 = workspace 7 silent, class:^(.*Obsidian.*)$

View file

@ -7,10 +7,17 @@
}; };
satellite.cloudflared.at.git.port = config.satellite.ports.forgejo; satellite.cloudflared.at.git.port = config.satellite.ports.forgejo;
satellite.cloudflared.at."ssh.git" = {
protocol = "ssh"; # Add CNAME record for ssh access. Unlike the http interface,
port = config.satellite.ports.forgejo-ssh; # this will only get exposed over tailscale, so it is safe.
}; satellite.dns.records = [
{
type = "CNAME";
zone = config.satellite.dns.domain;
at = "ssh.git";
to = config.networking.hostName;
}
];
services.forgejo = { services.forgejo = {
enable = true; enable = true;
@ -29,11 +36,7 @@
HTTP_PORT = config.satellite.cloudflared.at.git.port; HTTP_PORT = config.satellite.cloudflared.at.git.port;
ROOT_URL = config.satellite.cloudflared.at.git.url; ROOT_URL = config.satellite.cloudflared.at.git.url;
LANDING_PAGE = "prescientmoon"; # Make my profile the landing page LANDING_PAGE = "prescientmoon"; # Make my profile the landing page
SSH_DOMAIN = "ssh.${config.satellite.cloudflared.at.git.host}";
START_SSH_SERVER = true;
BUILTIN_SSH_SERVER_USER = "git";
SSH_DOMAIN = config.satellite.cloudflared.at."ssh.git".host;
SSH_LISTEN_PORT = config.satellite.ports.forgejo-ssh;
}; };
cron.ENABLED = true; cron.ENABLED = true;

View file

@ -8,7 +8,7 @@
root = lib.mkOption { root = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = "${config.xdg.userDirs.extraConfig.XDG_PROJECTS_DIR}/satellite"; default = "${config.xdg.userDirs.extraConfig.XDG_PROJECTS_DIR}/personal/satellite";
description = "Where the satellite repo is cloned"; description = "Where the satellite repo is cloned";
}; };