diff --git a/flake.lock b/flake.lock index 50cb08a..05d91e2 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1721571743, - "narHash": "sha256-hat7wggtDISBJD8kTo5MTrT+IsY/Ha2MwgjmqqijoCA=", + "lastModified": 1721755137, + "narHash": "sha256-DcJkFNaHGRMIkexx/ol2oNiUFT/zqnZH6dwODdHubIU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "601f6cf95cbe4fef02dc7faf34bba58566c914e9", + "rev": "4c72cd4d0b0368ce78bf94ea7f23d47670f0d429", "type": "github" }, "original": { @@ -119,11 +119,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1720472194, - "narHash": "sha256-CYscFEts6tyvosc1T29nxhzIYJAj/1CCEkV3ZMzSN/c=", + "lastModified": 1721784420, + "narHash": "sha256-bgF6fN4Qgk7NErFKGuuqWXcLORsiykTYyqMUFRiAUBY=", "owner": "catppuccin", "repo": "nix", - "rev": "d75d5803852fb0833767dc969a4581ac13204e22", + "rev": "8bdb55cc1c13f572b6e4307a3c0d64f1ae286a4f", "type": "github" }, "original": { @@ -577,11 +577,11 @@ ] }, "locked": { - "lastModified": 1721714663, - "narHash": "sha256-ZDW5+rlROxaOuoEfIQM7Gqhoa+WALEYdYIiZhyJjAu0=", + "lastModified": 1721804110, + "narHash": "sha256-i4jINRazBKPqlaS+qhlP+kV/UHEq3vs5itfpblqu4ZM=", "owner": "nix-community", "repo": "home-manager", - "rev": "7560dc942a6fbd37ebd1310b3dbda513de2d4b82", + "rev": "af70fc502a15d7e1e4c5a4c4fc8e06c2ec561e0c", "type": "github" }, "original": { @@ -654,11 +654,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1721684218, - "narHash": "sha256-FbFz+F5LJs92s6/DEkhh2h+k8NRqqrs8MGF+GRZWZGo=", + "lastModified": 1721836211, + "narHash": "sha256-N6IlIjizXrbytHpjVsMPcMdz7WKBpLwY0oPzwThnB8o=", "ref": "refs/heads/main", - "rev": "3c758db95c129ed6ca7ce0c1b5b82ad6e189488d", - "revCount": 4963, + "rev": "11843953621dc3f2df966c1447d0bbd81b099689", + "revCount": 4975, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -892,11 +892,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1721696446, - "narHash": "sha256-JBYhrtQIbQlMbe+nYDqxMFMR+fzVvVXhQuKe4R2b8G8=", + "lastModified": 1721801625, + "narHash": "sha256-AAgl+P5DcKhqzygohZR0eGzZ24R2H6M5fGac6JHkQvI=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "0380256dfe668d2a3add4fa063b07724e6cec198", + "rev": "784324e08c0d597ee74cccb3ea038ef0faf2c1e6", "type": "github" }, "original": { @@ -908,11 +908,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1721687430, - "narHash": "sha256-v6rM0mqwirJkE5O0ozcdtVR+rjiV8esxlUPHyxGNnr8=", + "lastModified": 1721777624, + "narHash": "sha256-X0tpZ/YxBJv/kxsLyGto0PFo2rkDv9jSOFIkpNxfYuQ=", "owner": "neovim", "repo": "neovim", - "rev": "9322b7e0594de77f8c0f6ef34c197b8a3aac7844", + "rev": "c025c049a4a7b0a6dbcd94f804504bba6d081a84", "type": "github" }, "original": { @@ -1083,11 +1083,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1721701671, - "narHash": "sha256-b3YlA+FXmfUECrFkRNkB9l4sHzzuMUcU7PvI4He8oCc=", + "lastModified": 1721795199, + "narHash": "sha256-I9p+zeni96gb302qYh/1NtaciKYZdc7tW7C1SNvUegg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2874fc48ccff3f513a05ba7af1f6e44bf44044af", + "rev": "4eb44db1f53f2cc57330a929d8e27fcd4d73f383", "type": "github" }, "original": { @@ -1208,11 +1208,11 @@ "systems": "systems_11" }, "locked": { - "lastModified": 1721680470, - "narHash": "sha256-dsGw96yNDirXtmmk8J2jJaUF8F0f7+Te7DtxDFB4ELw=", + "lastModified": 1721764001, + "narHash": "sha256-/UPESLVq7Mzp+JUGd2/rOvpA61W9K4/Q2R5FkdSDalY=", "owner": "raphamorim", "repo": "rio", - "rev": "e917f934494ffaa47a38cf50053f60f59a745d67", + "rev": "6c550bed11796e3715f77a3fc1fbfd37e1e5a18c", "type": "github" }, "original": { diff --git a/modules/nixos/services/web/nginx/default.nix b/modules/nixos/services/web/nginx/default.nix index 0e9bfe0..25295d9 100644 --- a/modules/nixos/services/web/nginx/default.nix +++ b/modules/nixos/services/web/nginx/default.nix @@ -22,12 +22,6 @@ in { forceSSL = true; enableACME = true; }; - - "zackmyers.io" = { - globalRedirect = "zackster.zip"; - forceSSL = true; - enableACME = true; - }; }; }; }; diff --git a/modules/nixos/sites/cv/default.nix b/modules/nixos/sites/cv/default.nix index 8c2a176..8695bac 100644 --- a/modules/nixos/sites/cv/default.nix +++ b/modules/nixos/sites/cv/default.nix @@ -12,7 +12,7 @@ in { options.sites.cv = with types; { enable = mkBoolOpt false "Enable CV site"; - domain = mkStringOpt "cv.zackster.zip" "The domain for the site"; + domain = mkStringOpt "cv.zackmyers.io" "The domain for the site"; }; config = mkIf cfg.enable { diff --git a/modules/nixos/sites/gitlab/default.nix b/modules/nixos/sites/gitlab/default.nix index 45eb434..0dd4f6a 100644 --- a/modules/nixos/sites/gitlab/default.nix +++ b/modules/nixos/sites/gitlab/default.nix @@ -56,7 +56,7 @@ in { enable = true; services = { nix = with lib; { - registrationConfigFile = toString sec.gitlab_runner.path; # 2 + authenticationTokenConfigFile = sec.gitlab_runner.path; dockerImage = "alpine"; dockerVolumes = [ "/nix/store:/nix/store:ro" @@ -86,7 +86,6 @@ in { PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin"; NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"; }; - tagList = ["nix"]; }; }; }; diff --git a/modules/nixos/sites/gitlab/sec/gitlab_runner.age b/modules/nixos/sites/gitlab/sec/gitlab_runner.age index 191b4be..085dd5d 100644 Binary files a/modules/nixos/sites/gitlab/sec/gitlab_runner.age and b/modules/nixos/sites/gitlab/sec/gitlab_runner.age differ diff --git a/systems/x86_64-linux/pluto/default.nix b/systems/x86_64-linux/pluto/default.nix index 8351949..6c978d0 100644 --- a/systems/x86_64-linux/pluto/default.nix +++ b/systems/x86_64-linux/pluto/default.nix @@ -34,7 +34,7 @@ }; zmio.blog.enable = true; - zmio.blog.domain = "zackster.zip"; + zmio.blog.domain = "zackmyers.io"; nix.settings.experimental-features = ["nix-command" "flakes"];