From b0a35325142d34556c8ca11764f709fd6574bb71 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Sun, 1 Dec 2024 21:30:15 -0500 Subject: [PATCH 1/4] postgresql_13 -> postgresql_16 --- hosts/gerg-desktop/services/postgresql.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/gerg-desktop/services/postgresql.nix b/hosts/gerg-desktop/services/postgresql.nix index e0b8e91..289fcb7 100644 --- a/hosts/gerg-desktop/services/postgresql.nix +++ b/hosts/gerg-desktop/services/postgresql.nix @@ -2,7 +2,7 @@ { services.postgresql = { enable = true; - package = pkgs.postgresql_13; + package = pkgs.postgresql_16; dataDir = "/persist/services/postgresql"; ensureDatabases = [ "miniflux" ]; From a2c68fe62d197651d8a0047f8f1da62b1752e2d5 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Sun, 1 Dec 2024 21:31:56 -0500 Subject: [PATCH 2/4] fix uneven capitalization of domain names --- hosts/gerg-desktop/services/nginx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/gerg-desktop/services/nginx.nix b/hosts/gerg-desktop/services/nginx.nix index f04242b..661b3ae 100644 --- a/hosts/gerg-desktop/services/nginx.nix +++ b/hosts/gerg-desktop/services/nginx.nix @@ -60,7 +60,7 @@ locations."/".proxyPass = "http://unix:${config.services.forgejo.settings.server.HTTP_ADDR}"; }; - "flux.gerg-L.com" = { + "flux.gerg-l.com" = { forceSSL = true; useACMEHost = "gerg-l.com"; @@ -74,7 +74,7 @@ zstd_types "*"; ''; }; - "cache.gerg-L.com" = { + "cache.gerg-l.com" = { forceSSL = true; useACMEHost = "gerg-l.com"; From 3a47a82360d114c4ffb32fd02856437e37f2672e Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Sun, 1 Dec 2024 21:32:12 -0500 Subject: [PATCH 3/4] add immich --- hosts/gerg-desktop/services/immich.nix | 17 +++++++++++++++++ hosts/gerg-desktop/services/nginx.nix | 5 +++++ 2 files changed, 22 insertions(+) create mode 100644 hosts/gerg-desktop/services/immich.nix diff --git a/hosts/gerg-desktop/services/immich.nix b/hosts/gerg-desktop/services/immich.nix new file mode 100644 index 0000000..919e497 --- /dev/null +++ b/hosts/gerg-desktop/services/immich.nix @@ -0,0 +1,17 @@ +{ config, ... }: +{ + users.users.${config.services.immich.user}.extraGroups = [ "postgres" ]; + services.immich = { + enable = true; + openFirewall = true; + database = { + enable = true; + createDB = true; + }; + mediaLocation = "/persist/services/immich"; + machine-learning.enable = false; + settings = null; + port = 2283; + host = "0.0.0.0"; + }; +} diff --git a/hosts/gerg-desktop/services/nginx.nix b/hosts/gerg-desktop/services/nginx.nix index 661b3ae..eba9dbf 100644 --- a/hosts/gerg-desktop/services/nginx.nix +++ b/hosts/gerg-desktop/services/nginx.nix @@ -86,6 +86,11 @@ ''; }; }; + "photos.gerg-l.com" = { + forceSSL = true; + useACMEHost = "gerg-l.com"; + locations."/".proxyPass = "http://localhost:${toString config.services.immich.port}"; + }; }; }; networking.firewall.allowedTCPPorts = [ From be0c3d5f1e066d7def457fd446315f0a2fdcf3ed Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 2 Dec 2024 05:14:30 +0000 Subject: [PATCH 4/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'master': 'github:NixOS/nixpkgs/2c27ab2e60502d1ebb7cf38909de38663f762a79?narHash=sha256-n/DOfpKH1vkukuBnach91QBQId2dr5tkE7/7UrkV2zw%3D' (2024-12-01) → 'github:NixOS/nixpkgs/5416c7b9a0d5680532b93ab8d8fc23e8fb76ead9?narHash=sha256-askNQjjitKZCbFnlWBqMHgGR8en6c2tgC4CptKEXH2Y%3D' (2024-12-02) • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/098e8b6ff72c86944a8d54b64ddd7b7e6635830a?narHash=sha256-/MNhZLR0eh9z/d3l%2Bammq%2BF5XxHln0RHgO4Bhtjr0IM%3D' (2024-11-25) → 'github:nix-community/nixos-generators/a471acc460d4c238936a5116c8cc48a3c431dd66?narHash=sha256-Qqnfnb/RFxBbD25UYJ/yibvl9kIZNK5WkyLsUcb2byk%3D' (2024-12-02) • Updated input 'nixos-generators/nixlib': 'github:nix-community/nixpkgs.lib/87b6978992e2eb605732fba842cad0a7e14b2047?narHash=sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck%3D' (2024-11-24) → 'github:nix-community/nixpkgs.lib/0e4fdd4a0ab733276b6d2274ff84ae353f17129e?narHash=sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8%3D' (2024-12-01) • Updated input 'nvim-flake': 'github:Gerg-L/nvim-flake/dd1ef9594c5ebaf6a3856f99f1f3b85b09b47eba?narHash=sha256-DtdrZiRh5rapnBHl5r/uG0GFNuZi5yzSeSJ52jBRVhA%3D' (2024-12-01) → 'github:Gerg-L/nvim-flake/8b20283b965522444da32ed09a73724d08be3c66?narHash=sha256-iO/wtaLsP/qQcto6%2ByQBheOmUIxxswv2xra33nHyXAE%3D' (2024-12-02) • Updated input 'nvim-flake/neovim-nightly': 'github:nix-community/neovim-nightly-overlay/0d545972c93c044bed52c27cc4035054793d913a?narHash=sha256-uA/KX/TVlreFS/xZjjAPBoRzybQQWUX%2BUr5mOzsF7FE%3D' (2024-12-01) → 'github:nix-community/neovim-nightly-overlay/73ec92a4c2773ead4af1c657ea81142d4a27fe78?narHash=sha256-HOzahkMv67wtSYcudRpGqNXjFwFoc2lwq0%2BEv6h8T3k%3D' (2024-12-02) • Updated input 'nvim-flake/neovim-nightly/neovim-src': 'github:neovim/neovim/ab9cfc4dc3422af5235759efef456d3e02745217?narHash=sha256-VKk53/3aTk91s1OmSfUt6RqFpxBjUy8ZYoYrechTUns%3D' (2024-11-30) → 'github:neovim/neovim/feb62d5429680278c1353c565db6bb3ecb3b7c24?narHash=sha256-oIbVYa5y0lgXDRaZUn0MdAKC2Vf9OakbtIFmbhL8K1k%3D' (2024-12-01) • Updated input 'nvim-flake/neovim-nightly/nixpkgs': 'github:NixOS/nixpkgs/4703b8d2c708e13a8cab03d865f90973536dcdf5?narHash=sha256-B5pYT%2BIVaqcrfOekkwKvx/iToDnuQWzc2oyDxzzBDc4%3D' (2024-11-30) → 'github:NixOS/nixpkgs/2c27ab2e60502d1ebb7cf38909de38663f762a79?narHash=sha256-n/DOfpKH1vkukuBnach91QBQId2dr5tkE7/7UrkV2zw%3D' (2024-12-01) • Updated input 'spicetify-nix': 'github:Gerg-L/spicetify-nix/c7a940a0152bdd9914c02f8f1eea2697d548cc16?narHash=sha256-hxjD%2BdVnL2W9n1kZlmYAx2ou4ttLgzfPuEdoCsiy7cE%3D' (2024-12-01) → 'github:Gerg-L/spicetify-nix/72ab46ed0c236d921083c0d584814657064281ae?narHash=sha256-44vD%2BPu9t0FRaMogG31cPrs3IAfFRU8Wv2YtWPrsti4%3D' (2024-12-02) • Updated input 'stable': 'github:NixOS/nixpkgs/c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9?narHash=sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ%2BCtTRyY%3D' (2024-11-28) → 'github:NixOS/nixpkgs/62c435d93bf046a5396f3016472e8f7c8e2aed65?narHash=sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT%2B34%3D' (2024-11-30) --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 095377e..1fd1747 100644 --- a/flake.lock +++ b/flake.lock @@ -409,11 +409,11 @@ }, "master": { "locked": { - "lastModified": 1733024928, - "narHash": "sha256-n/DOfpKH1vkukuBnach91QBQId2dr5tkE7/7UrkV2zw=", + "lastModified": 1733116386, + "narHash": "sha256-askNQjjitKZCbFnlWBqMHgGR8en6c2tgC4CptKEXH2Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c27ab2e60502d1ebb7cf38909de38663f762a79", + "rev": "5416c7b9a0d5680532b93ab8d8fc23e8fb76ead9", "type": "github" }, "original": { @@ -448,11 +448,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1733012044, - "narHash": "sha256-uA/KX/TVlreFS/xZjjAPBoRzybQQWUX+Ur5mOzsF7FE=", + "lastModified": 1733098025, + "narHash": "sha256-HOzahkMv67wtSYcudRpGqNXjFwFoc2lwq0+Ev6h8T3k=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "0d545972c93c044bed52c27cc4035054793d913a", + "rev": "73ec92a4c2773ead4af1c657ea81142d4a27fe78", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1732970806, - "narHash": "sha256-VKk53/3aTk91s1OmSfUt6RqFpxBjUy8ZYoYrechTUns=", + "lastModified": 1733090308, + "narHash": "sha256-oIbVYa5y0lgXDRaZUn0MdAKC2Vf9OakbtIFmbhL8K1k=", "owner": "neovim", "repo": "neovim", - "rev": "ab9cfc4dc3422af5235759efef456d3e02745217", + "rev": "feb62d5429680278c1353c565db6bb3ecb3b7c24", "type": "github" }, "original": { @@ -546,11 +546,11 @@ }, "nixlib": { "locked": { - "lastModified": 1732410305, - "narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=", + "lastModified": 1733015484, + "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "87b6978992e2eb605732fba842cad0a7e14b2047", + "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e", "type": "github" }, "original": { @@ -567,11 +567,11 @@ ] }, "locked": { - "lastModified": 1732496924, - "narHash": "sha256-/MNhZLR0eh9z/d3l+ammq+F5XxHln0RHgO4Bhtjr0IM=", + "lastModified": 1733101779, + "narHash": "sha256-Qqnfnb/RFxBbD25UYJ/yibvl9kIZNK5WkyLsUcb2byk=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "098e8b6ff72c86944a8d54b64ddd7b7e6635830a", + "rev": "a471acc460d4c238936a5116c8cc48a3c431dd66", "type": "github" }, "original": { @@ -674,11 +674,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1732937961, - "narHash": "sha256-B5pYT+IVaqcrfOekkwKvx/iToDnuQWzc2oyDxzzBDc4=", + "lastModified": 1733024928, + "narHash": "sha256-n/DOfpKH1vkukuBnach91QBQId2dr5tkE7/7UrkV2zw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4703b8d2c708e13a8cab03d865f90973536dcdf5", + "rev": "2c27ab2e60502d1ebb7cf38909de38663f762a79", "type": "github" }, "original": { @@ -698,11 +698,11 @@ ] }, "locked": { - "lastModified": 1733026985, - "narHash": "sha256-DtdrZiRh5rapnBHl5r/uG0GFNuZi5yzSeSJ52jBRVhA=", + "lastModified": 1733113340, + "narHash": "sha256-iO/wtaLsP/qQcto6+yQBheOmUIxxswv2xra33nHyXAE=", "owner": "Gerg-L", "repo": "nvim-flake", - "rev": "dd1ef9594c5ebaf6a3856f99f1f3b85b09b47eba", + "rev": "8b20283b965522444da32ed09a73724d08be3c66", "type": "github" }, "original": { @@ -862,11 +862,11 @@ ] }, "locked": { - "lastModified": 1733026768, - "narHash": "sha256-hxjD+dVnL2W9n1kZlmYAx2ou4ttLgzfPuEdoCsiy7cE=", + "lastModified": 1733113017, + "narHash": "sha256-44vD+Pu9t0FRaMogG31cPrs3IAfFRU8Wv2YtWPrsti4=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "c7a940a0152bdd9914c02f8f1eea2697d548cc16", + "rev": "72ab46ed0c236d921083c0d584814657064281ae", "type": "github" }, "original": { @@ -877,11 +877,11 @@ }, "stable": { "locked": { - "lastModified": 1732824227, - "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": {