diff options
Diffstat (limited to '')
| -rw-r--r-- | common/desktop.nix | 16 | ||||
| -rw-r--r-- | flora/services/cgit.nix | 10 | ||||
| -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 | 42 |
7 files changed, 63 insertions, 29 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..1d307e3 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}; 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 38a8606..faedff1 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": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", - "url": "https://github.com/nix-community/home-manager/archive/e1391fb22e18a36f57e6999c7a9f966dc80ac073.tar.gz", - "hash": "0c83di08nhkzq0cwc3v7aax3x8y5m7qahyzxppinzwxi3r8fnjq3" + "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": "accfd8aa9d786831e6e08e92162891e99e11c08a", + "revision": "c14486ae8d3bbc862c625d948a6b2f4dc0927d5b", "url": null, - "hash": "03bdrf6pa9fy797wqh3iv7slls0w28yqas1j3ckkaxj52hrcrhdx" + "hash": "17j4hmn2q43vrmkpsa3i49760samszkx010ns7f575g5fcxwkp7j" }, "lix-nixos-module": { "type": "Git", @@ -111,9 +111,9 @@ "url": "git+ssh://git@git.lix.systems/lix-project/nixos-module" }, "branch": "main", - "revision": "5d9d94089fb1ca96222a34bfe245ef5c5ebefd37", + "revision": "353b25f0b6da5ede15206d416345a2ec4195b5c8", "url": null, - "hash": "02dg1icyxamxblrvgxshadp2s8mx2ryjja7m9w26sgs07jl438zk" + "hash": "0aq9l1qhz01wm232gskq2mywik98zv2r8qn42bjw3kdb185wf9kl" }, "nixpkgs": { "type": "Git", @@ -123,9 +123,9 @@ "repo": "nixpkgs" }, "branch": "nixos-24.05", - "revision": "194846768975b7ad2c4988bdb82572c00222c0d7", - "url": "https://github.com/NixOS/nixpkgs/archive/194846768975b7ad2c4988bdb82572c00222c0d7.tar.gz", - "hash": "0snj72i9dm99jlnnmk8id8ffjnfg1k81lr7aw8d01kz3hdiraqil" + "revision": "68e7dce0a6532e876980764167ad158174402c6f", + "url": "https://github.com/NixOS/nixpkgs/archive/68e7dce0a6532e876980764167ad158174402c6f.tar.gz", + "hash": "024vd8hqdakvhyzxw6zpm6awkxm9bx0xg5hmrpsfl16nnrwy3z34" }, "nixpkgs-unstable": { "type": "Git", @@ -135,9 +135,9 @@ "repo": "nixpkgs" }, "branch": "nixpkgs-unstable", - "revision": "ab82a9612aa45284d4adf69ee81871a389669a9e", - "url": "https://github.com/NixOS/nixpkgs/archive/ab82a9612aa45284d4adf69ee81871a389669a9e.tar.gz", - "hash": "1d1jnz5ydcmmv5w91jhkn9wi7bj0282n7d6qks2dxrb8fli2kgg6" + "revision": "add0443ee587a0c44f22793b8c8649a0dbc3bb00", + "url": "https://github.com/NixOS/nixpkgs/archive/add0443ee587a0c44f22793b8c8649a0dbc3bb00.tar.gz", + "hash": "09ci84bqd0yb1p667wha2lj42285h4jgz28mmvshbc9z8hrbdanh" }, "ntfy-matrix-bot": { "type": "Git", @@ -169,9 +169,9 @@ "repo": "rust-overlay" }, "branch": "master", - "revision": "f0ca58b37ff4179ce4587589c32205764d9b4a4f", - "url": "https://github.com/oxalica/rust-overlay/archive/f0ca58b37ff4179ce4587589c32205764d9b4a4f.tar.gz", - "hash": "0vj09lwvv671gvq4v0a6wahxb1kq8p487xaglhlbn8ck14mpngpc" + "revision": "2ef910a6276a2f34513d18f2f826a8dea72c3b3f", + "url": "https://github.com/oxalica/rust-overlay/archive/2ef910a6276a2f34513d18f2f826a8dea72c3b3f.tar.gz", + "hash": "0pjgvqi1l0y2chzjs9lh6qvx962k71ny8c1c2rn6h4afxfpl52dv" }, "showrt": { "type": "Git", @@ -204,9 +204,9 @@ "repo": "sops-nix" }, "branch": "master", - "revision": "c184aca4db5d71c3db0c8cbfcaaec337a5d065ea", - "url": "https://github.com/Mic92/sops-nix/archive/c184aca4db5d71c3db0c8cbfcaaec337a5d065ea.tar.gz", - "hash": "0j9q7fl7n8mzmid127h8bwg29dqcnmm7v82ciy9g1wv1sfmkrhli" + "revision": "b68757cd2c3fa66d6ccaa0d046ce42a9324e0070", + "url": "https://github.com/Mic92/sops-nix/archive/b68757cd2c3fa66d6ccaa0d046ce42a9324e0070.tar.gz", + "hash": "0l5a0qshh5ygfhxya3cq2r2a6661gjcwnn5lx5422mg2irrpdxxd" }, "traveltext": { "type": "Git", |