fix: syntax error

This commit is contained in:
ryan4yin
2023-05-07 00:10:15 +08:00
parent bb47747529
commit 99e12fde04
5 changed files with 45 additions and 18 deletions

39
flake.lock generated
View File

@@ -38,6 +38,21 @@
} }
}, },
"flake-utils": { "flake-utils": {
"locked": {
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
@@ -119,7 +134,7 @@
}, },
"lib-aggregate": { "lib-aggregate": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
@@ -155,6 +170,27 @@
"type": "github" "type": "github"
} }
}, },
"nixos-cn": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1682818384,
"narHash": "sha256-l8jh9BQj6nfjPDYGyrZkZwX1GaOqBX+pBHU+7fFZU3w=",
"owner": "nixos-cn",
"repo": "flakes",
"rev": "2d475ec68cca251ef6c6c69a9224db5c264c5e5b",
"type": "github"
},
"original": {
"owner": "nixos-cn",
"repo": "flakes",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1683014792, "lastModified": 1683014792,
@@ -259,6 +295,7 @@
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"nixos-cn": "nixos-cn",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-wayland": "nixpkgs-wayland" "nixpkgs-wayland": "nixpkgs-wayland"
} }

View File

@@ -46,7 +46,7 @@
nixpkgs-wayland = { url = "github:nix-community/nixpkgs-wayland"; }; nixpkgs-wayland = { url = "github:nix-community/nixpkgs-wayland"; };
# nixos-cn 提供了一些国内常用的程序包,如 qq wechat dingtalk 等 # nixos-cn 提供了一些国内常用的程序包,如 qq wechat dingtalk 等
inputs.nixos-cn = { nixos-cn = {
url = "github:nixos-cn/flakes"; url = "github:nixos-cn/flakes";
# 强制 nixos-cn 和该 flake 使用相同版本的 nixpkgs # 强制 nixos-cn 和该 flake 使用相同版本的 nixpkgs
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -60,6 +60,7 @@
self, self,
nixpkgs, nixpkgs,
home-manager, home-manager,
nixos-cn,
... ...
}: { }: {
# 名为 nixosConfigurations 的 outputs 会在执行 `nixos-rebuild switch --flake .` 时被使用 # 名为 nixosConfigurations 的 outputs 会在执行 `nixos-rebuild switch --flake .` 时被使用

View File

@@ -8,7 +8,7 @@
firefox-wayland firefox-wayland
]; ];
programs = { programs =
let commandLineArgs = [ "--enable-wayland-ime" "--ozone-platform=wayland" ]; let commandLineArgs = [ "--enable-wayland-ime" "--ozone-platform=wayland" ];
in { in {
chromium = { chromium = {
@@ -20,5 +20,4 @@
inherit commandLineArgs; inherit commandLineArgs;
}; };
}; };
}; }
}

View File

@@ -120,7 +120,6 @@
jq.enable = true; # A lightweight and flexible command-line JSON processor jq.enable = true; # A lightweight and flexible command-line JSON processor
ssh.enable = true; ssh.enable = true;
aria2.enable = true; aria2.enable = true;
adb.enable = true;
skim = { skim = {
enable = true; enable = true;
@@ -144,4 +143,4 @@
# auto mount usb drives # auto mount usb drives
udiskie.enable = true; udiskie.enable = true;
}; };
} }

View File

@@ -1,4 +1,4 @@
{config, ...}: let {config, pkgs, ...}: let
browser = ["firefox.desktop"]; browser = ["firefox.desktop"];
# XDG MIME types # XDG MIME types
@@ -44,14 +44,5 @@ in {
}; };
}; };
# https://github.com/flatpak/xdg-desktop-portal
# enable wayland wlroots support
portal = {
enable = true;
extraPortals = with pkgs; [
xdg-desktop-portal-wlr
xdg-desktop-portal-gtk
];
};
}; };
} }