Compare commits

..
24 Commits
Author SHA1 Message Date
Kabbone bd8e1a3efa update postgresql to 18 2026-10-23 16:48:03 +02:00
Kabbone 3907b4d6e4 update nextcloud 2026-10-23 14:43:04 +02:00
Kabbone 20ca206ec9 update flake and remove steamdeck-firmware 2026-10-22 13:14:14 +02:00
Kabbone 4840cdc0f4 flake update & add packages for homelab to desktop module 2026-10-17 16:21:24 +02:00
Kabbone 7a29a0a16f flake update 2026-10-03 12:27:46 +02:00
Kabbone 68ee0a343f change gitea smtp from 2026-09-30 19:26:04 +02:00
Kabbone acbf21b361 correct nextcloud smtp setting 2026-09-27 18:04:34 +02:00
Kabbone 75c5a7bfae remove streamlink 2026-09-27 18:00:35 +02:00
Kabbone b0c7c2bdcd fix address for kubesync 2026-09-27 17:59:22 +02:00
Kabbone 31bd240527 minor fixes in smtp for nextcloud 2026-09-27 16:31:00 +02:00
Kabbone 39c60f22f6 update nextcloud secret 2026-09-27 16:27:30 +02:00
Kabbone 8d42f150e4 update nextcloud secret 2026-09-27 16:26:12 +02:00
Kabbone df300ba877 update nextcloud secret 2026-09-27 16:23:07 +02:00
Kabbone 3c76de4471 enable mail in nextcloud 2026-09-27 16:19:58 +02:00
Kabbone baa096b384 update nextcloud to 34 2026-09-27 15:58:59 +02:00
Kabbone ab9b82f31a enable notify in gitea 2026-09-27 15:57:57 +02:00
Kabbone 70cade4201 enable mail in gitea 2026-09-27 15:51:16 +02:00
Kabbone 1d776435ff correct syncthing kubesync 2026-09-27 09:32:14 +02:00
Kabbone 9b08470b26 flake update 2026-09-26 11:05:07 +02:00
Kabbone 24f1e33101 add additional resolver for kabtop 2026-09-26 10:48:26 +02:00
Kabbone 2975909c3d flake update
bring buffer back for stream
2026-09-20 15:11:35 +02:00
Kabbone 1ec4834e86 deactivate buffer and compression for lifebook btrbk 2026-09-17 07:45:15 +02:00
Kabbone b8c8592ae6 nas mount and btrbk changes 2026-09-17 07:36:40 +02:00
Kabbone 14feca7212 chang nas mount 2026-09-16 19:39:04 +02:00
19 changed files with 142 additions and 154 deletions
Generated
+60 -122
View File
@@ -2,19 +2,16 @@
"nodes": { "nodes": {
"agenix": { "agenix": {
"inputs": { "inputs": {
"darwin": "darwin",
"home-manager": "home-manager",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1770165109, "lastModified": 1792507013,
"narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=", "narHash": "sha256-8tKjSQajD3mUND1GaAuaWTcuyUpgcGsh5V+l4ibzC7U=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "b027ee29d959fda4b60b57566d64c98a202e0feb", "rev": "5e5b88a0c8e56f291a108c2fe9934054d9745b2e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -25,11 +22,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1788465171, "lastModified": 1790899423,
"narHash": "sha256-Y1/TTVXjYXGF068IThQH9fPSZ0SIE74PABlUxnWTUH0=", "narHash": "sha256-THGtz65UGJU+sonZidRboyCMk+9DclpMF7pwL4uDV4M=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "eb35abda9f232cc6610b1d1e3200d15c49b7ac54", "rev": "47b6b27ed9a3a9181415e4367d0c30ab2a0e0250",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -38,28 +35,6 @@
"type": "github" "type": "github"
} }
}, },
"darwin": {
"inputs": {
"nixpkgs": [
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1744478979,
"narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "43975d782b418ebf4969e9ccba82466728c2851b",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@@ -79,20 +54,20 @@
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"agenix",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1745494811, "lastModified": 1792438572,
"narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", "narHash": "sha256-5mQQOcggBRBXB7NlzUxO0dbvQN4euJOISjNybrtfxPk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", "rev": "24f8f8e786f87d6a818e1746cb2389bf922afdab",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-26.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -104,11 +79,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1789183968, "lastModified": 1792605213,
"narHash": "sha256-pEWnYdIF1pBMZwarp/rEPzl+Lknhm5hhjSfeLxH8nAA=", "narHash": "sha256-J73EBU30r2hXvHCcBtaigQDAIu/GGPYk1nc6P9THcmg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "cd1c9e552f41894aeb5cc5cb353d5a1d61550357", "rev": "ab97a5d09e0f2aa7339cfd35ec5824fd6653e27c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -118,27 +93,6 @@
} }
}, },
"home-manager_2": { "home-manager_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1789182507,
"narHash": "sha256-9nt4W0HNNP84B+b37yRs9Zxat1ZR5guJxEZDEjAgex4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b1d1b60084970f9d1e2b72662639dab6d039be71",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-26.05",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"impermanence", "impermanence",
@@ -161,15 +115,15 @@
}, },
"impermanence": { "impermanence": {
"inputs": { "inputs": {
"home-manager": "home-manager_3", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1769548169, "lastModified": 1792503832,
"narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", "narHash": "sha256-WsqPR04nPS1bi5bYva04cJJcJyHw7x/rbaJmoXMzF04=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "7b1d382faf603b6d264f58627330f9faa5cba149", "rev": "936ced36ecd25fcbd9b4789184b88aa2e4c2a901",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -186,11 +140,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1789150899, "lastModified": 1792665883,
"narHash": "sha256-uTHtIAZMi16LmPWB2wEdOuulMSbDzXAIoTe2lB6AMJQ=", "narHash": "sha256-8mBJs1By8sIk8IqT494MEEUjAScRzJSujNm1RusXJ1k=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "1d3ea3cb0aa757316468105748f514fdb92b669d", "rev": "9eabd87f2b6451a5d304fe69d638fabc5ff48cd1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -209,11 +163,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1788769372, "lastModified": 1792270892,
"narHash": "sha256-VkqjGPfG3aQGv+cgS/VbwNIR7yiXoLcUJih/tAdLv50=", "narHash": "sha256-aefPlhND0AelMxBw8g1R0JZKpm/Wkamhj49sbR60pHw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "03bc477f555adfe314af48ec0d3554f10d3390d8", "rev": "4b98333073bdaf9b1b5dd7d87c2dab96883b234e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -231,11 +185,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1789082121, "lastModified": 1791551030,
"narHash": "sha256-AS7YiRfU//W5a/+kHOWRrMI0mLuHQ9OQTVNfT6rUff4=", "narHash": "sha256-jTx3O3MKqPjv+cDfBFQ5zlKECBEwzF91scC+mSumZyE=",
"owner": "microvm-nix", "owner": "microvm-nix",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "1b99da49e9d1c8f15fd4911f7b8d2c4375758dcd", "rev": "f13928fe9900e91709d7ce581eefa47eaafa79e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -252,16 +206,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729697500, "lastModified": 1737420293,
"narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
"owner": "zhaofengli", "owner": "nix-community",
"repo": "nix-github-actions", "repo": "nix-github-actions",
"rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "zhaofengli", "owner": "nix-community",
"ref": "matrix-name",
"repo": "nix-github-actions", "repo": "nix-github-actions",
"type": "github" "type": "github"
} }
@@ -271,11 +224,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1789127271, "lastModified": 1792491056,
"narHash": "sha256-vL/Fpo7Zxa7wvO8V5FAToUBvP+K3XsMB1wUglTtd/J0=", "narHash": "sha256-6n1Dn+WYtD8lprnSi+0k4FjbKfIVNG8lblpJ5MiiqXs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "24cfdc1f9344b90a1eee329a3906e2f39f4d0f1e", "rev": "efb6d0d5e2394c3c5416a18652808aba206c0988",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -303,11 +256,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1789006805, "lastModified": 1792502884,
"narHash": "sha256-xB8mKMOx1IA9vTDNLmJZ6n4wCMq/cuWBBOzGCRnqxrU=", "narHash": "sha256-IoNisKcGbUjdd45qCqywGMCYmZ5EnkxezvLII0FWwNA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8ce4ef6cb6f871616146b9fe26d2a5ae594e94fe", "rev": "02c087f3fe673c9e317f206a627cb6b910336dbe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -319,11 +272,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1767892417, "lastModified": 1789546076,
"narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=",
"rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3",
"type": "tarball", "type": "tarball",
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@@ -332,11 +285,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1789114715, "lastModified": 1792615934,
"narHash": "sha256-ugpsyk3NM2s87vXfUiIIiibbJ4Pp0JPS5p/3mfs+q+c=", "narHash": "sha256-MlvRfa1O5Cqc2/a+gG+l9TSuowEoCKCmrJ1d9oAVm0I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "21a67dc470149f337cecafbe965d8d252a390518", "rev": "da6dc0e7b26060f2f71ce3ef7088fb56ee44fa36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -354,11 +307,11 @@
"noctalia-qs": "noctalia-qs" "noctalia-qs": "noctalia-qs"
}, },
"locked": { "locked": {
"lastModified": 1788016978, "lastModified": 1791909440,
"narHash": "sha256-kq3bbBPa5803bLv55bNFztx2YryJl5a/VfUWvvdaZjI=", "narHash": "sha256-9zJyNjsv2/BTTJd8ac8whFDpSQ7j3XLWNPGzQDbB5IY=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia", "repo": "noctalia",
"rev": "a08ff3619ed4c1e1cd8b7691438cea34ccecd6c5", "rev": "f6c7c01bb3023e290a91fed130810f623fcdcc06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -374,7 +327,7 @@
"noctalia", "noctalia",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_2", "systems": "systems",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
@@ -400,11 +353,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1788267358, "lastModified": 1790500375,
"narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=", "narHash": "sha256-XN3sDtn8TU9hAc9xqZ+SqRB/HHm2wjxM6aSWYLJU+oo=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "27555e2624241fb116b49095df4caaee85a25691", "rev": "a0e4241b51206fbcbf52fd322eb5f0cd80f153c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -416,7 +369,7 @@
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"home-manager": "home-manager_2", "home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable", "home-manager-unstable": "home-manager-unstable",
"impermanence": "impermanence", "impermanence": "impermanence",
"jovian-nixos": "jovian-nixos", "jovian-nixos": "jovian-nixos",
@@ -436,11 +389,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1788678114, "lastModified": 1792087235,
"narHash": "sha256-pcqbpV4ZI79al6KAlr+WJjaEo/PYfgctRlG43D5BSJM=", "narHash": "sha256-vQHkG9lwSHJI3MVnyilP50hWW3TNnBWFTbLIurWgPhI=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "4748ec2f5ed4a881474ed4c98aa71a5308cdac8d", "rev": "87ffb7f777aef2e2647fd8fd718a5b3cbc825588",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -452,11 +405,11 @@
"spectrum": { "spectrum": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1785761586, "lastModified": 1786032750,
"narHash": "sha256-MWOMVqJJERwjQGgRIv8d6rlEBqbLM3VZWxHkNKIIZNw=", "narHash": "sha256-+Ba/kIn5BjvV7PN8bWOo7RoqgTY/Yv2M7qeMf3wS2Ag=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "a7762d6f54b40560dd5255ce902e6e6a5d980fe9", "rev": "77d2389874bb092b8dbf05ecc5b1030372e80e98",
"revCount": 1416, "revCount": 1417,
"type": "git", "type": "git",
"url": "https://spectrum-os.org/git/spectrum" "url": "https://spectrum-os.org/git/spectrum"
}, },
@@ -466,21 +419,6 @@
} }
}, },
"systems": { "systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+5 -2
View File
@@ -32,13 +32,16 @@
myDesktop.syncthing.enable = true; myDesktop.syncthing.enable = true;
myDesktop.syncthing.devices = { myDesktop.syncthing.devices = {
"jupiter.home.opel-online.de" = {id = "T53WU6Z-3NT74ZE-PZVZB2N-7FBTZ5K-HESC2ZM-W4ABDAS-NWXHTGI-ST4CDQR";}; "kubesync.home.opel-online.de" = {
addresses = ["tcp://kubesync.home.opel-online.de"];
id = "JETVCDA-WUSQEDI-VSNPMTK-L756GSS-XZ7ZJOX-Y2HWLTQ-TD6K7ZI-LSWE5AH";
};
"lifebook.home.opel-online.de" = {id = "RKPZG3H-BDUZID3-DV26MKR-UOARIQC-JBCAFXP-J5QFM4H-5EGBSM5-VEGXHQ4";}; "lifebook.home.opel-online.de" = {id = "RKPZG3H-BDUZID3-DV26MKR-UOARIQC-JBCAFXP-J5QFM4H-5EGBSM5-VEGXHQ4";};
}; };
myDesktop.syncthing.folders = { myDesktop.syncthing.folders = {
"Sync" = { "Sync" = {
path = "/home/kabbone/Sync"; path = "/home/kabbone/Sync";
devices = ["jupiter.home.opel-online.de" "lifebook.home.opel-online.de"]; devices = ["kubesync.home.opel-online.de" "lifebook.home.opel-online.de"];
ignorePerms = false; ignorePerms = false;
}; };
}; };
+6 -6
View File
@@ -65,25 +65,25 @@
onCalendar = "daily"; onCalendar = "daily";
settings = { settings = {
stream_buffer = "256m"; stream_buffer = "256m";
stream_compress = "lz4"; stream_compress = "no";
incremental = "yes"; incremental = "yes";
snapshot_create = "no"; snapshot_create = "no";
snapshot_dir = "@snapshots"; snapshot_dir = "@snapshots";
timestamp_format = "long"; #timestamp_format = "long";
snapshot_preserve_min = "all"; snapshot_preserve_min = "all";
target_preserve_min = "no"; target_preserve_min = "no";
target_preserve = "4w 3d"; target_preserve = "4w 3d";
ssh_identity = "/etc/btrbk/ssh/id_ed25519_btrbk_nas"; ssh_identity = "/etc/btrbk/ssh/id_ed25519_btrbk_nas";
ssh_user = "btrbk"; ssh_user = "root";
volume = { volume = {
"/mnt/snapshots/root" = { "/mnt/snapshots/root" = {
subvolume = { subvolume = {
"@home" = {}; "@home" = {};
}; };
target = "ssh://jupiter.home.opel-online.de:2220/mnt/snapshots/Mars/@snapshots/@hades"; target = "ssh://n1.home.opel-online.de/srv/nas-hot/@snapshots/@hades";
}; };
}; };
}; };
@@ -140,13 +140,13 @@
}; };
fileSystems."/mnt/Pluto" = { fileSystems."/mnt/Pluto" = {
device = "jupiter:/Pluto"; device = "n1.home.opel-online.de:/srv/nas/@";
fsType = "nfs"; fsType = "nfs";
options = ["noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"]; options = ["noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"];
}; };
fileSystems."/mnt/Mars" = { fileSystems."/mnt/Mars" = {
device = "jupiter:/Mars"; device = "n1.home.opel-online.de:/srv/nas-hot/@nas";
fsType = "nfs"; fsType = "nfs";
options = ["noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"]; options = ["noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"];
}; };
-2
View File
@@ -10,8 +10,6 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
chromium chromium
thunderbird thunderbird
streamlink
streamlink-twitch-gui-bin
pulsemixer pulsemixer
nitrokey-app nitrokey-app
kicad kicad
-2
View File
@@ -23,8 +23,6 @@
# Applications # Applications
chromium chromium
thunderbird thunderbird
streamlink
streamlink-twitch-gui-bin
pulsemixer pulsemixer
]; ];
}; };
+2
View File
@@ -142,7 +142,9 @@
dns = [ dns = [
"9.9.9.9" "9.9.9.9"
"149.112.112.112"
"2620:fe::fe" "2620:fe::fe"
"2620:fe::9"
]; ];
}; };
}; };
+5 -2
View File
@@ -26,13 +26,16 @@
myDesktop.syncthing.enable = true; myDesktop.syncthing.enable = true;
myDesktop.syncthing.devices = { myDesktop.syncthing.devices = {
"jupiter.home.opel-online.de" = {id = "T53WU6Z-3NT74ZE-PZVZB2N-7FBTZ5K-HESC2ZM-W4ABDAS-NWXHTGI-ST4CDQR";}; "kubesync.home.opel-online.de" = {
addresses = ["tcp://kubesync.home.opel-online.de"];
id = "JETVCDA-WUSQEDI-VSNPMTK-L756GSS-XZ7ZJOX-Y2HWLTQ-TD6K7ZI-LSWE5AH";
};
"hades.home.opel-online.de" = {id = "3VPCBVW-RH7XKFM-TWJGQHC-ZRAQ575-CQKGGKP-NAB4VXE-KCKJFUT-AMCUQQA";}; "hades.home.opel-online.de" = {id = "3VPCBVW-RH7XKFM-TWJGQHC-ZRAQ575-CQKGGKP-NAB4VXE-KCKJFUT-AMCUQQA";};
}; };
myDesktop.syncthing.folders = { myDesktop.syncthing.folders = {
"Sync" = { "Sync" = {
path = "/home/kabbone/Sync"; path = "/home/kabbone/Sync";
devices = ["jupiter.home.opel-online.de" "hades.home.opel-online.de"]; devices = ["kubesync.home.opel-online.de" "hades.home.opel-online.de"];
ignorePerms = false; ignorePerms = false;
}; };
}; };
+5 -5
View File
@@ -91,21 +91,21 @@
incremental = "yes"; incremental = "yes";
snapshot_create = "no"; snapshot_create = "no";
snapshot_dir = "@snapshots"; snapshot_dir = "@snapshots";
timestamp_format = "long"; #timestamp_format = "long";
snapshot_preserve_min = "all"; snapshot_preserve_min = "all";
target_preserve_min = "no"; target_preserve_min = "no";
target_preserve = "4w 3d"; target_preserve = "4w 3d";
ssh_identity = "/etc/btrbk/ssh/id_ed25519_btrbk_nas"; ssh_identity = "/etc/btrbk/ssh/id_ed25519_btrbk_nas";
ssh_user = "btrbk"; ssh_user = "root";
volume = { volume = {
"/mnt/snapshots/root" = { "/mnt/snapshots/root" = {
subvolume = { subvolume = {
"@home" = {}; "@home" = {};
}; };
target = "ssh://jupiter.home.opel-online.de:2220/mnt/snapshots/Mars/@snapshots/@lifebook"; target = "ssh://n1.home.opel-online.de/srv/nas-hot/@snapshots/@lifebook";
}; };
}; };
}; };
@@ -228,13 +228,13 @@
}; };
fileSystems."/mnt/Pluto" = { fileSystems."/mnt/Pluto" = {
device = "jupiter.home.opel-online.de:/Pluto"; device = "n1.home.opel-online.de:/srv/nas/@";
fsType = "nfs"; fsType = "nfs";
options = ["nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"]; options = ["nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"];
}; };
fileSystems."/mnt/Mars" = { fileSystems."/mnt/Mars" = {
device = "jupiter.home.opel-online.de:/Mars"; device = "n1.home.opel-online.de:/srv/nas-hot/@nas";
fsType = "nfs"; fsType = "nfs";
options = ["nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"]; options = ["nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"];
}; };
-2
View File
@@ -11,8 +11,6 @@
libreoffice libreoffice
chromium chromium
thunderbird thunderbird
streamlink
streamlink-twitch-gui-bin
intel-gpu-tools intel-gpu-tools
pulsemixer pulsemixer
]; ];
+2 -2
View File
@@ -169,13 +169,13 @@
# }; # };
fileSystems."/mnt/Pluto" = { fileSystems."/mnt/Pluto" = {
device = "jupiter:/Pluto"; device = "n1.home.opel-online.de:/srv/nas/@";
fsType = "nfs"; fsType = "nfs";
options = ["nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"]; options = ["nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"];
}; };
fileSystems."/mnt/Mars" = { fileSystems."/mnt/Mars" = {
device = "jupiter:/Mars"; device = "n1.home.opel-online.de:/srv/nas-hot/@nas";
fsType = "nfs"; fsType = "nfs";
options = ["nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"]; options = ["nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2"];
}; };
-2
View File
@@ -17,8 +17,6 @@
libreoffice libreoffice
chromium chromium
thunderbird thunderbird
streamlink
streamlink-twitch-gui-bin
pulsemixer pulsemixer
]; ];
}; };
+10
View File
@@ -512,6 +512,16 @@ in {
OVMF-cloud-hypervisor OVMF-cloud-hypervisor
gvfs gvfs
cloud-hypervisor cloud-hypervisor
ansible
ansible-lint
age
kubectl
talosctl
sops
openssl
opentofu
fluxcd
libargon2
]; ];
}) })
+9
View File
@@ -64,6 +64,7 @@
service = { service = {
REGISTER_EMAIL_CONFIRM = true; REGISTER_EMAIL_CONFIRM = true;
DISABLE_REGISTRATION = true; DISABLE_REGISTRATION = true;
ENABLE_NOTIFY_MAIL = true;
}; };
actions = { actions = {
ENABLED = true; ENABLED = true;
@@ -71,6 +72,14 @@
indexer = { indexer = {
REPO_INDEXER_ENABLED = false; REPO_INDEXER_ENABLED = false;
}; };
mailer = {
ENABLED = true;
PROTOCOL = "smtp+starttls";
SMTP_ADDR = "in-v3.mailjet.com";
SMTP_PORT = "587";
FROM = "postmaster@kabtop.de";
USER = "a2b181fe40c48b9550183a1c5bc2d516";
};
}; };
}; };
+13 -1
View File
@@ -7,7 +7,7 @@
enable = true; enable = true;
hostName = "cloud.kabtop.de"; hostName = "cloud.kabtop.de";
https = true; https = true;
package = pkgs.nextcloud33; package = pkgs.nextcloud35;
database.createLocally = false; database.createLocally = false;
notify_push.enable = false; notify_push.enable = false;
enableImagemagick = true; enableImagemagick = true;
@@ -46,6 +46,13 @@
'OC\Preview\HEIC', 'OC\Preview\HEIC',
)"; )";
"maintenance_window_start" = "1"; "maintenance_window_start" = "1";
mail_from_address = "postmaster";
mail_domain = "kabtop.de";
mail_smtpauth = true;
mail_smtpmode = "smtp";
mail_smtphost = "in-v3.mailjet.com";
mail_smtpname = "a2b181fe40c48b9550183a1c5bc2d516";
mail_smtpport = 587;
}; };
config = { config = {
dbtype = "pgsql"; dbtype = "pgsql";
@@ -59,6 +66,7 @@
phpOptions = { phpOptions = {
"opcache.interned_strings_buffer" = "16"; "opcache.interned_strings_buffer" = "16";
}; };
secretFile = config.age.secrets."services/nextcloud/secretsFile".path;
}; };
services.redis = { services.redis = {
@@ -88,6 +96,10 @@
file = ../../../secrets/services/nextcloud/adminpassFile.age; file = ../../../secrets/services/nextcloud/adminpassFile.age;
owner = "nextcloud"; owner = "nextcloud";
}; };
age.secrets."services/nextcloud/secretsFile" = {
file = ../../../secrets/services/nextcloud/secretsFile.age;
owner = "nextcloud";
};
systemd.services."nextcloud-setup" = { systemd.services."nextcloud-setup" = {
requires = ["postgresql.service"]; requires = ["postgresql.service"];
+1 -1
View File
@@ -10,7 +10,7 @@
# imports = [ ./postgresql_upgrade.nix ]; # imports = [ ./postgresql_upgrade.nix ];
services.postgresql = { services.postgresql = {
enable = true; enable = true;
package = pkgs.postgresql_16; package = pkgs.postgresql_18;
settings = { settings = {
max_connections = 200; max_connections = 200;
listen_addresses = "localhost"; listen_addresses = "localhost";
@@ -8,7 +8,7 @@
(let (let
# XXX specify the postgresql package you'd like to upgrade to. # XXX specify the postgresql package you'd like to upgrade to.
# Do not forget to list the extensions you need. # Do not forget to list the extensions you need.
newPostgres = pkgs.postgresql_16.withPackages (pp: [ newPostgres = pkgs.postgresql_18.withPackages (pp: [
# pp.plv8 # pp.plv8
]); ]);
cfg = config.services.postgresql; cfg = config.services.postgresql;
-4
View File
@@ -41,8 +41,4 @@
enable = true; enable = true;
enable32Bit = true; enable32Bit = true;
}; };
environment.systemPackages = with pkgs; [
steamdeck-firmware
];
} }
+1
View File
@@ -70,6 +70,7 @@ in {
"services/matrix/mautrix-signal.age".publicKeys = servers ++ users; "services/matrix/mautrix-signal.age".publicKeys = servers ++ users;
"services/nextcloud/adminpassFile.age".publicKeys = servers ++ users; "services/nextcloud/adminpassFile.age".publicKeys = servers ++ users;
"services/nextcloud/dbpassFile.age".publicKeys = servers ++ users; "services/nextcloud/dbpassFile.age".publicKeys = servers ++ users;
"services/nextcloud/secretsFile.age".publicKeys = servers ++ users;
"services/gitea/databasePassword.age".publicKeys = servers ++ users; "services/gitea/databasePassword.age".publicKeys = servers ++ users;
"services/gitea/mailerPassword.age".publicKeys = servers ++ users; "services/gitea/mailerPassword.age".publicKeys = servers ++ users;
"services/mealie/credentialsFile.age".publicKeys = servers ++ users; "services/mealie/credentialsFile.age".publicKeys = servers ++ users;
@@ -0,0 +1,22 @@
age-encryption.org/v1
-> ssh-ed25519 WiIaQQ 7J6p571QopEw5nt8e67FeKAGglZ2TIVNGH0LsU1DOn0
LQ4RKgZgTZX1jvcTlm/M1iVGg9fe5Li9TtIwgH4J8zU
-> ssh-rsa VtjGpQ
kfuQ93P0lb7JGA9kgRyahGclkJRzJwWGhnlaOTBwBGPR44azQkP9uYu5fU9OMITB
sSgfls/WtwfjJtzOYHiP+PpuGdySCNtfKhxULubPFgezzi6b6LQOFRpjDqN3TTc6
pcVU8/FChnSUEuMGYIyBxuqHDTIQ6Oa+dq3n5EbCVggImNx8sJal/bvkjptoTasv
mLZ1lAFJEkaZ2/mjcjpb0w9G75w3+FQ1wvry7oA35gOkHnslvt2iuu6ya4+jGIO2
LxoU1EQc6fAwFRTkdFLg77s9ZvAI+gzgWipL6j3l7A/VlVcUDCDyS7jY+6K39Hfg
F599kX+opY7jOMur8rwJw2U93Y947EhUVj0zkNRTrPkMc1hbb+rVfEWFxzrWE/8V
cIoQfIhW5hx/yq2oA/vrmZIJRCbqaaVfo9sAA2pBv9XqF0FBgBrysoZI4Zdenudy
r+XL0RlWUrmO6Qed4H4UXM/ck124SpHJaieiERekfO1975CJAeuF5BsWqn7XY35F
uxuA9W+D5FjP1zuEiv08Rbp+OBbDmMrmyDPgPhT53mP9A8qE4uyXmSwiPoW2zO3V
LXqtfdyyoiooBKi1MqqCOnb/aoajdO+KFCSTWeE/wMaxuNLISqBEMuKIQhNfdJM5
ejCA8L0imwqaqN6+sQyUUA4s+LwEFVflWw4JsPMfCvY
-> piv-p256 grR75w ApdgEfWiWfmjRnbUBU/2qtECmlcvOXR4eDH7HMTaVvca
rvFi/JpfgB4FTXD/XTSizqFipUhfaot94oormhdvmj4
-> piv-p256 RQguQQ A1lkoXj5da2EEV+W4OoSyIGK88sCD0Ouph43vDy1RI6J
jAI713RF3ks+3DcOIcWh/fg0QOzhu0RG4FFTHqpaj24
--- F7jJX1Nkg6iLJ/7x5sfdDcEYeJWzNjIJHzk2VWJrHMM
½ô‹QÑXáäâew!�”xj ©xoÏi[¢¶ª³ksО�SG¯¢º>ô¹ÛÂÕ=
̼‰×:á´Tvÿ`ÉVt“nÉÂ:<ÄsØœXúþy‚