Skip to content

Commit cbe7f31

Browse files
committed
feat: 使用mylib.mklinkRelativeToRoot替换mkOutOfStoreSymlink,优化配置文件链接
1 parent 9d13d86 commit cbe7f31

7 files changed

Lines changed: 32 additions & 27 deletions

File tree

home/linux/gui/base/fcitx5/default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
config,
33
pkgs,
4+
mylib,
45
nur-DataEraserC,
56
...
67
}:
@@ -13,7 +14,7 @@
1314
force = true;
1415
};
1516
"mozc/config1.db".source =
16-
config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nix-config/home/linux/gui/base/fcitx5/mozc-config1.db";
17+
mylib.mklinkRelativeToRoot config "home/linux/gui/base/fcitx5/mozc-config1.db";
1718
};
1819

1920
i18n.inputMethod = {

home/linux/gui/base/hypridle/default.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
{
22
config,
33
lib,
4+
mylib,
45
...
56
}:
67

78
let
89
cfgNiri = config.modules.desktop.niri;
10+
mkSymlink = mylib.mklinkRelativeToRoot;
911
in
1012
lib.mkIf cfgNiri.enable {
11-
xdg.configFile."hypr/hypridle.conf".source = ./hypridle.conf;
13+
xdg.configFile."hypr/hypridle.conf".source =
14+
mkSymlink config "home/linux/gui/base/hypridle/hypridle.conf";
1215

1316
# Hyprland idle daemon
1417
services.hypridle.enable = true;

home/linux/gui/base/hypridle/hypridle.conf

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ general {
55
ignore_dbus_inhibit = false # whether to ignore dbus-sent idle-inhibit requests
66
}
77

8-
# NOTE: Disable this and my keyboard backlight device is named "platform::kbd_backlight"
9-
# listener {
10-
# timeout = 180 # 3 minutes
11-
# # List devices: brightnessctl --list
12-
# # Adjust keyboard backlight: brightnessctl -d kbd_backlight set 50%
13-
# on-timeout = brightnessctl --save --device=kbd_backlight set 0 # turn off keyboard backlight.
14-
# on-resume = brightnessctl --restore --device=kbd_backlight # turn on keyboard backlight.
15-
# }
8+
listener {
9+
timeout = 180 # 3 minutes
10+
# List devices: brightnessctl --list
11+
# Adjust keyboard backlight: brightnessctl -d platform::kbd_backlight set 50%
12+
on-timeout = brightnessctl --save --device=platform::kbd_backlight set 0 # turn off keyboard backlight.
13+
on-resume = brightnessctl --restore --device=platform::kbd_backlight # turn on keyboard backlight.
14+
}
1615

1716
# listener {
1817
# timeout = 600 # 10min.

home/linux/gui/base/noctalia/default.nix

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
lib,
33
config,
4+
mylib,
45
pkgs,
56
pkgs-patched,
67
wallpapers,
@@ -36,12 +37,12 @@ lib.mkIf cfgNiri.enable {
3637

3738
xdg.configFile =
3839
let
39-
mkSymlink = config.lib.file.mkOutOfStoreSymlink;
40-
confPath = "${config.home.homeDirectory}/nix-config/home/linux/gui/base/noctalia";
40+
mkSymlink = mylib.mklinkRelativeToRoot;
41+
confPath = "home/linux/gui/base/noctalia";
4142
in
4243
{
43-
"noctalia/settings.json".source = mkSymlink "${confPath}/settings.json";
44-
"qt6ct/qt6ct.conf".source = mkSymlink "${confPath}/qt6ct.conf";
44+
"noctalia/settings.json".source = mkSymlink config "${confPath}/settings.json";
45+
"qt6ct/qt6ct.conf".source = mkSymlink config "${confPath}/qt6ct.conf";
4546
};
4647

4748
systemd.user.services.noctalia-shell = {

home/linux/gui/niri/default.nix

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
pkgs,
33
config,
4+
mylib,
45
lib,
56
nur-DataEraserC,
67
...
@@ -24,15 +25,15 @@ in
2425

2526
xdg.configFile =
2627
let
27-
mkSymlink = config.lib.file.mkOutOfStoreSymlink;
28-
confPath = "${config.home.homeDirectory}/nix-config/home/linux/gui/niri/conf";
28+
mkSymlink = mylib.mklinkRelativeToRoot;
29+
confPath = "home/linux/gui/niri/conf";
2930
in
3031
{
31-
"niri/config.kdl".source = mkSymlink "${confPath}/config.kdl";
32-
"niri/keybindings.kdl".source = mkSymlink "${confPath}/keybindings.kdl";
33-
"niri/noctalia-shell.kdl".source = mkSymlink "${confPath}/noctalia-shell.kdl";
34-
"niri/spawn-at-startup.kdl".source = mkSymlink "${confPath}/spawn-at-startup.kdl";
35-
"niri/windowrules.kdl".source = mkSymlink "${confPath}/windowrules.kdl";
32+
"niri/config.kdl".source = mkSymlink config "${confPath}/config.kdl";
33+
"niri/keybindings.kdl".source = mkSymlink config "${confPath}/keybindings.kdl";
34+
"niri/noctalia-shell.kdl".source = mkSymlink config "${confPath}/noctalia-shell.kdl";
35+
"niri/spawn-at-startup.kdl".source = mkSymlink config "${confPath}/spawn-at-startup.kdl";
36+
"niri/windowrules.kdl".source = mkSymlink config "${confPath}/windowrules.kdl";
3637
};
3738

3839
systemd.user.services.niri-flake-polkit = {

hosts/12kingdoms-shoukei/home.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
{ config, ... }:
1+
{ config, mylib, ... }:
22
let
33
hostName = "shoukei"; # Define your hostname.
4-
mkSymlink = config.lib.file.mkOutOfStoreSymlink;
4+
mkSymlink = mylib.mklinkRelativeToRoot;
55
in
66
{
77
programs.ssh.matchBlocks."github.com".identityFile =
@@ -10,5 +10,5 @@ in
1010
modules.desktop.nvidia.enable = false;
1111

1212
xdg.configFile."niri/niri-hardware.kdl".source =
13-
mkSymlink "${config.home.homeDirectory}/nix-config/hosts/12kingdoms-shoukei/niri-hardware.kdl";
13+
mkSymlink config "hosts/12kingdoms-shoukei/niri-hardware.kdl";
1414
}

hosts/idols-ai/home.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
{ config, ... }:
1+
{ config, mylib, ... }:
22
let
3-
mkSymlink = config.lib.file.mkOutOfStoreSymlink;
3+
mkSymlink = mylib.mklinkRelativeToRoot;
44
in
55
{
66
programs.ssh.matchBlocks."github.com".identityFile =
@@ -9,5 +9,5 @@ in
99
modules.desktop.nvidia.enable = true;
1010

1111
xdg.configFile."niri/niri-hardware.kdl".source =
12-
mkSymlink "${config.home.homeDirectory}/nix-config/hosts/idols-ai/niri-hardware.kdl";
12+
mkSymlink config "hosts/idols-ai/niri-hardware.kdl";
1313
}

0 commit comments

Comments
 (0)