feat: update to latest linux kernel

This commit is contained in:
DACHXY 2025-01-17 15:21:32 +08:00
parent 5a383e7aad
commit 020ec5e967
15 changed files with 204 additions and 196 deletions

View file

@ -6,13 +6,14 @@
}:
let
browser = "firefox";
noOffloadBrowser = "${browser} -P noOffload -no-remote";
iconPrefix = ".local/share/icons/hicolor/scalable/apps";
newWindow = "${browser} --new-window";
mkIconPkg = import ../../utils/make-icon.nix { };
notionIcon = mkIconPkg {
name = "notion";
url = "";
sha256 = "";
mkIconPkg = pkgs.callPackage ../../utils/make-icon.nix { };
googleMeetIcon = mkIconPkg {
name = "googleMeet";
url = "https://fonts.gstatic.com/s/i/productlogos/meet_2020q4/v1/web-512dp/logo_meet_2020q4_color_1x_web_512dp.png";
sha256 = "sha256-LL33KhQTv4VVdPRBm7nzsHtPoQ2ArHwjwVxq2p8VdM4=";
};
in
{
@ -50,6 +51,7 @@ in
};
home.packages = [
googleMeetIcon
];
xdg.desktopEntries = {
@ -65,5 +67,17 @@ in
"Utility"
];
};
googleMeet = {
name = "Google Meet";
genericName = "Community";
exec = "${noOffloadBrowser} https://meet.google.com";
comment = "Google Meet";
icon = "googleMeet";
terminal = false;
categories = [
"Network"
];
};
};
}

View file

@ -2,11 +2,13 @@
pkgs,
xcursor-size,
...
}: let
}:
let
cursorName = "catppuccin-macchiato-lavender-cursors";
themeName = "catppuccin-macchiato-lavender-compact";
cursorSize = pkgs.lib.strings.toInt xcursor-size;
in {
in
{
gtk = {
enable = true;
@ -19,7 +21,7 @@ in {
theme = {
name = themeName;
package = pkgs.catppuccin-gtk.override {
accents = ["lavender"];
accents = [ "lavender" ];
size = "compact";
variant = "macchiato";
};
@ -55,13 +57,15 @@ in {
qt = {
enable = true;
style.name = "kvantum-dark";
style.name = "qt5ct-style";
style.package = pkgs.catppuccin-kvantum;
platformTheme.name = "qtct";
};
xdg.configFile = {
"Kvantum/Catppuccin-Macchiato-Lavender/Catppuccin-Macchiato-Blue/Catppuccin-Macchiato-Blue.kvconfig".source = "${pkgs.catppuccin-kvantum}/share/Kvantum/Catppuccin-Macchiato-Lavender/Cattpuccin-Macchiato-Blue.kvconfig";
"Kvantum/Catppuccin-Macchiato-Lavender/Catppuccin-Macchiato-Blue/Catppuccin-Macchiato-Blue.svg".source = "${pkgs.catppuccin-kvantum}/share/Kvantum/Catppuccin-Macchiato-Lavender/Cattpuccin-Macchiato-Blue.svg";
"Kvantum/Catppuccin-Macchiato-Lavender/Catppuccin-Macchiato-Blue/Catppuccin-Macchiato-Blue.kvconfig".source =
"${pkgs.catppuccin-kvantum}/share/Kvantum/Catppuccin-Macchiato-Lavender/Cattpuccin-Macchiato-Blue.kvconfig";
"Kvantum/Catppuccin-Macchiato-Lavender/Catppuccin-Macchiato-Blue/Catppuccin-Macchiato-Blue.svg".source =
"${pkgs.catppuccin-kvantum}/share/Kvantum/Catppuccin-Macchiato-Lavender/Cattpuccin-Macchiato-Blue.svg";
};
}

View file

@ -2,6 +2,7 @@
let
prefix = if nvidia-offload-enabled then "offload " else "";
browser = "${prefix}firefox";
noOffloadBrowser = "firefox -P noOffload";
terminal = "${prefix}ghostty";
filemanager = "nemo";
scripts = "~/.config/scripts";
@ -15,6 +16,7 @@ let
in
[
''${mainMod}, F, exec, ${browser}''
''CTRL ${mainMod}, F, exec, ${noOffloadBrowser} -no-remote''
''${mainMod}, RETURN, exec, ${terminal}''
''CTRL ALT, T, exec, ${terminal}''
''${mainMod}, Q, killactive, ''

View file

@ -20,6 +20,7 @@ let
${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1 &
${swayncScript}/bin/swaync-start &
dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
dbus-update-activation-environment --systemd --all &
systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
hyprpaper &

View file

@ -71,6 +71,9 @@ in
settings =
{
debug = {
disable_logs = false;
};
bind = import ./hypr/bind.nix { inherit mainMod nvidia-offload-enabled; };
bindm = import ./hypr/bindm.nix { inherit mainMod; };
monitor = import ./hypr/monitor.nix;

View file

@ -1,6 +1,22 @@
{ pkgs, ... }:
let
userChrome = builtins.readFile ../config/firefox/autohide_toolbox.css;
profileSettings = {
# about:config
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
"extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";
"font.language.group" = "zh-TW";
"font.name.sans-serif.ja" = "Noto Sans CJK JP";
"font.name.sans-serif.zh-TW" = "Noto Sans CJK TC";
"font.name.serif.ja" = "Noto Serif CJK JP";
"font.name.serif.zh-TW" = "Noto Serif CJK TC";
"font.name.monospace.ja" = "Noto Sans Mono CJK JP";
"font.name.monospace.x-western" = "CaskaydiaCove Nerd Font Mono";
"font.name.monospace.zh-TW" = "Noto Sans Mono CJK TC";
# Disable Ctrl+Q
"browser.quitShortcut.disabled" = true;
};
in
{
programs = {
@ -38,22 +54,16 @@ in
userChrome = userChrome;
settings = {
# about:config
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
"extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";
"font.language.group" = "zh-TW";
"font.name.sans-serif.ja" = "Noto Sans CJK JP";
"font.name.sans-serif.zh-TW" = "Noto Sans CJK TC";
"font.name.serif.ja" = "Noto Serif CJK JP";
"font.name.serif.zh-TW" = "Noto Serif CJK TC";
"font.name.monospace.ja" = "Noto Sans Mono CJK JP";
"font.name.monospace.x-western" = "CaskaydiaCove Nerd Font Mono";
"font.name.monospace.zh-TW" = "Noto Sans Mono CJK TC";
# Disable Ctrl+Q
"browser.quitShortcut.disabled" = true;
};
settings = profileSettings;
};
profiles.noOffload = {
id = 1;
name = "noOffload";
isDefault = false;
userChrome = userChrome;
settings = profileSettings;
};
};
};