mirror of
https://github.com/js0ny/dotfiles.git
synced 2025-12-21 00:33:00 +00:00
nix: waydroid
This commit is contained in:
parent
c9ce831415
commit
0c6d0edb42
9 changed files with 142 additions and 59 deletions
32
home/dot_config/nvim/lsp/nil.lua
Normal file
32
home/dot_config/nvim/lsp/nil.lua
Normal 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",
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
|
@ -10,10 +10,9 @@
|
|||
imports = [
|
||||
../../modules/nixos
|
||||
../../modules/nixos/host-machine.nix
|
||||
# ../../modules/nixos/users/js0ny.nix
|
||||
# ../../modules/nixos/guest.nix
|
||||
../../modules/nixos/waydroid.nix
|
||||
../../modules/nixos/laptop.nix
|
||||
../../modules/nixos/nvidia.nix
|
||||
../../modules/nixos/disable-nvidia.nix
|
||||
../../modules/nixos/additional-packages.nix
|
||||
../../modules/nixos/libvirt.nix
|
||||
../../modules/nixos/docker.nix
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{pkgs, ...}:
|
||||
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [
|
||||
gcc
|
||||
llvmPackages_21.clang-tools
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,54 +2,71 @@
|
|||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
maple-mono.NF
|
||||
sarasa-gothic
|
||||
lxgw-wenkai
|
||||
lxgw-neoxihei
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts
|
||||
noto-fonts-emoji
|
||||
nerd-fonts.jetbrains-mono
|
||||
}:
|
||||
let
|
||||
fontPkgs = [
|
||||
pkgs.maple-mono.NF
|
||||
pkgs.sarasa-gothic
|
||||
pkgs.lxgw-wenkai
|
||||
pkgs.lxgw-neoxihei
|
||||
pkgs.noto-fonts-cjk-sans
|
||||
pkgs.noto-fonts
|
||||
pkgs.noto-fonts-emoji
|
||||
pkgs.nerd-fonts.jetbrains-mono
|
||||
];
|
||||
in
|
||||
{
|
||||
environment.systemPackages = fontPkgs;
|
||||
|
||||
fonts = {
|
||||
enableDefaultPackages = true;
|
||||
packages = fontPkgs;
|
||||
|
||||
fontconfig = {
|
||||
enable = true;
|
||||
defaultFonts = {
|
||||
monospace = ["Maple Mono NF" "JetBrainsMono Nerd Font"];
|
||||
serif = ["LXGW WenKai"];
|
||||
sansSerif = ["LXGW Neo XiHei"];
|
||||
monospace = [
|
||||
"Maple Mono NF"
|
||||
"JetBrainsMono Nerd Font"
|
||||
];
|
||||
serif = [ "LXGW WenKai" ];
|
||||
sansSerif = [ "LXGW Neo XiHei" ];
|
||||
};
|
||||
};
|
||||
fontDir.enable = true;
|
||||
};
|
||||
|
||||
system.fsPackages = [pkgs.bindfs];
|
||||
fileSystems = let
|
||||
mkRoSymBind = path: {
|
||||
device = path;
|
||||
fsType = "fuse.bindfs";
|
||||
options = ["ro" "resolve-symlinks" "x-gvfs-hide"];
|
||||
};
|
||||
aggregated = pkgs.buildEnv {
|
||||
name = "system-fonts-and-icons";
|
||||
paths = with pkgs; [
|
||||
libsForQt5.breeze-qt5
|
||||
system.fsPackages = [ pkgs.bindfs ];
|
||||
fileSystems =
|
||||
let
|
||||
mkRoSymBind = path: {
|
||||
device = path;
|
||||
fsType = "fuse.bindfs";
|
||||
options = [
|
||||
"ro"
|
||||
"resolve-symlinks"
|
||||
"x-gvfs-hide"
|
||||
];
|
||||
};
|
||||
aggregated = pkgs.buildEnv {
|
||||
name = "system-fonts-and-icons";
|
||||
paths = fontPkgs; # with pkgs; [
|
||||
# libsForQt5.breeze-qt5
|
||||
|
||||
noto-fonts
|
||||
noto-fonts-emoji
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-cjk-serif
|
||||
];
|
||||
pathsToLink = ["/share/fonts" "/share/icons"];
|
||||
# noto-fonts
|
||||
# noto-fonts-emoji
|
||||
# noto-fonts-cjk-sans
|
||||
# noto-fonts-cjk-serif
|
||||
# ];
|
||||
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";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
# ~/.config/nix-config/common/packages-headless.nix
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
# nixpkgs.config.allowUnfree = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
vim
|
||||
|
|
@ -9,5 +8,6 @@
|
|||
git
|
||||
tmux
|
||||
wl-clipboard
|
||||
nix-index
|
||||
];
|
||||
}
|
||||
|
|
|
|||
22
nixcfgs/modules/nixos/waydroid.nix
Normal file
22
nixcfgs/modules/nixos/waydroid.nix
Normal 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";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
rclone
|
||||
age
|
||||
aichat
|
||||
beancount
|
||||
|
|
@ -40,16 +41,15 @@
|
|||
zoxide
|
||||
wakatime-cli
|
||||
# Langs
|
||||
# lua
|
||||
luajit
|
||||
# lua luajit
|
||||
lua51Packages.luarocks
|
||||
ghostscript
|
||||
mermaid-cli
|
||||
tectonic
|
||||
# Misc
|
||||
ta-lib
|
||||
ddgr
|
||||
protonvpn-cli
|
||||
# Misc ta-lib ddgr protonvpn-cli
|
||||
markdown-oxide
|
||||
nushell
|
||||
powershell
|
||||
powershell-editor-services
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
kitty
|
||||
ghostty
|
||||
|
|
@ -31,5 +32,6 @@
|
|||
protonvpn-gui
|
||||
proton-pass
|
||||
protonmail-bridge-gui
|
||||
mpv
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
gnome-tweaks
|
||||
sushi
|
||||
|
|
@ -16,14 +17,15 @@
|
|||
];
|
||||
programs.gnome-shell.enable = true;
|
||||
programs.gnome-shell.extensions = [
|
||||
{package = pkgs.gnomeExtensions.dash-to-dock;}
|
||||
{package = pkgs.gnomeExtensions.caffeine;}
|
||||
{package = pkgs.gnomeExtensions.logo-menu;}
|
||||
{package = pkgs.gnomeExtensions.kimpanel;}
|
||||
{package = pkgs.gnomeExtensions.appindicator;}
|
||||
{package = pkgs.gnomeExtensions.gsconnect;}
|
||||
{package = pkgs.gnomeExtensions.clipboard-indicator;}
|
||||
{package = pkgs.gnomeExtensions.advanced-alttab-window-switcher;}
|
||||
{ package = pkgs.gnomeExtensions.dash-to-dock; }
|
||||
{ package = pkgs.gnomeExtensions.caffeine; }
|
||||
{ package = pkgs.gnomeExtensions.logo-menu; }
|
||||
{ package = pkgs.gnomeExtensions.kimpanel; }
|
||||
{ package = pkgs.gnomeExtensions.appindicator; }
|
||||
{ package = pkgs.gnomeExtensions.gsconnect; }
|
||||
{ package = pkgs.gnomeExtensions.clipboard-indicator; }
|
||||
{ package = pkgs.gnomeExtensions.advanced-alttab-window-switcher; }
|
||||
{ package = pkgs.gnomeExtensions.blur-my-shell; }
|
||||
];
|
||||
|
||||
dconf.settings = {
|
||||
|
|
@ -76,6 +78,16 @@
|
|||
"/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";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue