diff --git a/README.md b/README.md index e3c0d02..fa0dfce 100644 --- a/README.md +++ b/README.md @@ -45,9 +45,14 @@ List over services | Dufs | File manager | [files.tbmrs.nl](https://files.tbmrs.nl) | | Syncthing | File syncing | [syncthing.local.tbmrs.nl](https://syncthing.local.tbmrs.nl) | | Home Assistant | Home automation | [home-assistant.local.tbmrs.nl](https://home-assistant.local.tbmrs.nl) | -| Karakeep | Bookmarking | [karakeep.local.tbmrs.nl](https://karakeep.local.tbmrs.nl) | +| ~~Karakeep~~ | Bookmarking | ~~[karakeep.local.tbmrs.nl](https://karakeep.local.tbmrs.nl)~~ | | Vikunja | Tasks management | [vikunja.local.tbmrs.nl](https://vikunja.local.tbmrs.nl) | | Stalwart | Mailserver | [mail.tbmrs.nl](https://mail.tbmrs.nl) | +| Linkding | Bookmark managment | [links.local.tbmrs.nl](https://links.local.tbmrs.nl) | + +### Todo + +- Install koreader selfhosted sync ### Openid commands diff --git a/flake.lock b/flake.lock index 7ecf0d0..0883d5d 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1745523430, - "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -90,11 +90,11 @@ ] }, "locked": { - "lastModified": 1747274630, - "narHash": "sha256-87RJwXbfOHyzTB9LYagAQ6vOZhszCvd8Gvudu+gf3qo=", + "lastModified": 1747742835, + "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", "owner": "nix-community", "repo": "disko", - "rev": "ec7c109a4f794fce09aad87239eab7f66540b888", + "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1743774811, - "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", + "lastModified": 1744642301, + "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", + "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", "type": "github" }, "original": { @@ -120,23 +120,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1746162366, - "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -151,24 +134,24 @@ "type": "github" } }, - "flake-utils": { + "flake-parts": { "inputs": { - "systems": [ + "nixpkgs-lib": [ "stylix", - "systems" + "nixpkgs" ] }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, @@ -239,16 +222,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "type": "github" }, "original": { "owner": "GNOME", - "ref": "47.2", + "ref": "48.1", "repo": "gnome-shell", "type": "github" } @@ -260,16 +243,16 @@ ] }, "locked": { - "lastModified": 1747331121, - "narHash": "sha256-3MmiUN/jOHBHQUnjqzg6qKArc17j2OS6jisEppDY4g8=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "1eec32f0efe3b830927989767a9e6ece0d82d608", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -282,16 +265,16 @@ ] }, "locked": { - "lastModified": 1743808813, - "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -315,34 +298,13 @@ "type": "github" } }, - "nixos-cosmic": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1747402241, - "narHash": "sha256-s52bryrvkofiNuiBcUdmOoTfu7KSjQsmCl7CR+KsPz4=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "02b683c2635a03fc610a87a15f2326f03e39214d", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "nixos-hardware": { "locked": { - "lastModified": 1747129300, - "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e81fd167b33121269149c57806599045fd33eeed", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -354,18 +316,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", + "lastModified": 1747825515, + "narHash": "sha256-BWpMQymVI73QoKZdcVCxUCCK3GNvr/xa2Dc4DM1o2BE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "rev": "cd2812de55cf87df88a9e09bf3be1ce63d50c1a6", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-25.05", + "type": "indirect" } }, "nixpkgs-lib": { @@ -383,29 +344,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1747209494, - "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5d736263df906c5da72ab0f372427814de2f52f8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1747327360, - "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -432,67 +377,68 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1743703532, - "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", + "lastModified": 1747610100, + "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bdb91860de2f719b57eef819b5617762f7120c70", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": [ + "stylix", + "flake-parts" + ], + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1746056780, + "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", + "owner": "nix-community", + "repo": "NUR", + "rev": "d476cd0972dd6242d76374fcc277e6735715c167", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "root": { "inputs": { "disko": "disko", "home-manager": "home-manager", "nix-colors": "nix-colors", - "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs-stable" - ], + "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix", "stylix": "stylix" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1747363019, - "narHash": "sha256-N4dwkRBmpOosa4gfFkFf/LTD8oOcNkAyvZ07JvRDEf0=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "0e624f2b1972a34be1a9b35290ed18ea4b419b6f", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1746485181, - "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -508,28 +454,31 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_3", + "nur": "nur", "systems": "systems", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux" + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1746143246, - "narHash": "sha256-O8rZjqJUIkUva66XTOZy0wcgfBP2eaxU9+Xt7ZHtfhI=", + "lastModified": 1747905597, + "narHash": "sha256-2pnf8w4XNS1F/fGt0ZwKGEDdrPeW7fp6d33OBR0GepE=", "owner": "danth", "repo": "stylix", - "rev": "20ace60f9cb5e179cb2256abaee505780df8e804", + "rev": "7f26a7f3d04482ea4da2382a806f413c917ac20d", "type": "github" }, "original": { "owner": "danth", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "stylix", "type": "github" } @@ -569,28 +518,43 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1744974599, + "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", "type": "github" } }, "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1743296873, - "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", + "lastModified": 1745111349, + "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", + "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", "type": "github" }, "original": { @@ -598,6 +562,44 @@ "repo": "tinted-tmux", "type": "github" } + }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 78dcf7d..3c56e0b 100644 --- a/flake.nix +++ b/flake.nix @@ -2,12 +2,12 @@ description = "Nixos configuration for Timo"; inputs = { - nixpkgs.url = "nixpkgs/nixos-24.11"; + nixpkgs.url = "nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -15,13 +15,7 @@ nix-colors.url = "github:misterio77/nix-colors"; - stylix.url = "github:danth/stylix/release-24.11"; - - nixpkgs.follows = "nixos-cosmic/nixpkgs-stable"; - - nixos-cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; - }; + stylix.url = "github:danth/stylix/release-25.05"; sops-nix.url = "github:Mic92/sops-nix"; @@ -35,7 +29,6 @@ home-manager, nix-colors, stylix, - nixos-cosmic, sops-nix, disko, ... @@ -147,7 +140,7 @@ # Deploy "deploy@p-th-rpi-01" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; + pkgs = nixpkgs.legacyPackages.aarch64-linux; extraSpecialArgs = { inherit inputs outputs; }; modules = [ ./hosts/p-th-rpi-01/home.nix diff --git a/hosts/ti-clt-dsk01/configuration.nix b/hosts/ti-clt-dsk01/configuration.nix index 7f5b943..f326f66 100644 --- a/hosts/ti-clt-dsk01/configuration.nix +++ b/hosts/ti-clt-dsk01/configuration.nix @@ -70,13 +70,22 @@ "monitor.local.tbmrs.nl" "syncthing.local.tbmrs.nl" "home-assistant.local.tbmrs.nl" - "karakeep.local.tbmrs.nl" - "vikunja.local.tbmrs.nl" - "linkding.local.tbmrs.nl" + "tasks.local.tbmrs.nl" + "links.local.tbmrs.nl" ]; }; - + # Setup nfs share + services.nfs = { + server = { + enable = true; + exports = '' + /export 192.168.100.0/24(rw,fsid=0,no_subtree_check) + /export/wrb 192.168.100.0/24(rw,nohide,no_subtree_check) + ''; + }; + }; + networking.firewall.allowedTCPPorts = [ 2049 ]; # state version system.stateVersion = "24.11"; diff --git a/hosts/ti-clt-dsk01/home.nix b/hosts/ti-clt-dsk01/home.nix index 63c289e..0981d83 100644 --- a/hosts/ti-clt-dsk01/home.nix +++ b/hosts/ti-clt-dsk01/home.nix @@ -53,7 +53,6 @@ unstable.rnote unstable.inkscape unstable.gimp - unstable.openscad-unstable unstable.brave unstable.freecad unstable.hoppscotch diff --git a/hosts/v-th-ctr-01/home.nix b/hosts/v-th-ctr-01/home.nix index 8128814..f3f4529 100644 --- a/hosts/v-th-ctr-01/home.nix +++ b/hosts/v-th-ctr-01/home.nix @@ -53,7 +53,7 @@ beszel.enable = true; storage.enable = true; homeassistant.enable = true; - karakeep.enable = true; + karakeep.enable = false; vikunja.enable = true; stalwart.enable = true; linkding.enable = true; diff --git a/modules/home/applications/firefox.nix b/modules/home/applications/firefox.nix index b95c193..9f73e84 100644 --- a/modules/home/applications/firefox.nix +++ b/modules/home/applications/firefox.nix @@ -22,6 +22,9 @@ in { home.packages = with pkgs; [ unstable.firefoxpwa ]; + + stylix.targets.firefox.profileNames = [ "${config.home.username}" ]; + programs.firefox = lib.mkMerge [ { enable = true; @@ -65,8 +68,9 @@ in { }; }; }; - profiles.xeovalyte = { - bookmarks = [ + profiles.${config.home.username} = { + bookmarks.force = true; + bookmarks.settings = [ { name = "Toolbar"; toolbar = true; @@ -130,9 +134,9 @@ in { definedAliases = [ "@sp" ]; }; - "Bing".metaData.hidden = true; - "Google".metaData.hidden = true; - "eBay".metaData.hidden = true; + "bing".metaData.hidden = true; + "google".metaData.hidden = true; + "ebay".metaData.hidden = true; }; search.force = true; search.default = "SearXNG"; diff --git a/modules/home/containers/caddy.nix b/modules/home/containers/caddy.nix index 48774f7..6a0570b 100644 --- a/modules/home/containers/caddy.nix +++ b/modules/home/containers/caddy.nix @@ -4,6 +4,29 @@ with lib; let cfg = config.settings.containers.caddy; + + generateRoutes = entries: lib.concatMapStrings (route: '' + @${route.name} host ${route.host} + handle @${route.name} { + reverse_proxy ${route.url} + } + '') entries; + + routesOption = lib.mkOption { + type = types.listOf (types.submodule { + options = { + name = mkOption { + type = types.str; + }; + url = mkOption { + type = types.str; + }; + host = mkOption { + type = types.str; + }; + }; + }); + }; in { options = { settings.containers.caddy.enable = lib.mkOption { @@ -13,6 +36,9 @@ in { Enable caddy container ''; }; + + settings.containers.caddy.routes.tbmrs = routesOption; + settings.containers.caddy.routes.tbmrs-local = routesOption; }; config = mkIf cfg.enable { @@ -33,6 +59,49 @@ in { ]; }; + settings.containers.caddy.routes.tbmrs = [ + { + name = "kanidm"; + host = "auth"; + url = "https://auth.tbmrs.nl"; + } + { + name = "forgejo"; + host = "git"; + url = "forgejo:3000"; + } + { + name = "immich"; + host = "photos"; + url = "immich-server:2283"; + } + { + name = "homepage"; + host = "home"; + url = "homepage:3000"; + } + { + name = "uptime-kuma"; + host = "uptime"; + url = "uptime-kuma:3001"; + } + { + name = "pingvin-share"; + host = "share"; + url = "pingvin-share:3000"; + } + { + name = "dufs"; + host = "files"; + url = "dufs:5000"; + } + { + name = "stalwart"; + host = "mail"; + url = "stalwart:8000"; + } + ]; + home.file."containers/caddy/Caddyfile".text = '' *.tbmrs.nl, tbmrs.nl { tls { @@ -40,50 +109,7 @@ in { resolvers 1.1.1.1 } - @root host tbmrs.nl - handle @root { - respond "Hello there" - } - - @kanidm host auth.tbmrs.nl - handle @kanidm { - reverse_proxy https://auth.tbmrs.nl - } - - @forgejo host git.tbmrs.nl - handle @forgejo { - reverse_proxy forgejo:3000 - } - - @immich host photos.tbmrs.nl - handle @immich { - reverse_proxy immich-server:2283 - } - - @homepage host home.tbmrs.nl - handle @homepage { - reverse_proxy homepage:3000 - } - - @uptime-kuma host uptime.tbmrs.nl - handle @uptime-kuma { - reverse_proxy uptime-kuma:3001 - } - - @pingvin-share host share.tbmrs.nl - handle @pingvin-share { - reverse_proxy pingvin-share:3000 - } - - @dufs host files.tbmrs.nl - handle @dufs { - reverse_proxy dufs:5000 - } - - @stalwart host mail.tbmrs.nl - handle @stalwart { - reverse_proxy stalwart:8080 - } + ${generateRoutes cfg.routes.tbmrs} } *.local.tbmrs.nl { diff --git a/modules/home/containers/network.nix b/modules/home/containers/network.nix index b26d751..914ef58 100644 --- a/modules/home/containers/network.nix +++ b/modules/home/containers/network.nix @@ -3,7 +3,7 @@ with lib; let - cfg = config.settings.containers.nginx; + cfg = config.settings.containers.network; in { options = { settings.containers.network.enable = lib.mkOption { @@ -18,6 +18,7 @@ in { config = mkIf cfg.enable { services.podman.networks.proxy = { description = "Container network for the proxy"; + driver = "bridge"; autoStart = true; }; }; diff --git a/modules/home/containers/static.nix b/modules/home/containers/static.nix index b02f5a0..c1700b2 100644 --- a/modules/home/containers/static.nix +++ b/modules/home/containers/static.nix @@ -19,7 +19,7 @@ in { settings.services.sops.enable = true; services.podman.containers.wrbapp = { - image = "gitea.xeovalyte.dev/xeovalyte/wrbapp:latest"; + image = "gitea.xeovalyte.dev/xeovalyte/wrbapp:latest-arm"; network = "proxy"; environmentFile = [ "${config.sops.templates."container-wrbapp.env".path}" @@ -27,17 +27,17 @@ in { }; services.podman.containers.hunshin = { - image = "gitea.xeovalyte.dev/xeovalyte/hunshin:latest"; + image = "gitea.xeovalyte.dev/xeovalyte/hunshin:latest-arm"; network = "proxy"; }; services.podman.containers.bijlobke = { - image = "gitea.xeovalyte.dev/xeovalyte/bijlobke:latest"; + image = "gitea.xeovalyte.dev/xeovalyte/bijlobke:latest-arm"; network = "proxy"; }; services.podman.containers.ardsite = { - image = "gitea.xeovalyte.dev/ardsite/ardsite:latest"; + image = "gitea.xeovalyte.dev/ardsite/ardsite:latest-arm"; network = "proxy"; }; diff --git a/modules/home/theming/fonts.nix b/modules/home/theming/fonts.nix index 28682b7..33269b7 100644 --- a/modules/home/theming/fonts.nix +++ b/modules/home/theming/fonts.nix @@ -23,7 +23,7 @@ in { font-awesome dejavu_fonts roboto - (nerdfonts.override { fonts = [ "DejaVuSansMono" ]; }) + nerd-fonts.dejavu-sans-mono ]; }; } diff --git a/modules/home/theming/stylix.nix b/modules/home/theming/stylix.nix index 23dc43b..de8b88f 100644 --- a/modules/home/theming/stylix.nix +++ b/modules/home/theming/stylix.nix @@ -29,7 +29,7 @@ in { }; imports = [ - inputs.stylix.homeManagerModules.stylix + inputs.stylix.homeModules.stylix ]; config = mkIf cfg.enable { diff --git a/modules/system/desktop-environments/cosmic.nix b/modules/system/desktop-environments/cosmic.nix index 3003dab..ef3926e 100644 --- a/modules/system/desktop-environments/cosmic.nix +++ b/modules/system/desktop-environments/cosmic.nix @@ -14,11 +14,12 @@ in { }; }; - imports = [ - inputs.nixos-cosmic.nixosModules.default - ]; + # imports = [ + # inputs.nixos-cosmic.nixosModules.default + # ]; config = mkIf cfg.enable { + services.displayManager.cosmic-greeter.enable = true; services.desktopManager.cosmic.enable = true; environment.sessionVariables = { diff --git a/secrets/deploy.yaml b/secrets/deploy.yaml index bd08155..932c38c 100644 --- a/secrets/deploy.yaml +++ b/secrets/deploy.yaml @@ -9,6 +9,10 @@ containers: karakeep: nextauth-secret: ENC[AES256_GCM,data:Izp5kO9dhD28mUzHOS4TqBINbbQ03spP865nrfUWbhqpx2dgW/rbExFZDXmgp1tX,iv:98su3bR8jMLr1jF5XBiNePMZ7qz4pMDQ6B4i8rMxIQQ=,tag:gyzJA6dsKy6YWkE8r5JXqg==,type:str] meili-key: ENC[AES256_GCM,data:47t3gk/189dmtriOb37MT4XC2pwBdwr2n+22t3K7q8Hf6tX2iHaq6zg1EV6W51F/,iv:OjAmWJWmGtIsSeIFWNlqT8hv8H8LLz+WQtvlvyu9Lx0=,tag:v4acQvlJPK64l0yCVpBqCQ==,type:str] + wrbapp: + private-key-id: ENC[AES256_GCM,data:VEPNv774ZI+5IAM43BSKJr7LoGYquUpLTk3iE4xObSscDtr/pVTnZQ==,iv:HVZHRU3v/REhrb9DTsKLyfryROU2WkPzg6tM0wz8Myc=,tag:rfjNGz5B526nvLw4Pj8hQw==,type:str] + private-key: ENC[AES256_GCM,data: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,iv:rMdIIc6MszxdOGX5rPQNqNrK7RbleEbKhFVcx4oWUZk=,tag:ti7O+u8PYNj2eKF7+jUfWQ==,type:str] + client-id: ENC[AES256_GCM,data:rVWPkR8RUhJL0vsUFNxBuqgfJBm4,iv:7WbzSt04QPcEf86eduT3R3K29tfVlQ6bWdBjSAHIf40=,tag:6OiHIR+7ncX4gMnH6ePj8w==,type:str] paperless-ngx: db-password: ENC[AES256_GCM,data:Trlr577CSZHBdaIya/UwAYGPq7Td+f7k7QeNWbpz41sIEEuBGtiOXaAi17292E2nhBCLMDsrugGVusugBo+Z7g==,iv:tDIRfThBOfHr+gGRqywlHAk/x4MkhHRFsJEp5nnlGPA=,tag:3LeYyRjgA/ZOIaFsrcEZGQ==,type:str] secret: ENC[AES256_GCM,data:eS/hG9A87fcop0Wey8HVLM8wwVQfzN9pmxhos9GkmtW0b9lsrjq/A2k2ngyJFNN+YKTqVIATD0VbQ28WvWRj1A==,iv:zzhFaoLnskspp1S291KABLZITgcof63cjShnsZrlAmw=,tag:ZxHsyxJSfVVSaOTlDuByCw==,type:str] @@ -37,8 +41,8 @@ sops: SzhxRnVPMHg0VzJzZWhYdGZndHVIL0UKgloohouQu5rN48hy5FvouHlZO1RoIG9W DlMH50012l4kcQ3ggP0BwuWRUq4FQ/bEpSBZoIOQriPmPQQp1qXOdA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-05-20T15:20:26Z" - mac: ENC[AES256_GCM,data:CZoaWvIkxFL4U6DlZZRVPornDi6ikCwD7XH2Cyi38VA3bzz4m0tKHdn/Q1GbFiNtzm0DrKSKRL2GK6YrvALUElEnXn/EnFCai1Ka7N5RlfMZfMQLKvetcoFNxo7TEJr0STOaZFrYFrw9ZjKAEB0QT9xgeiu1l7O5DJFJHDLrBOs=,iv:D9Yu4NduErlKwIDqzTVCfZD82HlXMRnOlNyZ5lLmkvc=,tag:p/inbnjhkgAEKhziM/c8tg==,type:str] + lastmodified: "2025-05-20T15:30:19Z" + mac: ENC[AES256_GCM,data:LHel3MmVvQ/TwEYQePjCNRZxmipPyJtssltyAIjSqdxSN6s7Kp4rbnAWSM6D/k7fVtasCCmWcqlbnHBH+M06/dIGhhjjL7HRPBj0jKgDlct7FshHAI5m+ZjrWMyzKOlKUj+2Il1d7VCdMKvC10jXoylpiunaHksaQMvagWAXDFc=,iv:0y/VL/eUw7p+u/ifnzXbZIyEfZNTv0aV5w7A9FT9A4w=,tag:RLAPe1C3DXOHjhLWM8TfEA==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.4