diff --git a/configuration.nix b/configuration.nix index f78d365..e8f1590 100644 --- a/configuration.nix +++ b/configuration.nix @@ -42,6 +42,8 @@ ./system-modules/users.nix ./system-modules/virtualisation.nix ./system-modules/ydotool.nix + + ./system-modules/simple-postgres.nix ] ++ (if hyper.isServer then [ ./system-modules/nx2site.nix ./system-modules/hugo.nix @@ -49,6 +51,7 @@ ./system-modules/nx2site/proxy.nix ./system-modules/nx2site/audiobookshelf.nix # ./system-modules/nx2site/baikal.nix + # ./system-modules/nx2site/nxcaldav.nix ./system-modules/nx2site/copyparty.nix ./system-modules/nx2site/gitea.nix ./system-modules/nx2site/open-web-calendar.nix @@ -57,7 +60,7 @@ ./system-modules/nx2site/paperless.nix ./system-modules/calendar/publish.nix ./system-modules/calendar/lec.nix - ./system-modules/calendar/lr.nix + # ./system-modules/calendar/lr.nix ./system-modules/calendar/dicos.nix ] else [ ]); environment.systemPackages = import ./system-modules/base-packages.nix pkgs; diff --git a/flake-modules/colors.json b/flake-modules/colors.json index f1e3675..2723ac7 100644 --- a/flake-modules/colors.json +++ b/flake-modules/colors.json @@ -27,15 +27,15 @@ }, "NxNORTH": { "base": { - "foreground": "#d2cefc", - "background": "#030118" + "foreground": "#d7e3f3", + "background": "#050b13" }, "to_alter": { - "accent": "#4b3cf5", - "secondary": "#ff3632", - "tertiary": "#fffc32", - "special": "#e6f53b", - "weird": "#f53ba8" + "accent": "#6291cf", + "secondary": "#5f5fd2", + "tertiary": "#999999", + "special": "#cf9f61", + "weird": "#c461cf" } }, "NxDCS": { diff --git a/flake.lock b/flake.lock index af7c9fb..ce12570 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1772292445, - "narHash": "sha256-4F1Q7U313TKUDDovCC96m/Za4wZcJ3yqtu4eSrj8lk8=", + "lastModified": 1775558810, + "narHash": "sha256-fy95EdPnqQlpbP8+rk0yWKclWShCUS5VKs6P7/1MF2c=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "1dbbba659c1cef0b0202ce92cadfe13bae550e8f", + "rev": "7371b669b22aa2af980f913fc312a786d2f1abb2", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1773005383, - "narHash": "sha256-Nlln9sKJa1q5lYX4xXS34Lt1oREwgQbT59Aa37nBGkU=", + "lastModified": 1776339486, + "narHash": "sha256-6V6fHUYCwM8SajDQVp9/X3AwLZGltve32mVqbin3awA=", "owner": "9001", "repo": "copyparty", - "rev": "266d6e0ae6a6eecac7bc863bd8f746d16686e61a", + "rev": "a997455b5a3d937f53ad40f431534a0e3865e9f7", "type": "github" }, "original": { @@ -220,11 +220,11 @@ ] }, "locked": { - "lastModified": 1772985280, - "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=", + "lastModified": 1775425411, + "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f736f007139d7f70752657dff6a401a585d6cbc", + "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", "type": "github" }, "original": { @@ -271,11 +271,11 @@ ] }, "locked": { - "lastModified": 1753964049, - "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", + "lastModified": 1772461003, + "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", + "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7", "type": "github" }, "original": { @@ -300,11 +300,11 @@ ] }, "locked": { - "lastModified": 1770511807, - "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=", + "lastModified": 1775496928, + "narHash": "sha256-Ds759WU03mGWtu3I43J+5GF5Ni8TvF+GYQUFD+fVeMo=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "7c75487edd43a71b61adb01cae8326d277aab683", + "rev": "cf95d93d17baa18f1d9b016b3afe27f820521a6e", "type": "github" }, "original": { @@ -330,11 +330,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1773082851, - "narHash": "sha256-4zkUP+gZF6zveHFN0W3oX750mpVgxfiShL+ZcvcH244=", + "lastModified": 1776514109, + "narHash": "sha256-WkUvIWPUrZxR4oSCiExhuMFCjFMQ0cRnZk9e0+ZqhC0=", "ref": "refs/heads/main", - "rev": "e32eeb1d454b029a24ca71f410896bf52839085d", - "revCount": 7010, + "rev": "889ee4f26d77ff0c36f5c4767ef0629371fd2c18", + "revCount": 7163, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -378,11 +378,11 @@ ] }, "locked": { - "lastModified": 1767023960, - "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=", + "lastModified": 1774710575, + "narHash": "sha256-p7Rcw13+gA4Z9EI3oGYe3neQ3FqyOOfZCleBTfhJ95Q=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660", + "rev": "0703df899520001209646246bef63358c9881e36", "type": "github" }, "original": { @@ -403,11 +403,11 @@ ] }, "locked": { - "lastModified": 1765214753, - "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", + "lastModified": 1772460177, + "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", + "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917", "type": "github" }, "original": { @@ -432,11 +432,11 @@ ] }, "locked": { - "lastModified": 1771866172, - "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=", + "lastModified": 1772459629, + "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41", + "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", "type": "github" }, "original": { @@ -484,11 +484,11 @@ ] }, "locked": { - "lastModified": 1764592794, - "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", + "lastModified": 1772462885, + "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", + "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", "type": "github" }, "original": { @@ -509,11 +509,11 @@ ] }, "locked": { - "lastModified": 1771271487, - "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=", + "lastModified": 1774911391, + "narHash": "sha256-c4YVwO33Mmw+FIV8E0u3atJZagHvGTJ9Jai6RtiB8rE=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d", + "rev": "e6caa3d4d1427eedbdf556cf4ceb70f2d9c0b56d", "type": "github" }, "original": { @@ -534,11 +534,11 @@ ] }, "locked": { - "lastModified": 1770501770, - "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=", + "lastModified": 1772459835, + "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40", + "rev": "0a692d4a645165eebd65f109146b8861e3a925e7", "type": "github" }, "original": { @@ -563,11 +563,11 @@ ] }, "locked": { - "lastModified": 1771606233, - "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=", + "lastModified": 1775414057, + "narHash": "sha256-mDpHnf+MkdOxEqIM1TnckYYh9p1SXR8B3KQfNZ12M8s=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a", + "rev": "86012ee01b0fdd8bf3101ef38816f2efbee42490", "type": "github" }, "original": { @@ -657,11 +657,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1772386632, - "narHash": "sha256-sm6OpWZuoDwR53KNlsY482YOoHFWlWYwt0wHmqLkRGE=", + "lastModified": 1776255237, + "narHash": "sha256-LQjlc0VEn55WAT4BiI8sIsokb/2FNlcbBD+Xr3MTE24=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "be894604b2aa2184c0b3d3b44995acd0da14dc0c", + "rev": "9a8c2a85f1ffdcecfb0f9c52c5a73c49ceb43911", "type": "github" }, "original": { @@ -720,11 +720,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1773098859, - "narHash": "sha256-ShEH4g8sw83iV+JDd2MYQv+Q7Lka2NgBjtPUQFsoZco=", + "lastModified": 1776537029, + "narHash": "sha256-9FKP6FEh4Q2a39wclFTj1WIZrb4EoSRgKzWcFDdllM8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1d74c186d4e7b3237c236eaeac6bc88c2904b560", + "rev": "97de37b9cc32c3b67befd37034d415204a1d77f8", "type": "github" }, "original": { @@ -752,11 +752,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1772963539, - "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", + "lastModified": 1776169885, + "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", + "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "type": "github" }, "original": { @@ -783,11 +783,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1772198003, - "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -815,11 +815,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1770019141, - "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=", + "lastModified": 1773734432, + "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137", + "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", "type": "github" }, "original": { @@ -831,11 +831,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1772822230, - "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=", + "lastModified": 1776434932, + "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96", + "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c", "type": "github" }, "original": { @@ -924,11 +924,11 @@ ] }, "locked": { - "lastModified": 1772024342, - "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=", + "lastModified": 1775036584, + "narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476", + "rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735", "type": "github" }, "original": { @@ -1046,11 +1046,11 @@ ] }, "locked": { - "lastModified": 1773096132, - "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=", + "lastModified": 1776119890, + "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784", + "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", "type": "github" }, "original": { @@ -1117,11 +1117,11 @@ ] }, "locked": { - "lastModified": 1761431178, - "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", + "lastModified": 1773601989, + "narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", + "rev": "a9b862d1aa000a676d310cc62d249f7ad726233d", "type": "github" }, "original": { @@ -1137,11 +1137,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1772869527, - "narHash": "sha256-U0E3U2Iu3JeQFbTQ+vclG2jZMoJl+rJdEa68I8qk4Eg=", + "lastModified": 1776356189, + "narHash": "sha256-VzBmJuQfi3iRC9rkHZ5QeWYZtMHffko3iYqFzMVsrFk=", "owner": "sxyazi", "repo": "yazi", - "rev": "741f84e22b2c360366c685724d45cbec6d90b480", + "rev": "ae4c138f49e00a64b478318ed9c7e9072fef8c52", "type": "github" }, "original": { diff --git a/git-crypt/secrets.nix b/git-crypt/secrets.nix index 96d8af2..286fdf6 100644 Binary files a/git-crypt/secrets.nix and b/git-crypt/secrets.nix differ diff --git a/home-modules/chatterino.nix b/home-modules/chatterino.nix index b989a5b..ca479cc 100644 --- a/home-modules/chatterino.nix +++ b/home-modules/chatterino.nix @@ -51,7 +51,7 @@ in { home = { packages = with pkgs; [ - chatterino2 + unstable.chatterino2 streamlink # mpv ]; @@ -192,7 +192,7 @@ in { }, "misc": { "askOnTabVisibilityToggle": false, - "currentVersion": "2.5.4", + "currentVersion": "2.5.5", "lockNotebookLayout": false }, "similarity": { diff --git a/home-modules/email.nix b/home-modules/email.nix index 9c3150e..02d5f9e 100644 --- a/home-modules/email.nix +++ b/home-modules/email.nix @@ -179,9 +179,34 @@ thunderbird = { enable = true; profiles = [ "nx2" ]; - settings = id: { - "mail.server.server_${id}.fcc_folder" = "imap://${un}%40hs-mittweida.de@xc.hs-mittweida.de/Sent"; - }; + settings = id: { }; + }; + }; + nx2site = { + address = "lennart@${hyper.domain}"; + userName = "lennart@${hyper.domain}"; + realName = "Lennart J. Kurzweg"; + imap = { + port = 143; + host = "mail.${hyper.domain}"; + tls.useStartTls = true; + }; + smtp = { + port = 587; + host = "mail.${hyper.domain}"; + tls.useStartTls = true; + }; + signature = { + text = '' + About Me: https://nx2.site/about-me + Contact: https://nx2.site/contact + GPG: https://nx2.site/gpg + ''; + showSignature = "append"; + }; + thunderbird = { + enable = true; + profiles = [ "nx2" ]; }; }; }; diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index a800985..16f0641 100644 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -5,10 +5,22 @@ terminal-exec = "ghostty --command="; monitors = { xps = { - main = { name = "eDP-1"; resolution = "1920x1200"; position = "1920x1080"; scale = "1.0"; }; - # main = { name = "eDP-1"; resolution = "1920x1080"; position = "1920x1080"; scale = "1.0"; }; - second = { name = "desc:Sony SONY TV 0x01010101"; resolution = "1920x1080"; position = "1920x0"; scale = "1.0"; }; - third = { name = "DP-6"; resolution = "1920x1080"; position = "0x0"; scale = "1.0"; }; + # Home + main = { name = "eDP-1"; resolution = "1920x1200"; position = "0x1080"; scale = "1.0"; }; + second = { name = "desc:Sony SONY TV 0x01010101"; resolution = "1920x1080"; position = "0x0"; scale = "1.0"; }; + third = { name = ""; resolution = "preferred"; position = "auto"; scale ="1, mirror, eDP-1"; }; + + # Presentation + # main = { name = "eDP-1"; resolution = "1920x1080"; position = "1920x1080"; scale = "1.0"; }; + # second = { name = ""; resolution = "preferred"; position = "auto"; scale ="1, mirror, eDP-1"; }; + # third = { name = ""; resolution = "preferred"; position = "auto"; scale ="1, mirror, eDP-1"; }; + + # thunderbolt docking + # main = { name = "eDP-1"; resolution = "1920x1200"; position = "1920x1200"; scale = "1.0"; }; + # second = { name = "DP-5"; resolution = "1920x1200"; position = "1920x0"; scale = "1.0"; }; + # third = { name = "DP-4"; resolution = "1920x1200"; position = "0x0"; scale = "1.0"; }; + # second = { name = "DP-6"; resolution = "1920x1200"; position = "0x0"; scale = "1.0"; }; + # third = { name = "DP-7"; resolution = "1920x1200"; position = "1920x0"; scale = "1.0"; }; }; north = { main = { name = "desc:Iiyama North America PL3270Q na"; resolution = "2560x1440"; position = "1920x0"; scale = "1.0"; }; @@ -53,7 +65,6 @@ in { "${main.name}, ${main.resolution}, ${main.position}, ${main.scale}" "${second.name}, ${second.resolution}, ${second.position}, ${second.scale}" "${third.name}, ${third.resolution}, ${third.position}, ${third.scale}" - " ,preferred, auto, 1, mirror, eDP-1" ]) else (if hyper.host == "NxNORTH" then (with monitors.north; [ "${main.name}, ${main.resolution}, ${main.position}, ${main.scale}" "${left.name}, ${left.resolution}, ${left.position}, ${left.scale}" diff --git a/home-modules/pkgs-list/programs.nix b/home-modules/pkgs-list/programs.nix index 10421b1..0013f9f 100644 --- a/home-modules/pkgs-list/programs.nix +++ b/home-modules/pkgs-list/programs.nix @@ -14,7 +14,7 @@ latest.antigravity element-desktop obsidian - zoom-us + fontforge-gtk inkscape audacity libreoffice diff --git a/system-modules/calendar/lr.nix b/system-modules/calendar/lr.nix index 1644817..003a3ea 100644 --- a/system-modules/calendar/lr.nix +++ b/system-modules/calendar/lr.nix @@ -23,7 +23,8 @@ from ics import Calendar import requests def filter_events(events): - return [event for event in events if ("LR" in event.name)] + return [event for event in events if ("WT" in event.name)] + # return [event for event in events if ("LR" in event.name)] # return [event for event in events if ("LR" in event.name) or ("TBD" in event.name)] def fetch_and_save_ical_events(ical_urls, save_path): @@ -62,7 +63,7 @@ def fetch_and_save_ical_events(ical_urls, save_path): if __name__ == "__main__": # Replace with your iCal URL and target file path ICAL_URLS = [ - "https://zlypher.github.io/lol-events/cal/league-of-legends-nlc.ical", + # "https://zlypher.github.io/lol-events/cal/league-of-legends-nlc.ical", "https://zlypher.github.io/lol-events/cal/league-of-legends-emea-masters.ical" ] SAVE_PATH = "${config.services.nginx.virtualHosts."${hyper.domain}".root}/lr.ics" diff --git a/system-modules/dm.nix b/system-modules/dm.nix index 8860160..a9d0f18 100644 --- a/system-modules/dm.nix +++ b/system-modules/dm.nix @@ -11,13 +11,15 @@ # }; # # useTextGreeter = true; # }; - services.displayManager.ly = { + services.xserver.displayManager.lightdm.enable = false; + services.displayManager.ly = pkgs.lib.mkIf (!hyper.isServer) { # info and docs at https://codeberg.org/fairyglade/ly/src/branch/master/res/config.ini enable = true; package = pkgs.ly; settings = with rice.color; let h = rice.lib.nohash; in { allow_empty_password = false; - animation = "matrix"; + # animation = "matrix"; + animation = "gameoflife"; animation_timeout_sec = 0; # forever asterisk = "*"; auth_fails = 10; diff --git a/system-modules/fonts.nix b/system-modules/fonts.nix index eeed533..4a764f1 100644 --- a/system-modules/fonts.nix +++ b/system-modules/fonts.nix @@ -1,18 +1,18 @@ { pkgs, ... }@all: with all; { fonts.packages = with pkgs; [ + atkinson-hyperlegible + nerd-fonts._3270 + nerd-fonts.heavy-data + nerd-fonts.jetbrains-mono + nerd-fonts.profont + nerd-fonts.proggy-clean-tt + nerd-fonts.zed-mono + newcomputermodern noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif noto-fonts-color-emoji - newcomputermodern - atkinson-hyperlegible - nerd-fonts.jetbrains-mono - nerd-fonts.zed-mono - nerd-fonts.profont - nerd-fonts.proggy-clean-tt - nerd-fonts.heavy-data - nerd-fonts._3270 ] ++ (with rice.font; [ base.package code.package diff --git a/system-modules/nx2site/gitea.nix b/system-modules/nx2site/gitea.nix index cd90be6..dc5b8ee 100644 --- a/system-modules/nx2site/gitea.nix +++ b/system-modules/nx2site/gitea.nix @@ -65,6 +65,8 @@ let git-user = "git"; in SSH_PORT = secrets.ssh.port; DOMAIN = "git.${hyper.domain}"; SSH_DOMAIN = "ssh.${hyper.domain}"; + ENABLE_PUSH_CREATE_USER = true; + ENABLE_PUSH_CREATE_ORG = true; # HTTP_ADDR = "${config.services.gitea.settings.server.DOMAIN}"; # HTTP_PORT = 3000; # default # PROTOCOL = "http"; # default diff --git a/system-modules/nx2site/nxcaldav.nix b/system-modules/nx2site/nxcaldav.nix new file mode 100644 index 0000000..477cd83 --- /dev/null +++ b/system-modules/nx2site/nxcaldav.nix @@ -0,0 +1 @@ +{ pkgs, ... }@all: with all; { } diff --git a/system-modules/nx2site/open-web-calendar.nix b/system-modules/nx2site/open-web-calendar.nix index 2a8967f..4cf343e 100644 --- a/system-modules/nx2site/open-web-calendar.nix +++ b/system-modules/nx2site/open-web-calendar.nix @@ -1,9 +1,8 @@ -{ pkgs, ... }@all: with all; -{ +{ pkgs, ... }@all: with all; { services = { open-web-calendar = { enable = true; - domain = "cal.${hyper.domain}"; + domain = "owc.${hyper.domain}"; package = pkgs.open-web-calendar; settings = { # PORT = 21342; @@ -11,4 +10,5 @@ calendarSettings = { }; }; }; + # proxy endpoint is done is done automatically } diff --git a/system-modules/nx2site/proxy.nix b/system-modules/nx2site/proxy.nix index d9d3753..a7516ab 100644 --- a/system-modules/nx2site/proxy.nix +++ b/system-modules/nx2site/proxy.nix @@ -156,6 +156,10 @@ listen = dl; locations = { "/" = { proxyPass = "http://127.0.0.1:5232"; }; }; }); + "nxc.${hyper.domain}" = lib.mkIf config.services.radicale.enable (vh // { + listen = dl; + locations = { "/" = { proxyPass = "http://127.0.0.1:14243"; }; }; + }); # "nc.${hyper.domain}" = vh // { # # directly to nc # }; @@ -185,17 +189,13 @@ }; }; # is done atomatically - # "cal.${hyper.domain}" = vh // { + # "owc.${hyper.domain}" = vh // { # listen = dl; # locations = { "/" = { # proxyPass = "http://unix:///run/open-web-calendar/socket"; # proxyWebsockets = true; # }; }; # }; - # "baikal.${hyper.domain}" = { - # forceSSL = true; - # enableACME = true; - # }; "file.${hyper.domain}" = { # copyparty listen = dl; forceSSL = true; diff --git a/system-modules/postgres.nix b/system-modules/postgres.nix index b441bca..62b9a47 100644 --- a/system-modules/postgres.nix +++ b/system-modules/postgres.nix @@ -28,6 +28,7 @@ "vaultwarden" "paperless" "nextcloud" + "nxcaldav" ]; settings = { port = 5432; # default @@ -54,6 +55,10 @@ name = "paperless"; ensureDBOwnership = true; } + { + name = "nxcaldav"; + ensureDBOwnership = true; + } ]; }; postgresqlBackup = { diff --git a/system-modules/simple-postgres.nix b/system-modules/simple-postgres.nix new file mode 100644 index 0000000..3eb4670 --- /dev/null +++ b/system-modules/simple-postgres.nix @@ -0,0 +1,31 @@ +{ pkgs, ... }@all: with all; { + services.postgresql = { + enable = false; + ensureUsers = [{ + name = "nxcaldav"; + ensureDBOwnership = true; + }]; + package = pkgs.postgresql_16; # https://stackoverflow.com/questions/51688193/how-to-upgrade-postgresql-in-nixos + + dataDir = "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"; # default + enableJIT = false; # default + initdbArgs = []; # default + checkConfig = true; # default + enableTCPIP = false; + # # extraPlugins = + initialScript = null; # default + authentication = lib.mkForce '' + # TYPE DATABASE USER ADDRESS METHOD + local all all trust + host all all 127.0.0.1/32 trust #scram-sha-256 + host all all ::1/128 trust #scram-sha-256 + ''; + settings = { + port = 5432; # default + listen_addresses = lib.mkForce "127.0.0.1"; + log_line_prefix = "[%p] "; # default + shared_preload_libraries = [ ]; # default + }; + ensureDatabases = [ "nxcaldav" ]; + }; +}