Merge branch 'main' into bot/handy-0.7.10

This commit is contained in:
2026-03-11 16:36:22 +00:00
4 changed files with 40 additions and 16 deletions
+2
View File
@@ -2,6 +2,7 @@
flake.nixosModules.development = {pkgs, ...}: { flake.nixosModules.development = {pkgs, ...}: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
nodejs_24 nodejs_24
go
nixfmt nixfmt
zellij zellij
@@ -17,6 +18,7 @@
vscode-langservers-extracted # includes css-lsp, eslint-lsp, html-lsp, json-lsp vscode-langservers-extracted # includes css-lsp, eslint-lsp, html-lsp, json-lsp
tailwindcss-language-server tailwindcss-language-server
biome biome
typescript-go
# Treesitter CLI + C compiler for building grammars # Treesitter CLI + C compiler for building grammars
tree-sitter tree-sitter
+8
View File
@@ -48,6 +48,14 @@ flake.nixosModules.nixos-host = {pkgs, ...}: {
pulse.enable = true; pulse.enable = true;
}; };
# SSH
services.openssh = {
enable = true;
settings = {
PermitRootLogin = "no";
};
};
# User account # User account
users.users.${config.username} = { users.users.${config.username} = {
isNormalUser = true; isNormalUser = true;
+2
View File
@@ -20,6 +20,8 @@
feishin feishin
obsidian obsidian
self.packages.${pkgs.stdenv.hostPlatform.system}.handy self.packages.${pkgs.stdenv.hostPlatform.system}.handy
mpv
ffmpeg
]; ];
}; };
} }
+22 -10
View File
@@ -1,6 +1,5 @@
{ ... }: { { lib, ... }: {
perSystem = { pkgs, ... }: { perSystem = { pkgs, ... }: let
packages.zen-browser = pkgs.appimageTools.wrapType2 rec {
pname = "zen-browser"; pname = "zen-browser";
version = "1.19.1b"; version = "1.19.1b";
@@ -9,21 +8,34 @@
hash = "sha256-h3lza2C+SxptpcX897Uf/nM8dNILUBXScSNQZlvSIQg="; hash = "sha256-h3lza2C+SxptpcX897Uf/nM8dNILUBXScSNQZlvSIQg=";
}; };
extraInstallCommands = let appimageContents = pkgs.appimageTools.extract { inherit pname version src; };
contents = pkgs.appimageTools.extract { inherit pname version src; }; in {
in '' packages.zen-browser = pkgs.appimageTools.wrapType2 {
desktop_file=$(find ${contents} -name "*.desktop" | head -n1) inherit pname version src;
extraPkgs = pkgs: [ pkgs.ffmpeg-full ];
extraInstallCommands = ''
desktop_file=$(find ${appimageContents} -name "*.desktop" | head -n1)
if [ -n "$desktop_file" ]; then if [ -n "$desktop_file" ]; then
install -m 444 -D "$desktop_file" "$out/share/applications/${pname}.desktop" install -m 444 -D "$desktop_file" "$out/share/applications/${pname}.desktop"
# The desktop file uses 'zen' as the binary name
substituteInPlace "$out/share/applications/${pname}.desktop" \ substituteInPlace "$out/share/applications/${pname}.desktop" \
--replace 'Exec=zen' 'Exec=${pname}' --replace 'Exec=zen' 'Exec=${pname}'
fi fi
if [ -d ${contents}/usr/share/icons ]; then if [ -d ${appimageContents}/usr/share/icons ]; then
cp -r ${contents}/usr/share/icons $out/share cp -r ${appimageContents}/usr/share/icons $out/share
fi fi
ln -s $out/bin/${pname} $out/bin/zen
''; '';
meta = {
description = "Experience tranquillity while browsing the web without people tracking you!";
homepage = "https://zen-browser.app";
license = lib.licenses.mpl20;
platforms = [ "x86_64-linux" ];
};
}; };
}; };
} }