feat: update TODO, fix some problems

This commit is contained in:
ryan4yin
2023-05-07 00:28:30 +08:00
parent b8b4d843d6
commit e9e63e6d4a
17 changed files with 114 additions and 64 deletions

View File

@@ -1,23 +1,24 @@
{
pkgs,
nixpkgs-stable,
config,
...
}: {
home.packages = with pkgs; [
# use wayland version of firefox
firefox-wayland
];
home.packages =
let
pkgs-stable = import nixpkgs-stable {
system = pkgs.system;
config.allowUnfree = true;
};
in
with pkgs-stable; [
firefox-wayland
programs =
let commandLineArgs = [ "--enable-wayland-ime" "--ozone-platform=wayland" ];
in {
chromium = {
enable = true;
inherit commandLineArgs;
};
google-chrome = {
enable = true;
inherit commandLineArgs;
};
};
# chrome wayland support was broken on nixos-unstable branch, so fallback to stable branch for now
# https://github.com/swaywm/sway/issues/7562
google-chrome
];
# programs = {
# };
}

View File

@@ -9,7 +9,6 @@
ripgrep
yq-go # https://github.com/mikefarah/yq
htop
nvtop
## networking tools
wireshark

View File

@@ -8,6 +8,7 @@
./common.nix
./git.nix
./media.nix
./nixos-cn.nix
./vscode.nix
./xdg.nix
];

View File

@@ -5,24 +5,19 @@
...
}:
{
imports = [
# 将 nixos-cn flake 提供的 registry 添加到全局 registry 列表中
# 可在`nixos-rebuild switch`之后通过`nix registry list`查看
nixos-cn.nixosModules.nixos-cn-registries
home.packages = with nixos-cn; [
qq
wechat-uos
netease-cloud-music
# 引入nixos-cn flake提供的NixOS模块
nixos-cn.nixosModules.nixos-cn
];
programs = {
mpv = {
enable = true;
defaultProfiles = ["gpu-hq"];
scripts = [pkgs.mpvScripts.mpris];
};
obs-studio.enable = true;
};
services = {
playerctld.enable = true;
};
# # 使用 nixos-cn flake 提供的包
home.packages = with nixos-cn.legacyPackages.${pkgs.system}; [
# qq
# wechat-uos # TODO failed to install
netease-cloud-music # TODO chinese font missing
];
}

View File

@@ -21,8 +21,8 @@
"video/*" = ["mpv.dekstop"];
"image/*" = ["imv.desktop"];
"application/json" = browser;
"application/pdf" = ["org.pwmt.zathura.desktop.desktop"];
"x-scheme-handler/discord" = ["discordcanary.desktop"];
"application/pdf" = ["org.pwmt.zathura.desktop.desktop"]; # TODO: pdf viewer
"x-scheme-handler/discord" = ["discord.desktop"];
"x-scheme-handler/spotify" = ["spotify.desktop"];
"x-scheme-handler/tg" = ["telegramdesktop.desktop"];
};
@@ -43,6 +43,5 @@ in {
XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";
};
};
};
}