nix: dirty flatpak fonts

This commit is contained in:
js0ny 2025-10-16 01:04:06 +01:00
parent af7c7b49f2
commit 608cd05802
8 changed files with 67 additions and 23 deletions

View file

@ -8,7 +8,7 @@ fork = true
idle = true idle = true
maximized = false maximized = false
# neovim-bin = "/opt/homebrew/bin/nvim" # neovim-bin = "/opt/homebrew/bin/nvim"
frame = "transparent" frame = "full"
no-multigrid = false no-multigrid = false
srgb = false srgb = false
tabs = true tabs = true
@ -19,8 +19,7 @@ wsl = false
[font] [font]
normal = [ normal = [
"Maple Mono NF CN", "Maple Mono NF",
"Iosevka Nerd Font", "Iosevka Nerd Font",
"霞鹜文楷等宽",
] # Will use the bundled Fira Code Nerd Font by default ] # Will use the bundled Fira Code Nerd Font by default
size = 14.0 size = 14.0

View file

@ -1,12 +1,5 @@
# ~/.config/nixcfgs/hosts/zephyrus/default.nix # ~/.config/nixcfgs/hosts/zephyrus/default.nix
{ {config, ...}: {
config,
lib,
pkgs,
nix-flatpak,
...
}:
{
imports = [ imports = [
../../modules/nixos ../../modules/nixos
../../modules/nixos/host-machine.nix ../../modules/nixos/host-machine.nix
@ -22,7 +15,7 @@
../../modules/nixos/obs-studio.nix ../../modules/nixos/obs-studio.nix
../../modules/nixos/wine.nix ../../modules/nixos/wine.nix
../../modules/nixos/desktop/gnome.nix ../../modules/nixos/desktop/gnome.nix
# ../../modules/nixos/desktop/niri.nix ../../modules/nixos/desktop/niri.nix
../../modules/nixos/desktop/kde.nix ../../modules/nixos/desktop/kde.nix
../../modules/nixos/display-manager/sddm.nix ../../modules/nixos/display-manager/sddm.nix
./hardware-configuration.nix ./hardware-configuration.nix
@ -36,8 +29,10 @@
boot.extraModulePackages = with config.boot.kernelPackages; [ boot.extraModulePackages = with config.boot.kernelPackages; [
v4l2loopback v4l2loopback
]; ];
networking.modemmanager.enable = false;
# Xilinx Artix-7 Basys 3
services.udev.extraRules = '' services.udev.extraRules = ''
ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010", MODE="0666", GROUP="wheel" ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010", MODE="0660", GROUP="dialout", SYMLINK+="basys3"
''; '';
system.stateVersion = "25.05"; system.stateVersion = "25.05";
} }

View file

@ -1,5 +1,5 @@
# https://github.com/gmodena/nix-flatpak # https://github.com/gmodena/nix-flatpak
{nix-flatpak, ...}: { {home, ...}: {
services.flatpak.enable = true; services.flatpak.enable = true;
services.flatpak.remotes = [ services.flatpak.remotes = [
{ {
@ -28,11 +28,14 @@
global = { global = {
Context = { Context = {
# Force wayland by default # Force wayland by default
sockets = ["wayland" "!x11" "!fallback-x11"];
filesystems = [ filesystems = [
"/run/current-system/sw/share/fonts:ro" "/run/current-system/sw/share/fonts:ro"
"xdg-config/fontconfig:ro" "xdg-config/fontconfig:ro"
# "xdg-data/fonts:ro" # If user font is set, it is required to access /nix/store
# since flatpak apps cannot read ~/.config/fontconfig/conf.d/*
# TODO: This is a bad practice, trying to look for a better solution
"/nix/store:ro"
"xdg-data/fonts:ro"
]; ];
}; };
}; };
@ -44,5 +47,6 @@
QT_IM_MODULE = "fcitx"; QT_IM_MODULE = "fcitx";
}; };
}; };
"md.obsidian.Obsidian".Context.sockets = ["wayland"];
}; };
} }

View file

@ -0,0 +1,13 @@
{pkgs, ...}: {
fonts.fontconfig.enable = true;
fonts.fontconfig = {
defaultFonts = {
monospace = [
"Maple Mono NF"
"JetBrainsMono Nerd Font"
];
serif = ["LXGW WenKai"];
sansSerif = ["LXGW Neo XiHei"];
};
};
}

View file

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

View file

@ -1,7 +1,13 @@
{ {
xdg.mime.enable = true;
xdg.mimeApps = { xdg.mimeApps = {
enable = true;
defaultApplications = { defaultApplications = {
"application/pdf" = "org.kde.okular.desktop"; "application/pdf" = "org.kde.okular.desktop";
"text/plain" = "nvim-qt.desktop";
"text/x-csrc" = "nvim-qt.desktop";
"text/x-chdr" = "nvim-qt.desktop";
"inode/directory" = "org.kde.dolphin.desktop";
}; };
}; };
} }

View file

@ -1,6 +1,8 @@
{pkgs, ...}: { {pkgs, ...}: {
home.packages = with pkgs.kdePackages; [ home.packages = with pkgs; [
yakuake kdePackages.yakuake
krunner-vscodeprojects
jetbrains-runner
]; ];
programs.plasma = { programs.plasma = {
enable = true; enable = true;
@ -28,6 +30,11 @@
]; ];
}; };
}; };
shortcuts = {
yakuake = {
"toggle-window-state" = "Meta+`";
};
};
input.touchpads = [ input.touchpads = [
{ {
disableWhileTyping = true; disableWhileTyping = true;
@ -101,7 +108,7 @@
"org.kde.plasma.marginsseparator" "org.kde.plasma.marginsseparator"
]; ];
opacity = "translucent"; opacity = "translucent";
hiding = "dodgewindows"; hiding = "none";
} }
]; ];
}; };

View file

@ -4,13 +4,26 @@
nix-flatpak, nix-flatpak,
plasma-manager, plasma-manager,
... ...
}: }: let
{ my-catppuccin-kde = pkgs.catppuccin-kde.override {
flavour = [
"mocha"
"latte"
];
accents = ["pink"];
winDecStyles = ["classic"];
};
my-catppuccin-gtk = pkgs.catppuccin-gtk.override {
accents = ["pink"];
variant = "mocha";
};
in {
imports = [ imports = [
./default.nix ./default.nix
./packages/cli.nix ./packages/cli.nix
./packages/gui.nix ./packages/gui.nix
./packages/flatpak.nix ./packages/flatpak.nix
./packages/fonts.nix
./programs/chromium.nix ./programs/chromium.nix
./programs/gnome.nix ./programs/gnome.nix
./programs/plasma.nix ./programs/plasma.nix
@ -37,5 +50,12 @@
# ./flatpak.nix # ./flatpak.nix
]; ];
home.packages = with pkgs; [
catppuccin
my-catppuccin-gtk
my-catppuccin-kde
catppuccin-fcitx5
];
home.stateVersion = "25.05"; home.stateVersion = "25.05";
} }