diff --git a/flake.lock b/flake.lock index 42f773b..a45e02a 100644 --- a/flake.lock +++ b/flake.lock @@ -34,7 +34,7 @@ "type": "github" } }, - "gitlab_archiver": { + "food-site": { "inputs": { "flake-compat": [ "flake-compat" @@ -47,43 +47,17 @@ ] }, "locked": { - "lastModified": 1695831427, - "narHash": "sha256-wyWgooFXg8SLF1DYMLU4JP6aB/zkwRCLBajO8sIeHQM=", - "owner": "ChaotiCryptidz", - "repo": "gitlab_archiver", - "rev": "090ace071629556b50087a2e80f9255340b286df", - "type": "gitlab" + "lastModified": 1696081021, + "narHash": "sha256-codMwlx0IbS7DLG23oGb0rFGXcblp08dJ/G0jvCI2mw=", + "ref": "refs/heads/hungy", + "rev": "f8ead549a7c55202b40fadfd112bc8328720a6db", + "revCount": 54, + "type": "git", + "url": "https://forgejo.owo.monster/chaos/food-site" }, "original": { - "owner": "ChaotiCryptidz", - "repo": "gitlab_archiver", - "type": "gitlab" - } - }, - "gitlab_artifacts_sync": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "nixpkgs": [ - "nixpkgs-unstable" - ], - "utils": [ - "flake-utils" - ] - }, - "locked": { - "lastModified": 1695831616, - "narHash": "sha256-86pme6c8WtplRoZVcZp/zjsq9XnGuBjPrO6V/pAmW94=", - "owner": "ChaotiCryptidz", - "repo": "gitlab_artifacts_sync", - "rev": "5099274ccff8fae50979ce94eb5287c3dcf5b914", - "type": "gitlab" - }, - "original": { - "owner": "ChaotiCryptidz", - "repo": "gitlab_artifacts_sync", - "type": "gitlab" + "type": "git", + "url": "https://forgejo.owo.monster/chaos/food-site" } }, "home-manager-unstable": { @@ -119,17 +93,17 @@ ] }, "locked": { - "lastModified": 1695831628, - "narHash": "sha256-UyVJXVWjbZ4TLgCeOVYUE44ekfD5duUfA2akoc1VGj0=", - "owner": "ChaotiCryptidz", - "repo": "musicutil", - "rev": "0e9aceb2b9b418f876a5fcd549420edbf8e8fdcb", - "type": "gitlab" + "lastModified": 1696077011, + "narHash": "sha256-kHURhTGXI4/p3yU8AE02f4H3DY6MwVj+kAge3VAV+K0=", + "ref": "refs/heads/main", + "rev": "d5f3cdde3a76f437f6910f39e82a0db9c2e73cfe", + "revCount": 72, + "type": "git", + "url": "https://forgejo.owo.monster/chaos/musicutil" }, "original": { - "owner": "ChaotiCryptidz", - "repo": "musicutil", - "type": "gitlab" + "type": "git", + "url": "https://forgejo.owo.monster/chaos/musicutil" } }, "nixpkgs-unstable": { @@ -178,23 +152,22 @@ "locked": { "lastModified": 1695847501, "narHash": "sha256-UxYiNfUApZ6IYJ0U83CzRBSRvmApDHMWa5o9WT99ukM=", - "owner": "ChaotiCryptidz", - "repo": "piped-flake", + "ref": "refs/heads/main", "rev": "2a03d86df5075f5060704bb68742af2ace8973e3", - "type": "gitlab" + "revCount": 18, + "type": "git", + "url": "https://forgejo.owo.monster/chaos/piped-flake" }, "original": { - "owner": "ChaotiCryptidz", - "repo": "piped-flake", - "type": "gitlab" + "type": "git", + "url": "https://forgejo.owo.monster/chaos/piped-flake" } }, "root": { "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "gitlab_archiver": "gitlab_archiver", - "gitlab_artifacts_sync": "gitlab_artifacts_sync", + "food-site": "food-site", "home-manager-unstable": "home-manager-unstable", "musicutil": "musicutil", "nixpkgs-unstable": "nixpkgs-unstable", @@ -268,17 +241,17 @@ ] }, "locked": { - "lastModified": 1695831820, - "narHash": "sha256-ZhSQqGg32WA/WYsjPMuYU96GgyljszPcjvc+GBLZVpY=", - "owner": "ChaotiCryptidz", - "repo": "VaultUI", - "rev": "d5fc05612e44cc2c8307186b0d36f7022d7a2f91", - "type": "gitlab" + "lastModified": 1696074847, + "narHash": "sha256-LuMkz9kvav0nryr8Gjzc+Hno7jACJ27prgdHbyRSYec=", + "ref": "refs/heads/main", + "rev": "56f40547debce4e5767c0f5de0be9fc57a3231ba", + "revCount": 460, + "type": "git", + "url": "https://forgejo.owo.monster/chaos/VaultUI" }, "original": { - "owner": "ChaotiCryptidz", - "repo": "VaultUI", - "type": "gitlab" + "type": "git", + "url": "https://forgejo.owo.monster/chaos/VaultUI" } } }, diff --git a/flake.nix b/flake.nix index 5444688..4a58230 100644 --- a/flake.nix +++ b/flake.nix @@ -21,30 +21,25 @@ nur.url = "github:nix-community/NUR"; - vaultui.url = "gitlab:ChaotiCryptidz/VaultUI"; + vaultui.url = "git+https://forgejo.owo.monster/chaos/VaultUI"; vaultui.inputs.nixpkgs.follows = "nixpkgs-unstable"; vaultui.inputs.utils.follows = "flake-utils"; vaultui.inputs.flake-compat.follows = "flake-compat"; - musicutil.url = "gitlab:ChaotiCryptidz/musicutil"; + musicutil.url = "git+https://forgejo.owo.monster/chaos/musicutil"; musicutil.inputs.nixpkgs.follows = "nixpkgs-unstable"; musicutil.inputs.utils.follows = "flake-utils"; musicutil.inputs.flake-compat.follows = "flake-compat"; - gitlab_archiver.url = "gitlab:ChaotiCryptidz/gitlab_archiver"; - gitlab_archiver.inputs.nixpkgs.follows = "nixpkgs-unstable"; - gitlab_archiver.inputs.utils.follows = "flake-utils"; - gitlab_archiver.inputs.flake-compat.follows = "flake-compat"; - - gitlab_artifacts_sync.url = "gitlab:ChaotiCryptidz/gitlab_artifacts_sync"; - gitlab_artifacts_sync.inputs.nixpkgs.follows = "nixpkgs-unstable"; - gitlab_artifacts_sync.inputs.utils.follows = "flake-utils"; - gitlab_artifacts_sync.inputs.flake-compat.follows = "flake-compat"; - - piped-flake.url = "gitlab:ChaotiCryptidz/piped-flake"; + piped-flake.url = "git+https://forgejo.owo.monster/chaos/piped-flake"; piped-flake.inputs.nixpkgs.follows = "nixpkgs-unstable"; piped-flake.inputs.utils.follows = "flake-utils"; piped-flake.inputs.flake-compat.follows = "flake-compat"; + + food-site.url = "git+https://forgejo.owo.monster/chaos/food-site"; + food-site.inputs.nixpkgs.follows = "nixpkgs-unstable"; + food-site.inputs.utils.follows = "flake-utils"; + food-site.inputs.flake-compat.follows = "flake-compat"; }; outputs = {...} @ inputs: import ./outputs.nix inputs; diff --git a/home/homeFolders.nix b/home/homeFolders.nix index 40a08a2..b3707f9 100644 --- a/home/homeFolders.nix +++ b/home/homeFolders.nix @@ -14,31 +14,4 @@ "Mounts/Temp1" "Mounts/Temp2" ]; - - home.file."Music/music-sync.sh" = { - executable = true; - text = '' - #!/usr/bin/env bash - - SCRIPT_DIR=$( cd -- "$( dirname -- "''${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) - cd "''${SCRIPT_DIR}" - - rclone sync -P . Storage:Music --exclude music-sync.sh,music-download.sh - restic-music backup $(fd -t d --max-depth=1 && fd -t f --max-depth=1) - - ~/Projects/music_library_website/update.sh - ''; - }; - - home.file."Music/music-download.sh" = { - executable = true; - text = '' - #!/usr/bin/env bash - - SCRIPT_DIR=$( cd -- "$( dirname -- "''${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) - cd "''${SCRIPT_DIR}" - - rclone sync -P --exclude music-sync.sh,music-download.sh Storage:Music . - ''; - }; } diff --git a/home/manualBackupApps.nix b/home/manualBackupApps.nix deleted file mode 100644 index d061baf..0000000 --- a/home/manualBackupApps.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - pkgs, - nixosConfig, - ... -} @ file_inputs: let - # Requires secrets.{gitlab_archiver_token, restic_music_env} - # expected to be in default locations - # Incase home.apps.manualBackupApps is running in container which passes secrets in from host - secrets = - if file_inputs ? "hostSecrets" - then file_inputs.hostSecrets - else nixosConfig.services.secrets.secrets; -in { - home.packages = with pkgs; [ - restic - - (pkgs.writeShellScriptBin "restic-music" '' - env $(cat ${secrets.restic_music_env.path}) \ - ${pkgs.restic}/bin/restic $@ - '') - - gitlab_archiver - ]; -} diff --git a/home/musicLibrary.nix b/home/musicLibrary.nix new file mode 100644 index 0000000..8adab7f --- /dev/null +++ b/home/musicLibrary.nix @@ -0,0 +1,70 @@ +{ + pkgs, + tree, + nixosConfig, + ... +}: let + # Requires secrets.{restic_music_env} + secrets = nixosConfig.services.secrets.secrets; +in { + imports = with tree; [ + home.apps.rclone + home.apps.musicutil + ]; + + home.packages = [ + pkgs.nodePackages.html-minifier + + (pkgs.writeShellScriptBin "restic-music" '' + env $(cat ${secrets.restic_music_env.path}) \ + ${pkgs.restic}/bin/restic $@ + '') + ]; + + home.file."Music/music-sync.sh" = { + executable = true; + text = '' + #!/usr/bin/env bash + + SCRIPT_DIR=$( cd -- "$( dirname -- "''${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + cd "''${SCRIPT_DIR}" + + rclone sync -P . Storage:Music --exclude music-sync.sh,music-download.sh + restic-music backup $(fd -t d --max-depth=1 && fd -t f --max-depth=1) + + TITLE="chaos's Music Library" + DESCRIPTION="A listing of all music we listen to and have downloaded/brought" + LINK_BASE="https://storage-http.owo.monster/Music" + + TMPDIR=$(mktemp -d) + + musicutil genhtml . "$TMPDIR" --title "$TITLE" --description "$DESCRIPTION" --link-base="$LINK_BASE" + + pushd "$TMPDIR" + + html-minifier \ + --collapse-whitespace --remove-comments \ + --remove-redundant-attributes --remove-script-type-attributes \ + --remove-tag-whitespace --use-short-doctype \ + index.html > index_min.html + mv index_min.html index.html + + rsync --recursive ./ hetzner-arm:/var/lib/static-sites/music_library/ + ssh hetzner-arm chown -R nginx:nginx /var/lib/static-sites/music_library + + popd + ''; + }; + + home.file."Music/music-download.sh" = { + executable = true; + text = '' + #!/usr/bin/env bash + + SCRIPT_DIR=$( cd -- "$( dirname -- "''${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + cd "''${SCRIPT_DIR}" + + rclone sync -P --exclude music-sync.sh,music-download.sh Storage:Music . + ''; + }; +} diff --git a/hosts/hetzner-arm/containers/forgejo/profiles/forgejo.nix b/hosts/hetzner-arm/containers/forgejo/profiles/forgejo.nix index 51ee95f..fa68989 100644 --- a/hosts/hetzner-arm/containers/forgejo/profiles/forgejo.nix +++ b/hosts/hetzner-arm/containers/forgejo/profiles/forgejo.nix @@ -32,9 +32,6 @@ indexer = { REPO_INDEXER_ENABLED = true; }; - security = { - #INSTALL_LOCK = false; - }; service = { DISABLE_REGISTRATION = true; }; diff --git a/hosts/hetzner-arm/hetzner-arm.nix b/hosts/hetzner-arm/hetzner-arm.nix index 2b9a3f1..fb2c11e 100644 --- a/hosts/hetzner-arm/hetzner-arm.nix +++ b/hosts/hetzner-arm/hetzner-arm.nix @@ -30,7 +30,7 @@ in { "forgejo" ] (name: ./containers + "/${name}")) ++ (with hosts.hetzner-arm.profiles; [ - gitlabStaticSites + staticSites ]); # For Containers diff --git a/hosts/hetzner-arm/profiles/gitlabStaticSites.nix b/hosts/hetzner-arm/profiles/gitlabStaticSites.nix deleted file mode 100644 index 5328d49..0000000 --- a/hosts/hetzner-arm/profiles/gitlabStaticSites.nix +++ /dev/null @@ -1,25 +0,0 @@ -{config, ...}: let - secrets = config.services.secrets.secrets; -in { - users.users.gitlab_artifacts_sync.uid = 2001; - users.groups.gitlab_artifacts_sync.gid = 2001; - - services.gitlab_artifacts_sync = { - enable = true; - credentialsEnvironmentFile = "${secrets.gitlab_env.path}"; - repos = [ - { - repoName = "ChaotiCryptidz/music_library_website"; - domain = "musiclibrary.owo.monster"; - } - { - repoName = "ChaotiCryptidz/food"; - domain = "food.owo.monster"; - } - { - repoName = "ChaotiCryptidz/thisisanexampleofspeex"; - domain = "thisisanexampleofspeex.uk"; - } - ]; - }; -} diff --git a/hosts/hetzner-arm/profiles/staticSiteData/contact/index.html b/hosts/hetzner-arm/profiles/staticSiteData/contact/index.html new file mode 100644 index 0000000..70ed38f --- /dev/null +++ b/hosts/hetzner-arm/profiles/staticSiteData/contact/index.html @@ -0,0 +1,56 @@ + + + + + + + chaos's Contact Info + + + +
+
+

chaos's Contact Info

+

Telegram: chaoticryptidz

+

Discord: chaoticryptidz

+

Matrix: @chaos:barr0w.net

+

Fediverse: @chaos@gts-01.owo.monster

+

Signal: Ask elsewhere for number

+

Session: Ask elsewhere for ID

+

IRC(liberachat, rarely active so ping me elsewhere): chaoticryptidz

+

Email: chaos@owo.monster

+

Age pubkey: age1za8dy3n8lqtuwfy0np2h0alcezw97sunzz5ywfv0pg22x4lqys6sl33uc8

+
+
+ + \ No newline at end of file diff --git a/hosts/hetzner-arm/profiles/staticSiteData/speex/audio.mp3 b/hosts/hetzner-arm/profiles/staticSiteData/speex/audio.mp3 new file mode 100644 index 0000000..de518ec Binary files /dev/null and b/hosts/hetzner-arm/profiles/staticSiteData/speex/audio.mp3 differ diff --git a/hosts/hetzner-arm/profiles/staticSiteData/speex/index.html b/hosts/hetzner-arm/profiles/staticSiteData/speex/index.html new file mode 100644 index 0000000..b871155 --- /dev/null +++ b/hosts/hetzner-arm/profiles/staticSiteData/speex/index.html @@ -0,0 +1,65 @@ + + + + + + + + + + This is an example of speex, + + + + +
+
+

This is an example of speex,

+

an audio compression codec specifically tuned for the reproduction of human speech.

+ +
+ +
+ + + + + \ No newline at end of file diff --git a/hosts/hetzner-arm/profiles/staticSiteData/speex/normalize.css b/hosts/hetzner-arm/profiles/staticSiteData/speex/normalize.css new file mode 100644 index 0000000..c469989 --- /dev/null +++ b/hosts/hetzner-arm/profiles/staticSiteData/speex/normalize.css @@ -0,0 +1,349 @@ +/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in iOS. + */ + + html { + line-height: 1.15; /* 1 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers. + */ + +body { + margin: 0; +} + +/** + * Render the `main` element consistently in IE. + */ + +main { + display: block; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Remove the gray background on active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * 1. Remove the bottom border in Chrome 57- + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove the border on images inside links in IE 10. + */ + +img { + border-style: none; +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers. + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * Correct the inability to style clickable types in iOS and Safari. + */ + +button, +[type="button"], +[type="reset"], +[type="submit"] { + -webkit-appearance: button; +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Correct the padding in Firefox. + */ + +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + vertical-align: baseline; +} + +/** + * Remove the default vertical scrollbar in IE 10+. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10. + * 2. Remove the padding in IE 10. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding in Chrome and Safari on macOS. + */ + +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in Edge, IE 10+, and Firefox. + */ + +details { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Misc + ========================================================================== */ + +/** + * Add the correct display in IE 10+. + */ + +template { + display: none; +} + +/** + * Add the correct display in IE 10. + */ + +[hidden] { + display: none; +} diff --git a/hosts/hetzner-arm/profiles/staticSites.nix b/hosts/hetzner-arm/profiles/staticSites.nix new file mode 100644 index 0000000..c415659 --- /dev/null +++ b/hosts/hetzner-arm/profiles/staticSites.nix @@ -0,0 +1,38 @@ +{ + inputs, + pkgs, + ... +}: { + services.nginx.virtualHosts."thisisanexampleofspeex.uk" = { + enableACME = true; + forceSSL = true; + root = ./staticSiteData/speex; + }; + + services.nginx.virtualHosts."contact.owo.monster" = { + enableACME = true; + forceSSL = true; + root = ./staticSiteData/contact; + }; + + services.nginx.virtualHosts."food.owo.monster" = { + enableACME = true; + forceSSL = true; + root = "${inputs.food-site.packages.${pkgs.system}.food-site}/share/food-site"; + }; + + services.nginx.virtualHosts."musiclibrary.owo.monster" = { + enableACME = true; + forceSSL = true; + root = "/var/lib/static-sites/music_library"; + }; + + systemd.services.nginx.serviceConfig.ReadWritePaths = [ + "/var/lib/static-sites" + ]; + + systemd.tmpfiles.rules = [ + "d /var/lib/static-sites - nginx nginx" + "d /var/lib/static-sites/music_library - nginx nginx" + ]; +} diff --git a/hosts/hetzner-arm/secrets.nix b/hosts/hetzner-arm/secrets.nix index be8d125..e3687e0 100644 --- a/hosts/hetzner-arm/secrets.nix +++ b/hosts/hetzner-arm/secrets.nix @@ -17,8 +17,6 @@ requiredVaultPaths = [ "private-public-keys/data/ssh/root@hetzner-arm" "private-public-keys/data/ssh/root@hetzner-arm-decrypt" - - "api-keys/data/gitlab/gitlab_pages_serve" ]; secrets = { @@ -53,17 +51,6 @@ simple_get "/private-public-keys/ssh/root@hetzner-arm-decrypt" .private | base64 -d > "$secretFile" ''; }; - - # Used directly by server - # for fetching gitlab static sites - gitlab_env = { - #user = "gitlab_artifacts_sync"; - #group = "gitlab_artifacts_sync"; - fetchScript = '' - token=$(simple_get "/api-keys/gitlab/gitlab_pages_serve" .token) - echo "GITLAB_TOKEN=$token" > "$secretFile" - ''; - }; }; }; } diff --git a/hosts/lappy-t495/lappy-t495.nix b/hosts/lappy-t495/lappy-t495.nix index 96113f1..f65d465 100644 --- a/hosts/lappy-t495/lappy-t495.nix +++ b/hosts/lappy-t495/lappy-t495.nix @@ -26,7 +26,7 @@ home.base home.dev.all home.homeFolders - home.manualBackupApps + home.musicLibrary home.programming.editors.vscode home.programming.languages.rust diff --git a/hosts/lappy-t495/secrets.nix b/hosts/lappy-t495/secrets.nix index aa72589..228f248 100644 --- a/hosts/lappy-t495/secrets.nix +++ b/hosts/lappy-t495/secrets.nix @@ -14,14 +14,6 @@ ''; }; - # Required for home.apps.manualBackupApps - gitlab_archiver_token = { - user = "chaos"; - fetchScript = '' - simple_get "/api-keys/gitlab/gitlab_archiver" .token > "$secretFile" - ''; - }; - # Required for home.apps.manualBackupApps restic_music_env = { user = "chaos"; diff --git a/hosts/nixos.nix b/hosts/nixos.nix index afd28f4..763af1e 100644 --- a/hosts/nixos.nix +++ b/hosts/nixos.nix @@ -30,7 +30,6 @@ inputs.home-manager-unstable.nixosModules.home-manager inputs.vaultui.nixosModules.default - inputs.gitlab_artifacts_sync.nixosModules.default inputs.piped-flake.nixosModules.default tree.modules.nixos.rcloneServe diff --git a/presets/nixos/containerBase.nix b/presets/nixos/containerBase.nix index 535b323..2362875 100644 --- a/presets/nixos/containerBase.nix +++ b/presets/nixos/containerBase.nix @@ -16,7 +16,6 @@ # Default modules which are usually included in nixos.nix inputs.home-manager-unstable.nixosModules.home-manager inputs.vaultui.nixosModules.default - inputs.gitlab_artifacts_sync.nixosModules.default inputs.piped-flake.nixosModules.default ]; diff --git a/profiles/base/nix.nix b/profiles/base/nix.nix index cd756e5..bdba7b5 100644 --- a/profiles/base/nix.nix +++ b/profiles/base/nix.nix @@ -30,8 +30,6 @@ in { inputs.vaultui.overlays.default inputs.musicutil.overlays.default - inputs.gitlab_artifacts_sync.overlays.default - inputs.gitlab_archiver.overlays.default inputs.piped-flake.overlays.default (_prev: final: {