diff options
Diffstat (limited to '')
| -rw-r--r-- | common/desktop.nix | 16 | ||||
| -rw-r--r-- | flora/services/cgit.nix | 14 | ||||
| -rw-r--r-- | flora/services/monit.nix | 8 | ||||
| -rw-r--r-- | flora/services/nginx.nix | 16 | ||||
| -rw-r--r-- | home/newsboat-public.nix | 4 | ||||
| -rw-r--r-- | home/packages-minimal.nix | 2 | ||||
| -rw-r--r-- | home/packages.nix | 2 | ||||
| -rw-r--r-- | npins/sources.json | 46 |
8 files changed, 75 insertions, 33 deletions
diff --git a/common/desktop.nix b/common/desktop.nix index 5d3bcf5..4c07183 100644 --- a/common/desktop.nix +++ b/common/desktop.nix @@ -90,5 +90,19 @@ # Enable sound. sound.enable = true; - hardware.pulseaudio.enable = true; + # hardware.pulseaudio.enable = true; + + xdg.portal.wlr.enable = true; + + services.pipewire = { + enable = true; + audio.enable = true; + pulse.enable = true; + alsa = { + enable = true; + support32Bit = true; + }; + # jack.enable = true; + }; + } diff --git a/flora/services/cgit.nix b/flora/services/cgit.nix index 032ec1d..1dae737 100644 --- a/flora/services/cgit.nix +++ b/flora/services/cgit.nix @@ -56,10 +56,14 @@ let ''; in { - services.fcgiwrap = { + services.fcgiwrap.instances.cgit.process = { user = "git"; group = "users"; - enable = true; + }; + services.fcgiwrap.instances.cgit.socket = { + user = "git"; + group = "users"; + mode = "0622"; }; services.nginx.virtualHosts."stuebinm.eu" = { @@ -69,7 +73,7 @@ in # this one should come last, behind the git-http-backend blocks locations."~ /git(/.*)".priority = 1100; locations."~ /git(/.*)".extraConfig = '' - fastcgi_pass unix:${config.services.fcgiwrap.socketAddress}; + fastcgi_pass unix:${config.services.fcgiwrap.instances.cgit.socket.address}; include ${pkgs.nginx}/conf/fastcgi_params; fastcgi_param SCRIPT_FILENAME ${pkgs.cgit}/cgit/cgit.cgi; fastcgi_param CGIT_CONFIG ${pkgs.writeText "cgit.conf" cgitconf}; @@ -78,7 +82,7 @@ in locations."~ /git(/[^/]*/(info/refs|git-(upload|receive)-pack|objects/info/packs))" = { extraConfig = '' - fastcgi_pass unix:${config.services.fcgiwrap.socketAddress}; + fastcgi_pass unix:${config.services.fcgiwrap.instances.cgit.socket.address}; include ${pkgs.nginx}/conf/fastcgi_params; fastcgi_param SCRIPT_FILENAME ${pkgs.gitMinimal}/bin/git-http-backend; fastcgi_param GIT_HTTP_EXPORT_ALL ""; @@ -89,7 +93,7 @@ in locations."~ /git/forks(/.*/(info/refs|git-(upload|receive)-pack|objects/info/packs))" = { extraConfig = '' - fastcgi_pass unix:${config.services.fcgiwrap.socketAddress}; + fastcgi_pass unix:${config.services.fcgiwrap.instances.cgit.socket.address}; include ${pkgs.nginx}/conf/fastcgi_params; fastcgi_param SCRIPT_FILENAME ${pkgs.gitMinimal}/bin/git-http-backend; fastcgi_param GIT_HTTP_EXPORT_ALL ""; diff --git a/flora/services/monit.nix b/flora/services/monit.nix index 0b7ee7c..83436e7 100644 --- a/flora/services/monit.nix +++ b/flora/services/monit.nix @@ -41,6 +41,14 @@ check host hacc-mattermost with address mattermost.infra4future.de if failed port 443 with protocol https then alert + + check host hacc-nextcloud with address cloud.infra4future.de + if failed port 443 with protocol https + then alert + + check host nobelium with address colorspace.club + if failed port 443 with protocol https + then alert ''; }; diff --git a/flora/services/nginx.nix b/flora/services/nginx.nix index 1d95255..4a9bf33 100644 --- a/flora/services/nginx.nix +++ b/flora/services/nginx.nix @@ -24,12 +24,24 @@ enableACME = true; forceSSL = true; locations."~ (.*)".extraConfig = '' - fastcgi_pass unix:${config.services.fcgiwrap.socketAddress}; + fastcgi_pass unix:${config.services.fcgiwrap.instances.nomsing.socket.address}; include ${pkgs.nginx}/conf/fastcgi_params; fastcgi_param SCRIPT_FILENAME ${lib.getExe pkgs.nomsring}; fastcgi_param PATH_INFO $1; ''; }; }; - services.fcgiwrap.enable = true; + + services.fcgiwrap.instances.nomsing = { + socket = { + user = "nomsring"; + group = "users"; + mode = "0622"; + }; + }; + + users.users.nomsring = { + isSystemUser = true; + group = "users"; + }; } diff --git a/home/newsboat-public.nix b/home/newsboat-public.nix index ca75c5e..1bd5bcb 100644 --- a/home/newsboat-public.nix +++ b/home/newsboat-public.nix @@ -28,6 +28,7 @@ with import ./newsboat-lib.nix; (ntag "https://git.github.io/feed.xml" "comp") (ntag "https://www.gdl.de/feed.rss" "trains") (ntag "https://www.transformativeworks.org/feed" "fandom") + (ntag "https://haskell.github.io/security-advisories/atom.xml" "comp") # blogs (btag "https://scilogs.spektrum.de/klimalounge/feed/" "climate") @@ -201,6 +202,9 @@ with import ./newsboat-lib.nix; (btag "https://nanmu.me/en/posts/index.xml" "comp") (btag "https://forgejo.org/releases/rss.xml" "comp") (btag "https://ludic.mataroa.blog/rss/" "comp") + (btag "https://blog.poisson.chat/rss.xml" "comp") + (btag "https://blog.nadja.top/feed.rss" "hardware") + (btag "https://matttproud.com/blog/index.xml" "comp") # paper (btag "http://arxiv.org/rss/cs.PL" "paper") diff --git a/home/packages-minimal.nix b/home/packages-minimal.nix index 1e54596..fe09bc3 100644 --- a/home/packages-minimal.nix +++ b/home/packages-minimal.nix @@ -28,6 +28,6 @@ jq html-tidy nodePackages.stylelint nodePackages.js-beautify zola lowdown # nix things - nixfmt-rfc-style niv deploy-rs.deploy-rs + nixfmt-rfc-style deploy-rs.deploy-rs ]; } diff --git a/home/packages.nix b/home/packages.nix index 0250184..78ea25d 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -61,7 +61,7 @@ in # others python39 inweb # nix things - niv npins nix-output-monitor direnv + npins nix-output-monitor direnv # isabelle (isabelle.mkEnv "isabelle-env" "fish") isabat diff --git a/npins/sources.json b/npins/sources.json index fea3dd3..46a1a2a 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -18,9 +18,9 @@ "url": "https://stuebinm.eu/git/bahnhof.name" }, "branch": "main", - "revision": "8a4723f12fb220204d0aa5ebde8fb65214ad1b47", + "revision": "2dd565d546ef7cba05846e90d79ae4a15a193f41", "url": null, - "hash": "0lbraq56vqlisv98hp6ck8bj6z83psqmnq17c647ln498hjp7i4c" + "hash": "137wq0hj9j4wikq401mz577a7r5cmfzfxyf4wv1ncxy450l4lrsh" }, "blog": { "type": "Git", @@ -78,9 +78,9 @@ "repo": "home-manager" }, "branch": "release-24.05", - "revision": "a1fddf0967c33754271761d91a3d921772b30d0e", - "url": "https://github.com/nix-community/home-manager/archive/a1fddf0967c33754271761d91a3d921772b30d0e.tar.gz", - "hash": "1vvrrk14vrhb6drj3fy8snly0sf24x3402ykb9q5j1gy99vvqqq6" + "revision": "208df2e558b73b6a1f0faec98493cb59a25f62ba", + "url": "https://github.com/nix-community/home-manager/archive/208df2e558b73b6a1f0faec98493cb59a25f62ba.tar.gz", + "hash": "13jlfifjw6pirk700p61anijv8q66mn0f356fw3ssb16vzhhqf5l" }, "isabelle-utils": { "type": "Git", @@ -100,9 +100,9 @@ "url": "git+ssh://git@git.lix.systems/lix-project/lix" }, "branch": "main", - "revision": "4c3d93611f2848c56ebc69c85f2b1e18001ed3c7", + "revision": "727258241fc0b3c02691b72302d2c3092baca275", "url": null, - "hash": "1vkw0c9j8gf5ngjadhgxmncrfwjs59w2kd5hx3vmy2dp2yz2d250" + "hash": "13di3qgy4qg6kqy1s6fk0yqs822wdwd8rrjmilnds2v8hrr1782a" }, "lix-nixos-module": { "type": "Git", @@ -111,9 +111,9 @@ "url": "git+ssh://git@git.lix.systems/lix-project/nixos-module" }, "branch": "main", - "revision": "909e593ae9f5fe338ab19b4ed9d52bb0ea09bad8", + "revision": "353b25f0b6da5ede15206d416345a2ec4195b5c8", "url": null, - "hash": "0b029q2cz661dh79x4an1xkp3kl2l5a3zysw6a3xpnvbgyyhrmqd" + "hash": "0aq9l1qhz01wm232gskq2mywik98zv2r8qn42bjw3kdb185wf9kl" }, "nixpkgs": { "type": "Git", @@ -123,9 +123,9 @@ "repo": "nixpkgs" }, "branch": "nixos-24.05", - "revision": "e4509b3a560c87a8d4cb6f9992b8915abf9e36d8", - "url": "https://github.com/NixOS/nixpkgs/archive/e4509b3a560c87a8d4cb6f9992b8915abf9e36d8.tar.gz", - "hash": "1i18lq7zlzxx6p9d98lv39zm0abb1f0f4bfqs9vljk3iiirbyj1b" + "revision": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", + "url": "https://github.com/NixOS/nixpkgs/archive/8f7492cce28977fbf8bd12c72af08b1f6c7c3e49.tar.gz", + "hash": "033my323rmlllrb7f5as7zikas0jxgidr8ffj8gabh8q0x9mgra6" }, "nixpkgs-unstable": { "type": "Git", @@ -135,9 +135,9 @@ "repo": "nixpkgs" }, "branch": "nixpkgs-unstable", - "revision": "9693852a2070b398ee123a329e68f0dab5526681", - "url": "https://github.com/NixOS/nixpkgs/archive/9693852a2070b398ee123a329e68f0dab5526681.tar.gz", - "hash": "0fxjg061wx4kgrwk4m6a98fg2l02qmbxnhk7x5831xxmgr854wlc" + "revision": "039b72d0c738c934e2e36d7fc5520d1b425287a6", + "url": "https://github.com/NixOS/nixpkgs/archive/039b72d0c738c934e2e36d7fc5520d1b425287a6.tar.gz", + "hash": "0cnw4x10wf8gcmg5ybkczhzd7yzjj8hy0ckx2n0zlpwzwvpcyykb" }, "ntfy-matrix-bot": { "type": "Git", @@ -169,9 +169,9 @@ "repo": "rust-overlay" }, "branch": "master", - "revision": "577ee84c69ba89894ac622d71a678a14d746b2f7", - "url": "https://github.com/oxalica/rust-overlay/archive/577ee84c69ba89894ac622d71a678a14d746b2f7.tar.gz", - "hash": "0f5r1f0fjffi90ns1i8xbzbbz4qq1dc6pmqwgc8l352q78rcfmbc" + "revision": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2", + "url": "https://github.com/oxalica/rust-overlay/archive/ca2e79cd22625d214b8437c2c4080ce79bd9f7d2.tar.gz", + "hash": "15lr2x5ndhhls40057m1kdain475gzwfl4ywgj0x9vqb1sinrsm6" }, "showrt": { "type": "Git", @@ -204,9 +204,9 @@ "repo": "sops-nix" }, "branch": "master", - "revision": "5e2e9421e9ed2b918be0a441c4535cfa45e04811", - "url": "https://github.com/Mic92/sops-nix/archive/5e2e9421e9ed2b918be0a441c4535cfa45e04811.tar.gz", - "hash": "0pml2wszmfrwvcqckxwn25vbw135han7bpff7x13k5z93b6r1gcj" + "revision": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e", + "url": "https://github.com/Mic92/sops-nix/archive/f30b1bac192e2dc252107ac8a59a03ad25e1b96e.tar.gz", + "hash": "0rs0dr9s5cknld1gd77szcln8i3dx0wji49ry6rw7dlfnicsic6g" }, "traveltext": { "type": "Git", @@ -215,9 +215,9 @@ "url": "https://stuebinm.eu/git/traveltext" }, "branch": "main", - "revision": "b6080abc5661f9323593944f5701d7dd7597afb9", + "revision": "0a3aad3a4e31049b36832827a5b3afff1334bff8", "url": null, - "hash": "0rwfkkq46j7yjbkv3ylpsifzlhq7qlc2svzpbwjyqm65d53dyalm" + "hash": "1pxzngg7lyacnc260h7v63yl4vbh74h1ipkfrff71qk7lg4xvcyg" }, "uplcg": { "type": "Git", |