nix: waydroid

This commit is contained in:
js0ny 2025-10-14 01:33:40 +01:00
parent c9ce831415
commit 0c6d0edb42
9 changed files with 142 additions and 59 deletions

View file

@ -0,0 +1,32 @@
-- <nixCats>/lsp/nil.lua
-- Nil LSP config
vim.lsp.config("nil", {
cmd = { "nil" },
root_markers = {
"flake.nix",
"flake.lock",
},
filetypes = {
"nix",
},
-- Global config options
settings = {
["nil"] = {
formatting = {
command = { "alejandra" },
},
diagnostics = {
ignored = {},
},
nix = {
maxMemoryMB = 2560,
},
flake = {
autoArchive = false,
autoEvalImputs = true,
nixpkgsInputName = "nixpkgs",
},
},
},
})

View file

@ -10,10 +10,9 @@
imports = [ imports = [
../../modules/nixos ../../modules/nixos
../../modules/nixos/host-machine.nix ../../modules/nixos/host-machine.nix
# ../../modules/nixos/users/js0ny.nix ../../modules/nixos/waydroid.nix
# ../../modules/nixos/guest.nix
../../modules/nixos/laptop.nix ../../modules/nixos/laptop.nix
../../modules/nixos/nvidia.nix ../../modules/nixos/disable-nvidia.nix
../../modules/nixos/additional-packages.nix ../../modules/nixos/additional-packages.nix
../../modules/nixos/libvirt.nix ../../modules/nixos/libvirt.nix
../../modules/nixos/docker.nix ../../modules/nixos/docker.nix

View file

@ -1,7 +1,6 @@
{pkgs, ...}: {pkgs, ...}: {
{
home.packages = with pkgs; [ home.packages = with pkgs; [
gcc gcc
llvmPackages_21.clang-tools
]; ];
} }

View file

@ -2,54 +2,71 @@
pkgs, pkgs,
config, config,
... ...
}: { }:
environment.systemPackages = with pkgs; [ let
maple-mono.NF fontPkgs = [
sarasa-gothic pkgs.maple-mono.NF
lxgw-wenkai pkgs.sarasa-gothic
lxgw-neoxihei pkgs.lxgw-wenkai
noto-fonts-cjk-sans pkgs.lxgw-neoxihei
noto-fonts pkgs.noto-fonts-cjk-sans
noto-fonts-emoji pkgs.noto-fonts
nerd-fonts.jetbrains-mono pkgs.noto-fonts-emoji
pkgs.nerd-fonts.jetbrains-mono
]; ];
in
{
environment.systemPackages = fontPkgs;
fonts = { fonts = {
enableDefaultPackages = true; enableDefaultPackages = true;
packages = fontPkgs;
fontconfig = { fontconfig = {
enable = true; enable = true;
defaultFonts = { defaultFonts = {
monospace = ["Maple Mono NF" "JetBrainsMono Nerd Font"]; monospace = [
serif = ["LXGW WenKai"]; "Maple Mono NF"
sansSerif = ["LXGW Neo XiHei"]; "JetBrainsMono Nerd Font"
];
serif = [ "LXGW WenKai" ];
sansSerif = [ "LXGW Neo XiHei" ];
}; };
}; };
fontDir.enable = true; fontDir.enable = true;
}; };
system.fsPackages = [pkgs.bindfs]; system.fsPackages = [ pkgs.bindfs ];
fileSystems = let fileSystems =
mkRoSymBind = path: { let
device = path; mkRoSymBind = path: {
fsType = "fuse.bindfs"; device = path;
options = ["ro" "resolve-symlinks" "x-gvfs-hide"]; fsType = "fuse.bindfs";
}; options = [
aggregated = pkgs.buildEnv { "ro"
name = "system-fonts-and-icons"; "resolve-symlinks"
paths = with pkgs; [ "x-gvfs-hide"
libsForQt5.breeze-qt5 ];
};
aggregated = pkgs.buildEnv {
name = "system-fonts-and-icons";
paths = fontPkgs; # with pkgs; [
# libsForQt5.breeze-qt5
noto-fonts # noto-fonts
noto-fonts-emoji # noto-fonts-emoji
noto-fonts-cjk-sans # noto-fonts-cjk-sans
noto-fonts-cjk-serif # noto-fonts-cjk-serif
]; # ];
pathsToLink = ["/share/fonts" "/share/icons"]; pathsToLink = [
"/share/fonts"
"/share/icons"
];
};
in
{
# Create an FHS mount to support flatpak host icons/fonts
"/usr/share/icons" = mkRoSymBind "${aggregated}/share/icons";
"/usr/share/fonts" = mkRoSymBind "${aggregated}/share/fonts";
}; };
in {
# Create an FHS mount to support flatpak host icons/fonts
"/usr/share/icons" = mkRoSymBind "${aggregated}/share/icons";
"/usr/share/fonts" = mkRoSymBind "${aggregated}/share/fonts";
};
} }

View file

@ -1,6 +1,5 @@
# ~/.config/nix-config/common/packages-headless.nix # ~/.config/nix-config/common/packages-headless.nix
{ pkgs, ... }: {pkgs, ...}: {
{
# nixpkgs.config.allowUnfree = true; # nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
vim vim
@ -9,5 +8,6 @@
git git
tmux tmux
wl-clipboard wl-clipboard
nix-index
]; ];
} }

View file

@ -0,0 +1,22 @@
{ pkgs, inputs, ... }:
{
virtualisation.waydroid.enable = true;
nixpkgs.overlays = [
inputs.nur.overlays.default
];
# waydroid-script: Tool to install libhoudini (arm support), magisk, ...
# usage: sudo waydroid-script
environment.systemPackages = with pkgs; [
nur.repos.ataraxiasjel.waydroid-script
waydroid-helper
];
systemd = {
packages = [ pkgs.waydroid-helper ];
services.waydroid-mount = {
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${pkgs.waydroid-helper}/bin/waydroid-helper --start-mount";
};
};
};
}

View file

@ -2,6 +2,7 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
rclone
age age
aichat aichat
beancount beancount
@ -40,16 +41,15 @@
zoxide zoxide
wakatime-cli wakatime-cli
# Langs # Langs
# lua # lua luajit
luajit
lua51Packages.luarocks lua51Packages.luarocks
ghostscript ghostscript
mermaid-cli mermaid-cli
tectonic tectonic
# Misc # Misc ta-lib ddgr protonvpn-cli
ta-lib
ddgr
protonvpn-cli
markdown-oxide markdown-oxide
nushell
powershell
powershell-editor-services
]; ];
} }

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
home.packages = with pkgs; [ home.packages = with pkgs; [
kitty kitty
ghostty ghostty
@ -31,5 +32,6 @@
protonvpn-gui protonvpn-gui
proton-pass proton-pass
protonmail-bridge-gui protonmail-bridge-gui
mpv
]; ];
} }

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
home.packages = with pkgs; [ home.packages = with pkgs; [
gnome-tweaks gnome-tweaks
sushi sushi
@ -16,14 +17,15 @@
]; ];
programs.gnome-shell.enable = true; programs.gnome-shell.enable = true;
programs.gnome-shell.extensions = [ programs.gnome-shell.extensions = [
{package = pkgs.gnomeExtensions.dash-to-dock;} { package = pkgs.gnomeExtensions.dash-to-dock; }
{package = pkgs.gnomeExtensions.caffeine;} { package = pkgs.gnomeExtensions.caffeine; }
{package = pkgs.gnomeExtensions.logo-menu;} { package = pkgs.gnomeExtensions.logo-menu; }
{package = pkgs.gnomeExtensions.kimpanel;} { package = pkgs.gnomeExtensions.kimpanel; }
{package = pkgs.gnomeExtensions.appindicator;} { package = pkgs.gnomeExtensions.appindicator; }
{package = pkgs.gnomeExtensions.gsconnect;} { package = pkgs.gnomeExtensions.gsconnect; }
{package = pkgs.gnomeExtensions.clipboard-indicator;} { package = pkgs.gnomeExtensions.clipboard-indicator; }
{package = pkgs.gnomeExtensions.advanced-alttab-window-switcher;} { package = pkgs.gnomeExtensions.advanced-alttab-window-switcher; }
{ package = pkgs.gnomeExtensions.blur-my-shell; }
]; ];
dconf.settings = { dconf.settings = {
@ -76,6 +78,16 @@
"/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-2/" "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-2/"
]; ];
}; };
"org/freedesktop/tracker/miner/files" = {
"index-recursive-directories" = [
"&DESKTOP"
"&DOCUMENTS"
"&MUSIC"
"&PICTURES"
"&VIDEOS"
"/home/js0ny/Obsidian"
];
};
}; };
# qt.style.name = "adwaita"; # qt.style.name = "adwaita";