diff --git a/.gitignore b/.gitignore index 86b3a23..9b9a8cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ cafe.qcow2 +result diff --git a/flake.lock b/flake.lock index 7a010a3..eed1c37 100644 --- a/flake.lock +++ b/flake.lock @@ -208,26 +208,37 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716361217, - "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", + "lastModified": 1718717462, + "narHash": "sha256-qddfQLMaWR2gxfEzUM/zFZVK6H1kTv9WBQSBQxbP3MU=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", + "rev": "938aa157bbd6e3c6fd7dcb77998b1f92c2ad1631", "type": "github" }, "original": { "owner": "NixOs", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1701263465, + "narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=", + "path": "/nix/store/7i525k013ds687vgp12lyhwmx79qd4qj-source", + "rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "rachelcafe": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1705262863, diff --git a/flake.nix b/flake.nix index 416e507..3f5381e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,9 @@ description = "NixOs configuration for my server"; inputs = { - nixpkgs.url = "github:NixOs/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:NixOs/nixpkgs/nixos-24.05"; nixos-config.url = "git+https://githug.xyz/rachel/nixos-config"; rachelcafe.url = "git+https://githug.xyz/rachel/rachel.cafe"; - rachelcafe.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = inputs@{ self, nixpkgs, nixos-config, rachelcafe, ... }: @@ -44,7 +43,7 @@ }; }; }; - state-version = "23.11"; + state-version = "24.05"; modules = [ nix-config-module keyboard-module diff --git a/services/gitea.nix b/services/gitea.nix index 698f0b0..f8643da 100644 --- a/services/gitea.nix +++ b/services/gitea.nix @@ -18,8 +18,8 @@ }; settings = { server = { - # DOMAIN = "githug.xyz"; - # ROOT_URL = "https://githug.xyz/"; + DOMAIN = "githug.xyz"; + ROOT_URL = "https://githug.xyz/"; # COOKIE_SECURE = true; HTTP_PORT = 3001; OFFLINE_MODE = true; diff --git a/update-blog.sh b/update-blog.sh old mode 100644 new mode 100755