From c46aa581ba2699dfed3af318e132417d0aae3c7c Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 12 May 2025 13:38:53 +0800 Subject: [PATCH] fix build --- flake.lock | 70 ++++++++++--------- flake.nix | 8 ++- modules/hardware/default.nix | 2 +- modules/packages/desktop.nix | 8 +-- modules/packages/firefox.nix | 4 +- modules/packages/zsh/default.nix | 2 +- modules/system/catppuccin.nix | 9 +-- modules/system/font.nix | 4 +- modules/system/nixpkgs/buildNixpkgsConfig.nix | 4 +- 9 files changed, 59 insertions(+), 52 deletions(-) diff --git a/flake.lock b/flake.lock index 1a0fc5d4..ab69fcea 100644 --- a/flake.lock +++ b/flake.lock @@ -8,16 +8,15 @@ ] }, "locked": { - "lastModified": 1744237139, - "narHash": "sha256-f395cE+MIvKcRfRZubYXc7TJfJJ7edwpt7tYIFDgYQo=", + "lastModified": 1746065248, + "narHash": "sha256-pf0CHOIJTQllsH++29xzQzGaWUIy/976v2wAEADfDaI=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "a1a00f83d74988e98af8757e9b86ddf04d2ecdfc", + "rev": "d44515cc7473e1463a8e619f7a4ac1c1b58580bd", "type": "github" }, "original": { "owner": "ezKEa", - "ref": "release-24.11", "repo": "aagl-gtk-on-nix", "type": "github" } @@ -93,7 +92,9 @@ }, "catppuccin": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1746896926, @@ -570,16 +571,16 @@ ] }, "locked": { - "lastModified": 1744526849, - "narHash": "sha256-dSV9W6he2Qs3Oq3XwKTUvXRLLra7JkOjAA8Gf4oXxBk=", + "lastModified": 1747030531, + "narHash": "sha256-XAIUZTNZ/UaKZkaZP0BwK81hWjtUsQsn7qPqIzhuhI8=", "owner": "CHN-beta", "repo": "home-manager", - "rev": "f23a198156137477251f35db8282d74299dba15c", + "rev": "4f66885a6adbece89d73945299b4d5bb99daa804", "type": "github" }, "original": { "owner": "CHN-beta", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -871,16 +872,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", - "owner": "NixOS", + "lastModified": 1747032327, + "narHash": "sha256-i921o6g0Kl1R2Ml+C2hOgZcWhMYd+ELNjVphByz8wW4=", + "owner": "CHN-beta", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "e25343b102309e2e3ff34a48993821ecf78fbbca", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "CHN-beta", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -964,22 +965,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1746948977, - "narHash": "sha256-dQ8Wrn0Rc/JTYRnOO/Xbo1MMNzV7ac+fV9/PT6gfHxA=", - "owner": "CHN-beta", - "repo": "nixpkgs", - "rev": "39c74d635607203639ef302caec6223689d2f6bb", - "type": "github" - }, - "original": { - "owner": "CHN-beta", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvirt": { "inputs": { "nixpkgs": [ @@ -1282,7 +1267,7 @@ "nix-index-database": "nix-index-database", "nix-vscode-extensions": "nix-vscode-extensions", "nixos-wallpaper": "nixos-wallpaper", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-23.05": "nixpkgs-23.05", "nixpkgs-23.11": "nixpkgs-23.11", "nixpkgs-unstable": "nixpkgs-unstable", @@ -1298,6 +1283,7 @@ "qchem": "qchem", "rsshub": "rsshub", "rycee": "rycee", + "shadowrz": "shadowrz", "slate": "slate", "sockpp": "sockpp", "sops-nix": "sops-nix", @@ -1361,6 +1347,26 @@ "type": "gitlab" } }, + "shadowrz": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1745637907, + "narHash": "sha256-9Q7mKzRfSZGvKmbkbtZ3GKqcL0VxyxkyR76Yc2Ypuqs=", + "owner": "ShadowRZ", + "repo": "nur-packages", + "rev": "b87f9a470a5856219fdcbfaab6c0931acc7f3b7a", + "type": "github" + }, + "original": { + "owner": "ShadowRZ", + "repo": "nur-packages", + "type": "github" + } + }, "slate": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 17e18c77..18eeec27 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ "nixpkgs-23.11".url = "github:CHN-beta/nixpkgs/nixos-23.11"; "nixpkgs-23.05".url = "github:CHN-beta/nixpkgs/nixos-23.05"; nixpkgs-unstable.url = "github:CHN-beta/nixpkgs/nixos-unstable"; - home-manager = { url = "github:CHN-beta/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; + home-manager = { url = "github:CHN-beta/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; nur-xddxdd = { url = "github:xddxdd/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -29,12 +29,14 @@ inputs = { nixpkgs.follows = "nixpkgs"; home-manager.follows = "home-manager"; }; }; gricad = { url = "github:Gricad/nur-packages"; flake = false; }; - catppuccin.url = "github:catppuccin/nix"; + catppuccin = { url = "github:catppuccin/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; bscpkgs = { url = "github:CHN-beta/bscpkgs"; inputs.nixpkgs.follows = "nixpkgs"; }; winapps = { url = "github:winapps-org/winapps/feat-nix-packaging"; inputs.nixpkgs.follows = "nixpkgs"; }; - aagl = { url = "github:ezKEa/aagl-gtk-on-nix/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; + # TODO: switch to stable branch + aagl = { url = "github:ezKEa/aagl-gtk-on-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; cachyos-lts.url = "github:drakon64/nixos-cachyos-kernel"; nixvirt = { url = "github:CHN-beta/NixVirt"; inputs.nixpkgs.follows = "nixpkgs"; }; + shadowrz = { url = "github:ShadowRZ/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; }; misskey = { url = "git+https://github.com/CHN-beta/misskey?submodules=1"; flake = false; }; rsshub = { url = "github:DIYgod/RSSHub"; flake = false; }; diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix index 73e87938..65865a01 100644 --- a/modules/hardware/default.nix +++ b/modules/hardware/default.nix @@ -36,7 +36,7 @@ inputs: ( inputs.lib.mkIf (hardware.sound != null) { - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; services.pipewire = { enable = true; alsa = { enable = true; support32Bit = true; }; pulse.enable = true; }; security.rtkit.enable = true; } diff --git a/modules/packages/desktop.nix b/modules/packages/desktop.nix index 8f9aa84c..28239046 100644 --- a/modules/packages/desktop.nix +++ b/modules/packages/desktop.nix @@ -29,11 +29,11 @@ inputs: # networking pkgs-unstable.remmina putty mtr-gui # media - mpv nomacs yesplaymusic simplescreenrecorder imagemagick gimp-with-plugins netease-cloud-music-gtk qcm + mpv nomacs simplescreenrecorder imagemagick gimp-with-plugins netease-cloud-music-gtk qcm waifu2x-converter-cpp blender paraview vlc whalebird spotify obs-studio (inkscape-with-extensions.override { inkscapeExtensions = null; }) # themes - klassy localPackages.slate localPackages.blurred-wallpaper tela-circle-icon-theme + klassy-qt6 localPackages.slate localPackages.blurred-wallpaper tela-circle-icon-theme catppuccin catppuccin-sddm catppuccin-cursors catppuccinifier-gui catppuccinifier-cli catppuccin-plymouth (catppuccin-kde.override { flavour = [ "latte" ]; }) (catppuccin-kvantum.override { variant = "latte"; }) # terminal @@ -54,7 +54,7 @@ inputs: fluent-reader rssguard newsflash newsboat follow # nix tools nixpkgs-fmt appimage-run nixd nix-serve node2nix nix-prefetch-github prefetch-npm-deps nix-prefetch-docker - nix-template nil pnpm-lock-export bundix + nix-template nil bundix # instant messager element-desktop telegram-desktop discord zoom-us slack nur-linyinfeng.wemeet nheko fluffychat signal-desktop qq nur-xddxdd.wechat-uos-sandboxed cinny-desktop @@ -127,7 +127,7 @@ inputs: obs-studio = { enable = true; - plugins = with inputs.pkgs.obs-studio-plugins; [ wlrobs obs-vaapi obs-nvfbc droidcam-obs obs-vkcapture ]; + plugins = with inputs.pkgs.obs-studio-plugins; [ wlrobs obs-vaapi droidcam-obs obs-vkcapture ]; }; }; }]; diff --git a/modules/packages/firefox.nix b/modules/packages/firefox.nix index 6152a784..be1ad440 100644 --- a/modules/packages/firefox.nix +++ b/modules/packages/firefox.nix @@ -30,13 +30,13 @@ inputs: policies.DefaultDownloadDirectory = "\${home}/Downloads"; profiles.default = { - extensions = with inputs.pkgs.firefox-addons; + extensions.packages = with inputs.pkgs.firefox-addons; [ tampermonkey bitwarden cookies-txt dualsub firefox-color i-dont-care-about-cookies metamask pakkujs switchyomega rsshub-radar rsspreview tabliss tree-style-tab ublock-origin wallabagger wappalyzer grammarly plasma-integration zotero-connector pwas-for-firefox smartproxy kiss-translator ]; - search = { default = "Google"; force = true; }; + search = { default = "google"; force = true; }; userChrome = builtins.readFile "${inputs.topInputs.lepton}/userChrome.css"; userContent = builtins.readFile "${inputs.topInputs.lepton}/userContent.css"; extraConfig = builtins.readFile "${inputs.topInputs.lepton}/user.js"; diff --git a/modules/packages/zsh/default.nix b/modules/packages/zsh/default.nix index 55fa6795..7dbd8dc3 100644 --- a/modules/packages/zsh/default.nix +++ b/modules/packages/zsh/default.nix @@ -56,7 +56,7 @@ inputs: }; } ]; - initExtraBeforeCompInit = + initContent = inputs.lib.mkOrder 550 '' # p10k instant prompt P10K_INSTANT_PROMPT="$XDG_CACHE_HOME/p10k-instant-prompt-''${(%):-%n}.zsh" diff --git a/modules/system/catppuccin.nix b/modules/system/catppuccin.nix index 5ec49dcf..8c4dad88 100644 --- a/modules/system/catppuccin.nix +++ b/modules/system/catppuccin.nix @@ -3,16 +3,13 @@ inputs: config = { catppuccin.flavor = "latte"; - console.catppuccin.enable = true; + catppuccin.tty.enable = true; nixos.user.sharedModules = [{ config = { - programs = - { - bat = { enable = true; catppuccin.enable = true; }; - btop = { enable = true; catppuccin.enable = true; }; - }; + catppuccin = { btop.enable = true; bat.enable = true; }; + programs = { bat.enable = true; btop.enable = true; }; xdg = { enable = true; configFile."btop/btop.conf".force = true; }; }; }]; diff --git a/modules/system/font.nix b/modules/system/font.nix index 71b3e35b..b9c63be6 100644 --- a/modules/system/font.nix +++ b/modules/system/font.nix @@ -7,9 +7,9 @@ inputs: fontDir.enable = true; packages = with inputs.pkgs; [ - noto-fonts source-han-sans source-han-serif source-code-pro hack-font jetbrains-mono nerdfonts hack-font inter + noto-fonts source-han-sans source-han-serif source-code-pro hack-font jetbrains-mono hack-font inter noto-fonts-color-emoji roboto sarasa-gothic source-han-mono wqy_microhei wqy_zenhei noto-fonts-cjk-sans - noto-fonts-emoji corefonts vistafonts vistafonts-chs dejavu_fonts + noto-fonts-emoji corefonts vistafonts vistafonts-chs dejavu_fonts nerd-fonts.fira-code ]; fontconfig.defaultFonts = { diff --git a/modules/system/nixpkgs/buildNixpkgsConfig.nix b/modules/system/nixpkgs/buildNixpkgsConfig.nix index c5ab404c..452c275c 100644 --- a/modules/system/nixpkgs/buildNixpkgsConfig.nix +++ b/modules/system/nixpkgs/buildNixpkgsConfig.nix @@ -38,9 +38,11 @@ in platformConfig // inputs.topInputs.bscpkgs.overlays.default inputs.topInputs.aagl.overlays.default inputs.topInputs.nur-xddxdd.overlays.inSubTree + inputs.topInputs.shadowrz.overlays.default + inputs.topInputs.nix-vscode-extensions.overlays.default (final: prev: { - nix-vscode-extensions = inputs.topInputs.nix-vscode-extensions.extensions.${prev.system}; + inherit (inputs.topInputs.nix-vscode-extensions.overlays.default final prev) nix-vscode-extensions; nur-linyinfeng = (inputs.topInputs.nur-linyinfeng.overlays.default final prev).linyinfeng; firefox-addons = (import "${inputs.topInputs.rycee}" { inherit (prev) pkgs; }).firefox-addons; inherit (import inputs.topInputs.gricad { pkgs = final; }) intel-oneapi intel-oneapi-2022;